mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-07 12:03:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #483 from roeming/master

Browse Source 
Link 3 more effects
This commit is contained in:
Cuyler36
2025-05-31 13:31:11 -04:00
committed by GitHub
parent 1502b24688 ce0f131b2a
commit f5c7ddd3c9
6 changed files with 227 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+3 -3
View File
@@ -1256,11 +1256,11 @@ config.libs = [
Object(Matching, "effect/ef_furo_yuge.c"),
Object(Matching, "effect/ef_gimonhu.c"),
Object(Matching, "effect/ef_goki.c"),
Object(NonMatching, "effect/ef_ha.c"),
Object(Matching, "effect/ef_ha.c"),
Object(Matching, "effect/ef_halloween.c"),
Object(Matching, "effect/ef_halloween_smoke.c"),
Object(NonMatching, "effect/ef_hanabi_botan1.c"),
Object(NonMatching, "effect/ef_hanabi_botan2.c"),
Object(Matching, "effect/ef_hanabi_botan1.c"),
Object(Matching, "effect/ef_hanabi_botan2.c"),
Object(Matching, "effect/ef_hanabi_dummy.c"),
Object(NonMatching, "effect/ef_hanabi_hoshi.c"),
Object(NonMatching, "effect/ef_hanabi_set.c"),
include/audio_defs.h
+2 -1
View File
@@ -60,6 +60,7 @@ typedef enum audio_sound_effects {
NA_SE_27 = 0x27,
NA_SE_2A = 0x2A,
NA_SE_2C = 0x2C,
NA_SE_2F = 0x2F,
@@ -155,6 +156,7 @@ typedef enum audio_sound_effects {
NA_SE_KA_BUZZ = 0xCF,
NA_SE_107 = 0x107,
NA_SE_108 = 0x108,
NA_SE_ROD_STROKE = 0x109,
NA_SE_ROD_BACK,
@@ -327,7 +329,6 @@ typedef enum audio_sound_effects {
NA_SE_FOOTSTEP_WAVE,
NA_SE_FOOTSTEP_PLUSSBRIDGE,
NA_SE_FLOOR_SE_START = SE_ECHO(0x2E6),
} AudioSE;
src/effect/ef_gimonhu.c
+1 -1
View File
@@ -72,7 +72,7 @@ static void eGM_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
static void eGM_mv(eEC_Effect_c* effect, GAME* game) {
s16 currentFrame = EFFECT_LIFETIME - effect->timer;
if (currentFrame == 0) {
sAdo_OngenTrgStart(0X2F, &effect->position);
sAdo_OngenTrgStart(NA_SE_2F, &effect->position);
}
}
src/effect/ef_ha.c
+47 -5
View File
@@ -1,10 +1,16 @@
#include "ef_effect_control.h"
#include "m_common_data.h"
#include "m_rcp.h"
#include "sys_matrix.h"
#include "m_debug.h"
#define EFFECT_LIFETIME 56
static void eHA_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
static void eHA_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
static void eHA_mv(eEC_Effect_c* effect, GAME* game);
static void eHA_dw(eEC_Effect_c* effect, GAME* game);
extern Gfx ef_ha01_00_modelT[];
eEC_PROFILE_c iam_ef_ha = {
// clang-format off
&eHA_init,
@@ -17,18 +23,54 @@ eEC_PROFILE_c iam_ef_ha = {
// clang-format on
};
s16 eHA_angle_z_data[] = { DEG2SHORT_ANGLE2(45.f), DEG2SHORT_ANGLE2(315.f) };
static void eHA_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_HA, pos, NULL, game, &angle, item_name, prio, 0, 0);
}
static void eHA_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
// TODO
GAME_PLAY* play = (GAME_PLAY*)game;
s16* ang_p = (s16*)ct_arg;
u16 angle = *ang_p - (s16)((s16)getCamera2AngleY(play) + DEG2SHORT_ANGLE2(180));
effect->scale.x = 0.0067f;
effect->scale.y = 0.0067f;
effect->scale.z = 0.0067f;
effect->timer = EFFECT_LIFETIME;
effect->offset.y += 12.f;
if (angle >= (u16)DEG2SHORT_ANGLE2(180)) {
effect->effect_specific[0] = 0;
effect->offset.x += -16.f;
} else {
effect->effect_specific[0] = 1;
effect->offset.x += 16.f;
}
}
static void eHA_mv(eEC_Effect_c* effect, GAME* game) {
// TODO
if (effect->timer == EFFECT_LIFETIME) {
sAdo_OngenTrgStart(NA_SE_2C, &effect->position);
}
}
static void eHA_dw(eEC_Effect_c* effect, GAME* game) {
// TODO
GAME_PLAY* play = (GAME_PLAY*)game;
s16 v = effect->effect_specific[0];
int opacity = (u8)eEC_CLIP->calc_adjust_proc(EFFECT_LIFETIME - effect->timer, 24, EFFECT_LIFETIME, 255.f, 0.f);
OPEN_DISP(game->graph);
_texture_z_light_fog_prim_xlu(game->graph);
Matrix_translate(effect->position.x, effect->position.y, effect->position.z, FALSE);
Matrix_mult(&play->billboard_matrix, TRUE);
Matrix_translate(effect->offset.x + GETREG(MYKREG, 0x18), effect->offset.y + GETREG(MYKREG, 0x19),
effect->offset.z + GETREG(MYKREG, 0x1a), TRUE);
Matrix_RotateZ(eHA_angle_z_data[v], TRUE);
Matrix_scale(effect->scale.x * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f),
effect->scale.y * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f),
effect->scale.z * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f), 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, 128, 255, 255, 255, opacity);
gDPSetEnvColor(NEXT_POLY_XLU_DISP, 0, 0, 255, 255);
gSPDisplayList(NEXT_POLY_XLU_DISP, ef_ha01_00_modelT);
CLOSE_DISP(game->graph);
}
src/effect/ef_hanabi_botan1.c
+86 -4
View File
@@ -1,10 +1,18 @@
#include "ef_effect_control.h"
#include "m_common_data.h"
#include "m_rcp.h"
#include "sys_matrix.h"
#include "m_debug.h"
static void eHanabiBotan1_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
static void eHanabiBotan1_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
static void eHanabiBotan1_mv(eEC_Effect_c* effect, GAME* game);
static void eHanabiBotan1_dw(eEC_Effect_c* effect, GAME* game);
#define CALC_EASE(x) (1.0f - sqrtf(1.0f - (x)))
#define EFFECT_LIFETIME 110
eEC_PROFILE_c iam_ef_hanabi_botan1 = {
// clang-format off
&eHanabiBotan1_init,
@@ -18,17 +26,91 @@ eEC_PROFILE_c iam_ef_hanabi_botan1 = {
};
static void eHanabiBotan1_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_HANABI_BOTAN1, pos, NULL, game, NULL, item_name, prio, arg0, arg1);
}
static void eHanabiBotan1_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
// TODO
effect->timer = EFFECT_LIFETIME;
effect->scale.x = 0.01f;
effect->scale.y = 0.01f;
effect->scale.z = 0.01f;
effect->effect_specific[0] = 0;
effect->effect_specific[1] = 0;
effect->effect_specific[2] = 0;
effect->offset.x = 0.f;
effect->offset.y = 0.f;
effect->offset.z = 0.f;
effect->effect_specific[3] = ((u16)RANDOM_F(10.f)) & 1; // ??? why not just qrand() & 1?
}
static void eHanabiBotan1_mv(eEC_Effect_c* effect, GAME* game) {
// TODO
s16 aliveFrames = EFFECT_LIFETIME - effect->timer;
effect->effect_specific[0] += 0x300;
effect->effect_specific[1] += 0x100;
effect->effect_specific[2] += 0x80;
effect->offset.x = sin_s(effect->effect_specific[1]) * 2.f;
effect->offset.z = sin_s(-effect->effect_specific[1]) * 2.f;
add_calc2(&effect->scale.x, 0.07, CALC_EASE(0.2f), 5.f);
effect->scale.y = effect->scale.x;
effect->scale.z = effect->scale.x;
if (aliveFrames == 10) {
static rgba_t botan1_light[] = { { 75, 45, 30, 255 }, { 30, 90, 30, 255 } };
rgba_t resultColor;
eEC_CLIP->decide_light_power_proc(&resultColor, botan1_light[effect->effect_specific[3]], effect->position,
game, 2.f, 0.f, 480.f);
if (effect->arg0) {
// `resultColor.r *= (4.f/3.f);` does not match
resultColor.r = resultColor.r * (4.f / 3.f);
resultColor.g = resultColor.g * (4.f / 3.f);
resultColor.b = resultColor.b * (4.f / 3.f);
}
eEC_CLIP->regist_effect_light(resultColor, 20, 50, TRUE);
}
if (aliveFrames == 72) {
xyz_t p = effect->position;
p.y += 200.f;
sAdo_OngenTrgStart(NA_SE_HANABI0, &p);
}
}
eEC_morph_data_c eHanabiBotan1_morph_data1[] = {
{ 0, 0, FALSE, 255.f, 255.f }, { 0, 0, FALSE, 255.f, 255.f }, { 34, 44, TRUE, 0.f, 100.f },
{ 44, 54, TRUE, 150.f, 0.f }, { 10, 34, TRUE, 0.f, 255.f }, { 0, 0, FALSE, 255.f, 255.f },
{ 0, 0, FALSE, 0.f, 0.f }, { 34, 44, TRUE, 100.f, 255.f }, { 0, 0, FALSE, 255.f, 255.f },
};
eEC_morph_data_c eHanabiBotan1_morph_data2[] = {
{ 0, 0, FALSE, 255.f, 255.f }, { 0, 0, FALSE, 255.f, 255.f }, { 34, 44, TRUE, 0.f, 50.f },
{ 44, 54, TRUE, 150.f, 0.f }, { 10, 34, TRUE, 0.f, 255.f }, { 0, 0, FALSE, 0.f, 0.f },
{ 0, 0, FALSE, 255.f, 255.f }, { 34, 44, FALSE, 50.f, 255.f }, { 0, 0, FALSE, 255.f, 255.f },
};
eEC_morph_data_c* eHanabiBotan1_morph_table[] = { eHanabiBotan1_morph_data1, eHanabiBotan1_morph_data2 };
extern Gfx ef_hanabi_b_00_modelT[];
static void eHanabiBotan1_dw(eEC_Effect_c* effect, GAME* game) {
// TODO
u8 result[9];
f32 v2, v;
s16 index;
s16 active_frames = EFFECT_LIFETIME - effect->timer;
v = (sin_s(effect->effect_specific[0]) + 1.f) * 0.5f * 0.14000005f + 0.93f;
index = effect->effect_specific[3];
v2 = eEC_CLIP->calc_adjust_proc(active_frames, 0, EFFECT_LIFETIME - 1, 0.0f, 0.01f) + effect->scale.x;
eEC_CLIP->morph_combine_proc(result, eHanabiBotan1_morph_table[index], active_frames);
OPEN_DISP(game->graph);
_texture_z_light_fog_prim_xlu(game->graph);
Matrix_translate(effect->position.x + effect->offset.x, effect->position.y + effect->offset.y,
effect->position.z + effect->offset.z, FALSE);
Matrix_RotateX(DEG2SHORT_ANGLE2(270), TRUE);
Matrix_RotateZ(-effect->effect_specific[1], TRUE);
Matrix_scale(v, 1.f, 1.f, TRUE);
Matrix_RotateZ(effect->effect_specific[1], TRUE);
Matrix_scale(v2 * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f), v2 * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f),
v2 * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f), 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, result[4], result[0], result[1], result[2], result[3]);
gDPSetEnvColor(NEXT_POLY_XLU_DISP, result[5], result[6], result[7], 255);
gSPDisplayList(NEXT_POLY_XLU_DISP, ef_hanabi_b_00_modelT);
CLOSE_DISP(game->graph);
}
src/effect/ef_hanabi_botan2.c
+88 -4
View File
@@ -1,10 +1,17 @@
#include "ef_effect_control.h"
#include "m_common_data.h"
#include "m_rcp.h"
#include "sys_matrix.h"
#include "m_debug.h"
static void eHanabiBotan2_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
static void eHanabiBotan2_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
static void eHanabiBotan2_mv(eEC_Effect_c* effect, GAME* game);
static void eHanabiBotan2_dw(eEC_Effect_c* effect, GAME* game);
#define EFFECT_LIFETIME 110
#define CALC_EASE(x) (1.0f - sqrtf(1.0f - (x)))
eEC_PROFILE_c iam_ef_hanabi_botan2 = {
// clang-format off
&eHanabiBotan2_init,
@@ -18,17 +25,94 @@ eEC_PROFILE_c iam_ef_hanabi_botan2 = {
};
static void eHanabiBotan2_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_HANABI_BOTAN2, pos, NULL, game, NULL, item_name, prio, arg0, arg1);
}
static void eHanabiBotan2_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
// TODO
effect->timer = EFFECT_LIFETIME;
effect->scale.x = 0.01f;
effect->scale.y = 0.01f;
effect->scale.z = 0.01f;
effect->effect_specific[0] = 0;
effect->effect_specific[1] = 0;
effect->effect_specific[2] = 0;
effect->offset.x = 0.f;
effect->offset.y = 0.f;
effect->offset.z = 0.f;
effect->effect_specific[3] = (u16)(RANDOM_F(10.f)) & 1;
}
static void eHanabiBotan2_mv(eEC_Effect_c* effect, GAME* game) {
// TODO
s16 timer = EFFECT_LIFETIME - effect->timer;
effect->effect_specific[0] += 0x300;
effect->effect_specific[1] += 0x100;
effect->effect_specific[2] += 0x80;
effect->offset.x = sin_s(effect->effect_specific[1]) * 2.f;
effect->offset.z = sin_s(-effect->effect_specific[1]) * 2.f;
add_calc2(&effect->scale.x, 0.08, CALC_EASE(0.2f), 5.f);
effect->scale.y = effect->scale.x;
effect->scale.z = effect->scale.x;
if (timer == 10) {
rgba_t resultColor;
static rgba_t botan2_light = { 60, 15, 90, 255 };
eEC_CLIP->decide_light_power_proc(&resultColor, botan2_light, effect->position, game, 2.f, 0.f, 480.f);
if (effect->arg0) {
resultColor.r = resultColor.r * (4.f / 3.f);
resultColor.g = resultColor.g * (4.f / 3.f);
resultColor.b = resultColor.b * (4.f / 3.f);
}
eEC_CLIP->regist_effect_light(resultColor, 20, 50, TRUE);
}
if (timer == 72) {
xyz_t p = effect->position;
p.y += 200.f;
sAdo_OngenTrgStart(NA_SE_HANABI1, &p);
}
}
eEC_morph_data_c eHanabiBotan2_morph_data_out[] = {
{ 34, 44, TRUE, 255.f, 0.f }, { 0, 0, FALSE, 255.f, 255.f }, { 0, 0, FALSE, 255.f, 255.f },
{ 44, 54, TRUE, 150.f, 0.f }, { 9, 34, TRUE, 0.f, 255.f }, { 9, 34, TRUE, 255.f, 0.f },
{ 0, 0, FALSE, 0.f, 0.f }, { 0, 0, FALSE, 255.f, 255.f }, { 0, 0, FALSE, 255.f, 255.f },
};
eEC_morph_data_c eHanabiBotan2_morph_data_in[] = {
{ 0, 0, FALSE, 255.f, 255.f }, { 0, 0, FALSE, 255.f, 255.f }, { 0, 0, FALSE, 0.f, 0.f },
{ 44, 54, TRUE, 150.f, 0.f }, { 14, 34, TRUE, 0.f, 255.f }, { 0, 0, FALSE, 255.f, 255.f },
{ 0, 0, FALSE, 0.f, 0.f }, { 14, 34, TRUE, 0.f, 255.f }, { 0, 0, FALSE, 255.f, 255.f },
};
extern Gfx ef_hanabi_b_00_modelT[];
static void eHanabiBotan2_dw(eEC_Effect_c* effect, GAME* game) {
// TODO
u8 res1[9];
u8 res2[9];
s16 now_timer = EFFECT_LIFETIME - effect->timer;
f32 v2;
f32 v = (sin_s(effect->effect_specific[0]) + 1.f) * 0.5f * 0.14000005f + 0.93f;
v2 = effect->scale.x + eEC_CLIP->calc_adjust_proc(now_timer, 0, EFFECT_LIFETIME - 1, 0.f, 0.01);
eEC_CLIP->morph_combine_proc(res1, eHanabiBotan2_morph_data_out, now_timer);
eEC_CLIP->morph_combine_proc(res2, eHanabiBotan2_morph_data_in, now_timer);
OPEN_DISP(game->graph);
_texture_z_light_fog_prim_xlu(game->graph);
Matrix_translate(effect->position.x + effect->offset.x, effect->position.y + effect->offset.y,
effect->position.z + effect->offset.z, FALSE);
Matrix_RotateX(DEG2SHORT_ANGLE2(270), TRUE);
Matrix_RotateZ(-effect->effect_specific[1], TRUE);
Matrix_scale(v, 1.f, 1.f, TRUE);
Matrix_RotateZ(effect->effect_specific[1], TRUE);
Matrix_push();
Matrix_scale(v2 * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f), v2 * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f),
v2 * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f), 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, res1[4], res1[0], res1[1], res1[2], res1[3]);
gDPSetEnvColor(NEXT_POLY_XLU_DISP, res1[5], res1[6], res1[7], res1[8]);
gSPDisplayList(NEXT_POLY_XLU_DISP, ef_hanabi_b_00_modelT);
Matrix_pull();
Matrix_scale(v2 * 0.6f, v2 * 0.6f, v2 * 0.6f, TRUE);
gDPPipeSync(NEXT_POLY_XLU_DISP);
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, res2[4], res2[0], res2[1], res2[2], res2[3]);
gDPSetEnvColor(NEXT_POLY_XLU_DISP, res2[5], res2[6], res2[7], res2[8]);
gSPDisplayList(NEXT_POLY_XLU_DISP, ef_hanabi_b_00_modelT);
CLOSE_DISP(game->graph);
}