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

Link & Implement ef_kasamizu.c (#427)

Browse Source 
* Link & Implement ef_kasamizu.c

* ef_kasamizu.c fixed

* ef_kasamizu.c fixed again
This commit is contained in:
Reaperoe
2024-09-06 18:17:16 -04:00
committed by GitHub
parent 02351e6257
commit 4eb639655c
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/rel_slices.yml
+3
View File
@@ -1220,6 +1220,9 @@ ef_hanabi_dummy.c:
ef_hanatiri.c:
.text: [0x80610478, 0x8061061C]
.data: [0x806D2C08, 0x806D2C20]
ef_kasamizu.c:
.text: [0x806127BC, 0x80612960]
.data: [0x806D2DE0, 0x806D2E08]
ef_killer.c:
.text: [0x80614178, 0x8061481C]
.rodata: [0x8064C680, 0x8064C6C0]
src/ef_kasamizu.c
+21 -4
View File
@@ -1,5 +1,7 @@
#include "ef_effect_control.h"
#include "m_common_data.h"
static void eKasamizu_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
static void eKasamizu_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
static void eKasamizu_mv(eEC_Effect_c* effect, GAME* game);
@@ -18,17 +20,32 @@ eEC_PROFILE_c iam_ef_kasamizu = {
};
static void eKasamizu_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
// TODO
eEC_CLIP->make_effect_proc(eEC_EFFECT_KASAMIZU, pos, NULL, game, &angle, item_name, prio, arg0, arg1);
}
static void eKasamizu_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
// TODO
static xyz_t base_offset = {0, 45.0f, -20.0f};
xyz_t pos;
s16 angle = *(s16*)ct_arg;
Matrix_RotateY(angle, 0);
Matrix_Position(&base_offset, &pos);
xyz_t_add(&effect->position, &pos, &effect->position);
effect->effect_specific[0] = angle;
effect->timer = 24;
}
static void eKasamizu_mv(eEC_Effect_c* effect, GAME* game) {
// TODO
GAME_PLAY* play = (GAME_PLAY*)game;
if (eEC_CLIP != (eEC_EffectControl_Clip_c*)0) {
int mEnv_NowWeather();
if (mEnv_NowWeather() == mEnv_WEATHER_RAIN && play->game_frame & 1) {
xyz_t pos = effect->position;
eEC_CLIP->effect_make_proc(eEC_EFFECT_KASAMIZUTAMA, pos, effect->prio, effect->effect_specific[0], game,
effect->item_name, 0, 0);
}
}
}
static void eKasamizu_dw(eEC_Effect_c* effect, GAME* game) {
// TODO
// Nothing
}