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_siawase_hana_ch

Browse Source
This commit is contained in:
Norgesnerd
2025-06-14 15:17:46 +02:00
parent e588910840
commit 1b5186e1c4
2 changed files with 93 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1321,7 +1321,7 @@ config.libs = [
Object(Matching, "effect/ef_shooting_kira.c"),
Object(Matching, "effect/ef_shooting_set.c"),
Object(Matching, "effect/ef_siawase_hana.c"),
Object(NonMatching, "effect/ef_siawase_hana_ch.c"),
Object(Matching, "effect/ef_siawase_hana_ch.c"),
Object(NonMatching, "effect/ef_siawase_hikari.c"),
Object(NonMatching, "effect/ef_sibuki.c"),
Object(NonMatching, "effect/ef_situren.c"),
src/effect/ef_siawase_hana_ch.c
+92 -4
View File
@@ -1,5 +1,11 @@
#include "ef_effect_control.h"
#include "m_common_data.h"
#include "m_rcp.h"
#include "sys_matrix.h"
extern Gfx ef_siawase01_01_modelT[];
static void eSSHNC_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
static void eSSHNC_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
static void eSSHNC_mv(eEC_Effect_c* effect, GAME* game);
@@ -17,18 +23,100 @@ eEC_PROFILE_c iam_ef_siawase_hana_ch = {
// clang-format on
};
static u8 eSSHNC_pink_prim[] = { 255, 255, 255, 255 };
static u8 eSSHNC_pink_env[] = { 255, 0, 255, 255 };
static u8 eSSHNC_yellow_prim[] = { 255, 255, 0, 255 };
static u8 eSSHNC_yellow_env[] = { 255, 0, 0, 255 };
static u8* eSSHNC_color_info[] = { eSSHNC_pink_prim, eSSHNC_pink_env, eSSHNC_yellow_prim, eSSHNC_yellow_env };
static void eSSHNC_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_SIAWASE_HANA_CH, pos, NULL, game, NULL, item_name, prio, arg0, arg1);
}
static void eSSHNC_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
// TODO
int i;
int rand = RANDOM(10.0f);
effect->timer = 92;
eEC_CLIP->random_first_speed_proc(&effect->velocity, 0.4f, 180.0f, 0.0f);
effect->acceleration.x = 0.0f;
effect->acceleration.y = 0.01f;
effect->acceleration.z = 0.0f;
effect->scale.x = 0.0f;
effect->scale.y = 0.0f;
effect->scale.z = 0.0f;
effect->effect_specific[0] = rand & 1;
effect->effect_specific[1] = 0;
if (effect->velocity.x > 0.0f) {
effect->effect_specific[2] = DEG2SHORT_ANGLE2(6.96f);
} else {
effect->effect_specific[2] = DEG2SHORT_ANGLE2(-6.96f);
}
if (effect->arg0 != 0) {
i = effect->arg0;
effect->timer -= effect->arg0 << 1;
while (i-- != 0) {
xyz_t_add(&effect->velocity, &effect->acceleration, &effect->velocity);
xyz_t_add(&effect->position, &effect->velocity, &effect->position);
};
}
}
static void eSSHNC_mv(eEC_Effect_c* effect, GAME* game) {
// TODO
f32 scale;
s16 timer = 92 - effect->timer;
if (timer >= 58) {
effect->acceleration.y = 0.01f;
} else {
effect->acceleration.y = eEC_CLIP->calc_adjust_proc(timer, 40, 58, 0.0f, 0.01f);
}
xyz_t_add(&effect->velocity, &effect->acceleration, &effect->velocity);
xyz_t_add(&effect->position, &effect->velocity, &effect->position);
effect->effect_specific[1] += effect->effect_specific[2];
scale = eEC_CLIP->calc_adjust_proc(timer, 40, 58, 0.0f, 0.005f);
effect->scale.x = scale;
effect->scale.y = scale;
effect->scale.z = scale;
}
static void eSSHNC_dw(eEC_Effect_c* effect, GAME* game) {
// TODO
GRAPH* graph;
u8 prim_a;
s16 timer = 92 - effect->timer;
u8* prim = eSSHNC_color_info[2 * effect->effect_specific[0]];
u8* env = eSSHNC_color_info[2 * effect->effect_specific[0] + 1];
if (timer >= 66) {
prim_a = (int)eEC_CLIP->calc_adjust_proc(timer, 66, 92, 255.0f, 0.0f);
} else {
prim_a = 255;
}
graph = game->graph;
OPEN_DISP(graph);
_texture_z_light_fog_prim_xlu(graph);
Matrix_translate(effect->position.x, effect->position.y, effect->position.z, FALSE);
Matrix_mult(&((GAME_PLAY*)game)->billboard_matrix, TRUE);
Matrix_scale(effect->scale.x, effect->scale.y, effect->scale.z, TRUE);
Matrix_RotateZ(effect->effect_specific[1], TRUE);
gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 255, prim[0], prim[1], prim[2], prim_a);
gDPSetEnvColor(NEXT_POLY_XLU_DISP, env[0], env[1], env[2], env[3]);
gSPDisplayList(NEXT_POLY_XLU_DISP, ef_siawase01_01_modelT);
CLOSE_DISP(graph);
}