From e672778b0ef99c1f20efa643f9d02ff4d3417a0c Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 19 Jul 2020 19:42:59 -0400 Subject: [PATCH] Fx bootstrap (#278) * script * update * dun? --- .../{func_8099EDB0.s => EffectSsBlast_Init.s} | 2 +- .../{func_8099F1B0.s => EffectSsBomb_Init.s} | 2 +- .../{func_8099F650.s => EffectSsBomb2_Init.s} | 2 +- ...{func_809A0040.s => EffectSsBubble_Init.s} | 2 +- .../{func_809A0550.s => EffectSsDFire_Init.s} | 2 +- ...{func_809A0AA0.s => EffectSsDeadDb_Init.s} | 2 +- ...{func_809A0FE0.s => EffectSsDeadDd_Init.s} | 2 +- ...{func_809A1610.s => EffectSsDeadDs_Init.s} | 2 +- ...nc_809A1B30.s => EffectSsDeadSound_Init.s} | 2 +- ...unc_809A1CB0.s => EffectSsDtBubble_Init.s} | 2 +- ...{func_809A2B60.s => EffectSsEnFire_Init.s} | 2 +- .../{func_809A3330.s => EffectSsEnIce_Init.s} | 2 +- .../{func_809A3CC0.s => EffectSsExtra_Init.s} | 2 +- ...func_809A4120.s => EffectSsFcircle_Init.s} | 2 +- ...unc_809A4660.s => EffectSsFhgFlash_Init.s} | 2 +- ...unc_809A5740.s => EffectSsFireTail_Init.s} | 2 +- .../{func_809A5ED0.s => EffectSsGFire_Init.s} | 2 +- ...{func_809A6150.s => EffectSsGMagma_Init.s} | 2 +- ...func_809A63A0.s => EffectSsGMagma2_Init.s} | 2 +- ...func_809A6960.s => EffectSsGRipple_Init.s} | 2 +- .../{func_809A6F30.s => EffectSsGSpk_Init.s} | 2 +- ...func_809A7540.s => EffectSsGSplash_Init.s} | 2 +- .../{func_809A7A60.s => EffectSsHahen_Init.s} | 2 +- ...func_809A8150.s => EffectSsHitMark_Init.s} | 2 +- ...unc_809A8700.s => EffectSsIcePiece_Init.s} | 2 +- ...unc_809A8BF0.s => EffectSsIceSmoke_Init.s} | 2 +- .../{func_809A91B0.s => EffectSsKFire_Init.s} | 2 +- ...{func_809A9680.s => EffectSsKakera_Init.s} | 2 +- ...unc_809AA810.s => EffectSsKiraKira_Init.s} | 2 +- ...nc_809AAEF0.s => EffectSsLightning_Init.s} | 2 +- ...{func_809AB630.s => EffectSsSibuki_Init.s} | 2 +- ...func_809ABD60.s => EffectSsSibuki2_Init.s} | 2 +- .../{func_809AC2D0.s => EffectSsStick_Init.s} | 2 +- ...{func_809AC700.s => EffectSsStone1_Init.s} | 2 +- data/overlays/effects/z_eff_ss_blast.data.s | 2 +- data/overlays/effects/z_eff_ss_bomb.data.s | 2 +- data/overlays/effects/z_eff_ss_bomb2.data.s | 2 +- data/overlays/effects/z_eff_ss_bubble.data.s | 2 +- data/overlays/effects/z_eff_ss_d_fire.data.s | 2 +- data/overlays/effects/z_eff_ss_dead_db.data.s | 2 +- data/overlays/effects/z_eff_ss_dead_dd.data.s | 2 +- data/overlays/effects/z_eff_ss_dead_ds.data.s | 2 +- .../effects/z_eff_ss_dead_sound.data.s | 2 +- .../effects/z_eff_ss_dt_bubble.data.s | 2 +- data/overlays/effects/z_eff_ss_en_fire.data.s | 2 +- data/overlays/effects/z_eff_ss_en_ice.data.s | 2 +- data/overlays/effects/z_eff_ss_extra.data.s | 2 +- data/overlays/effects/z_eff_ss_fcircle.data.s | 2 +- .../effects/z_eff_ss_fhg_flash.data.s | 2 +- .../effects/z_eff_ss_fire_tail.data.s | 2 +- data/overlays/effects/z_eff_ss_g_fire.data.s | 2 +- data/overlays/effects/z_eff_ss_g_magma.data.s | 2 +- .../overlays/effects/z_eff_ss_g_magma2.data.s | 2 +- .../overlays/effects/z_eff_ss_g_ripple.data.s | 2 +- data/overlays/effects/z_eff_ss_g_spk.data.s | 2 +- .../overlays/effects/z_eff_ss_g_splash.data.s | 2 +- data/overlays/effects/z_eff_ss_hahen.data.s | 2 +- data/overlays/effects/z_eff_ss_hitmark.data.s | 2 +- .../effects/z_eff_ss_ice_piece.data.s | 2 +- .../effects/z_eff_ss_ice_smoke.data.s | 2 +- data/overlays/effects/z_eff_ss_k_fire.data.s | 2 +- data/overlays/effects/z_eff_ss_kakera.data.s | 2 +- .../overlays/effects/z_eff_ss_kirakira.data.s | 2 +- .../effects/z_eff_ss_lightning.data.s | 2 +- data/overlays/effects/z_eff_ss_sibuki.data.s | 2 +- data/overlays/effects/z_eff_ss_sibuki2.data.s | 2 +- data/overlays/effects/z_eff_ss_stick.data.s | 2 +- data/overlays/effects/z_eff_ss_stone1.data.s | 2 +- .../ovl_Effect_Ss_Blast/z_eff_ss_blast.c | 38 +++- .../ovl_Effect_Ss_Blast/z_eff_ss_blast.h | 13 ++ .../ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c | 38 +++- .../ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h | 13 ++ .../ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c | 38 +++- .../ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h | 13 ++ .../ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c | 38 +++- .../ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h | 13 ++ .../ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c | 38 +++- .../ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h | 13 ++ .../ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c | 38 +++- .../ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h | 13 ++ .../ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c | 38 +++- .../ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h | 13 ++ .../ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c | 38 +++- .../ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h | 13 ++ .../z_eff_ss_dead_sound.c | 38 +++- .../z_eff_ss_dead_sound.h | 13 ++ .../z_eff_ss_dt_bubble.c | 38 +++- .../z_eff_ss_dt_bubble.h | 13 ++ .../ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c | 38 +++- .../ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h | 13 ++ .../ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c | 38 +++- .../ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h | 13 ++ .../ovl_Effect_Ss_Extra/z_eff_ss_extra.c | 38 +++- .../ovl_Effect_Ss_Extra/z_eff_ss_extra.h | 13 ++ .../ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c | 38 +++- .../ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h | 13 ++ .../z_eff_ss_fhg_flash.c | 38 +++- .../z_eff_ss_fire_tail.c | 38 +++- .../z_eff_ss_fire_tail.h | 13 ++ .../ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c | 38 +++- .../ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h | 13 ++ .../ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c | 38 +++- .../ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h | 13 ++ .../z_eff_ss_g_magma2.c | 38 +++- .../z_eff_ss_g_magma2.h | 13 ++ .../z_eff_ss_g_ripple.c | 38 +++- .../z_eff_ss_g_ripple.h | 13 ++ .../ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c | 38 +++- .../ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h | 13 ++ .../z_eff_ss_g_splash.c | 38 +++- .../z_eff_ss_g_splash.h | 13 ++ .../ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c | 38 +++- .../ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h | 13 ++ .../ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c | 38 +++- .../ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h | 13 ++ .../z_eff_ss_ice_piece.c | 38 +++- .../z_eff_ss_ice_piece.h | 13 ++ .../z_eff_ss_ice_smoke.c | 38 +++- .../z_eff_ss_ice_smoke.h | 13 ++ .../ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c | 38 +++- .../ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h | 13 ++ .../ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c | 38 +++- .../ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h | 13 ++ .../z_eff_ss_kirakira.c | 38 +++- .../z_eff_ss_kirakira.h | 13 ++ .../z_eff_ss_lightning.c | 38 +++- .../z_eff_ss_lightning.h | 13 ++ .../ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c | 38 +++- .../ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h | 13 ++ .../ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c | 38 +++- .../ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h | 13 ++ .../ovl_Effect_Ss_Stick/z_eff_ss_stick.c | 38 +++- .../ovl_Effect_Ss_Stick/z_eff_ss_stick.h | 13 ++ .../ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c | 38 +++- .../ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h | 13 ++ tools/bootstrap_fx.py | 196 ++++++++++++++++++ 136 files changed, 1883 insertions(+), 170 deletions(-) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/{func_8099EDB0.s => EffectSsBlast_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/{func_8099F1B0.s => EffectSsBomb_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/{func_8099F650.s => EffectSsBomb2_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/{func_809A0040.s => EffectSsBubble_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/{func_809A0550.s => EffectSsDFire_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/{func_809A0AA0.s => EffectSsDeadDb_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/{func_809A0FE0.s => EffectSsDeadDd_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/{func_809A1610.s => EffectSsDeadDs_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/{func_809A1B30.s => EffectSsDeadSound_Init.s} (98%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/{func_809A1CB0.s => EffectSsDtBubble_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/{func_809A2B60.s => EffectSsEnFire_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/{func_809A3330.s => EffectSsEnIce_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/{func_809A3CC0.s => EffectSsExtra_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/{func_809A4120.s => EffectSsFcircle_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/{func_809A4660.s => EffectSsFhgFlash_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/{func_809A5740.s => EffectSsFireTail_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/{func_809A5ED0.s => EffectSsGFire_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/{func_809A6150.s => EffectSsGMagma_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/{func_809A63A0.s => EffectSsGMagma2_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/{func_809A6960.s => EffectSsGRipple_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/{func_809A6F30.s => EffectSsGSpk_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/{func_809A7540.s => EffectSsGSplash_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/{func_809A7A60.s => EffectSsHahen_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/{func_809A8150.s => EffectSsHitMark_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/{func_809A8700.s => EffectSsIcePiece_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/{func_809A8BF0.s => EffectSsIceSmoke_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/{func_809A91B0.s => EffectSsKFire_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/{func_809A9680.s => EffectSsKakera_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/{func_809AA810.s => EffectSsKiraKira_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/{func_809AAEF0.s => EffectSsLightning_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/{func_809AB630.s => EffectSsSibuki_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/{func_809ABD60.s => EffectSsSibuki2_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/{func_809AC2D0.s => EffectSsStick_Init.s} (99%) rename asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/{func_809AC700.s => EffectSsStone1_Init.s} (99%) create mode 100644 src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h create mode 100644 src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h create mode 100755 tools/bootstrap_fx.py diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EDB0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/EffectSsBlast_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EDB0.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/EffectSsBlast_Init.s index cecd4a6fc1..64d49aa33d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EDB0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/EffectSsBlast_Init.s @@ -1,4 +1,4 @@ -glabel func_8099EDB0 +glabel EffectSsBlast_Init /* 00000 8099EDB0 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 8099EDB4 AFA50004 */ sw $a1, 0x0004($sp) /* 00008 8099EDB8 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F1B0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/EffectSsBomb_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F1B0.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/EffectSsBomb_Init.s index ca7e3ce390..745db0b27c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F1B0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/EffectSsBomb_Init.s @@ -1,4 +1,4 @@ -glabel func_8099F1B0 +glabel EffectSsBomb_Init /* 00000 8099F1B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 8099F1B4 AFBF001C */ sw $ra, 0x001C($sp) /* 00008 8099F1B8 AFB00018 */ sw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F650.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/EffectSsBomb2_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F650.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/EffectSsBomb2_Init.s index ed1836dd2f..588eba39d8 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F650.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/EffectSsBomb2_Init.s @@ -1,4 +1,4 @@ -glabel func_8099F650 +glabel EffectSsBomb2_Init /* 00000 8099F650 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 8099F654 AFBF001C */ sw $ra, 0x001C($sp) /* 00008 8099F658 AFB10018 */ sw $s1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0040.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/EffectSsBubble_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0040.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/EffectSsBubble_Init.s index 765b14e40a..d37b15fe6b 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0040.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/EffectSsBubble_Init.s @@ -1,4 +1,4 @@ -glabel func_809A0040 +glabel EffectSsBubble_Init /* 00000 809A0040 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 809A0044 AFBF0024 */ sw $ra, 0x0024($sp) /* 00008 809A0048 AFB10020 */ sw $s1, 0x0020($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0550.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/EffectSsDFire_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0550.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/EffectSsDFire_Init.s index 0b7429a8bc..50a2ce6e5d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0550.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/EffectSsDFire_Init.s @@ -1,4 +1,4 @@ -glabel func_809A0550 +glabel EffectSsDFire_Init /* 00000 809A0550 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 809A0554 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00008 809A0558 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0AA0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/EffectSsDeadDb_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0AA0.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/EffectSsDeadDb_Init.s index 5c215caa3e..f68cce4d49 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0AA0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/EffectSsDeadDb_Init.s @@ -1,4 +1,4 @@ -glabel func_809A0AA0 +glabel EffectSsDeadDb_Init /* 00000 809A0AA0 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 809A0AA4 AFA50004 */ sw $a1, 0x0004($sp) /* 00008 809A0AA8 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A0FE0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/EffectSsDeadDd_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A0FE0.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/EffectSsDeadDd_Init.s index 982868d7ba..53add7fb76 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A0FE0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/EffectSsDeadDd_Init.s @@ -4,7 +4,7 @@ glabel D_809A1550 .balign 4 .text -glabel func_809A0FE0 +glabel EffectSsDeadDd_Init /* 000000 809A0FE0 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 000004 809A0FE4 AFBF003C */ sw $ra, 0x3c($sp) /* 000008 809A0FE8 AFB20038 */ sw $s2, 0x38($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1610.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/EffectSsDeadDs_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1610.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/EffectSsDeadDs_Init.s index dc67bcf93b..4edd2f7a95 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1610.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/EffectSsDeadDs_Init.s @@ -1,4 +1,4 @@ -glabel func_809A1610 +glabel EffectSsDeadDs_Init /* 00000 809A1610 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 809A1614 AFA50004 */ sw $a1, 0x0004($sp) /* 00008 809A1618 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1B30.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/EffectSsDeadSound_Init.s similarity index 98% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1B30.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/EffectSsDeadSound_Init.s index ffe7642f36..4ea742b478 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1B30.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/EffectSsDeadSound_Init.s @@ -4,7 +4,7 @@ glabel D_809A1C60 .text -glabel func_809A1B30 +glabel EffectSsDeadSound_Init /* 000000 809A1B30 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 000004 809A1B34 AFBF0014 */ sw $ra, 0x14($sp) /* 000008 809A1B38 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1CB0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/EffectSsDtBubble_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1CB0.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/EffectSsDtBubble_Init.s index 669c4fbf2a..b9d29d5486 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1CB0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/EffectSsDtBubble_Init.s @@ -1,4 +1,4 @@ -glabel func_809A1CB0 +glabel EffectSsDtBubble_Init /* 00000 809A1CB0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00004 809A1CB4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00008 809A1CB8 AFA40028 */ sw $a0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2B60.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/EffectSsEnFire_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2B60.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/EffectSsEnFire_Init.s index 262b9a6891..a36167af2b 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2B60.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/EffectSsEnFire_Init.s @@ -1,4 +1,4 @@ -glabel func_809A2B60 +glabel EffectSsEnFire_Init /* 00000 809A2B60 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00004 809A2B64 3C0E809A */ lui $t6, %hi(D_809A3248) ## $t6 = 809A0000 /* 00008 809A2B68 AFBF0024 */ sw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3330.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/EffectSsEnIce_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3330.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/EffectSsEnIce_Init.s index 87f103a5a5..d496d610fc 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3330.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/EffectSsEnIce_Init.s @@ -4,7 +4,7 @@ glabel D_809A3BA0 .balign 4 .text -glabel func_809A3330 +glabel EffectSsEnIce_Init /* 00000 809A3330 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 809A3334 AFBF0014 */ sw $ra, 0x0014($sp) /* 00008 809A3338 AFA40030 */ sw $a0, 0x0030($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3CC0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/EffectSsExtra_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3CC0.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/EffectSsExtra_Init.s index 406f069ed2..c3a7773822 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3CC0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/EffectSsExtra_Init.s @@ -1,4 +1,4 @@ -glabel func_809A3CC0 +glabel EffectSsExtra_Init /* 000000 809A3CC0 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 000004 809A3CC4 3C010001 */ lui $at, (0x000117A4 >> 16) # lui $at, 1 /* 000008 809A3CC8 AFA40030 */ sw $a0, 0x30($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A4120.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/EffectSsFcircle_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A4120.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/EffectSsFcircle_Init.s index 45ed34f315..e591b9c55b 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A4120.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/EffectSsFcircle_Init.s @@ -1,4 +1,4 @@ -glabel func_809A4120 +glabel EffectSsFcircle_Init /* 00000 809A4120 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 809A4124 AFA50004 */ sw $a1, 0x0004($sp) /* 00008 809A4128 8CEF0004 */ lw $t7, 0x0004($a3) ## 00000004 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/EffectSsFhgFlash_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/EffectSsFhgFlash_Init.s index 41649da233..fed6b6b091 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/EffectSsFhgFlash_Init.s @@ -4,7 +4,7 @@ glabel D_809A5580 .balign 4 .text -glabel func_809A4660 +glabel EffectSsFhgFlash_Init /* 00000 809A4660 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00004 809A4664 3C0E809A */ lui $t6, %hi(D_809A5088) ## $t6 = 809A0000 /* 00008 809A4668 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5740.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/EffectSsFireTail_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5740.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/EffectSsFireTail_Init.s index 40b7f4bba4..54c3daa4c8 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5740.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/EffectSsFireTail_Init.s @@ -1,4 +1,4 @@ -glabel func_809A5740 +glabel EffectSsFireTail_Init /* 00000 809A5740 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 809A5744 AFA50004 */ sw $a1, 0x0004($sp) /* 00008 809A5748 8CEF0004 */ lw $t7, 0x0004($a3) ## 00000004 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A5ED0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/EffectSsGFire_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A5ED0.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/EffectSsGFire_Init.s index 1e2ec5c8c7..daf7debe32 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A5ED0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/EffectSsGFire_Init.s @@ -1,4 +1,4 @@ -glabel func_809A5ED0 +glabel EffectSsGFire_Init /* 00000 809A5ED0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 809A5ED4 3C0E809A */ lui $t6, %hi(D_809A60D8) ## $t6 = 809A0000 /* 00008 809A5ED8 AFA40020 */ sw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6150.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/EffectSsGMagma_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6150.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/EffectSsGMagma_Init.s index c2eed8b4d7..3f8d585346 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6150.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/EffectSsGMagma_Init.s @@ -1,4 +1,4 @@ -glabel func_809A6150 +glabel EffectSsGMagma_Init /* 00000 809A6150 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 809A6154 3C0E809A */ lui $t6, %hi(D_809A6328) ## $t6 = 809A0000 /* 00008 809A6158 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A63A0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/EffectSsGMagma2_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A63A0.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/EffectSsGMagma2_Init.s index 085f4470f1..2ab925794f 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A63A0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/EffectSsGMagma2_Init.s @@ -1,4 +1,4 @@ -glabel func_809A63A0 +glabel EffectSsGMagma2_Init /* 00000 809A63A0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 809A63A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00008 809A63A8 AFA40038 */ sw $a0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6960.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/EffectSsGRipple_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6960.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/EffectSsGRipple_Init.s index 969b9903f7..2f440c10a7 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6960.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/EffectSsGRipple_Init.s @@ -1,4 +1,4 @@ -glabel func_809A6960 +glabel EffectSsGRipple_Init /* 00000 809A6960 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00004 809A6964 3C0E809A */ lui $t6, %hi(D_809A6E88) ## $t6 = 809A0000 /* 00008 809A6968 AFBF0024 */ sw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A6F30.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/EffectSsGSpk_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A6F30.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/EffectSsGSpk_Init.s index 67b234e0c5..84ab693236 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A6F30.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/EffectSsGSpk_Init.s @@ -1,4 +1,4 @@ -glabel func_809A6F30 +glabel EffectSsGSpk_Init /* 00000 809A6F30 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 809A6F34 AFBF001C */ sw $ra, 0x001C($sp) /* 00008 809A6F38 AFB10018 */ sw $s1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7540.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/EffectSsGSplash_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7540.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/EffectSsGSplash_Init.s index 3e0f13ae48..9060b2c8e6 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7540.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/EffectSsGSplash_Init.s @@ -1,4 +1,4 @@ -glabel func_809A7540 +glabel EffectSsGSplash_Init /* 00000 809A7540 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 809A7544 3C0E809A */ lui $t6, %hi(D_809A7948) ## $t6 = 809A0000 /* 00008 809A7548 AFA40020 */ sw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7A60.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/EffectSsHahen_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7A60.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/EffectSsHahen_Init.s index ed3dc4f813..00e8a92bb6 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7A60.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/EffectSsHahen_Init.s @@ -1,4 +1,4 @@ -glabel func_809A7A60 +glabel EffectSsHahen_Init /* 00070 809A7A60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00074 809A7A64 AFBF001C */ sw $ra, 0x001C($sp) /* 00078 809A7A68 AFB10018 */ sw $s1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8150.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/EffectSsHitMark_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8150.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/EffectSsHitMark_Init.s index 44bf3c6e2e..2ac9f95f5e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8150.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/EffectSsHitMark_Init.s @@ -1,4 +1,4 @@ -glabel func_809A8150 +glabel EffectSsHitMark_Init /* 00000 809A8150 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 809A8154 AFA50004 */ sw $a1, 0x0004($sp) /* 00008 809A8158 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8700.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/EffectSsIcePiece_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8700.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/EffectSsIcePiece_Init.s index b758600df2..50ff1f03d7 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8700.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/EffectSsIcePiece_Init.s @@ -1,4 +1,4 @@ -glabel func_809A8700 +glabel EffectSsIcePiece_Init /* 00000 809A8700 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00004 809A8704 AFBF0014 */ sw $ra, 0x0014($sp) /* 00008 809A8708 AFA40028 */ sw $a0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/EffectSsIceSmoke_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/EffectSsIceSmoke_Init.s index aa8272c6c4..4fea3c78d2 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/EffectSsIceSmoke_Init.s @@ -4,7 +4,7 @@ glabel D_809A90C0 .balign 4 .text -glabel func_809A8BF0 +glabel EffectSsIceSmoke_Init /* 00000 809A8BF0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 809A8BF4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00008 809A8BF8 AFA40038 */ sw $a0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A91B0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/EffectSsKFire_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A91B0.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/EffectSsKFire_Init.s index 921e71350a..f5a9f02179 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A91B0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/EffectSsKFire_Init.s @@ -1,4 +1,4 @@ -glabel func_809A91B0 +glabel EffectSsKFire_Init /* 00000 809A91B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 809A91B4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00008 809A91B8 AFA40018 */ sw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9680.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/EffectSsKakera_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9680.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/EffectSsKakera_Init.s index c5f309b143..29cc4e7ba3 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9680.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/EffectSsKakera_Init.s @@ -15,7 +15,7 @@ glabel D_809AA66C .float 32767.0 .text -glabel func_809A9680 +glabel EffectSsKakera_Init /* 00000 809A9680 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 809A9684 AFBF001C */ sw $ra, 0x001C($sp) /* 00008 809A9688 AFB10018 */ sw $s1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA810.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/EffectSsKiraKira_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA810.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/EffectSsKiraKira_Init.s index 8f10dfd59c..e4e6fd462e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA810.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/EffectSsKiraKira_Init.s @@ -1,4 +1,4 @@ -glabel func_809AA810 +glabel EffectSsKiraKira_Init /* 00000 809AA810 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 809AA814 AFA50004 */ sw $a1, 0x0004($sp) /* 00008 809AA818 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAEF0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/EffectSsLightning_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAEF0.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/EffectSsLightning_Init.s index 22c717de83..00b6ad49a9 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAEF0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/EffectSsLightning_Init.s @@ -1,4 +1,4 @@ -glabel func_809AAEF0 +glabel EffectSsLightning_Init /* 00000 809AAEF0 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 809AAEF4 AFA50004 */ sw $a1, 0x0004($sp) /* 00008 809AAEF8 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/EffectSsSibuki_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/EffectSsSibuki_Init.s index c34aea18bf..30a1e5a4fb 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/EffectSsSibuki_Init.s @@ -3,7 +3,7 @@ glabel D_809ABCD8 .float 0.01 .text -glabel func_809AB630 +glabel EffectSsSibuki_Init /* 00000 809AB630 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 809AB634 AFBF0014 */ sw $ra, 0x0014($sp) /* 00008 809AB638 AFA40018 */ sw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABD60.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/EffectSsSibuki2_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABD60.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/EffectSsSibuki2_Init.s index a13d55284a..1ee0f98164 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABD60.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/EffectSsSibuki2_Init.s @@ -1,4 +1,4 @@ -glabel func_809ABD60 +glabel EffectSsSibuki2_Init /* 00000 809ABD60 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 809ABD64 AFA50004 */ sw $a1, 0x0004($sp) /* 00008 809ABD68 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC2D0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/EffectSsStick_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC2D0.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/EffectSsStick_Init.s index 7b63f2d40d..d8f92fcd38 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC2D0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/EffectSsStick_Init.s @@ -1,4 +1,4 @@ -glabel func_809AC2D0 +glabel EffectSsStick_Init /* 00000 809AC2D0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00004 809AC2D4 3C0E809B */ lui $t6, %hi(D_809AC628) ## $t6 = 809B0000 /* 00008 809AC2D8 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC700.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/EffectSsStone1_Init.s similarity index 99% rename from asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC700.s rename to asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/EffectSsStone1_Init.s index 51737ed1ea..6c5d46419d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC700.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/EffectSsStone1_Init.s @@ -1,4 +1,4 @@ -glabel func_809AC700 +glabel EffectSsStone1_Init /* 00000 809AC700 27BDFFF0 */ addiu $sp, $sp, 0xFFF0 ## $sp = FFFFFFF0 /* 00004 809AC704 AFA40010 */ sw $a0, 0x0010($sp) /* 00008 809AC708 AFA50014 */ sw $a1, 0x0014($sp) diff --git a/data/overlays/effects/z_eff_ss_blast.data.s b/data/overlays/effects/z_eff_ss_blast.data.s index 45af52bf5a..89423f367b 100644 --- a/data/overlays/effects/z_eff_ss_blast.data.s +++ b/data/overlays/effects/z_eff_ss_blast.data.s @@ -11,6 +11,6 @@ glabel Effect_Ss_Blast_InitVars .word 0x00000004 -.word func_8099EDB0 +.word EffectSsBlast_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_bomb.data.s b/data/overlays/effects/z_eff_ss_bomb.data.s index 64f1d0f519..d5e3283677 100644 --- a/data/overlays/effects/z_eff_ss_bomb.data.s +++ b/data/overlays/effects/z_eff_ss_bomb.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_Bomb_InitVars .word 0x00000002 -.word func_8099F1B0 +.word EffectSsBomb_Init glabel D_8099F588 .word 0x04007F80, 0x04008780, 0x04008F80, 0x04009780, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_bomb2.data.s b/data/overlays/effects/z_eff_ss_bomb2.data.s index 1e24f9b702..a7fed382e6 100644 --- a/data/overlays/effects/z_eff_ss_bomb2.data.s +++ b/data/overlays/effects/z_eff_ss_bomb2.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_Bomb2_InitVars .word 0x00000003 -.word func_8099F650 +.word EffectSsBomb2_Init glabel D_8099FED8 .word func_8099F748 .word func_8099F960 diff --git a/data/overlays/effects/z_eff_ss_bubble.data.s b/data/overlays/effects/z_eff_ss_bubble.data.s index fdc641c1de..2f470b3461 100644 --- a/data/overlays/effects/z_eff_ss_bubble.data.s +++ b/data/overlays/effects/z_eff_ss_bubble.data.s @@ -11,6 +11,6 @@ glabel Effect_Ss_Bubble_InitVars .word 0x00000007 -.word func_809A0040 +.word EffectSsBubble_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_d_fire.data.s b/data/overlays/effects/z_eff_ss_d_fire.data.s index 5e9b035cd7..9503d615dc 100644 --- a/data/overlays/effects/z_eff_ss_d_fire.data.s +++ b/data/overlays/effects/z_eff_ss_d_fire.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_D_Fire_InitVars .word 0x00000006 -.word func_809A0550 +.word EffectSsDFire_Init glabel D_809A09F8 .word 0x060090A0, 0x060092A0, 0x060094A0, 0x060096A0, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_dead_db.data.s b/data/overlays/effects/z_eff_ss_dead_db.data.s index 628de45c7f..bf0d4a7fde 100644 --- a/data/overlays/effects/z_eff_ss_dead_db.data.s +++ b/data/overlays/effects/z_eff_ss_dead_db.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_Dead_Db_InitVars .word 0x00000020 -.word func_809A0AA0 +.word EffectSsDeadDb_Init glabel D_809A0F28 .word 0x0402CFE0, 0x0402D7E0, 0x0402DFE0, 0x0402E7E0, 0x0402EFE0, 0x0402F7E0, 0x0402FFE0, 0x040307E0, 0x04030FE0, 0x040317E0 diff --git a/data/overlays/effects/z_eff_ss_dead_dd.data.s b/data/overlays/effects/z_eff_ss_dead_dd.data.s index 358e8fa5cc..c358b6a50d 100644 --- a/data/overlays/effects/z_eff_ss_dead_dd.data.s +++ b/data/overlays/effects/z_eff_ss_dead_dd.data.s @@ -11,5 +11,5 @@ glabel Effect_Ss_Dead_Dd_InitVars .word 0x00000021 -.word func_809A0FE0 +.word EffectSsDeadDd_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_dead_ds.data.s b/data/overlays/effects/z_eff_ss_dead_ds.data.s index 03b0ff9193..5c64c46ad6 100644 --- a/data/overlays/effects/z_eff_ss_dead_ds.data.s +++ b/data/overlays/effects/z_eff_ss_dead_ds.data.s @@ -11,6 +11,6 @@ glabel Effect_Ss_Dead_Ds_InitVars .word 0x00000022 -.word func_809A1610 +.word EffectSsDeadDs_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_dead_sound.data.s b/data/overlays/effects/z_eff_ss_dead_sound.data.s index 93c1ac18cb..8c0dfb7138 100644 --- a/data/overlays/effects/z_eff_ss_dead_sound.data.s +++ b/data/overlays/effects/z_eff_ss_dead_sound.data.s @@ -11,6 +11,6 @@ glabel Effect_Ss_Dead_Sound_InitVars .word 0x00000023 -.word func_809A1B30 +.word EffectSsDeadSound_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_dt_bubble.data.s b/data/overlays/effects/z_eff_ss_dt_bubble.data.s index 8e87d192e8..2d8e528b61 100644 --- a/data/overlays/effects/z_eff_ss_dt_bubble.data.s +++ b/data/overlays/effects/z_eff_ss_dt_bubble.data.s @@ -15,5 +15,5 @@ glabel D_809A220C .word 0xAA0000FF, 0x006400FF, 0x0000FFFF glabel Effect_Ss_Dt_Bubble_InitVars .word 0x0000000E -.word func_809A1CB0 +.word EffectSsDtBubble_Init diff --git a/data/overlays/effects/z_eff_ss_en_fire.data.s b/data/overlays/effects/z_eff_ss_en_fire.data.s index 9783bfa4d9..041d5b2700 100644 --- a/data/overlays/effects/z_eff_ss_en_fire.data.s +++ b/data/overlays/effects/z_eff_ss_en_fire.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_En_Fire_InitVars .word 0x0000001D -.word func_809A2B60 +.word EffectSsEnFire_Init glabel D_809A3248 .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_en_ice.data.s b/data/overlays/effects/z_eff_ss_en_ice.data.s index 6ccdadda2d..3bcdc1c4a7 100644 --- a/data/overlays/effects/z_eff_ss_en_ice.data.s +++ b/data/overlays/effects/z_eff_ss_en_ice.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_En_Ice_InitVars .word 0x0000001B -.word func_809A3330 +.word EffectSsEnIce_Init glabel D_809A3B88 .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_extra.data.s b/data/overlays/effects/z_eff_ss_extra.data.s index e077d6abd2..3b30419cee 100644 --- a/data/overlays/effects/z_eff_ss_extra.data.s +++ b/data/overlays/effects/z_eff_ss_extra.data.s @@ -13,6 +13,6 @@ glabel D_809A4060 .word 0x001E003C, 0x00640000 glabel Effect_Ss_Extra_InitVars .word 0x0000001E -.word func_809A3CC0 +.word EffectSsExtra_Init glabel D_809A4070 .word 0x06000000, 0x06000480, 0x06000900, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_fcircle.data.s b/data/overlays/effects/z_eff_ss_fcircle.data.s index 2f0f0010b4..5435954dbf 100644 --- a/data/overlays/effects/z_eff_ss_fcircle.data.s +++ b/data/overlays/effects/z_eff_ss_fcircle.data.s @@ -11,6 +11,6 @@ glabel Effect_Ss_Fcircle_InitVars .word 0x0000001F -.word func_809A4120 +.word EffectSsFcircle_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_fhg_flash.data.s b/data/overlays/effects/z_eff_ss_fhg_flash.data.s index 2c9ac388bc..81e33412eb 100644 --- a/data/overlays/effects/z_eff_ss_fhg_flash.data.s +++ b/data/overlays/effects/z_eff_ss_fhg_flash.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_Fhg_Flash_InitVars .word 0x00000016 -.word func_809A4660 +.word EffectSsFhgFlash_Init glabel D_809A5088 .word 0x00000000, 0x00000000, 0x00000000 glabel D_809A5094 diff --git a/data/overlays/effects/z_eff_ss_fire_tail.data.s b/data/overlays/effects/z_eff_ss_fire_tail.data.s index e8d1274dea..07dfab1e60 100644 --- a/data/overlays/effects/z_eff_ss_fire_tail.data.s +++ b/data/overlays/effects/z_eff_ss_fire_tail.data.s @@ -11,6 +11,6 @@ glabel Effect_Ss_Fire_Tail_InitVars .word 0x0000001C -.word func_809A5740 +.word EffectSsFireTail_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_g_fire.data.s b/data/overlays/effects/z_eff_ss_g_fire.data.s index 6844605910..d74bf58ce3 100644 --- a/data/overlays/effects/z_eff_ss_g_fire.data.s +++ b/data/overlays/effects/z_eff_ss_g_fire.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_G_Fire_InitVars .word 0x0000000C -.word func_809A5ED0 +.word EffectSsGFire_Init glabel D_809A60D8 .word 0x00000000, 0x00000000, 0x00000000 glabel D_809A60E4 diff --git a/data/overlays/effects/z_eff_ss_g_magma.data.s b/data/overlays/effects/z_eff_ss_g_magma.data.s index a64651a949..d3988abf88 100644 --- a/data/overlays/effects/z_eff_ss_g_magma.data.s +++ b/data/overlays/effects/z_eff_ss_g_magma.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_G_Magma_InitVars .word 0x0000000B -.word func_809A6150 +.word EffectSsGMagma_Init glabel D_809A6328 .word 0x00000000, 0x00000000, 0x00000000 glabel D_809A6334 diff --git a/data/overlays/effects/z_eff_ss_g_magma2.data.s b/data/overlays/effects/z_eff_ss_g_magma2.data.s index 5b20588e9b..c268db6c15 100644 --- a/data/overlays/effects/z_eff_ss_g_magma2.data.s +++ b/data/overlays/effects/z_eff_ss_g_magma2.data.s @@ -13,7 +13,7 @@ glabel D_809A6860 .word 0x0602E4E0, 0x0602E8E0, 0x0602ECE0, 0x0602F0E0, 0x0602F4E0, 0x0602F8E0, 0x0602FCE0, 0x060300E0, 0x060304E0, 0x060308E0, 0x060308E0, 0x060308E0, 0x060308E0 glabel Effect_Ss_G_Magma2_InitVars .word 0x00000013 -.word func_809A63A0 +.word EffectSsGMagma2_Init glabel D_809A689C .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_g_ripple.data.s b/data/overlays/effects/z_eff_ss_g_ripple.data.s index 2a87f3fab0..62ee8df637 100644 --- a/data/overlays/effects/z_eff_ss_g_ripple.data.s +++ b/data/overlays/effects/z_eff_ss_g_ripple.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_G_Ripple_InitVars .word 0x00000009 -.word func_809A6960 +.word EffectSsGRipple_Init glabel D_809A6E88 .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_g_spk.data.s b/data/overlays/effects/z_eff_ss_g_spk.data.s index c147e97a86..d7eab0a418 100644 --- a/data/overlays/effects/z_eff_ss_g_spk.data.s +++ b/data/overlays/effects/z_eff_ss_g_spk.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_G_Spk_InitVars .word 0x00000005 -.word func_809A6F30 +.word EffectSsGSpk_Init glabel D_809A7498 .word 0x04055FB0, 0x040561B0, 0x040563B0, 0x040565B0, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_g_splash.data.s b/data/overlays/effects/z_eff_ss_g_splash.data.s index f04898f6ab..9ebb2da06c 100644 --- a/data/overlays/effects/z_eff_ss_g_splash.data.s +++ b/data/overlays/effects/z_eff_ss_g_splash.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_G_Splash_InitVars .word 0x0000000A -.word func_809A7540 +.word EffectSsGSplash_Init glabel D_809A7948 .word 0x00000000, 0x00000000, 0x00000000 glabel D_809A7954 diff --git a/data/overlays/effects/z_eff_ss_hahen.data.s b/data/overlays/effects/z_eff_ss_hahen.data.s index 83edae146b..ec5246ce32 100644 --- a/data/overlays/effects/z_eff_ss_hahen.data.s +++ b/data/overlays/effects/z_eff_ss_hahen.data.s @@ -11,6 +11,6 @@ glabel Effect_Ss_Hahen_InitVars .word 0x0000000F -.word func_809A7A60 +.word EffectSsHahen_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_hitmark.data.s b/data/overlays/effects/z_eff_ss_hitmark.data.s index 90d42903e2..6907bc0159 100644 --- a/data/overlays/effects/z_eff_ss_hitmark.data.s +++ b/data/overlays/effects/z_eff_ss_hitmark.data.s @@ -15,6 +15,6 @@ glabel D_809A85E0 .word 0x0401F370, 0x0401F4F0, 0x0401F670, 0x0401F7F0, 0x0401F970, 0x0401FAF0, 0x0401FC70, 0x0401FDF0, 0x0401FF70, 0x040200F0, 0x04020270, 0x040203F0, 0x04020570, 0x040206F0, 0x04020870, 0x040209F0, 0x04020B70, 0x04020CF0, 0x04020E70, 0x04020FF0, 0x04021170, 0x040212F0, 0x04021470, 0x040215F0, 0x0401F370, 0x0401F4F0, 0x0401F670, 0x0401F7F0, 0x0401F970, 0x0401FAF0, 0x0401FC70, 0x0401FDF0 glabel Effect_Ss_HitMark_InitVars .word 0x00000015 -.word func_809A8150 +.word EffectSsHitMark_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_ice_piece.data.s b/data/overlays/effects/z_eff_ss_ice_piece.data.s index 8434d8990d..d5463af92e 100644 --- a/data/overlays/effects/z_eff_ss_ice_piece.data.s +++ b/data/overlays/effects/z_eff_ss_ice_piece.data.s @@ -11,6 +11,6 @@ glabel Effect_Ss_Ice_Piece_InitVars .word 0x0000001A -.word func_809A8700 +.word EffectSsIcePiece_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_ice_smoke.data.s b/data/overlays/effects/z_eff_ss_ice_smoke.data.s index 3a4f33a40b..c29f88ac9d 100644 --- a/data/overlays/effects/z_eff_ss_ice_smoke.data.s +++ b/data/overlays/effects/z_eff_ss_ice_smoke.data.s @@ -11,6 +11,6 @@ glabel Effect_Ss_Ice_Smoke_InitVars .word 0x00000024 -.word func_809A8BF0 +.word EffectSsIceSmoke_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_k_fire.data.s b/data/overlays/effects/z_eff_ss_k_fire.data.s index 82ed8d9767..55363f5385 100644 --- a/data/overlays/effects/z_eff_ss_k_fire.data.s +++ b/data/overlays/effects/z_eff_ss_k_fire.data.s @@ -11,6 +11,6 @@ glabel Effect_Ss_K_Fire_InitVars .word 0x00000017 -.word func_809A91B0 +.word EffectSsKFire_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_kakera.data.s b/data/overlays/effects/z_eff_ss_kakera.data.s index e51514ebe5..ca1415a611 100644 --- a/data/overlays/effects/z_eff_ss_kakera.data.s +++ b/data/overlays/effects/z_eff_ss_kakera.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_Kakera_InitVars .word 0x00000019 -.word func_809A9680 +.word EffectSsKakera_Init glabel D_809AA528 .word 0xFFFFFFEB, 0xAA820000 glabel D_809AA530 diff --git a/data/overlays/effects/z_eff_ss_kirakira.data.s b/data/overlays/effects/z_eff_ss_kirakira.data.s index 2ffa724234..56f4b73a61 100644 --- a/data/overlays/effects/z_eff_ss_kirakira.data.s +++ b/data/overlays/effects/z_eff_ss_kirakira.data.s @@ -11,6 +11,6 @@ glabel Effect_Ss_KiraKira_InitVars .word 0x00000001 -.word func_809AA810 +.word EffectSsKiraKira_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_lightning.data.s b/data/overlays/effects/z_eff_ss_lightning.data.s index 7cf3ce0d51..e3932c5c97 100644 --- a/data/overlays/effects/z_eff_ss_lightning.data.s +++ b/data/overlays/effects/z_eff_ss_lightning.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_Lightning_InitVars .word 0x0000000D -.word func_809AAEF0 +.word EffectSsLightning_Init glabel D_809AB538 .word 0x04029F30, 0x0402A530, 0x0402AB30, 0x0402B130, 0x0402B730, 0x0402BD30, 0x0402C330, 0x0402C930, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_sibuki.data.s b/data/overlays/effects/z_eff_ss_sibuki.data.s index 637b529564..6fece2fc00 100644 --- a/data/overlays/effects/z_eff_ss_sibuki.data.s +++ b/data/overlays/effects/z_eff_ss_sibuki.data.s @@ -11,6 +11,6 @@ glabel Effect_Ss_Sibuki_InitVars .word 0x00000011 -.word func_809AB630 +.word EffectSsSibuki_Init .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_sibuki2.data.s b/data/overlays/effects/z_eff_ss_sibuki2.data.s index 27c6577225..2c7d5e972d 100644 --- a/data/overlays/effects/z_eff_ss_sibuki2.data.s +++ b/data/overlays/effects/z_eff_ss_sibuki2.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_Sibuki2_InitVars .word 0x00000012 -.word func_809ABD60 +.word EffectSsSibuki2_Init glabel D_809AC068 .word 0x0401C2C0, 0x0401C2C0, 0x0401C6C0, 0x0401CAC0, 0x0401CEC0, 0x0401D2C0, 0x0401D6C0, 0x0401DAC0, 0x0401DEC0, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_stick.data.s b/data/overlays/effects/z_eff_ss_stick.data.s index 3ce23d5297..d27c3ea639 100644 --- a/data/overlays/effects/z_eff_ss_stick.data.s +++ b/data/overlays/effects/z_eff_ss_stick.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_Stick_InitVars .word 0x00000010 -.word func_809AC2D0 +.word EffectSsStick_Init glabel D_809AC628 .word 0x00140000, 0x0602BA38, 0x00150000, 0x06006CC0, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_stone1.data.s b/data/overlays/effects/z_eff_ss_stone1.data.s index 88317d27dd..582162375c 100644 --- a/data/overlays/effects/z_eff_ss_stone1.data.s +++ b/data/overlays/effects/z_eff_ss_stone1.data.s @@ -11,7 +11,7 @@ glabel Effect_Ss_Stone1_InitVars .word 0x00000014 -.word func_809AC700 +.word EffectSsStone1_Init glabel D_809ACA08 .word 0x04029A90, 0xC80000FF, 0x000000FF, 0x04029690, 0xFF6400FF, 0x640000FF, 0x04029290, 0xFFC800FF, 0xC80000FF, 0x04028E90, 0xFFFF00FF, 0xFF0000FF, 0x04028A90, 0xFFFF96FF, 0xFF9600FF, 0x04028690, 0xFFFFFFFF, 0xFFFF00FF, 0x04028290, 0xFFFFFFFF, 0x00FF00FF, 0x04027E90, 0xFFFFFFFF, 0x00FFFFFF, 0x00000000, 0x00000000 diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c index 77c3b7629f..e71a83034f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_blast.c + * Overlay: ovl_Effect_Ss_Blast + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EDB0.s") +#include "z_eff_ss_blast.h" + +typedef enum { + /* 0x00 */ SS_BLAST_0, + /* 0x01 */ SS_BLAST_1, + /* 0x02 */ SS_BLAST_2, + /* 0x03 */ SS_BLAST_3, + /* 0x04 */ SS_BLAST_4, + /* 0x05 */ SS_BLAST_5, + /* 0x06 */ SS_BLAST_6, + /* 0x07 */ SS_BLAST_7, + /* 0x08 */ SS_BLAST_8, + /* 0x09 */ SS_BLAST_9, + /* 0x0A */ SS_BLAST_A, + /* 0x0B */ SS_BLAST_B, + /* 0x0C */ SS_BLAST_C, +} EffectSsBlastRegs; + +u32 EffectSsBlast_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsBlast_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsBlast_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Blast_InitVars = { + EFFECT_SS_BLAST, + EffectSsBlast_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/EffectSsBlast_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h new file mode 100644 index 0000000000..39b4bda60a --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_BLAST_H_ +#define _Z_EFF_SS_BLAST_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsBlastInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c index 45fe73bc88..c7062a842c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_bomb.c + * Overlay: ovl_Effect_Ss_Bomb + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F1B0.s") +#include "z_eff_ss_bomb.h" + +typedef enum { + /* 0x00 */ SS_BOMB_0, + /* 0x01 */ SS_BOMB_1, + /* 0x02 */ SS_BOMB_2, + /* 0x03 */ SS_BOMB_3, + /* 0x04 */ SS_BOMB_4, + /* 0x05 */ SS_BOMB_5, + /* 0x06 */ SS_BOMB_6, + /* 0x07 */ SS_BOMB_7, + /* 0x08 */ SS_BOMB_8, + /* 0x09 */ SS_BOMB_9, + /* 0x0A */ SS_BOMB_A, + /* 0x0B */ SS_BOMB_B, + /* 0x0C */ SS_BOMB_C, +} EffectSsBombRegs; + +u32 EffectSsBomb_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsBomb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsBomb_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Bomb_InitVars = { + EFFECT_SS_BOMB, + EffectSsBomb_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/EffectSsBomb_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h new file mode 100644 index 0000000000..9e877e90d5 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_BOMB_H_ +#define _Z_EFF_SS_BOMB_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsBombInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c index b4985f3bbd..460bc6fd5f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_bomb2.c + * Overlay: ovl_Effect_Ss_Bomb2 + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F650.s") +#include "z_eff_ss_bomb2.h" + +typedef enum { + /* 0x00 */ SS_BOMB2_0, + /* 0x01 */ SS_BOMB2_1, + /* 0x02 */ SS_BOMB2_2, + /* 0x03 */ SS_BOMB2_3, + /* 0x04 */ SS_BOMB2_4, + /* 0x05 */ SS_BOMB2_5, + /* 0x06 */ SS_BOMB2_6, + /* 0x07 */ SS_BOMB2_7, + /* 0x08 */ SS_BOMB2_8, + /* 0x09 */ SS_BOMB2_9, + /* 0x0A */ SS_BOMB2_A, + /* 0x0B */ SS_BOMB2_B, + /* 0x0C */ SS_BOMB2_C, +} EffectSsBomb2Regs; + +u32 EffectSsBomb2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsBomb2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsBomb2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Bomb2_InitVars = { + EFFECT_SS_BOMB2, + EffectSsBomb2_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/EffectSsBomb2_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h new file mode 100644 index 0000000000..605f48b45b --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_BOMB2_H_ +#define _Z_EFF_SS_BOMB2_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsBomb2InitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c index 8ee11f8e53..af991d86df 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_bubble.c + * Overlay: ovl_Effect_Ss_Bubble + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0040.s") +#include "z_eff_ss_bubble.h" + +typedef enum { + /* 0x00 */ SS_BUBBLE_0, + /* 0x01 */ SS_BUBBLE_1, + /* 0x02 */ SS_BUBBLE_2, + /* 0x03 */ SS_BUBBLE_3, + /* 0x04 */ SS_BUBBLE_4, + /* 0x05 */ SS_BUBBLE_5, + /* 0x06 */ SS_BUBBLE_6, + /* 0x07 */ SS_BUBBLE_7, + /* 0x08 */ SS_BUBBLE_8, + /* 0x09 */ SS_BUBBLE_9, + /* 0x0A */ SS_BUBBLE_A, + /* 0x0B */ SS_BUBBLE_B, + /* 0x0C */ SS_BUBBLE_C, +} EffectSsBubbleRegs; + +u32 EffectSsBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Bubble_InitVars = { + EFFECT_SS_BUBBLE, + EffectSsBubble_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/EffectSsBubble_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h new file mode 100644 index 0000000000..d9710fec1c --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_BUBBLE_H_ +#define _Z_EFF_SS_BUBBLE_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsBubbleInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c index be8a0129cc..0ed4a214b1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_d_fire.c + * Overlay: ovl_Effect_Ss_D_Fire + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0550.s") +#include "z_eff_ss_d_fire.h" + +typedef enum { + /* 0x00 */ SS_D_FIRE_0, + /* 0x01 */ SS_D_FIRE_1, + /* 0x02 */ SS_D_FIRE_2, + /* 0x03 */ SS_D_FIRE_3, + /* 0x04 */ SS_D_FIRE_4, + /* 0x05 */ SS_D_FIRE_5, + /* 0x06 */ SS_D_FIRE_6, + /* 0x07 */ SS_D_FIRE_7, + /* 0x08 */ SS_D_FIRE_8, + /* 0x09 */ SS_D_FIRE_9, + /* 0x0A */ SS_D_FIRE_A, + /* 0x0B */ SS_D_FIRE_B, + /* 0x0C */ SS_D_FIRE_C, +} EffectSsD_FireRegs; + +u32 EffectSsDFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsDFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsDFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_D_Fire_InitVars = { + EFFECT_SS_D_FIRE, + EffectSsDFire_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/EffectSsDFire_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h new file mode 100644 index 0000000000..36bfa9eeae --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_D_FIRE_H_ +#define _Z_EFF_SS_D_FIRE_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsDFireInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c index 4f75a5671a..0d2bc6c02c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_dead_db.c + * Overlay: ovl_Effect_Ss_Dead_Db + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0AA0.s") +#include "z_eff_ss_dead_db.h" + +typedef enum { + /* 0x00 */ SS_DEAD_DB_0, + /* 0x01 */ SS_DEAD_DB_1, + /* 0x02 */ SS_DEAD_DB_2, + /* 0x03 */ SS_DEAD_DB_3, + /* 0x04 */ SS_DEAD_DB_4, + /* 0x05 */ SS_DEAD_DB_5, + /* 0x06 */ SS_DEAD_DB_6, + /* 0x07 */ SS_DEAD_DB_7, + /* 0x08 */ SS_DEAD_DB_8, + /* 0x09 */ SS_DEAD_DB_9, + /* 0x0A */ SS_DEAD_DB_A, + /* 0x0B */ SS_DEAD_DB_B, + /* 0x0C */ SS_DEAD_DB_C, +} EffectSsDead_DbRegs; + +u32 EffectSsDeadDb_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsDeadDb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsDeadDb_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Dead_Db_InitVars = { + EFFECT_SS_DEAD_DB, + EffectSsDeadDb_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/EffectSsDeadDb_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h new file mode 100644 index 0000000000..e180a20779 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_DEAD_DB_H_ +#define _Z_EFF_SS_DEAD_DB_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsDeadDbInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c index 582ea22b0e..e8770367d3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_dead_dd.c + * Overlay: ovl_Effect_Ss_Dead_Dd + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A0FE0.s") +#include "z_eff_ss_dead_dd.h" + +typedef enum { + /* 0x00 */ SS_DEAD_DD_0, + /* 0x01 */ SS_DEAD_DD_1, + /* 0x02 */ SS_DEAD_DD_2, + /* 0x03 */ SS_DEAD_DD_3, + /* 0x04 */ SS_DEAD_DD_4, + /* 0x05 */ SS_DEAD_DD_5, + /* 0x06 */ SS_DEAD_DD_6, + /* 0x07 */ SS_DEAD_DD_7, + /* 0x08 */ SS_DEAD_DD_8, + /* 0x09 */ SS_DEAD_DD_9, + /* 0x0A */ SS_DEAD_DD_A, + /* 0x0B */ SS_DEAD_DD_B, + /* 0x0C */ SS_DEAD_DD_C, +} EffectSsDead_DdRegs; + +u32 EffectSsDeadDd_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsDeadDd_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsDeadDd_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Dead_Dd_InitVars = { + EFFECT_SS_DEAD_DD, + EffectSsDeadDd_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/EffectSsDeadDd_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h new file mode 100644 index 0000000000..66a8a85e8a --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_DEAD_DD_H_ +#define _Z_EFF_SS_DEAD_DD_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsDeadDdInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c index d4995444ae..6171df8087 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_dead_ds.c + * Overlay: ovl_Effect_Ss_Dead_Ds + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1610.s") +#include "z_eff_ss_dead_ds.h" + +typedef enum { + /* 0x00 */ SS_DEAD_DS_0, + /* 0x01 */ SS_DEAD_DS_1, + /* 0x02 */ SS_DEAD_DS_2, + /* 0x03 */ SS_DEAD_DS_3, + /* 0x04 */ SS_DEAD_DS_4, + /* 0x05 */ SS_DEAD_DS_5, + /* 0x06 */ SS_DEAD_DS_6, + /* 0x07 */ SS_DEAD_DS_7, + /* 0x08 */ SS_DEAD_DS_8, + /* 0x09 */ SS_DEAD_DS_9, + /* 0x0A */ SS_DEAD_DS_A, + /* 0x0B */ SS_DEAD_DS_B, + /* 0x0C */ SS_DEAD_DS_C, +} EffectSsDead_DsRegs; + +u32 EffectSsDeadDs_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsDeadDs_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsDeadDs_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Dead_Ds_InitVars = { + EFFECT_SS_DEAD_DS, + EffectSsDeadDs_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/EffectSsDeadDs_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h new file mode 100644 index 0000000000..95064ff01b --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_DEAD_DS_H_ +#define _Z_EFF_SS_DEAD_DS_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsDeadDsInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c index 722d468899..9374353b00 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c @@ -1,6 +1,38 @@ -#include -#include +/* + * File: z_eff_ss_dead_sound.c + * Overlay: ovl_Effect_Ss_Dead_Sound + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1B30.s") +#include "z_eff_ss_dead_sound.h" + +typedef enum { + /* 0x00 */ SS_DEAD_SOUND_0, + /* 0x01 */ SS_DEAD_SOUND_1, + /* 0x02 */ SS_DEAD_SOUND_2, + /* 0x03 */ SS_DEAD_SOUND_3, + /* 0x04 */ SS_DEAD_SOUND_4, + /* 0x05 */ SS_DEAD_SOUND_5, + /* 0x06 */ SS_DEAD_SOUND_6, + /* 0x07 */ SS_DEAD_SOUND_7, + /* 0x08 */ SS_DEAD_SOUND_8, + /* 0x09 */ SS_DEAD_SOUND_9, + /* 0x0A */ SS_DEAD_SOUND_A, + /* 0x0B */ SS_DEAD_SOUND_B, + /* 0x0C */ SS_DEAD_SOUND_C, +} EffectSsDead_SoundRegs; + +u32 EffectSsDeadSound_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsDeadSound_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsDeadSound_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Dead_Sound_InitVars = { + EFFECT_SS_DEAD_SOUND, + EffectSsDeadSound_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/EffectSsDeadSound_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1BD8.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h new file mode 100644 index 0000000000..504bdaf7e6 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_DEAD_SOUND_H_ +#define _Z_EFF_SS_DEAD_SOUND_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsDeadSoundInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c index 45f0eb9bf3..0f4cf4e97d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_dt_bubble.c + * Overlay: ovl_Effect_Ss_Dt_Bubble + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1CB0.s") +#include "z_eff_ss_dt_bubble.h" + +typedef enum { + /* 0x00 */ SS_DT_BUBBLE_0, + /* 0x01 */ SS_DT_BUBBLE_1, + /* 0x02 */ SS_DT_BUBBLE_2, + /* 0x03 */ SS_DT_BUBBLE_3, + /* 0x04 */ SS_DT_BUBBLE_4, + /* 0x05 */ SS_DT_BUBBLE_5, + /* 0x06 */ SS_DT_BUBBLE_6, + /* 0x07 */ SS_DT_BUBBLE_7, + /* 0x08 */ SS_DT_BUBBLE_8, + /* 0x09 */ SS_DT_BUBBLE_9, + /* 0x0A */ SS_DT_BUBBLE_A, + /* 0x0B */ SS_DT_BUBBLE_B, + /* 0x0C */ SS_DT_BUBBLE_C, +} EffectSsDt_BubbleRegs; + +u32 EffectSsDtBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsDtBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsDtBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Dt_Bubble_InitVars = { + EFFECT_SS_DT_BUBBLE, + EffectSsDtBubble_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/EffectSsDtBubble_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h new file mode 100644 index 0000000000..29e04550e8 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_DT_BUBBLE_H_ +#define _Z_EFF_SS_DT_BUBBLE_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsDtBubbleInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c index eb6d647d6d..229e1e3d2c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_en_fire.c + * Overlay: ovl_Effect_Ss_En_Fire + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2B60.s") +#include "z_eff_ss_en_fire.h" + +typedef enum { + /* 0x00 */ SS_EN_FIRE_0, + /* 0x01 */ SS_EN_FIRE_1, + /* 0x02 */ SS_EN_FIRE_2, + /* 0x03 */ SS_EN_FIRE_3, + /* 0x04 */ SS_EN_FIRE_4, + /* 0x05 */ SS_EN_FIRE_5, + /* 0x06 */ SS_EN_FIRE_6, + /* 0x07 */ SS_EN_FIRE_7, + /* 0x08 */ SS_EN_FIRE_8, + /* 0x09 */ SS_EN_FIRE_9, + /* 0x0A */ SS_EN_FIRE_A, + /* 0x0B */ SS_EN_FIRE_B, + /* 0x0C */ SS_EN_FIRE_C, +} EffectSsEn_FireRegs; + +u32 EffectSsEnFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsEnFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsEnFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_En_Fire_InitVars = { + EFFECT_SS_EN_FIRE, + EffectSsEnFire_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/EffectSsEnFire_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h new file mode 100644 index 0000000000..4d30723391 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_EN_FIRE_H_ +#define _Z_EFF_SS_EN_FIRE_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsEnFireInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index b34074f312..96489a1973 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_en_ice.c + * Overlay: ovl_Effect_Ss_En_Ice + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3330.s") +#include "z_eff_ss_en_ice.h" + +typedef enum { + /* 0x00 */ SS_EN_ICE_0, + /* 0x01 */ SS_EN_ICE_1, + /* 0x02 */ SS_EN_ICE_2, + /* 0x03 */ SS_EN_ICE_3, + /* 0x04 */ SS_EN_ICE_4, + /* 0x05 */ SS_EN_ICE_5, + /* 0x06 */ SS_EN_ICE_6, + /* 0x07 */ SS_EN_ICE_7, + /* 0x08 */ SS_EN_ICE_8, + /* 0x09 */ SS_EN_ICE_9, + /* 0x0A */ SS_EN_ICE_A, + /* 0x0B */ SS_EN_ICE_B, + /* 0x0C */ SS_EN_ICE_C, +} EffectSsEn_IceRegs; + +u32 EffectSsEnIce_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsEnIce_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsEnIce_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_En_Ice_InitVars = { + EFFECT_SS_EN_ICE, + EffectSsEnIce_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/EffectSsEnIce_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h new file mode 100644 index 0000000000..5ca6a9e4d9 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_EN_ICE_H_ +#define _Z_EFF_SS_EN_ICE_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsEnIceInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index d3c9b4edbf..691c563a33 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_extra.c + * Overlay: ovl_Effect_Ss_Extra + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3CC0.s") +#include "z_eff_ss_extra.h" + +typedef enum { + /* 0x00 */ SS_EXTRA_0, + /* 0x01 */ SS_EXTRA_1, + /* 0x02 */ SS_EXTRA_2, + /* 0x03 */ SS_EXTRA_3, + /* 0x04 */ SS_EXTRA_4, + /* 0x05 */ SS_EXTRA_5, + /* 0x06 */ SS_EXTRA_6, + /* 0x07 */ SS_EXTRA_7, + /* 0x08 */ SS_EXTRA_8, + /* 0x09 */ SS_EXTRA_9, + /* 0x0A */ SS_EXTRA_A, + /* 0x0B */ SS_EXTRA_B, + /* 0x0C */ SS_EXTRA_C, +} EffectSsExtraRegs; + +u32 EffectSsExtra_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsExtra_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Extra_InitVars = { + EFFECT_SS_EXTRA, + EffectSsExtra_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/EffectSsExtra_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h new file mode 100644 index 0000000000..de35e3c925 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_EXTRA_H_ +#define _Z_EFF_SS_EXTRA_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsExtraInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c index 3da011570b..116933f26b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_fcircle.c + * Overlay: ovl_Effect_Ss_Fcircle + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A4120.s") +#include "z_eff_ss_fcircle.h" + +typedef enum { + /* 0x00 */ SS_FCIRCLE_0, + /* 0x01 */ SS_FCIRCLE_1, + /* 0x02 */ SS_FCIRCLE_2, + /* 0x03 */ SS_FCIRCLE_3, + /* 0x04 */ SS_FCIRCLE_4, + /* 0x05 */ SS_FCIRCLE_5, + /* 0x06 */ SS_FCIRCLE_6, + /* 0x07 */ SS_FCIRCLE_7, + /* 0x08 */ SS_FCIRCLE_8, + /* 0x09 */ SS_FCIRCLE_9, + /* 0x0A */ SS_FCIRCLE_A, + /* 0x0B */ SS_FCIRCLE_B, + /* 0x0C */ SS_FCIRCLE_C, +} EffectSsFcircleRegs; + +u32 EffectSsFcircle_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsFcircle_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsFcircle_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Fcircle_InitVars = { + EFFECT_SS_FCIRCLE, + EffectSsFcircle_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/EffectSsFcircle_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h new file mode 100644 index 0000000000..ded270d029 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_FCIRCLE_H_ +#define _Z_EFF_SS_FCIRCLE_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsFcircleInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index c04ee27c9f..4273e6ef8f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_fhg_flash.c + * Overlay: ovl_Effect_Ss_Fhg_Flash + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s") +#include "z_eff_ss_fhg_flash.h" + +typedef enum { + /* 0x00 */ SS_FHG_FLASH_0, + /* 0x01 */ SS_FHG_FLASH_1, + /* 0x02 */ SS_FHG_FLASH_2, + /* 0x03 */ SS_FHG_FLASH_3, + /* 0x04 */ SS_FHG_FLASH_4, + /* 0x05 */ SS_FHG_FLASH_5, + /* 0x06 */ SS_FHG_FLASH_6, + /* 0x07 */ SS_FHG_FLASH_7, + /* 0x08 */ SS_FHG_FLASH_8, + /* 0x09 */ SS_FHG_FLASH_9, + /* 0x0A */ SS_FHG_FLASH_A, + /* 0x0B */ SS_FHG_FLASH_B, + /* 0x0C */ SS_FHG_FLASH_C, +} EffectSsFhg_FlashRegs; + +u32 EffectSsFhgFlash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsFhgFlash_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsFhgFlash_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Fhg_Flash_InitVars = { + EFFECT_SS_FHG_FLASH, + EffectSsFhgFlash_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/EffectSsFhgFlash_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c index 09ef8ed751..dd21cbdc50 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_fire_tail.c + * Overlay: ovl_Effect_Ss_Fire_Tail + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5740.s") +#include "z_eff_ss_fire_tail.h" + +typedef enum { + /* 0x00 */ SS_FIRE_TAIL_0, + /* 0x01 */ SS_FIRE_TAIL_1, + /* 0x02 */ SS_FIRE_TAIL_2, + /* 0x03 */ SS_FIRE_TAIL_3, + /* 0x04 */ SS_FIRE_TAIL_4, + /* 0x05 */ SS_FIRE_TAIL_5, + /* 0x06 */ SS_FIRE_TAIL_6, + /* 0x07 */ SS_FIRE_TAIL_7, + /* 0x08 */ SS_FIRE_TAIL_8, + /* 0x09 */ SS_FIRE_TAIL_9, + /* 0x0A */ SS_FIRE_TAIL_A, + /* 0x0B */ SS_FIRE_TAIL_B, + /* 0x0C */ SS_FIRE_TAIL_C, +} EffectSsFire_TailRegs; + +u32 EffectSsFireTail_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsFireTail_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Fire_Tail_InitVars = { + EFFECT_SS_FIRE_TAIL, + EffectSsFireTail_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/EffectSsFireTail_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h new file mode 100644 index 0000000000..a1c8b6c289 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_FIRE_TAIL_H_ +#define _Z_EFF_SS_FIRE_TAIL_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsFireTailInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c index 943976af01..de412f969b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_g_fire.c + * Overlay: ovl_Effect_Ss_G_Fire + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A5ED0.s") +#include "z_eff_ss_g_fire.h" + +typedef enum { + /* 0x00 */ SS_G_FIRE_0, + /* 0x01 */ SS_G_FIRE_1, + /* 0x02 */ SS_G_FIRE_2, + /* 0x03 */ SS_G_FIRE_3, + /* 0x04 */ SS_G_FIRE_4, + /* 0x05 */ SS_G_FIRE_5, + /* 0x06 */ SS_G_FIRE_6, + /* 0x07 */ SS_G_FIRE_7, + /* 0x08 */ SS_G_FIRE_8, + /* 0x09 */ SS_G_FIRE_9, + /* 0x0A */ SS_G_FIRE_A, + /* 0x0B */ SS_G_FIRE_B, + /* 0x0C */ SS_G_FIRE_C, +} EffectSsG_FireRegs; + +u32 EffectSsGFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsGFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsGFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_G_Fire_InitVars = { + EFFECT_SS_G_FIRE, + EffectSsGFire_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/EffectSsGFire_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A6010.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h new file mode 100644 index 0000000000..e4bf699af4 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_G_FIRE_H_ +#define _Z_EFF_SS_G_FIRE_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsGFireInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c index 6dc514c3b8..45bc5d790d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_g_magma.c + * Overlay: ovl_Effect_Ss_G_Magma + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6150.s") +#include "z_eff_ss_g_magma.h" + +typedef enum { + /* 0x00 */ SS_G_MAGMA_0, + /* 0x01 */ SS_G_MAGMA_1, + /* 0x02 */ SS_G_MAGMA_2, + /* 0x03 */ SS_G_MAGMA_3, + /* 0x04 */ SS_G_MAGMA_4, + /* 0x05 */ SS_G_MAGMA_5, + /* 0x06 */ SS_G_MAGMA_6, + /* 0x07 */ SS_G_MAGMA_7, + /* 0x08 */ SS_G_MAGMA_8, + /* 0x09 */ SS_G_MAGMA_9, + /* 0x0A */ SS_G_MAGMA_A, + /* 0x0B */ SS_G_MAGMA_B, + /* 0x0C */ SS_G_MAGMA_C, +} EffectSsG_MagmaRegs; + +u32 EffectSsGMagma_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsGMagma_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsGMagma_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_G_Magma_InitVars = { + EFFECT_SS_G_MAGMA, + EffectSsGMagma_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/EffectSsGMagma_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A62A8.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h new file mode 100644 index 0000000000..cda7afd11a --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_G_MAGMA_H_ +#define _Z_EFF_SS_G_MAGMA_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsGMagmaInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c index 23d10a5ac1..f5ed4510c1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_g_magma2.c + * Overlay: ovl_Effect_Ss_G_Magma2 + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A63A0.s") +#include "z_eff_ss_g_magma2.h" + +typedef enum { + /* 0x00 */ SS_G_MAGMA2_0, + /* 0x01 */ SS_G_MAGMA2_1, + /* 0x02 */ SS_G_MAGMA2_2, + /* 0x03 */ SS_G_MAGMA2_3, + /* 0x04 */ SS_G_MAGMA2_4, + /* 0x05 */ SS_G_MAGMA2_5, + /* 0x06 */ SS_G_MAGMA2_6, + /* 0x07 */ SS_G_MAGMA2_7, + /* 0x08 */ SS_G_MAGMA2_8, + /* 0x09 */ SS_G_MAGMA2_9, + /* 0x0A */ SS_G_MAGMA2_A, + /* 0x0B */ SS_G_MAGMA2_B, + /* 0x0C */ SS_G_MAGMA2_C, +} EffectSsG_Magma2Regs; + +u32 EffectSsGMagma2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsGMagma2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsGMagma2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_G_Magma2_InitVars = { + EFFECT_SS_G_MAGMA2, + EffectSsGMagma2_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/EffectSsGMagma2_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h new file mode 100644 index 0000000000..c96c27ac1f --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_G_MAGMA2_H_ +#define _Z_EFF_SS_G_MAGMA2_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsGMagma2InitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c index 169d45524f..bd8e0bb3eb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_g_ripple.c + * Overlay: ovl_Effect_Ss_G_Ripple + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6960.s") +#include "z_eff_ss_g_ripple.h" + +typedef enum { + /* 0x00 */ SS_G_RIPPLE_0, + /* 0x01 */ SS_G_RIPPLE_1, + /* 0x02 */ SS_G_RIPPLE_2, + /* 0x03 */ SS_G_RIPPLE_3, + /* 0x04 */ SS_G_RIPPLE_4, + /* 0x05 */ SS_G_RIPPLE_5, + /* 0x06 */ SS_G_RIPPLE_6, + /* 0x07 */ SS_G_RIPPLE_7, + /* 0x08 */ SS_G_RIPPLE_8, + /* 0x09 */ SS_G_RIPPLE_9, + /* 0x0A */ SS_G_RIPPLE_A, + /* 0x0B */ SS_G_RIPPLE_B, + /* 0x0C */ SS_G_RIPPLE_C, +} EffectSsG_RippleRegs; + +u32 EffectSsGRipple_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsGRipple_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsGRipple_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_G_Ripple_InitVars = { + EFFECT_SS_G_RIPPLE, + EffectSsGRipple_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/EffectSsGRipple_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h new file mode 100644 index 0000000000..f0231b087d --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_G_RIPPLE_H_ +#define _Z_EFF_SS_G_RIPPLE_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsGRippleInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c index 50c1df035f..944540b5f2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_g_spk.c + * Overlay: ovl_Effect_Ss_G_Spk + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A6F30.s") +#include "z_eff_ss_g_spk.h" + +typedef enum { + /* 0x00 */ SS_G_SPK_0, + /* 0x01 */ SS_G_SPK_1, + /* 0x02 */ SS_G_SPK_2, + /* 0x03 */ SS_G_SPK_3, + /* 0x04 */ SS_G_SPK_4, + /* 0x05 */ SS_G_SPK_5, + /* 0x06 */ SS_G_SPK_6, + /* 0x07 */ SS_G_SPK_7, + /* 0x08 */ SS_G_SPK_8, + /* 0x09 */ SS_G_SPK_9, + /* 0x0A */ SS_G_SPK_A, + /* 0x0B */ SS_G_SPK_B, + /* 0x0C */ SS_G_SPK_C, +} EffectSsG_SpkRegs; + +u32 EffectSsGSpk_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsGSpk_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsGSpk_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_G_Spk_InitVars = { + EFFECT_SS_G_SPK, + EffectSsGSpk_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/EffectSsGSpk_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h new file mode 100644 index 0000000000..394e68a75b --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_G_SPK_H_ +#define _Z_EFF_SS_G_SPK_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsGSpkInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c index 87496873a1..f78b751285 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_g_splash.c + * Overlay: ovl_Effect_Ss_G_Splash + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7540.s") +#include "z_eff_ss_g_splash.h" + +typedef enum { + /* 0x00 */ SS_G_SPLASH_0, + /* 0x01 */ SS_G_SPLASH_1, + /* 0x02 */ SS_G_SPLASH_2, + /* 0x03 */ SS_G_SPLASH_3, + /* 0x04 */ SS_G_SPLASH_4, + /* 0x05 */ SS_G_SPLASH_5, + /* 0x06 */ SS_G_SPLASH_6, + /* 0x07 */ SS_G_SPLASH_7, + /* 0x08 */ SS_G_SPLASH_8, + /* 0x09 */ SS_G_SPLASH_9, + /* 0x0A */ SS_G_SPLASH_A, + /* 0x0B */ SS_G_SPLASH_B, + /* 0x0C */ SS_G_SPLASH_C, +} EffectSsG_SplashRegs; + +u32 EffectSsGSplash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsGSplash_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsGSplash_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_G_Splash_InitVars = { + EFFECT_SS_G_SPLASH, + EffectSsGSplash_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/EffectSsGSplash_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7760.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h new file mode 100644 index 0000000000..9116d22f06 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_G_SPLASH_H_ +#define _Z_EFF_SS_G_SPLASH_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsGSplashInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c index 4dca04f290..d9b254f6ac 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c @@ -1,9 +1,41 @@ -#include -#include +/* + * File: z_eff_ss_hahen.c + * Overlay: ovl_Effect_Ss_Hahen + * Description: + */ + +#include "z_eff_ss_hahen.h" + +typedef enum { + /* 0x00 */ SS_HAHEN_0, + /* 0x01 */ SS_HAHEN_1, + /* 0x02 */ SS_HAHEN_2, + /* 0x03 */ SS_HAHEN_3, + /* 0x04 */ SS_HAHEN_4, + /* 0x05 */ SS_HAHEN_5, + /* 0x06 */ SS_HAHEN_6, + /* 0x07 */ SS_HAHEN_7, + /* 0x08 */ SS_HAHEN_8, + /* 0x09 */ SS_HAHEN_9, + /* 0x0A */ SS_HAHEN_A, + /* 0x0B */ SS_HAHEN_B, + /* 0x0C */ SS_HAHEN_C, +} EffectSsHahenRegs; + +u32 EffectSsHahen_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsHahen_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsHahen_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Hahen_InitVars = { + EFFECT_SS_HAHEN, + EffectSsHahen_Init, +}; +*/ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A79F0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7A60.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/EffectSsHahen_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h new file mode 100644 index 0000000000..6f79985f17 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_HAHEN_H_ +#define _Z_EFF_SS_HAHEN_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsHahenInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c index 7574886edb..5086175d28 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_hitmark.c + * Overlay: ovl_Effect_Ss_HitMark + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8150.s") +#include "z_eff_ss_hitmark.h" + +typedef enum { + /* 0x00 */ SS_HITMARK_0, + /* 0x01 */ SS_HITMARK_1, + /* 0x02 */ SS_HITMARK_2, + /* 0x03 */ SS_HITMARK_3, + /* 0x04 */ SS_HITMARK_4, + /* 0x05 */ SS_HITMARK_5, + /* 0x06 */ SS_HITMARK_6, + /* 0x07 */ SS_HITMARK_7, + /* 0x08 */ SS_HITMARK_8, + /* 0x09 */ SS_HITMARK_9, + /* 0x0A */ SS_HITMARK_A, + /* 0x0B */ SS_HITMARK_B, + /* 0x0C */ SS_HITMARK_C, +} EffectSsHitMarkRegs; + +u32 EffectSsHitMark_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsHitMark_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsHitMark_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_HitMark_InitVars = { + EFFECT_SS_HITMARK, + EffectSsHitMark_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/EffectSsHitMark_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h new file mode 100644 index 0000000000..c7bd65b72c --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_HITMARK_H_ +#define _Z_EFF_SS_HITMARK_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsHitMarkInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c index 91092b680f..ed209cfff0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_ice_piece.c + * Overlay: ovl_Effect_Ss_Ice_Piece + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8700.s") +#include "z_eff_ss_ice_piece.h" + +typedef enum { + /* 0x00 */ SS_ICE_PIECE_0, + /* 0x01 */ SS_ICE_PIECE_1, + /* 0x02 */ SS_ICE_PIECE_2, + /* 0x03 */ SS_ICE_PIECE_3, + /* 0x04 */ SS_ICE_PIECE_4, + /* 0x05 */ SS_ICE_PIECE_5, + /* 0x06 */ SS_ICE_PIECE_6, + /* 0x07 */ SS_ICE_PIECE_7, + /* 0x08 */ SS_ICE_PIECE_8, + /* 0x09 */ SS_ICE_PIECE_9, + /* 0x0A */ SS_ICE_PIECE_A, + /* 0x0B */ SS_ICE_PIECE_B, + /* 0x0C */ SS_ICE_PIECE_C, +} EffectSsIce_PieceRegs; + +u32 EffectSsIcePiece_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsIcePiece_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsIcePiece_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Ice_Piece_InitVars = { + EFFECT_SS_ICE_PIECE, + EffectSsIcePiece_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/EffectSsIcePiece_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h new file mode 100644 index 0000000000..6982716077 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_ICE_PIECE_H_ +#define _Z_EFF_SS_ICE_PIECE_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsIcePieceInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index ff7c85ba14..728940461f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_ice_smoke.c + * Overlay: ovl_Effect_Ss_Ice_Smoke + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s") +#include "z_eff_ss_ice_smoke.h" + +typedef enum { + /* 0x00 */ SS_ICE_SMOKE_0, + /* 0x01 */ SS_ICE_SMOKE_1, + /* 0x02 */ SS_ICE_SMOKE_2, + /* 0x03 */ SS_ICE_SMOKE_3, + /* 0x04 */ SS_ICE_SMOKE_4, + /* 0x05 */ SS_ICE_SMOKE_5, + /* 0x06 */ SS_ICE_SMOKE_6, + /* 0x07 */ SS_ICE_SMOKE_7, + /* 0x08 */ SS_ICE_SMOKE_8, + /* 0x09 */ SS_ICE_SMOKE_9, + /* 0x0A */ SS_ICE_SMOKE_A, + /* 0x0B */ SS_ICE_SMOKE_B, + /* 0x0C */ SS_ICE_SMOKE_C, +} EffectSsIce_SmokeRegs; + +u32 EffectSsIceSmoke_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsIceSmoke_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Ice_Smoke_InitVars = { + EFFECT_SS_ICE_SMOKE, + EffectSsIceSmoke_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/EffectSsIceSmoke_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h new file mode 100644 index 0000000000..5b77bca96a --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_ICE_SMOKE_H_ +#define _Z_EFF_SS_ICE_SMOKE_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsIceSmokeInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index 6e6749a9bf..eea951f084 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_k_fire.c + * Overlay: ovl_Effect_Ss_K_Fire + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A91B0.s") +#include "z_eff_ss_k_fire.h" + +typedef enum { + /* 0x00 */ SS_K_FIRE_0, + /* 0x01 */ SS_K_FIRE_1, + /* 0x02 */ SS_K_FIRE_2, + /* 0x03 */ SS_K_FIRE_3, + /* 0x04 */ SS_K_FIRE_4, + /* 0x05 */ SS_K_FIRE_5, + /* 0x06 */ SS_K_FIRE_6, + /* 0x07 */ SS_K_FIRE_7, + /* 0x08 */ SS_K_FIRE_8, + /* 0x09 */ SS_K_FIRE_9, + /* 0x0A */ SS_K_FIRE_A, + /* 0x0B */ SS_K_FIRE_B, + /* 0x0C */ SS_K_FIRE_C, +} EffectSsK_FireRegs; + +u32 EffectSsKFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsKFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsKFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_K_Fire_InitVars = { + EFFECT_SS_K_FIRE, + EffectSsKFire_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/EffectSsKFire_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h new file mode 100644 index 0000000000..b21a83473d --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_K_FIRE_H_ +#define _Z_EFF_SS_K_FIRE_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsKFireInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index 1b1cd9d50d..044c5e0357 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_kakera.c + * Overlay: ovl_Effect_Ss_Kakera + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9680.s") +#include "z_eff_ss_kakera.h" + +typedef enum { + /* 0x00 */ SS_KAKERA_0, + /* 0x01 */ SS_KAKERA_1, + /* 0x02 */ SS_KAKERA_2, + /* 0x03 */ SS_KAKERA_3, + /* 0x04 */ SS_KAKERA_4, + /* 0x05 */ SS_KAKERA_5, + /* 0x06 */ SS_KAKERA_6, + /* 0x07 */ SS_KAKERA_7, + /* 0x08 */ SS_KAKERA_8, + /* 0x09 */ SS_KAKERA_9, + /* 0x0A */ SS_KAKERA_A, + /* 0x0B */ SS_KAKERA_B, + /* 0x0C */ SS_KAKERA_C, +} EffectSsKakeraRegs; + +u32 EffectSsKakera_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsKakera_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsKakera_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Kakera_InitVars = { + EFFECT_SS_KAKERA, + EffectSsKakera_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/EffectSsKakera_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9818.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h new file mode 100644 index 0000000000..304c06e0db --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_KAKERA_H_ +#define _Z_EFF_SS_KAKERA_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsKakeraInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c index 553f117911..57c07f77bb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_kirakira.c + * Overlay: ovl_Effect_Ss_KiraKira + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA810.s") +#include "z_eff_ss_kirakira.h" + +typedef enum { + /* 0x00 */ SS_KIRAKIRA_0, + /* 0x01 */ SS_KIRAKIRA_1, + /* 0x02 */ SS_KIRAKIRA_2, + /* 0x03 */ SS_KIRAKIRA_3, + /* 0x04 */ SS_KIRAKIRA_4, + /* 0x05 */ SS_KIRAKIRA_5, + /* 0x06 */ SS_KIRAKIRA_6, + /* 0x07 */ SS_KIRAKIRA_7, + /* 0x08 */ SS_KIRAKIRA_8, + /* 0x09 */ SS_KIRAKIRA_9, + /* 0x0A */ SS_KIRAKIRA_A, + /* 0x0B */ SS_KIRAKIRA_B, + /* 0x0C */ SS_KIRAKIRA_C, +} EffectSsKiraKiraRegs; + +u32 EffectSsKiraKira_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsKiraKira_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsKiraKira_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_KiraKira_InitVars = { + EFFECT_SS_KIRAKIRA, + EffectSsKiraKira_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/EffectSsKiraKira_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h new file mode 100644 index 0000000000..9ee7283988 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_KIRAKIRA_H_ +#define _Z_EFF_SS_KIRAKIRA_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsKiraKiraInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c index cf29b1521e..6945ebac8d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_lightning.c + * Overlay: ovl_Effect_Ss_Lightning + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAEF0.s") +#include "z_eff_ss_lightning.h" + +typedef enum { + /* 0x00 */ SS_LIGHTNING_0, + /* 0x01 */ SS_LIGHTNING_1, + /* 0x02 */ SS_LIGHTNING_2, + /* 0x03 */ SS_LIGHTNING_3, + /* 0x04 */ SS_LIGHTNING_4, + /* 0x05 */ SS_LIGHTNING_5, + /* 0x06 */ SS_LIGHTNING_6, + /* 0x07 */ SS_LIGHTNING_7, + /* 0x08 */ SS_LIGHTNING_8, + /* 0x09 */ SS_LIGHTNING_9, + /* 0x0A */ SS_LIGHTNING_A, + /* 0x0B */ SS_LIGHTNING_B, + /* 0x0C */ SS_LIGHTNING_C, +} EffectSsLightningRegs; + +u32 EffectSsLightning_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsLightning_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsLightning_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Lightning_InitVars = { + EFFECT_SS_LIGHTNING, + EffectSsLightning_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/EffectSsLightning_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAFD4.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h new file mode 100644 index 0000000000..22b5e6c9e2 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_LIGHTNING_H_ +#define _Z_EFF_SS_LIGHTNING_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsLightningInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c index 5daf2d6cb2..2dfe3b2b9e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_sibuki.c + * Overlay: ovl_Effect_Ss_Sibuki + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s") +#include "z_eff_ss_sibuki.h" + +typedef enum { + /* 0x00 */ SS_SIBUKI_0, + /* 0x01 */ SS_SIBUKI_1, + /* 0x02 */ SS_SIBUKI_2, + /* 0x03 */ SS_SIBUKI_3, + /* 0x04 */ SS_SIBUKI_4, + /* 0x05 */ SS_SIBUKI_5, + /* 0x06 */ SS_SIBUKI_6, + /* 0x07 */ SS_SIBUKI_7, + /* 0x08 */ SS_SIBUKI_8, + /* 0x09 */ SS_SIBUKI_9, + /* 0x0A */ SS_SIBUKI_A, + /* 0x0B */ SS_SIBUKI_B, + /* 0x0C */ SS_SIBUKI_C, +} EffectSsSibukiRegs; + +u32 EffectSsSibuki_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsSibuki_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsSibuki_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Sibuki_InitVars = { + EFFECT_SS_SIBUKI, + EffectSsSibuki_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/EffectSsSibuki_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h new file mode 100644 index 0000000000..4778c010cf --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_SIBUKI_H_ +#define _Z_EFF_SS_SIBUKI_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsSibukiInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c index 9a080975fc..1ad49398a2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_sibuki2.c + * Overlay: ovl_Effect_Ss_Sibuki2 + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABD60.s") +#include "z_eff_ss_sibuki2.h" + +typedef enum { + /* 0x00 */ SS_SIBUKI2_0, + /* 0x01 */ SS_SIBUKI2_1, + /* 0x02 */ SS_SIBUKI2_2, + /* 0x03 */ SS_SIBUKI2_3, + /* 0x04 */ SS_SIBUKI2_4, + /* 0x05 */ SS_SIBUKI2_5, + /* 0x06 */ SS_SIBUKI2_6, + /* 0x07 */ SS_SIBUKI2_7, + /* 0x08 */ SS_SIBUKI2_8, + /* 0x09 */ SS_SIBUKI2_9, + /* 0x0A */ SS_SIBUKI2_A, + /* 0x0B */ SS_SIBUKI2_B, + /* 0x0C */ SS_SIBUKI2_C, +} EffectSsSibuki2Regs; + +u32 EffectSsSibuki2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsSibuki2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsSibuki2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Sibuki2_InitVars = { + EFFECT_SS_SIBUKI2, + EffectSsSibuki2_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/EffectSsSibuki2_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h new file mode 100644 index 0000000000..0df7d93f64 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_SIBUKI2_H_ +#define _Z_EFF_SS_SIBUKI2_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsSibuki2InitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index 1fc5e5b32f..17bcdd4a8b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_stick.c + * Overlay: ovl_Effect_Ss_Stick + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC2D0.s") +#include "z_eff_ss_stick.h" + +typedef enum { + /* 0x00 */ SS_STICK_0, + /* 0x01 */ SS_STICK_1, + /* 0x02 */ SS_STICK_2, + /* 0x03 */ SS_STICK_3, + /* 0x04 */ SS_STICK_4, + /* 0x05 */ SS_STICK_5, + /* 0x06 */ SS_STICK_6, + /* 0x07 */ SS_STICK_7, + /* 0x08 */ SS_STICK_8, + /* 0x09 */ SS_STICK_9, + /* 0x0A */ SS_STICK_A, + /* 0x0B */ SS_STICK_B, + /* 0x0C */ SS_STICK_C, +} EffectSsStickRegs; + +u32 EffectSsStick_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsStick_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsStick_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Stick_InitVars = { + EFFECT_SS_STICK, + EffectSsStick_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/EffectSsStick_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h new file mode 100644 index 0000000000..52a5726b89 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_STICK_H_ +#define _Z_EFF_SS_STICK_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsStickInitParams; // size = 0x + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c index 04790b4279..fed1e60e49 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c @@ -1,7 +1,39 @@ -#include -#include +/* + * File: z_eff_ss_stone1.c + * Overlay: ovl_Effect_Ss_Stone1 + * Description: + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC700.s") +#include "z_eff_ss_stone1.h" + +typedef enum { + /* 0x00 */ SS_STONE1_0, + /* 0x01 */ SS_STONE1_1, + /* 0x02 */ SS_STONE1_2, + /* 0x03 */ SS_STONE1_3, + /* 0x04 */ SS_STONE1_4, + /* 0x05 */ SS_STONE1_5, + /* 0x06 */ SS_STONE1_6, + /* 0x07 */ SS_STONE1_7, + /* 0x08 */ SS_STONE1_8, + /* 0x09 */ SS_STONE1_9, + /* 0x0A */ SS_STONE1_A, + /* 0x0B */ SS_STONE1_B, + /* 0x0C */ SS_STONE1_C, +} EffectSsStone1Regs; + +u32 EffectSsStone1_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsStone1_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsStone1_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +/* +EffectSsInit Effect_Ss_Stone1_InitVars = { + EFFECT_SS_STONE1, + EffectSsStone1_Init, +}; +*/ + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/EffectSsStone1_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s") diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h new file mode 100644 index 0000000000..e14927a931 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h @@ -0,0 +1,13 @@ +#ifndef _Z_EFF_SS_STONE1_H_ +#define _Z_EFF_SS_STONE1_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; +} EffectSsStone1InitParams; // size = 0x + +#endif diff --git a/tools/bootstrap_fx.py b/tools/bootstrap_fx.py new file mode 100755 index 0000000000..d280f23ccd --- /dev/null +++ b/tools/bootstrap_fx.py @@ -0,0 +1,196 @@ +#!/usr/bin/python3 + +import os +import sys +import re + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = script_dir + "/../" +data_dir = root_dir + "data/overlays/effects" +asm_dir = root_dir + "asm/non_matchings/overlays/effects" +src_dir = root_dir + "src/overlays/effects" +include_dir = root_dir + "include" +indent = " " + +effect_enum = [ + "EFFECT_SS_DUST", + "EFFECT_SS_KIRAKIRA", + "EFFECT_SS_BOMB", + "EFFECT_SS_BOMB2", + "EFFECT_SS_BLAST", + "EFFECT_SS_G_SPK", + "EFFECT_SS_D_FIRE", + "EFFECT_SS_BUBBLE", + "EFFECT_SS_UNSET", + "EFFECT_SS_G_RIPPLE", + "EFFECT_SS_G_SPLASH", + "EFFECT_SS_G_MAGMA", + "EFFECT_SS_G_FIRE", + "EFFECT_SS_LIGHTNING", + "EFFECT_SS_DT_BUBBLE", + "EFFECT_SS_HAHEN", + "EFFECT_SS_STICK", + "EFFECT_SS_SIBUKI", + "EFFECT_SS_SIBUKI2", + "EFFECT_SS_G_MAGMA2", + "EFFECT_SS_STONE1", + "EFFECT_SS_HITMARK", + "EFFECT_SS_FHG_FLASH", + "EFFECT_SS_K_FIRE", + "EFFECT_SS_SOLDER_SRCH_BALL", + "EFFECT_SS_KAKERA", + "EFFECT_SS_ICE_PIECE", + "EFFECT_SS_EN_ICE", + "EFFECT_SS_FIRE_TAIL", + "EFFECT_SS_EN_FIRE", + "EFFECT_SS_EXTRA", + "EFFECT_SS_FCIRCLE", + "EFFECT_SS_DEAD_DB", + "EFFECT_SS_DEAD_DD", + "EFFECT_SS_DEAD_DS", + "EFFECT_SS_DEAD_SOUND", + "EFFECT_SS_ICE_SMOKE", +] + +to_rename = [] + + +def get_regs_enum(short_name): + upper_name = short_name.upper() + return \ + "typedef enum {\n" + \ + indent + "/* 0x00 */ SS_" + upper_name + "_0,\n" + \ + indent + "/* 0x01 */ SS_" + upper_name + "_1,\n" + \ + indent + "/* 0x02 */ SS_" + upper_name + "_2,\n" + \ + indent + "/* 0x03 */ SS_" + upper_name + "_3,\n" + \ + indent + "/* 0x04 */ SS_" + upper_name + "_4,\n" + \ + indent + "/* 0x05 */ SS_" + upper_name + "_5,\n" + \ + indent + "/* 0x06 */ SS_" + upper_name + "_6,\n" + \ + indent + "/* 0x07 */ SS_" + upper_name + "_7,\n" + \ + indent + "/* 0x08 */ SS_" + upper_name + "_8,\n" + \ + indent + "/* 0x09 */ SS_" + upper_name + "_9,\n" + \ + indent + "/* 0x0A */ SS_" + upper_name + "_A,\n" + \ + indent + "/* 0x0B */ SS_" + upper_name + "_B,\n" + \ + indent + "/* 0x0C */ SS_" + upper_name + "_C,\n" + \ + "} " + "EffectSs" + short_name + "Regs;\n" + +def bootstrap(ovl_path, ovl_text): + path_split = ovl_path.split(os.path.sep) + z_name = path_split[-1][:-2] + ovl_name = path_split[-2] + short_name = ovl_name[14:] + init_vars_name = ovl_name[4:] + "_InitVars" + + top_comment = "/*\n * File: " + z_name + ".c" \ + "\n * Overlay: " + ovl_name + "\n * Description:\n */\n" + header_include = "#include \"" + z_name + ".h\"\n" + regs_enum = get_regs_enum(short_name) + + with open(os.path.join(data_dir, z_name + ".data.s")) as f: + data_text = f.read() + + pattern = re.compile("glabel " + init_vars_name + + "\n.word 0x........\n\.word func_........\n") + init_data = pattern.search(data_text) + if init_data is None or len(init_data.regs) == 0: + return "" + init_data = data_text[init_data.regs[0][0]:init_data.regs[0][1]] + + lines = init_data.split("\n") + + effect_id = int(lines[1][6:], 16) + init_func = lines[2][6:] + + ovl_shortened = ovl_name.replace("ovl", "").replace("_", "") + init_func_name = ovl_shortened + "_Init" + + ovl_text = ovl_text.replace(init_func, init_func_name) + to_rename.append((init_func, init_func_name)) + + effect_id_name = effect_enum[effect_id] + + struct_text = "/*\nEffectSsInit " + init_vars_name + \ + " = {\n" + indent + effect_id_name + \ + ",\n" + indent + init_func_name + ",\n};\n*/" + + decs = "u32 " + init_func_name + \ + "(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);\n" + decs += "void " + \ + init_func_name[:-4] + \ + "Draw(GlobalContext* globalCtx, u32 index, EffectSs* this);\n" + decs += "void " + \ + init_func_name[:-4] + \ + "Update(GlobalContext* globalCtx, u32 index, EffectSs* this);\n" + + insert_pos = ovl_text.find("global.h>\n") + + return top_comment + "\n" + header_include + "\n" + regs_enum + "\n" + decs + "\n" + struct_text + "\n" + ovl_text[insert_pos + 10:] + + +def get_header(header_path): + path_split = header_path.split(os.path.sep) + ovl_name = path_split[-2] + short_name = ovl_name[14:] + init_vars_name = "".join(ovl_name[4:].split("_")) + "InitParams" + + ifndef = "#ifndef _Z_EFF_SS_" + short_name.upper() + "_H_\n" + \ + "#define _Z_EFF_SS_" + short_name.upper() + "_H_\n\n" + + includes = "#include \n#include \n\n" + + struct = "typedef struct {\n" + \ + indent + "/* 0x00 */ Vec3f pos;\n" + \ + indent + "/* 0x0C */ Vec3f velocity;\n" + \ + indent + "/* 0x18 */ Vec3f accel;\n" + \ + "} " + init_vars_name + "; // size = 0x\n\n#endif\n" + + return ifndef + includes + struct + +def rename(): + # Filenames first + for root, dirs, files in os.walk(root_dir): + for file in files: + for elem in to_rename: + if elem[0] in file: + new_file = file.replace(elem[0], elem[1]) + file_path = os.path.join(root, file) + new_file_path = os.path.join(root, new_file) + os.rename(file_path, new_file_path) + + # File contents + for root, dirs, files in os.walk(root_dir): + for file in files: + if file.endswith(".c") or file.endswith(".s"): + file_path = os.path.join(root, file) + with open(file_path) as f: + file_text = f.read() + new_file_text = file_text + for elem in to_rename: + # if "func_" in elem[0]: + # new_file_text = new_file_text.replace("glabel " + elem[0], elem[1] + ":") + new_file_text = new_file_text.replace(elem[0], elem[1]) + if new_file_text != file_text: + with open(file_path, "w", newline="\n") as f: + f.write(new_file_text) + +def main(): + for root, dirs, files in os.walk(src_dir): + for file in files: + if file.endswith(".c"): + file_path = os.path.join(root, file) + with open(file_path) as f: + file_text = f.read() + brace_count = file_text.count("{") + if brace_count == 0: + if "dead" in file_path: + dog = 5 + header_path = file_path[:-1] + "h" + c_text = bootstrap(file_path, file_text) + header_text = get_header(header_path) + with open(file_path, "w", newline="\n") as f: + f.write(c_text) + with open(header_path, "w", newline="\n") as f: + f.write(header_text) + rename() + +main()