From 345c41152c8ccface2a139585ee0c2a9beba504f Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Mon, 9 Sep 2024 23:05:11 +0200 Subject: [PATCH 01/10] refac: rename func_8025A70C to comusic_playTrack --- include/functions.h | 2 +- src/MMM/code_DC0.c | 4 ++-- src/SM/code_2990.c | 2 +- src/TTC/ch/leaky.c | 4 ++-- src/core1/code_1BE90.c | 4 ++-- src/core2/abilityprogress.c | 2 +- src/core2/ba/marker.c | 4 ++-- src/core2/bs/timeout.c | 4 ++-- src/core2/bs/walrus.c | 4 ++-- src/core2/code_14420.c | 2 +- src/core2/code_4A6F0.c | 2 +- src/core2/code_4C020.c | 6 +++--- src/core2/code_91E10.c | 4 ++-- src/core2/code_935F0.c | 2 +- src/core2/gc/parade.c | 4 ++-- src/core2/gc/transition.c | 4 ++-- src/core2/gc/zoombox.c | 2 +- src/fight/chbossjinjobase.c | 2 +- src/fight/chjinjonatorbase.c | 2 +- src/lair/ch/brentilda.c | 4 ++-- src/lair/code_5ED0.c | 14 +++++++------- src/lair/code_86F0.c | 12 ++++++------ src/lair/code_C1C0.c | 2 +- src/lair/code_C6C0.c | 2 +- 24 files changed, 47 insertions(+), 47 deletions(-) diff --git a/include/functions.h b/include/functions.h index e35fc618..1e5c844b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -273,7 +273,7 @@ void func_802589E4(f32 dst[3], f32 yaw, f32 length); f32 mlDiffDegF(f32, f32); void func_8025A6EC(enum comusic_e, s32); -void func_8025A70C(enum comusic_e); +void comusic_playTrack(enum comusic_e); void comusic_8025AB44(enum comusic_e comusic_id, s32 arg1, s32 arg2); f32 cosf(f32); diff --git a/src/MMM/code_DC0.c b/src/MMM/code_DC0.c index a1bfcd0a..866d26ea 100644 --- a/src/MMM/code_DC0.c +++ b/src/MMM/code_DC0.c @@ -82,11 +82,11 @@ bool MMM_func_80387340(ActorMarker *marker){ if(sp1C == 0){ ml_vec3f_copy(sp20, actor->position); sp20[1] += 80.0f; - func_8025A70C(COMUSIC_2D_PUZZLE_SOLVED_FANFARE); + comusic_playTrack(COMUSIC_2D_PUZZLE_SOLVED_FANFARE); jiggy_spawn(JIGGY_63_MMM_FLOWER_POTS, sp20); } else{ - func_8025A70C(COMUSIC_2B_DING_B); + comusic_playTrack(COMUSIC_2B_DING_B); } } func_803871D4(sp1C); diff --git a/src/SM/code_2990.c b/src/SM/code_2990.c index 352b315a..d411993b 100644 --- a/src/SM/code_2990.c +++ b/src/SM/code_2990.c @@ -199,7 +199,7 @@ static void __chsmmole_additionalAbilityLearnActions(ActorMarker *marker, enum a timed_setStaticCameraToNode(0.0f, 0x12); break; case 6: - func_8025A70C(COMUSIC_2B_DING_B); + comusic_playTrack(COMUSIC_2B_DING_B); break; case 0xff: chsmmole_setSpiralMountainStaticCamera(actor); diff --git a/src/TTC/ch/leaky.c b/src/TTC/ch/leaky.c index e11ff76f..5211dcf0 100644 --- a/src/TTC/ch/leaky.c +++ b/src/TTC/ch/leaky.c @@ -41,7 +41,7 @@ void chLeaky_update(Actor *this) { this->marker->propPtr->unk8_3 = FALSE; if (levelSpecificFlags_get(5) != 0) { levelSpecificFlags_set(5, FALSE); - timedFunc_set_1(0.5f, (GenFunction_1)func_8025A70C, COMUSIC_2D_PUZZLE_SOLVED_FANFARE); + timedFunc_set_1(0.5f, (GenFunction_1)comusic_playTrack, COMUSIC_2D_PUZZLE_SOLVED_FANFARE); } if (levelSpecificFlags_get(2) != 0) { temp_v0_2 = func_8034C5AC(300); @@ -104,7 +104,7 @@ bool chLeaky_eggCollision(ActorMarker *marker){ if(levelSpecificFlags_get(2)) return TRUE; - func_8025A70C(COMUSIC_2B_DING_B); + comusic_playTrack(COMUSIC_2B_DING_B); this->unk38_31++; if(this->unk38_31 < 2) return TRUE; diff --git a/src/core1/code_1BE90.c b/src/core1/code_1BE90.c index 2b3bf856..3fc0a342 100644 --- a/src/core1/code_1BE90.c +++ b/src/core1/code_1BE90.c @@ -410,7 +410,7 @@ void func_8025A6EC(enum comusic_e track_id, s32 arg1){ } //comusic_queueTrack -void func_8025A70C(enum comusic_e track_id){ +void comusic_playTrack(enum comusic_e track_id){ CoMusic *trackPtr; s32 indx; @@ -430,7 +430,7 @@ void func_8025A70C(enum comusic_e track_id){ } void func_8025A788(enum comusic_e comusic_id, f32 delay1, f32 delay2){ - timedFunc_set_1(delay1, (GenFunction_1) func_8025A70C, comusic_id); + timedFunc_set_1(delay1, (GenFunction_1) comusic_playTrack, comusic_id); timedFunc_set_1(delay1 + delay2, (GenFunction_1) func_8025A7DC, comusic_id); } diff --git a/src/core2/abilityprogress.c b/src/core2/abilityprogress.c index 3d2470f0..4d1634fc 100644 --- a/src/core2/abilityprogress.c +++ b/src/core2/abilityprogress.c @@ -64,7 +64,7 @@ void ability_use(s32 arg0){ break; }//L80295744 if(sp28) - func_8025A70C(COMUSIC_2B_DING_B); + comusic_playTrack(COMUSIC_2B_DING_B); if(sp2C) func_80311480(sp2C, 4, NULL, NULL, NULL, 0); diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index eb6baa5d..7f801c67 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -622,7 +622,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ sns_set_item_and_update_payload(SNS_ITEM_EGG_PINK, 0, 1); break; } - func_8025A70C(COMUSIC_88_BIG_SNS_FANFARE); + comusic_playTrack(COMUSIC_88_BIG_SNS_FANFARE); FUNC_8030E624(SFX_114_BRICKWALL_BREAKING, 0.8f, 15000); tmp_v0_2 = 3*(actor->unkF4_8 - 1); @@ -666,7 +666,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ break; case MARKER_168_ICE_KEY: //L8028CC7C sns_set_item_and_update_payload(SNS_ITEM_ICE_KEY, 0, 1); - func_8025A70C(COMUSIC_88_BIG_SNS_FANFARE); + comusic_playTrack(COMUSIC_88_BIG_SNS_FANFARE); func_80324DBC(2.5f, 0xDB5, 0x20, 0, 0, 0, 0); marker_despawn(marker); break; diff --git a/src/core2/bs/timeout.c b/src/core2/bs/timeout.c index 8012eae5..67666b5f 100644 --- a/src/core2/bs/timeout.c +++ b/src/core2/bs/timeout.c @@ -16,7 +16,7 @@ void func_802B6270(void){ yaw_setIdeal(func_8029B41C() + 35.0f); ncDynamicCamD_func_802BF2C0(80.0f); func_8025A58C(0,0xfa0); - func_8025A70C(COMUSIC_3C_MINIGAME_LOSS); + comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS); func_8024BD08(0); func_8029E070(1); baMarker_collisionOff(); @@ -57,7 +57,7 @@ void func_802B63F8(void){ yaw_setIdeal(func_8029B41C() + 35.0f); ncDynamicCamD_func_802BF2C0(80.0f); func_8025A58C(0,0xfa0); - func_8025A70C(COMUSIC_3C_MINIGAME_LOSS); + comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS); func_8024BD08(0); baMarker_collisionOff(); func_8029E3C0(0, 2.9f); diff --git a/src/core2/bs/walrus.c b/src/core2/bs/walrus.c index 4f58388b..61f9191d 100644 --- a/src/core2/bs/walrus.c +++ b/src/core2/bs/walrus.c @@ -468,7 +468,7 @@ void bswalrus_die_init(void){ ncDynamicCamD_func_802BF2C0(30.0f); func_8025AB00(); func_8025A2FC(0, 0xfa0); - func_8025A70C(0x1A); + comusic_playTrack(0x1A); baMarker_collisionOff(); func_80292E48(); func_8029E3C0(0, 1.5f); @@ -731,7 +731,7 @@ void bswalrus_timeout_init(void) { func_802914CC(0xD); ncDynamicCamD_func_802BF2C0(60.0f); func_8025A58C(0, 4000); - func_8025A70C(COMUSIC_3C_MINIGAME_LOSS); + comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS); func_8024BD08(0); baMarker_collisionOff(); func_8029E3C0(0, 2.9f); diff --git a/src/core2/code_14420.c b/src/core2/code_14420.c index b2f09bdf..5a36b4a9 100644 --- a/src/core2/code_14420.c +++ b/src/core2/code_14420.c @@ -822,7 +822,7 @@ void func_8029C848(AnimCtrl *arg0) { void func_8029C984(void){ func_8025AB00(); func_8025A2FC(0, 4000); - func_8025A70C(COMUSIC_1A_DEATH); + comusic_playTrack(COMUSIC_1A_DEATH); func_8024BD08(0); } diff --git a/src/core2/code_4A6F0.c b/src/core2/code_4A6F0.c index f668bae9..97ebb5d9 100644 --- a/src/core2/code_4A6F0.c +++ b/src/core2/code_4A6F0.c @@ -380,7 +380,7 @@ void chMumbo_update(Actor *this) { func_8030E6D4(1); } if (actor_animationIsAt(this, 0.01f)) { - func_8025A70C(COMUSIC_1D_MUMBO_TRANSFORMATION); + comusic_playTrack(COMUSIC_1D_MUMBO_TRANSFORMATION); func_8025A58C(0, 1000); } if (actor_animationIsAt(this, 0.01f)) { diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index 899f9f31..43b08cc3 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -139,7 +139,7 @@ void func_802D2FB0(Actor *this, s32 arg1, s32 arg2, s32 arg3, f32 arg4, s32 arg5 // collision function if player shoots egg at spider webs void func_802D3138(ActorMarker *marker, ActorMarker *other_marker) { if(marker->id == MARKER_224_BREAKABLE_FLOOR_COBWEB || marker->id == MARKER_225_BREAKABLE_WALL_COBWEB) { - func_8025A70C(COMUSIC_2B_DING_B); + comusic_playTrack(COMUSIC_2B_DING_B); } } @@ -185,7 +185,7 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) { break; case MARKER_224_BREAKABLE_FLOOR_COBWEB: - func_8025A70C(COMUSIC_2B_DING_B); + comusic_playTrack(COMUSIC_2B_DING_B); func_8030E6A4(SFX_129_SWOOSH, (sp2C->scale < 0.45) ? 1.0 : 0.8, 0x7FF8); subaddie_set_state_looped(sp2C, 0xC); func_802D2FB0(sp2C, 8, -0x3C, 0xC8, 2.0f, 0xFA, 0x3C, 0x64); @@ -193,7 +193,7 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) { break; case MARKER_225_BREAKABLE_WALL_COBWEB: - func_8025A70C(COMUSIC_2B_DING_B); + comusic_playTrack(COMUSIC_2B_DING_B); func_8030E540(SFX_129_SWOOSH); subaddie_set_state_looped(sp2C, 0xF); func_802D2FB0(sp2C, 0xE, -0x3C, 0xC8, 2.0f, 0xFA, 0x3C, 0x64); diff --git a/src/core2/code_91E10.c b/src/core2/code_91E10.c index 1065c395..5685170f 100644 --- a/src/core2/code_91E10.c +++ b/src/core2/code_91E10.c @@ -431,9 +431,9 @@ void func_803197AC(s32 arg0){ case 8: //80319CFC if (D_803830E0->unk0 != -1) { - func_8025A70C((D_803830E0->unk11 == 1)? COMUSIC_2B_DING_B : COMUSIC_2C_BUZZER); + comusic_playTrack((D_803830E0->unk11 == 1)? COMUSIC_2B_DING_B : COMUSIC_2C_BUZZER); } else { - func_8025A70C(COMUSIC_2B_DING_B); + comusic_playTrack(COMUSIC_2B_DING_B); } timedFunc_set_1(1.0f, func_803197AC, 9); break; diff --git a/src/core2/code_935F0.c b/src/core2/code_935F0.c index 768a6044..73288068 100644 --- a/src/core2/code_935F0.c +++ b/src/core2/code_935F0.c @@ -136,7 +136,7 @@ void __chMinigame_setState(Actor *this, u32 arg1) { volatileFlag_set(VOLATILE_FLAG_4, 1); func_8028F918(2); func_8025AB00(); - func_8025A70C((volatileFlag_get(VOLATILE_FLAG_5_FF_MINIGAME_WON)) ? COMUSIC_3B_MINIGAME_VICTORY : COMUSIC_3C_MINIGAME_LOSS); + comusic_playTrack((volatileFlag_get(VOLATILE_FLAG_5_FF_MINIGAME_WON)) ? COMUSIC_3B_MINIGAME_VICTORY : COMUSIC_3C_MINIGAME_LOSS); func_802E4A70(); volatileFlag_set(VOLATILE_FLAG_21, TRUE); timedFunc_set_3(2.0f, (GenFunction_3)func_802E4078, MAP_8E_GL_FURNACE_FUN, 1, 1); diff --git a/src/core2/gc/parade.c b/src/core2/gc/parade.c index 7a59e383..ae501c8b 100644 --- a/src/core2/gc/parade.c +++ b/src/core2/gc/parade.c @@ -197,7 +197,7 @@ void gcparade_setState(enum parade_state_e next_state) { D_803830F0.indx = 0; D_803830F0.parade_id = PARADE_0_POST_FURNACE_FUN; D_803830F0.count = 0x1B; - func_8025A70C(COMUSIC_8E_CREDITS); + comusic_playTrack(COMUSIC_8E_CREDITS); next_state = PARADE_STATE_3_WARP; gcparade_8031AC8C(); break; @@ -209,7 +209,7 @@ void gcparade_setState(enum parade_state_e next_state) { D_803830F0.count = 0x3A; func_8025A55C(0, 0x1388, 0xB); func_8025AB00(); - func_8025A70C(COMUSIC_8E_CREDITS); + comusic_playTrack(COMUSIC_8E_CREDITS); next_state = PARADE_STATE_3_WARP; gcparade_8031AC8C(); break; diff --git a/src/core2/gc/transition.c b/src/core2/gc/transition.c index f2be092f..ae0c7b6a 100644 --- a/src/core2/gc/transition.c +++ b/src/core2/gc/transition.c @@ -209,7 +209,7 @@ void _gctranstion_changeState(s32 state, TransitionInfo *desc){ if(state == TRANSITION_STATE_4_FADE_IN){ if(func_802D4608()==0){ - func_8025A70C(COMUSIC_4E_IN_TRANSITION); + comusic_playTrack(COMUSIC_4E_IN_TRANSITION); func_8025AC20(COMUSIC_4E_IN_TRANSITION, 0, 1000, 0.4f, "gctransition.c", 0x12d); func_8025AABC(COMUSIC_4E_IN_TRANSITION); } @@ -220,7 +220,7 @@ void _gctranstion_changeState(s32 state, TransitionInfo *desc){ } else{ if(func_802D4608() == 0){ - func_8025A70C(COMUSIC_4F_OUT_TRANSITION); + comusic_playTrack(COMUSIC_4F_OUT_TRANSITION); func_8025AC20(COMUSIC_4F_OUT_TRANSITION, 0, 1000, 0.2f, "gctransition.c", 0x13a); func_8025AABC(COMUSIC_4F_OUT_TRANSITION); } diff --git a/src/core2/gc/zoombox.c b/src/core2/gc/zoombox.c index 142fcb26..28ac527d 100644 --- a/src/core2/gc/zoombox.c +++ b/src/core2/gc/zoombox.c @@ -706,7 +706,7 @@ void func_80315C90(GcZoombox *this, s32 arg1) { if (this->unk110[0] == -1.0f) { if (func_8025AD7C(this->unk108[0]) == 0) { - func_8025A70C(this->unk108[0]); + comusic_playTrack(this->unk108[0]); } } else { diff --git a/src/fight/chbossjinjobase.c b/src/fight/chbossjinjobase.c index ded84712..4fc67871 100644 --- a/src/fight/chbossjinjobase.c +++ b/src/fight/chbossjinjobase.c @@ -71,7 +71,7 @@ void chBossJinjoBase_getHitByEgg(ActorMarker *this, ActorMarker *other) { actor_base = marker_getActor(this); if (actor_base->state != CHBOSSJINJOBASE_STATE_3_SPAWNED_BOSS_JINJO) { - func_8025A70C(COMUSIC_2B_DING_B); + comusic_playTrack(COMUSIC_2B_DING_B); actor_base->unk38_31++; // hit count if (actor_base->unk38_31 >= 3) { // spawn Jjnjonator diff --git a/src/fight/chjinjonatorbase.c b/src/fight/chjinjonatorbase.c index 64e7113f..8eab470c 100644 --- a/src/fight/chjinjonatorbase.c +++ b/src/fight/chjinjonatorbase.c @@ -78,7 +78,7 @@ void func_8038E120(ActorMarker * marker, ActorMarker *arg1){ if(actor->state != 3){ if(local->unk0[indx]){ local->unk0[indx]--; - func_8025A70C(COMUSIC_2B_DING_B); + comusic_playTrack(COMUSIC_2B_DING_B); if(local->unk0[indx] <= 0){ func_8038E0D4(actor, indx + 0x19a, -100.0f, 0.0f, 1.2f); func_80324D54(1.2f, SFX_90_SWITCH_PRESS, 1.0f, 32000, actor->position, 1000.0f, 2000.0f); diff --git a/src/lair/ch/brentilda.c b/src/lair/ch/brentilda.c index c9a4be87..812f9375 100644 --- a/src/lair/ch/brentilda.c +++ b/src/lair/ch/brentilda.c @@ -144,7 +144,7 @@ void chBrentilda_update(Actor *this) { if (sp74 < 0xFF) { sp74 = (sp74 + 0xC < 0xFF) ? sp74 + 0xC : 0xFF; if (!this->unk138_24) { - func_8025A70C(COMUSIC_81_ACTIVATING_BRENTILDA); + comusic_playTrack(COMUSIC_81_ACTIVATING_BRENTILDA); func_80324D2C(1.0f, COMUSIC_81_ACTIVATING_BRENTILDA); this->unk138_24 = TRUE; this->unk138_23 = FALSE; @@ -156,7 +156,7 @@ void chBrentilda_update(Actor *this) { if (sp74 >= 0x41) { sp74 = (sp74 - 0xC >= 0x41) ? sp74 - 0xC : 0x40; if (!this->unk138_23) { - func_8025A70C(COMUSIC_8B_DEACTIVATE_BRENTILDA); + comusic_playTrack(COMUSIC_8B_DEACTIVATE_BRENTILDA); func_80324D2C(1.0f, COMUSIC_8B_DEACTIVATE_BRENTILDA); this->unk138_23 = TRUE; this->unk138_24 = FALSE; diff --git a/src/lair/code_5ED0.c b/src/lair/code_5ED0.c index 8471031c..aef1b78e 100644 --- a/src/lair/code_5ED0.c +++ b/src/lair/code_5ED0.c @@ -1010,7 +1010,7 @@ void func_8038D670(enum FF_Action next_state) { if (fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE) == 0) { func_8025A55C(0, 0x1388, 0xB); func_8025AB00(); - func_8025A70C(JINGLE_DOOR_OF_GRUNTY_OPENED); + comusic_playTrack(JINGLE_DOOR_OF_GRUNTY_OPENED); fileProgressFlag_set(FILEPROG_A6_FURNACE_FUN_COMPLETE, TRUE); volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, FALSE); volatileFlag_set(VOLATILE_FLAG_A6_FF_FOUND_HONEYCOMB, TRUE); @@ -1178,23 +1178,23 @@ void lair_func_8038E0B0(void) { if (D_8037DCB8->unk11) { switch(sp38){ case FFTT_6_SKULL://L8038E26C - func_8025A70C(COMUSIC_7B_STEP_ON_SKULL_TILE); + comusic_playTrack(COMUSIC_7B_STEP_ON_SKULL_TILE); break; case FFTT_5_GRUNTY://L8038E280 - func_8025A70C(COMUSIC_7C_STEP_ON_GRUNTY_TILE); + comusic_playTrack(COMUSIC_7C_STEP_ON_GRUNTY_TILE); break; case FFTT_1_BANJO://L8038E294 - func_8025A70C(COMUSIC_7D_STEP_ON_BK_TILE); + comusic_playTrack(COMUSIC_7D_STEP_ON_BK_TILE); break; case FFTT_7_JOKER://L8038E2A8 - func_8025A70C(COMUSIC_7E_STEP_ON_MINIGAME_TILE); + comusic_playTrack(COMUSIC_7E_STEP_ON_MINIGAME_TILE); break; case FFTT_3_MUSIC://L8038E2BC - func_8025A70C(COMUSIC_7F_STEP_ON_JOKER_TILE); + comusic_playTrack(COMUSIC_7F_STEP_ON_JOKER_TILE); break; case FFTT_2_PICTURE://L8038E2D0 @@ -1261,7 +1261,7 @@ void lair_func_8038E0B0(void) { func_8038D670(8); } } else { - func_8025A70C(COMUSIC_2C_BUZZER); + comusic_playTrack(COMUSIC_2C_BUZZER); } } } diff --git a/src/lair/code_86F0.c b/src/lair/code_86F0.c index ad7b2e89..659f42d5 100644 --- a/src/lair/code_86F0.c +++ b/src/lair/code_86F0.c @@ -311,7 +311,7 @@ void func_8038F350(Actor *this, s32 next_state){ case 8: //L8038F4AC if (local->unk4 > 0) { - func_8025A70C(SFX_REMOVE_JIGGY); + comusic_playTrack(SFX_REMOVE_JIGGY); this->unk60 = 1.0f; temp_s1 = func_8038F0EC(this); func_8038F1EC(this, temp_s1, 0); @@ -324,7 +324,7 @@ void func_8038F350(Actor *this, s32 next_state){ case 5: //L8038F550 if (local->unk4 < func_8038EB24(this)) { - func_8025A70C(COMUSIC_67_INSERTING_JIGGY); + comusic_playTrack(COMUSIC_67_INSERTING_JIGGY); this->unk60 = 1.0f; local->unk4++; temp_s1 = func_8038F0EC(this); @@ -344,7 +344,7 @@ void func_8038F350(Actor *this, s32 next_state){ else{ sp4C = item_getCount(ITEM_26_JIGGY_TOTAL); } - func_8025A70C(COMUSIC_67_INSERTING_JIGGY); + comusic_playTrack(COMUSIC_67_INSERTING_JIGGY); this->unk60 = 1.0f; for(phi_s0 = 0; phi_s0 < sp4C; phi_s0++){ local->unk4++; @@ -359,7 +359,7 @@ void func_8038F350(Actor *this, s32 next_state){ break; case 7: //L8038F724 - func_8025A70C(COMUSIC_65_WORLD_OPENING_B); + comusic_playTrack(COMUSIC_65_WORLD_OPENING_B); if (this->unkF4_8 == 1) { func_80324DBC(1.0f, 0xF7E, 4, NULL, this->marker, func_8038F0C0, NULL); } else if (this->unkF4_8 == 0xA) { @@ -390,7 +390,7 @@ void lair_func_8038F894(Actor *this, s32 arg1) { func_8038F350(this, arg1); return; } - func_8025A70C(COMUSIC_2C_BUZZER); + comusic_playTrack(COMUSIC_2C_BUZZER); if (fileProgressFlag_get(FILEPROG_DE_USED_ALL_YOUR_PUZZLE_PIECES) != 0) { func_8038F350(this, 1); return; @@ -503,7 +503,7 @@ void lair_func_8038F924(Actor *this) { if (local->unk4) { func_8038F350(this, 8); } else { - func_8025A70C(COMUSIC_2C_BUZZER); + comusic_playTrack(COMUSIC_2C_BUZZER); func_8038F350(this, 1); } } diff --git a/src/lair/code_C1C0.c b/src/lair/code_C1C0.c index d2666612..433d2156 100644 --- a/src/lair/code_C1C0.c +++ b/src/lair/code_C1C0.c @@ -65,7 +65,7 @@ void func_80392700(Actor *this) { mapSpecificFlags_set(4, 0); } if (mapSpecificFlags_get(6)) { - func_8025A70C(COMUSIC_A8_KLUNGO_BY_FALLEN_GRUNTY); + comusic_playTrack(COMUSIC_A8_KLUNGO_BY_FALLEN_GRUNTY); func_802BC280(); ncStaticCamera_setToNode(9); mapSpecificFlags_set(9, 1); diff --git a/src/lair/code_C6C0.c b/src/lair/code_C6C0.c index 4c2d7221..6cb929c6 100644 --- a/src/lair/code_C6C0.c +++ b/src/lair/code_C6C0.c @@ -46,7 +46,7 @@ void func_80392B6C(Actor *this) { } if (mapSpecificFlags_get(7) != 0) { sp28 = ml_distance_vec3f(this->position, this->unk1C) / 350.0; - func_8025A70C(COMUSIC_A9_TOOTY); + comusic_playTrack(COMUSIC_A9_TOOTY); mapSpecificFlags_set(7, 0); mapSpecificFlags_set(9, 1); ncStaticCamera_setToNode(0x10); From 5e55a7f4454c74c09513f4e57bb5fc23882a16a5 Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Mon, 9 Sep 2024 23:09:55 +0200 Subject: [PATCH 02/10] refac: rename MISC_FLAG_15 to MISC_FLAG_15_LOADZONE --- include/enums.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/enums.h b/include/enums.h index ee35aa27..5a9305e5 100644 --- a/include/enums.h +++ b/include/enums.h @@ -4774,7 +4774,7 @@ enum misc_flag_e{ MISC_FLAG_12_HAS_FLAPPED, // has used flap MISC_FLAG_13, // related to ground damage ? MISC_FLAG_14_LOSE_BOGGY_RACE, // in difficult terrain (mud) - MISC_FLAG_15, // touching loadzone? + MISC_FLAG_15_LOADZONE, // touching loadzone? MISC_FLAG_16, // related to flying MISC_FLAG_17_FIRST_PERSON_VIEW, MISC_FLAG_18, // related to underwater state From f17c2242b0010169fb9e15a7dacee71afaf2b960 Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Mon, 9 Sep 2024 23:10:21 +0200 Subject: [PATCH 03/10] refac: rename func_80291930 to codeA960_forceLoadzone --- src/core2/code_A960.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core2/code_A960.c b/src/core2/code_A960.c index d01147b5..f67ac9e2 100644 --- a/src/core2/code_A960.c +++ b/src/core2/code_A960.c @@ -3,19 +3,19 @@ #include "variables.h" #include "core2/ba/physics.h" -void func_80291930(s32); +void codeA960_forceLoadzone(s32); int func_802918F0(void){ - return miscFlag_isTrue(MISC_FLAG_15); + return miscFlag_isTrue(MISC_FLAG_15_LOADZONE); } void func_80291910(void){ - func_80291930(0); + codeA960_forceLoadzone(0); } -void func_80291930(s32 arg0){ +void codeA960_forceLoadzone(s32 arg0){ if(!func_802918F0()){ - miscFlag_set(MISC_FLAG_15); + miscFlag_set(MISC_FLAG_15_LOADZONE); if(arg0){ func_8029E3C0(5, 2.0f); func_8029C984(); @@ -30,6 +30,6 @@ void func_80291930(s32 arg0){ void func_802919A0(void){ if(func_802918F0() && func_8029E1A8(5)){ func_8029B890(); - func_80291930(0); + codeA960_forceLoadzone(0); } } From 0d55c2db1b695558e61e873271930b01909c7f67 Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Mon, 9 Sep 2024 23:18:37 +0200 Subject: [PATCH 04/10] refac: rename func_802918F0 to isLoadzoneFlagSet --- src/core2/code_A960.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core2/code_A960.c b/src/core2/code_A960.c index f67ac9e2..bb345c0f 100644 --- a/src/core2/code_A960.c +++ b/src/core2/code_A960.c @@ -5,7 +5,7 @@ void codeA960_forceLoadzone(s32); -int func_802918F0(void){ +int isLoadzoneFlagSet(void){ return miscFlag_isTrue(MISC_FLAG_15_LOADZONE); } @@ -14,7 +14,7 @@ void func_80291910(void){ } void codeA960_forceLoadzone(s32 arg0){ - if(!func_802918F0()){ + if(!isLoadzoneFlagSet()){ miscFlag_set(MISC_FLAG_15_LOADZONE); if(arg0){ func_8029E3C0(5, 2.0f); @@ -28,7 +28,7 @@ void codeA960_forceLoadzone(s32 arg0){ } void func_802919A0(void){ - if(func_802918F0() && func_8029E1A8(5)){ + if(isLoadzoneFlagSet() && func_8029E1A8(5)){ func_8029B890(); codeA960_forceLoadzone(0); } From 9390431cd540034b7bdcfc57e469e7718b537a4a Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Mon, 9 Sep 2024 23:28:02 +0200 Subject: [PATCH 05/10] refac: rename func_803331D8 to codeABC00_spawnJiggyAtLocation --- src/core2/code_ABC00.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core2/code_ABC00.c b/src/core2/code_ABC00.c index 5f686538..d70fad02 100644 --- a/src/core2/code_ABC00.c +++ b/src/core2/code_ABC00.c @@ -26,7 +26,7 @@ typedef struct { Struct81s unk10; }Struct_core2_ABC00_0; -void func_803331D8(enum jiggy_e, f32[3]); +void codeABC00_spawnJiggyAtLocation(enum jiggy_e, f32[3]); void jiggy_free(Actor *); /* .data */ @@ -191,7 +191,7 @@ void func_80332D98(enum map_e map_id, enum jiggy_e jiggy_id, enum file_progress_ && !jiggyscore_isSpawned(jiggy_id) && nodeProp_findPositionFromActorId(arg3, sp1C) ) { - func_803331D8(jiggy_id, sp1C); + codeABC00_spawnJiggyAtLocation(jiggy_id, sp1C); } } @@ -253,12 +253,12 @@ void jiggy_spawn(enum jiggy_e jiggy_id, f32 pos[3]) { } } -void func_803331D8(enum jiggy_e jiggy_id, f32 arg1[3]) { +void codeABC00_spawnJiggyAtLocation(enum jiggy_e jiggy_id, f32 location[3]) { jiggy_id = ((jiggy_id <= 0) || (jiggy_id >= (s_jiggyList_level_jiggy_count * 10))) ? JIGGY_A_MM_CONGA : jiggy_id; - jiggylist_list[jiggy_id - 1].unk10.position[0] = arg1[0]; - jiggylist_list[jiggy_id - 1].unk10.position[1] = arg1[1]; - jiggylist_list[jiggy_id - 1].unk10.position[2] = arg1[2]; + jiggylist_list[jiggy_id - 1].unk10.position[0] = location[0]; + jiggylist_list[jiggy_id - 1].unk10.position[1] = location[1]; + jiggylist_list[jiggy_id - 1].unk10.position[2] = location[2]; jiggylist_list[jiggy_id - 1].init(&jiggylist_list[jiggy_id - 1].unk10); jiggyscore_setSpawned(jiggy_id, TRUE); } From 2a0d1eacd5210765887b3458a08979f3caebaa46 Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Mon, 9 Sep 2024 23:38:22 +0200 Subject: [PATCH 06/10] fix: rename function references from previous refactors --- src/CC/ch/tooth.c | 2 +- src/core2/code_4C020.c | 2 +- src/core2/code_EF50.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CC/ch/tooth.c b/src/CC/ch/tooth.c index 91d2148a..425d08b7 100644 --- a/src/CC/ch/tooth.c +++ b/src/CC/ch/tooth.c @@ -93,7 +93,7 @@ extern void chTooth_update(Actor * this){ sp24[1] = 1470.0f; func_80333388(local->unk0->jiggy_id); - func_803331D8(local->unk0->jiggy_id, sp24); + codeABC00_spawnJiggyAtLocation(local->unk0->jiggy_id, sp24); } } } diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index 43b08cc3..219fe47f 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -715,7 +715,7 @@ void func_802D4D3C(enum actor_e arg0, enum actor_e arg1) { f32 sp40[3]; if (nodeProp_findPositionFromActorId(arg1, sp5C)) { - func_803331D8(arg0, sp5C); + codeABC00_spawnJiggyAtLocation(arg0, sp5C); func_8025A6EC(COMUSIC_3D_JIGGY_SPAWN, 0x7FFF); if (arg0 == 0x36) { diff --git a/src/core2/code_EF50.c b/src/core2/code_EF50.c index 9d8f515c..fc0274fe 100644 --- a/src/core2/code_EF50.c +++ b/src/core2/code_EF50.c @@ -334,7 +334,7 @@ void func_80296608(void){ break; case BS_INTR_2C: //L80296738 item_set(ITEM_14_HEALTH, 0); - func_80291930(1); + codeA960_forceLoadzone(1); sp2C = 2; break; case BS_INTR_13: //L80296760 From aedd993cd97a1ab2c2294b1b246e031c42f79f76 Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Tue, 10 Sep 2024 00:38:45 +0200 Subject: [PATCH 07/10] refac: rename init overlay init functions --- asm/core1/code_1E820.s | 62 ++++++++++++++++++++++++++++++++++++ src/core2/code_9B990.c | 72 +++++++++++++++++++++--------------------- 2 files changed, 98 insertions(+), 36 deletions(-) create mode 100644 asm/core1/code_1E820.s diff --git a/asm/core1/code_1E820.s b/asm/core1/code_1E820.s new file mode 100644 index 00000000..747f86ef --- /dev/null +++ b/asm/core1/code_1E820.s @@ -0,0 +1,62 @@ +.include "macro.inc" + +/* assembler directives */ +.set noat /* allow manual use of $at */ +.set noreorder /* don't insert nops after branches */ +.set gp=64 /* allow use of 64-bit general purpose registers */ + +.section .text, "ax" + +/* Generated by spimdisasm 1.28.1 */ + +glabel func_8025C240 +/* F37A70 8025C240 3C048027 */ lui $a0, %hi(D_80276E70) +/* F37A74 8025C244 DC846E70 */ ld $a0, %lo(D_80276E70)($a0) +/* F37A78 8025C248 3C018027 */ lui $at, %hi(D_80276E70) +/* F37A7C 8025C24C 000437FC */ dsll32 $a2, $a0, 31 +/* F37A80 8025C250 00042FF8 */ dsll $a1, $a0, 31 +/* F37A84 8025C254 000637FA */ dsrl $a2, $a2, 31 +/* F37A88 8025C258 0005283E */ dsrl32 $a1, $a1, 0 +/* F37A8C 8025C25C 0004233C */ dsll32 $a0, $a0, 12 +/* F37A90 8025C260 00C53025 */ or $a2, $a2, $a1 +/* F37A94 8025C264 0004203E */ dsrl32 $a0, $a0, 0 +/* F37A98 8025C268 00C43026 */ xor $a2, $a2, $a0 +/* F37A9C 8025C26C 0006253A */ dsrl $a0, $a2, 20 +/* F37AA0 8025C270 30840FFF */ andi $a0, $a0, 0xFFF +/* F37AA4 8025C274 00862026 */ xor $a0, $a0, $a2 +/* F37AA8 8025C278 0004103C */ dsll32 $v0, $a0, 0 +/* F37AAC 8025C27C FC246E70 */ sd $a0, %lo(D_80276E70)($at) +/* F37AB0 8025C280 03E00008 */ jr $ra +/* F37AB4 8025C284 0002103F */ dsra32 $v0, $v0, 0 +endlabel func_8025C240 +.size func_8025C240, . - func_8025C240 + +glabel func_8025C288 +/* F37AB8 8025C288 64840001 */ daddiu $a0, $a0, 0x1 +/* F37ABC 8025C28C 3C018027 */ lui $at, %hi(D_80276E70) +/* F37AC0 8025C290 FC246E70 */ sd $a0, %lo(D_80276E70)($at) +/* F37AC4 8025C294 03E00008 */ jr $ra +/* F37AC8 8025C298 24040000 */ addiu $a0, $zero, 0x0 +endlabel func_8025C288 +.size func_8025C288, . - func_8025C288 + +glabel func_8025C29C +/* F37ACC 8025C29C DC870000 */ ld $a3, 0x0($a0) +/* F37AD0 8025C2A0 000737FC */ dsll32 $a2, $a3, 31 +/* F37AD4 8025C2A4 00072FF8 */ dsll $a1, $a3, 31 +/* F37AD8 8025C2A8 000637FA */ dsrl $a2, $a2, 31 +/* F37ADC 8025C2AC 0005283E */ dsrl32 $a1, $a1, 0 +/* F37AE0 8025C2B0 00073B3C */ dsll32 $a3, $a3, 12 +/* F37AE4 8025C2B4 00C53025 */ or $a2, $a2, $a1 +/* F37AE8 8025C2B8 0007383E */ dsrl32 $a3, $a3, 0 +/* F37AEC 8025C2BC 00C73026 */ xor $a2, $a2, $a3 +/* F37AF0 8025C2C0 00063D3A */ dsrl $a3, $a2, 20 +/* F37AF4 8025C2C4 30E70FFF */ andi $a3, $a3, 0xFFF +/* F37AF8 8025C2C8 00E63826 */ xor $a3, $a3, $a2 +/* F37AFC 8025C2CC 0007103C */ dsll32 $v0, $a3, 0 +/* F37B00 8025C2D0 FC870000 */ sd $a3, 0x0($a0) +/* F37B04 8025C2D4 03E00008 */ jr $ra +/* F37B08 8025C2D8 0002103F */ dsra32 $v0, $v0, 0 +/* F37B0C 8025C2DC 00000000 */ nop +endlabel func_8025C29C +.size func_8025C29C, . - func_8025C29C diff --git a/src/core2/code_9B990.c b/src/core2/code_9B990.c index 6be00859..4d36bfb5 100644 --- a/src/core2/code_9B990.c +++ b/src/core2/code_9B990.c @@ -7,67 +7,67 @@ void __overlay_mmm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_mmm_release(void); -void func_80322960(void); +void overlay_mmm_init(void); void __overlay_mmm_update(void); void func_803229C0(s32, s32); void __overlay_cc_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_cc_release(void); -void func_80322A28(void); +void overlay_whale_init(void); void __overlay_cc_update(void); void func_80322A78(s32, s32); void __overlay_gv_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_gv_release(void); -void func_80322ACC(void); +void overlay_gv_init(void); void __overlay_gv_update(void); void func_80322B3C(s32, s32); void __overlay_ttc_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_ttc_release(void); -void func_80322B78(void); +void overlay_ttc_init(void); void __overlay_ttc_update(void); void func_80322BB8(s32, s32); void __overlay_mm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_mm_release(void); -void func_80322CD0(void); +void overlay_mm_init(void); void __overlay_mm_update(void); void func_80322CE0(s32, s32); void __overlay_bgs_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_bgs_release(void); -void func_80322D38(void); +void overlay_bgs_init(void); void __overlay_bgs_update(void); void func_80322D94(s32, s32); void __overlay_sm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_sm_release(void); -void func_80322BDC(void); +void overlay_sm_init(void); void __overlay_sm_update(void); void func_80322BEC(s32, s32); void __overlay_lair_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_lair_release(void); -void func_80322C38(void); +void overlay_lair_init(void); void __overlay_lair_update(void); void func_80322C78(s32, s32); void __overlay_fight_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_fight_release(void); -void func_80322C9C(void); +void overlay_fight_init(void); void __overlay_fight_update(void); void func_80322CAC(s32, s32); void __overlay_intro_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_intro_release(void); -void func_80322D04(void); +void overlay_intro_init(void); void __overlay_intro_update(void); void func_80322D14(s32, s32); void __overlay_fp_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_fp_release(void); -void func_80322DE8(void); +void overlay_fp_init(void); void __overlay_fp_update(void); void func_80322E58(s32, s32); @@ -77,7 +77,7 @@ typedef struct{ }level_overlay_map_elem; typedef struct{ - s16 unk0; + s16 overlay_id; u8 unk2; u8 unk3; void (*init)(void); @@ -106,17 +106,17 @@ level_overlay_map_elem D_8036E2C0[] = { }; level_overlay_update_struct D_8036E2F8[] = { - { OVERLAY_2_WHALE, 1, 0, func_80322A28, __overlay_cc_update, __overlay_cc_release, __overlay_cc_draw, func_80322A78}, - { OVERLAY_3_HAUNTED, 1, 0, func_80322960, __overlay_mmm_update, __overlay_mmm_release, __overlay_mmm_draw, func_803229C0}, - { OVERLAY_4_DESERT, 1, 0, func_80322ACC, __overlay_gv_update, __overlay_gv_release, __overlay_gv_draw, func_80322B3C}, - { OVERLAY_5_BEACH, 1, 0, func_80322B78, __overlay_ttc_update, __overlay_ttc_release, __overlay_ttc_draw, func_80322BB8}, - { OVERLAY_6_JUNGLE, 1, 0, func_80322CD0, __overlay_mm_update, __overlay_mm_release, __overlay_mm_draw, func_80322CE0}, - { OVERLAY_7_SWAMP, 1, 0, func_80322D38, __overlay_bgs_update, __overlay_bgs_release, __overlay_bgs_draw, func_80322D94}, - { OVERLAY_B_TRAINING, 1, 0, func_80322BDC, __overlay_sm_update, __overlay_sm_release, __overlay_sm_draw, func_80322BEC}, - { OVERLAY_C_INTRO, 1, 0, func_80322D04, __overlay_intro_update, __overlay_intro_release, __overlay_intro_draw, func_80322D14}, - { OVERLAY_D_WITCH, 1, 0, func_80322C38, __overlay_lair_update, __overlay_lair_release, __overlay_lair_draw, func_80322C78}, - { OVERLAY_E_BATTLE, 1, 0, func_80322C9C, __overlay_fight_update, __overlay_fight_release, __overlay_fight_draw, func_80322CAC}, - { OVERLAY_9_SNOW, 0, 1, func_80322DE8, __overlay_fp_update, __overlay_fp_release, __overlay_fp_draw, func_80322E58}, + { OVERLAY_2_WHALE, 1, 0, overlay_whale_init, __overlay_cc_update, __overlay_cc_release, __overlay_cc_draw, func_80322A78}, + { OVERLAY_3_HAUNTED, 1, 0, overlay_mmm_init, __overlay_mmm_update, __overlay_mmm_release, __overlay_mmm_draw, func_803229C0}, + { OVERLAY_4_DESERT, 1, 0, overlay_gv_init, __overlay_gv_update, __overlay_gv_release, __overlay_gv_draw, func_80322B3C}, + { OVERLAY_5_BEACH, 1, 0, overlay_ttc_init, __overlay_ttc_update, __overlay_ttc_release, __overlay_ttc_draw, func_80322BB8}, + { OVERLAY_6_JUNGLE, 1, 0, overlay_mm_init, __overlay_mm_update, __overlay_mm_release, __overlay_mm_draw, func_80322CE0}, + { OVERLAY_7_SWAMP, 1, 0, overlay_bgs_init, __overlay_bgs_update, __overlay_bgs_release, __overlay_bgs_draw, func_80322D94}, + { OVERLAY_B_TRAINING, 1, 0, overlay_sm_init, __overlay_sm_update, __overlay_sm_release, __overlay_sm_draw, func_80322BEC}, + { OVERLAY_C_INTRO, 1, 0, overlay_intro_init, __overlay_intro_update, __overlay_intro_release, __overlay_intro_draw, func_80322D14}, + { OVERLAY_D_WITCH, 1, 0, overlay_lair_init, __overlay_lair_update, __overlay_lair_release, __overlay_lair_draw, func_80322C78}, + { OVERLAY_E_BATTLE, 1, 0, overlay_fight_init, __overlay_fight_update, __overlay_fight_release, __overlay_fight_draw, func_80322CAC}, + { OVERLAY_9_SNOW, 0, 1, overlay_fp_init, __overlay_fp_update, __overlay_fp_release, __overlay_fp_draw, func_80322E58}, {0} }; @@ -141,7 +141,7 @@ void __overlay_mmm_release(void){ func_8038A994(); } -void func_80322960(void){ +void overlay_mmm_init(void){ func_80389544(); func_80389CE0(); func_8038A9B4(); @@ -166,7 +166,7 @@ void __overlay_cc_release(void){ func_803880D4(); } -void func_80322A28(void){ +void overlay_whale_init(void){ func_80388D54(); func_80388104(); } @@ -189,7 +189,7 @@ void __overlay_gv_release(void){ gv_waterCtrl_end(); } -void func_80322ACC(void){ +void overlay_gv_init(void){ func_8038FF68(); func_80390100(); gv_matchingGame_init(); //gv_matchingGame_init @@ -211,7 +211,7 @@ void __overlay_ttc_release(void){ func_8038B04C(); } -void func_80322B78(void){ +void overlay_ttc_init(void){ func_8038B094(); } @@ -225,7 +225,7 @@ void __overlay_sm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){ return; } void __overlay_sm_release(void){ return; } -void func_80322BDC(void){ return; } +void overlay_sm_init(void){ return; } void __overlay_sm_update(void){ return; } @@ -239,7 +239,7 @@ void __overlay_lair_release(void){ lair_func_8038CD48(); } -void func_80322C38(void){ +void overlay_lair_init(void){ lair_func_8038CF18(); } @@ -254,7 +254,7 @@ void __overlay_fight_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){ return; } void __overlay_fight_release(void){ return; } -void func_80322C9C(void){ return; } +void overlay_fight_init(void){ return; } void __overlay_fight_update(void){ return; } @@ -264,7 +264,7 @@ void __overlay_mm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){ return; } void __overlay_mm_release(void){ return; } -void func_80322CD0(void){ return; } +void overlay_mm_init(void){ return; } void __overlay_mm_update(void){ return; } @@ -274,7 +274,7 @@ void __overlay_intro_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){ return; } void __overlay_intro_release(void){ return; } -void func_80322D04(void){ return; } +void overlay_intro_init(void){ return; } void __overlay_intro_update(void){ return; } @@ -284,7 +284,7 @@ void __overlay_bgs_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){ return; } void __overlay_bgs_release(void){ return; } -void func_80322D38(void){ +void overlay_bgs_init(void){ if( map_get() == MAP_10_BGS_MR_VILE && volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && volatileFlag_get(VOLATILE_FLAG_7_HAS_SEEN_VILE_FF_MINIGAME) @@ -306,7 +306,7 @@ void __overlay_fp_release(void){ func_8039195C(); } -void func_80322DE8(void){ +void overlay_fp_init(void){ fp_sirslushgame_init(); fp_snowmanButtonGame_init(); func_8038B7A4(); @@ -374,8 +374,8 @@ void func_80322FE4(void){ D_80383350.init = D_80383350.update = D_80383350.release = NULL; D_80383350.draw = NULL; D_80383350.unk14 = NULL; - for(i = 0; D_8036E2F8[i].unk0 != 0; i++){ - if(overlay_id == D_8036E2F8[i].unk0){ + for(i = 0; D_8036E2F8[i].overlay_id != 0; i++){ + if(overlay_id == D_8036E2F8[i].overlay_id){ D_80383350.unk0 = D_8036E2F8[i].unk2; D_80383350.unk1 = D_8036E2F8[i].unk3; D_80383350.init = D_8036E2F8[i].init; From 3b76490b72850ec99078fa265f939577d2293e7b Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Tue, 10 Sep 2024 00:44:17 +0200 Subject: [PATCH 08/10] refac: rename D_80383350 to sOverlay --- src/core2/code_9B990.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/core2/code_9B990.c b/src/core2/code_9B990.c index 4d36bfb5..ae4b7a92 100644 --- a/src/core2/code_9B990.c +++ b/src/core2/code_9B990.c @@ -130,7 +130,7 @@ struct { void (*release)(void); void (*draw)(Gfx **, Mtx **, Vtx **); void (*unk14)(s32, s32); -} D_80383350; +} sOverlay; /* .code */ void __overlay_mmm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){ return; } @@ -323,8 +323,8 @@ void __overlay_fp_update(void){ void func_80322E58(s32 arg0, s32 arg1){ return; } void func_80322E64(Gfx **gfx, Mtx **mtx, Vtx **vtx){ - if(D_80383350.draw) - D_80383350.draw(gfx, mtx, vtx); + if(sOverlay.draw) + sOverlay.draw(gfx, mtx, vtx); } enum overlay_e level_to_overlay(enum level_e lvl){ @@ -337,14 +337,14 @@ enum overlay_e level_to_overlay(enum level_e lvl){ } void func_80322EDC(int arg0){ - if(arg0 == D_80383350.unk1 && D_80383350.release){ - D_80383350.release(); + if(arg0 == sOverlay.unk1 && sOverlay.release){ + sOverlay.release(); } } void func_80322F1C(int arg0){ - if(arg0 == D_80383350.unk0 && D_80383350.init){ - D_80383350.init(); + if(arg0 == sOverlay.unk0 && sOverlay.init){ + sOverlay.init(); } } @@ -371,29 +371,29 @@ void func_80322FE4(void){ s32 overlay_id; func_80356714(); overlay_id = overlayManagergetLoadedId(); - D_80383350.init = D_80383350.update = D_80383350.release = NULL; - D_80383350.draw = NULL; - D_80383350.unk14 = NULL; + sOverlay.init = sOverlay.update = sOverlay.release = NULL; + sOverlay.draw = NULL; + sOverlay.unk14 = NULL; for(i = 0; D_8036E2F8[i].overlay_id != 0; i++){ if(overlay_id == D_8036E2F8[i].overlay_id){ - D_80383350.unk0 = D_8036E2F8[i].unk2; - D_80383350.unk1 = D_8036E2F8[i].unk3; - D_80383350.init = D_8036E2F8[i].init; - D_80383350.update = D_8036E2F8[i].update; - D_80383350.release = D_8036E2F8[i].release; - D_80383350.draw = D_8036E2F8[i].draw; - D_80383350.unk14 = D_8036E2F8[i].unk14; + sOverlay.unk0 = D_8036E2F8[i].unk2; + sOverlay.unk1 = D_8036E2F8[i].unk3; + sOverlay.init = D_8036E2F8[i].init; + sOverlay.update = D_8036E2F8[i].update; + sOverlay.release = D_8036E2F8[i].release; + sOverlay.draw = D_8036E2F8[i].draw; + sOverlay.unk14 = D_8036E2F8[i].unk14; break; } } } void func_80323098(s32 arg0, s32 arg1){ - if(D_80383350.unk14) - D_80383350.unk14(arg0, arg1); + if(sOverlay.unk14) + sOverlay.unk14(arg0, arg1); } void overlay_update(void){ - if(D_80383350.update) - D_80383350.update(); + if(sOverlay.update) + sOverlay.update(); } From ab81b1bdef4d4a3896deb62e39effc88f7f413fd Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Tue, 10 Sep 2024 00:51:00 +0200 Subject: [PATCH 09/10] refac: rename func_80322FE4 to overlay_init --- src/core2/code_9B990.c | 2 +- src/core2/code_AD5B0.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core2/code_9B990.c b/src/core2/code_9B990.c index ae4b7a92..64ebdba7 100644 --- a/src/core2/code_9B990.c +++ b/src/core2/code_9B990.c @@ -366,7 +366,7 @@ void func_80322FBC(void){ void func_80322FDC(void){ return; } -void func_80322FE4(void){ +void overlay_init(void){ int i; s32 overlay_id; func_80356714(); diff --git a/src/core2/code_AD5B0.c b/src/core2/code_AD5B0.c index 4949adbb..8454dc0d 100644 --- a/src/core2/code_AD5B0.c +++ b/src/core2/code_AD5B0.c @@ -191,7 +191,7 @@ void func_80334B20(enum map_e arg0, s32 arg1, s32 arg2) { D_803835D0.unk0 = 3; D_803835D0.map_4 = arg0; D_803835D0.unk8 = arg1; - func_80322FE4(); + overlay_init(); func_80335110(1); func_80335128(1); func_802D2CB8(); From 692cfe0ee0bb394990691c85f29b454336896859 Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Tue, 10 Sep 2024 01:07:19 +0200 Subject: [PATCH 10/10] refac: rename func_80389DF4 to code3420_handleOrganGame --- src/MMM/code_3420.c | 5 +++-- src/core2/code_9B990.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/MMM/code_3420.c b/src/MMM/code_3420.c index 8c4eebc3..eea14df9 100644 --- a/src/MMM/code_3420.c +++ b/src/MMM/code_3420.c @@ -11,7 +11,7 @@ typedef struct { } Struct_MMM_3420_0; typedef struct { - u8 unk0; + u8 unk0; // black key flag? black key == 2 || 4 u8 unk1; } Struct_MMM_3420_1; @@ -300,7 +300,8 @@ void func_80389D9C(s32 key_id){ D_8038C4F0.unk0++; } -void func_80389DF4(s32 arg0, s32 arg1) { +// organ game/higgy in church? +void code3420_handleOrganGame(s32 arg0, s32 arg1) { Struct_MMM_3420_1 *iPtr; f32 key_position[3]; bool is_black_key; diff --git a/src/core2/code_9B990.c b/src/core2/code_9B990.c index 64ebdba7..f9ad626c 100644 --- a/src/core2/code_9B990.c +++ b/src/core2/code_9B990.c @@ -154,7 +154,7 @@ void __overlay_mmm_update(void){ } void func_803229C0(s32 arg0, s32 arg1){ - func_80389DF4(arg0, arg1); + code3420_handleOrganGame(arg0, arg1); } void __overlay_cc_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){