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 ef_bush_yuki

Browse Source
This commit is contained in:
Prakxo
2024-04-21 18:32:23 +02:00
parent 4df2a85304
commit 61351a9dde
2 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/rel_slices.yml
+4
View File
@@ -1006,6 +1006,10 @@ ef_bush_happa.c:
.text: [0x80606A68, 0x806072DC]
.rodata: [0x8064BD78, 0x8064BDD8]
.data: [0x806D1F68, 0x806D1F80]
ef_bush_yuki.c:
.text: [0x806072DC, 0x806075BC]
.rodata: [0x8064BDD8, 0x8064BE00]
.data: [0x806D1F80, 0x806D1F98]
ef_coin.c:
.text: [0x80608060, 0x806087EC]
.rodata: [0x8064BE48, 0x8064BEA0]
src/ef_bush_yuki.c
+47 -5
View File
@@ -1,4 +1,8 @@
#include "ef_effect_control.h"
#include "m_common_data.h"
#include "m_rcp.h"
extern Gfx ef_w_yabu01_00_modelT[];
static void eBushYuki_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
static void eBushYuki_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
@@ -18,17 +22,55 @@ eEC_PROFILE_c iam_ef_bush_yuki = {
};
static void eBushYuki_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_BUSH_YUKI, pos, NULL, game, &angle, item_name, prio, arg0, arg1);
}
static void eBushYuki_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
// TODO
f32 y = 1.5f + (RANDOM_F(1.5f));
f32 initialPos = -3.0f + (6.0f * fqrand());
effect->timer = 60;
effect->position.x += initialPos;
effect->position.y += initialPos;
eEC_CLIP->random_first_speed_proc(&effect->velocity,y,45.0f,45.0f);
if (effect->arg1 == 1) {
effect->velocity.x = RANDOM2_F(2.0f);
effect->velocity.y = fqrand();
effect->velocity.z = fqrand();
}
effect->scale.x = 0.005f;
effect->scale.y = 0.005f;
effect->scale.z = 0.005f;
effect->acceleration.x = 0.0f;
effect->acceleration.y = -0.125f;
effect->acceleration.z = 0.0f;
}
static void eBushYuki_mv(eEC_Effect_c* effect, GAME* game) {
// TODO
void eBushYuki_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);
}
static void eBushYuki_dw(eEC_Effect_c* effect, GAME* game) {
// TODO
GAME_PLAY* play = (GAME_PLAY*)game;
GRAPH* graph;
u8 alpha = (int)eEC_CLIP->calc_adjust_proc(60 - effect->timer, 32, 60, 200.0f, 0.0f);
graph = game->graph;
_texture_z_light_fog_prim_xlu(game->graph);
eEC_CLIP->auto_matrix_xlu_proc(game, &effect->position, &effect->scale);
OPEN_DISP(graph);
gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 128, 40, 40, 40, alpha);
gSPDisplayList(NEXT_POLY_XLU_DISP,ef_w_yabu01_00_modelT);
CLOSE_DISP(graph);
}