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

Implement & link ef_tumble_bodyprint

Browse Source
This commit is contained in:
Cuyler36
2025-06-16 07:53:48 -04:00
parent 1cf04e4e68
commit 3b4da7de48
3 changed files with 84 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1341,7 +1341,7 @@ config.libs = [
Object(Matching, "effect/ef_tape.c"),
Object(Matching, "effect/ef_tent_lamp.c"),
Object(NonMatching, "effect/ef_tumble.c"),
Object(NonMatching, "effect/ef_tumble_bodyprint.c"),
Object(Matching, "effect/ef_tumble_bodyprint.c"),
Object(Matching, "effect/ef_tumble_dust.c"),
Object(Matching, "effect/ef_turi_hamon.c"),
Object(Matching, "effect/ef_turi_hane0.c"),
include/m_lib.h
+1
View File
@@ -83,6 +83,7 @@ extern int mem_cmp(u8* p1, u8* p2, size_t size);
extern f32 cos_s(s16 angle);
extern f32 sin_s(s16 angle);
#define tan_s(angle) (sin_s(angle) / cos_s(angle))
extern int chase_angle(s16* const pValue, const s16 target, s16 step);
extern int chase_s(s16* const pValue, const s16 target, s16 step);
src/effect/ef_tumble_bodyprint.c
+82 -4
View File
@@ -1,5 +1,9 @@
#include "ef_effect_control.h"
#include "m_common_data.h"
#include "m_rcp.h"
#include "sys_matrix.h"
static void eTumbleBodyPrint_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
static void eTumbleBodyPrint_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
static void eTumbleBodyPrint_mv(eEC_Effect_c* effect, GAME* game);
@@ -18,17 +22,91 @@ eEC_PROFILE_c iam_ef_tumble_bodyprint = {
};
static void eTumbleBodyPrint_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_TUMBLE_BODYPRINT, pos, NULL, game, &angle, item_name, prio, arg0, arg1);
}
static void eTumbleBodyPrint_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
// TODO
s16* angle_p = (s16*)ct_arg;
s16 angle = *angle_p;
s_xyz ground_angle;
if ((Common_Get(time.season) == mTM_SEASON_WINTER &&
(effect->arg0 == mCoBG_ATTRIBUTE_GRASS0 || effect->arg0 == mCoBG_ATTRIBUTE_GRASS1 ||
effect->arg0 == mCoBG_ATTRIBUTE_GRASS2 || effect->arg0 == mCoBG_ATTRIBUTE_GRASS3)) ||
effect->arg0 == mCoBG_ATTRIBUTE_SAND || effect->arg0 == mCoBG_ATTRIBUTE_WAVE) {
effect->scale.x = effect->scale.y = effect->scale.z = 0.016f;
effect->position.y = mCoBG_GetBgY_AngleS_FromWpos(&ground_angle, effect->position, 0.0f);
effect->position.y += 0.6f;
effect->position.x += sin_s(angle) * 7.0f;
effect->position.z += cos_s(angle) * 7.0f;
if (ground_angle.x != 0 || ground_angle.z != 0) {
effect->position.y += (cos_s(angle) * -tan_s(ground_angle.x) + sin_s(angle) * tan_s(ground_angle.z)) * 7.0f + 1.4f;
}
effect->effect_specific[1] = angle;
effect->effect_specific[0] = ground_angle.x;
effect->effect_specific[2] = ground_angle.z;
effect->effect_specific[4] = 0;
if (effect->arg0 == mCoBG_ATTRIBUTE_SAND || effect->arg0 == mCoBG_ATTRIBUTE_WAVE) {
effect->timer = 600;
effect->effect_specific[3] = 1;
} else {
effect->timer = 800;
effect->effect_specific[3] = 0;
}
} else {
effect->timer = 0;
}
}
static void eTumbleBodyPrint_mv(eEC_Effect_c* effect, GAME* game) {
// TODO
mActor_name_t* fg_p = mFI_GetUnitFG(effect->position);
if (effect->scale.x < 0.021f) {
effect->scale.x += 0.0005f;
effect->scale.z = effect->scale.x;
}
if (effect->effect_specific[4] != 1 && fg_p != NULL && (ITEM_IS_HOLE(*fg_p) || *fg_p == HOLE_SHINE)) {
effect->effect_specific[4] = 1;
}
if (effect->effect_specific[4] == 1 && effect->timer >= 70) {
effect->timer -= 70;
}
}
extern Gfx ef_bodyprint01_00_modelT[];
static void eTumbleBodyPrint_dw(eEC_Effect_c* effect, GAME* game) {
// TODO
s16 counter = 800 - effect->timer;
u8 a;
if (effect->effect_specific[3] != 0) {
a = (int)eEC_CLIP->calc_adjust_proc(counter, 360, 600, 150.0f, 0.0f);
} else {
a = (int)eEC_CLIP->calc_adjust_proc(counter, 500, 799, 150.0f, 0.0f);
}
OPEN_DISP(game->graph);
_texture_z_light_fog_prim_xlu(game->graph);
Matrix_translate(effect->position.x, effect->position.y, effect->position.z, 0);
Matrix_scale(effect->scale.x, effect->scale.y, effect->scale.z, 1);
Matrix_RotateZ(effect->effect_specific[2], 1);
Matrix_RotateX(effect->effect_specific[0], 1);
Matrix_RotateY(effect->effect_specific[1], 1);
gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (effect->effect_specific[3] != 0) {
gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 255, 70, 50, 50, a);
} else {
gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 255, 0, 50, 100, a);
}
gSPDisplayList(NEXT_POLY_XLU_DISP, ef_bodyprint01_00_modelT);
CLOSE_DISP(game->graph);
}