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

Link ef_turi_suiteki

Browse Source
This commit is contained in:
Cuyler36
2025-06-05 15:08:06 -04:00
parent a346d0c377
commit 56d9c7f2b0
2 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1347,7 +1347,7 @@ config.libs = [
Object(NonMatching, "effect/ef_turi_hane0.c"),
Object(NonMatching, "effect/ef_turi_hane1.c"),
Object(Matching, "effect/ef_turi_mizu.c"),
Object(NonMatching, "effect/ef_turi_suiteki.c"),
Object(Matching, "effect/ef_turi_suiteki.c"),
Object(NonMatching, "effect/ef_turn_asimoto.c"),
Object(NonMatching, "effect/ef_turn_footprint.c"),
Object(Matching, "effect/ef_uranai.c"),
src/effect/ef_turi_suiteki.c
+53 -4
View File
@@ -1,5 +1,9 @@
#include "ef_effect_control.h"
#include "m_common_data.h"
#include "sys_matrix.h"
#include "m_rcp.h"
static void eTS_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
static void eTS_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
static void eTS_mv(eEC_Effect_c* effect, GAME* game);
@@ -18,17 +22,62 @@ eEC_PROFILE_c iam_ef_turi_suiteki = {
};
static void eTS_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_TURI_SUITEKI, pos, NULL, game, NULL, item_name, prio, arg0, arg1);
}
static void eTS_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
// TODO
effect->scale.x = 0.0015f;
effect->scale.y = 0.0015f;
effect->scale.z = 0.0015f;
effect->effect_specific[0] = (s16)(sin_s(DEG2SHORT_ANGLE(74.53125f)) * 10.0f / 0.75f + 2.0f);
effect->effect_specific[0] *= 2;
effect->acceleration.x = RANDOM_F(5.0f);
effect->acceleration.z = RANDOM_F(5.0f);
effect->timer = effect->effect_specific[0];
}
static void eTS_mv(eEC_Effect_c* effect, GAME* game) {
// TODO
u32 attribute = mCoBG_Wpos2Attribute(effect->velocity, NULL);
f32 height;
if (mCoBG_CheckWaterAttribute(attribute)) {
height = mCoBG_GetWaterHeight_File(effect->velocity, __FILE__, 129);
if (height >= effect->velocity.y && height < effect->position.y + 10.0f) {
eEC_CLIP->effect_make_proc(eEC_EFFECT_TURI_HAMON, effect->velocity, 1, 0, game, EMPTY_NO, 3, 0);
effect->timer = 0;
}
}
}
extern Gfx ef_turi_suiteki01_00_modelT[];
static void eTS_dw(eEC_Effect_c* effect, GAME* game) {
// TODO
xyz_t scale = effect->scale;
f32 remain = effect->effect_specific[0] - effect->timer;
f32 angle_f;
int angle;
if (effect->arg1 != 0) {
angle_f = (f32)effect->arg0 * 360.0f / (f32)effect->arg1;
} else {
angle_f = 0.0f;
}
angle = DEG2SHORT_ANGLE2(angle_f);
effect->velocity.x = effect->position.x + effect->acceleration.x * remain * cos_s(DEG2SHORT_ANGLE(74.53125f)) * sin_s(angle);
effect->velocity.z = effect->position.z + effect->acceleration.z * remain * cos_s(DEG2SHORT_ANGLE(74.53125f)) * cos_s(angle);
effect->velocity.y = (effect->position.y + (remain * 5.0f) * sin_s(DEG2SHORT_ANGLE(74.53125f))) - remain * (0.375f * remain);
OPEN_DISP(game->graph);
_texture_z_light_fog_prim_xlu(game->graph);
Matrix_translate(effect->velocity.x, effect->velocity.y, effect->velocity.z, 0);
Matrix_scale(scale.x, scale.y, scale.z, 1);
gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(NEXT_POLY_XLU_DISP, ef_turi_suiteki01_00_modelT);
CLOSE_DISP(game->graph);
}