mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement & link ef_killer

Browse Source
This commit is contained in:
Cuyler36
2024-03-11 06:31:55 -04:00
parent 3ae9f12c91
commit 3b72ddee4d
2 changed files with 143 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/rel_slices.yml
+4
View File
@@ -891,6 +891,10 @@ ac_weather_leaf.c:
.text: [0x8060420C, 0x806048B8]
.rodata: [0x8064BBE8, 0x8064BC40]
.data: [0x806D1E28, 0x806D1E48]
ef_killer.c:
.text: [0x80614178, 0x8061481C]
.rodata: [0x8064C680, 0x8064C6C0]
.data: [0x806D2EC0, 0x806D2F90]
ef_make_hem.c:
.text: [0x806162B0, 0x8061710C]
.rodata: [0x8064C818, 0x8064C860]
src/ef_killer.c
+139 -14
View File
@@ -1,20 +1,13 @@
#include "ef_effect_control.h"
static void eKL_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
// TODO
}
#include "m_common_data.h"
#include "sys_matrix.h"
#include "m_rcp.h"
static void eKL_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
// TODO
}
static void eKL_mv(eEC_Effect_c* effect, GAME* game) {
// TODO
}
static void eKL_dw(eEC_Effect_c* effect, GAME* game) {
// TODO
}
static void eKL_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
static void eKL_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
static void eKL_mv(eEC_Effect_c* effect, GAME* game);
static void eKL_dw(eEC_Effect_c* effect, GAME* game);
eEC_PROFILE_c iam_ef_killer = {
// clang-format off
@@ -27,3 +20,135 @@ eEC_PROFILE_c iam_ef_killer = {
eEC_IGNORE_DEATH_DIST,
// clang-format on
};
static void eKL_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
(*eEC_CLIP->make_effect_proc)(eEC_EFFECT_KILLER, pos, NULL, game, NULL, item_name, prio, angle, arg1);
}
static void eKL_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
static xyz_t xyz0 = { 0.0f, 0.0f, 0.0f };
effect->acceleration = xyz0;
effect->velocity = xyz0;
effect->velocity.x = sin_s(effect->arg0) * 2.0f;
effect->velocity.z = cos_s(effect->arg0) * 2.0f;
effect->timer = 360;
switch (Save_Get(scene_no)) {
case SCENE_MY_ROOM_S:
effect->offset.x = 40.0f;
effect->offset.z = 40.0f;
effect->offset.y = 200.0f;
effect->scale.x = 360.0f;
break;
case SCENE_NPC_HOUSE:
case SCENE_MY_ROOM_M:
case SCENE_MY_ROOM_LL2:
case SCENE_COTTAGE_NPC:
effect->offset.x = 40.0f;
effect->offset.z = 40.0f;
effect->offset.y = 280.0f;
effect->scale.x = 440.0f;
break;
case SCENE_MY_ROOM_L:
case SCENE_MY_ROOM_LL1:
case SCENE_MY_ROOM_BASEMENT_S:
case SCENE_MY_ROOM_BASEMENT_M:
case SCENE_MY_ROOM_BASEMENT_L:
case SCENE_MY_ROOM_BASEMENT_LL1:
case SCENE_COTTAGE_MY:
effect->offset.x = 40.0f;
effect->offset.z = 40.0f;
effect->offset.y = 360.0f;
effect->scale.x = 520.0f;
break;
default:
effect->offset.x = 0.0f;
effect->offset.y = 0.0f;
effect->offset.z = 0.0f;
effect->scale.x = 0.0f;
break;
}
{
if (ABS(effect->arg0 & 0xFFFF) <= 15) {
if (ABS(effect->position.z - effect->scale.x) <= 21.0f) {
effect->timer = 0;
return;
}
} else if (ABS((effect->arg0 & 0xFFFF) - (u16)DEG2SHORT_ANGLE(90.0f)) <= 15) {
if (ABS(effect->position.x - effect->offset.y) <= 21.0f) {
effect->timer = 0;
return;
}
} else if (ABS((effect->arg0 & 0xFFFF) - (u16)DEG2SHORT_ANGLE(180.0f)) <= 15) {
if (ABS(effect->position.z - effect->offset.z) <= 21.0f) {
effect->timer = 0;
return;
}
} else if (ABS((effect->arg0 & 0xFFFF) - (u16)DEG2SHORT_ANGLE(270.0f)) <= 15) {
if (ABS(effect->position.x - effect->offset.x) <= 21.0f) {
effect->timer = 0;
return;
}
} else {
return;
}
sAdo_OngenTrgStart(0x44F, &effect->position);
effect->effect_specific[0] = 0;
}
}
static void eKL_mv(eEC_Effect_c* effect, GAME* game) {
xyz_t_add(&effect->velocity, &effect->acceleration, &effect->velocity);
xyz_t_add(&effect->position, &effect->velocity, &effect->position);
if (effect->position.x < effect->offset.x || effect->position.z < effect->offset.z ||
effect->position.x > effect->offset.y || effect->position.z > effect->scale.x) {
effect->timer = 0;
effect->scale.z = 0.0f;
} else {
f32 dist = 1000.0f;
if (ABS(effect->position.x - effect->offset.x) < 16.0f) {
dist = ABS(effect->position.x - effect->offset.x);
} else if (ABS(effect->position.z - effect->offset.z) < 16.0f) {
dist = ABS(effect->position.z - effect->offset.z);
} else if (ABS(effect->position.x - effect->offset.y) < 16.0f) {
dist = ABS(effect->position.x - effect->offset.y);
} else if (ABS(effect->position.z - effect->scale.x) < 16.0f) {
dist = ABS(effect->position.z - effect->scale.x);
}
if (dist < 20.0f) {
effect->scale.z = dist / 16.0f;
if (effect->effect_specific[0] == 0) {
effect->velocity.x *= 0.5f;
effect->velocity.z *= 0.5f;
effect->effect_specific[0] = 1;
}
} else {
effect->scale.z = 1.0f;
}
}
}
extern Gfx act_killer_model[];
static void eKL_dw(eEC_Effect_c* effect, GAME* game) {
GAME_PLAY* play = (GAME_PLAY*)game;
Matrix_translate(effect->position.x, effect->position.y, effect->position.z, 0);
Matrix_RotateY(effect->arg0, 1);
Matrix_scale(0.01f, 0.01f, effect->scale.z * 0.01f, 1);
_texture_z_light_fog_prim(game->graph);
OPEN_DISP(game->graph);
gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(NEXT_POLY_OPA_DISP, act_killer_model);
CLOSE_DISP(game->graph);
}