kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

refac: rename init overlay init functions

Browse Source
This commit is contained in:
Bl00D4NGEL
2024-09-10 00:38:45 +02:00
parent 2a0d1eacd5
commit aedd993cd9
2 changed files with 98 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
asm/core1/code_1E820.s Normal file
View File

@@ -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

72
src/core2/code_9B990.c
View File

@@ -7,67 +7,67 @@
void __overlay_mmm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_mmm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx);
void __overlay_mmm_release(void); void __overlay_mmm_release(void);
void func_80322960(void); void overlay_mmm_init(void);
void __overlay_mmm_update(void); void __overlay_mmm_update(void);
void func_803229C0(s32, s32); void func_803229C0(s32, s32);
void __overlay_cc_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_cc_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx);
void __overlay_cc_release(void); void __overlay_cc_release(void);
void func_80322A28(void); void overlay_whale_init(void);
void __overlay_cc_update(void); void __overlay_cc_update(void);
void func_80322A78(s32, s32); void func_80322A78(s32, s32);
void __overlay_gv_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_gv_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx);
void __overlay_gv_release(void); void __overlay_gv_release(void);
void func_80322ACC(void); void overlay_gv_init(void);
void __overlay_gv_update(void); void __overlay_gv_update(void);
void func_80322B3C(s32, s32); void func_80322B3C(s32, s32);
void __overlay_ttc_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_ttc_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx);
void __overlay_ttc_release(void); void __overlay_ttc_release(void);
void func_80322B78(void); void overlay_ttc_init(void);
void __overlay_ttc_update(void); void __overlay_ttc_update(void);
void func_80322BB8(s32, s32); void func_80322BB8(s32, s32);
void __overlay_mm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_mm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx);
void __overlay_mm_release(void); void __overlay_mm_release(void);
void func_80322CD0(void); void overlay_mm_init(void);
void __overlay_mm_update(void); void __overlay_mm_update(void);
void func_80322CE0(s32, s32); void func_80322CE0(s32, s32);
void __overlay_bgs_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_bgs_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx);
void __overlay_bgs_release(void); void __overlay_bgs_release(void);
void func_80322D38(void); void overlay_bgs_init(void);
void __overlay_bgs_update(void); void __overlay_bgs_update(void);
void func_80322D94(s32, s32); void func_80322D94(s32, s32);
void __overlay_sm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_sm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx);
void __overlay_sm_release(void); void __overlay_sm_release(void);
void func_80322BDC(void); void overlay_sm_init(void);
void __overlay_sm_update(void); void __overlay_sm_update(void);
void func_80322BEC(s32, s32); void func_80322BEC(s32, s32);
void __overlay_lair_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_lair_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx);
void __overlay_lair_release(void); void __overlay_lair_release(void);
void func_80322C38(void); void overlay_lair_init(void);
void __overlay_lair_update(void); void __overlay_lair_update(void);
void func_80322C78(s32, s32); void func_80322C78(s32, s32);
void __overlay_fight_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_fight_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx);
void __overlay_fight_release(void); void __overlay_fight_release(void);
void func_80322C9C(void); void overlay_fight_init(void);
void __overlay_fight_update(void); void __overlay_fight_update(void);
void func_80322CAC(s32, s32); void func_80322CAC(s32, s32);
void __overlay_intro_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_intro_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx);
void __overlay_intro_release(void); void __overlay_intro_release(void);
void func_80322D04(void); void overlay_intro_init(void);
void __overlay_intro_update(void); void __overlay_intro_update(void);
void func_80322D14(s32, s32); void func_80322D14(s32, s32);
void __overlay_fp_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx); void __overlay_fp_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx);
void __overlay_fp_release(void); void __overlay_fp_release(void);
void func_80322DE8(void); void overlay_fp_init(void);
void __overlay_fp_update(void); void __overlay_fp_update(void);
void func_80322E58(s32, s32); void func_80322E58(s32, s32);
@@ -77,7 +77,7 @@ typedef struct{
}level_overlay_map_elem; }level_overlay_map_elem;
typedef struct{ typedef struct{
s16 unk0; s16 overlay_id;
u8 unk2; u8 unk2;
u8 unk3; u8 unk3;
void (*init)(void); void (*init)(void);
@@ -106,17 +106,17 @@ level_overlay_map_elem D_8036E2C0[] = {
}; };
level_overlay_update_struct D_8036E2F8[] = { 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_2_WHALE, 1, 0, overlay_whale_init, __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_3_HAUNTED, 1, 0, overlay_mmm_init, __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_4_DESERT, 1, 0, overlay_gv_init, __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_5_BEACH, 1, 0, overlay_ttc_init, __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_6_JUNGLE, 1, 0, overlay_mm_init, __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_7_SWAMP, 1, 0, overlay_bgs_init, __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_B_TRAINING, 1, 0, overlay_sm_init, __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_C_INTRO, 1, 0, overlay_intro_init, __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_D_WITCH, 1, 0, overlay_lair_init, __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_E_BATTLE, 1, 0, overlay_fight_init, __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_9_SNOW, 0, 1, overlay_fp_init, __overlay_fp_update, __overlay_fp_release, __overlay_fp_draw, func_80322E58},
{0} {0}
}; };
@@ -141,7 +141,7 @@ void __overlay_mmm_release(void){
func_8038A994(); func_8038A994();
} }
void func_80322960(void){ void overlay_mmm_init(void){
func_80389544(); func_80389544();
func_80389CE0(); func_80389CE0();
func_8038A9B4(); func_8038A9B4();
@@ -166,7 +166,7 @@ void __overlay_cc_release(void){
func_803880D4(); func_803880D4();
} }
void func_80322A28(void){ void overlay_whale_init(void){
func_80388D54(); func_80388D54();
func_80388104(); func_80388104();
} }
@@ -189,7 +189,7 @@ void __overlay_gv_release(void){
gv_waterCtrl_end(); gv_waterCtrl_end();
} }
void func_80322ACC(void){ void overlay_gv_init(void){
func_8038FF68(); func_8038FF68();
func_80390100(); func_80390100();
gv_matchingGame_init(); //gv_matchingGame_init gv_matchingGame_init(); //gv_matchingGame_init
@@ -211,7 +211,7 @@ void __overlay_ttc_release(void){
func_8038B04C(); func_8038B04C();
} }
void func_80322B78(void){ void overlay_ttc_init(void){
func_8038B094(); func_8038B094();
} }
@@ -225,7 +225,7 @@ void __overlay_sm_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){ return; }
void __overlay_sm_release(void){ return; } void __overlay_sm_release(void){ return; }
void func_80322BDC(void){ return; } void overlay_sm_init(void){ return; }
void __overlay_sm_update(void){ return; } void __overlay_sm_update(void){ return; }
@@ -239,7 +239,7 @@ void __overlay_lair_release(void){
lair_func_8038CD48(); lair_func_8038CD48();
} }
void func_80322C38(void){ void overlay_lair_init(void){
lair_func_8038CF18(); 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 __overlay_fight_release(void){ return; }
void func_80322C9C(void){ return; } void overlay_fight_init(void){ return; }
void __overlay_fight_update(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 __overlay_mm_release(void){ return; }
void func_80322CD0(void){ return; } void overlay_mm_init(void){ return; }
void __overlay_mm_update(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 __overlay_intro_release(void){ return; }
void func_80322D04(void){ return; } void overlay_intro_init(void){ return; }
void __overlay_intro_update(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 __overlay_bgs_release(void){ return; }
void func_80322D38(void){ void overlay_bgs_init(void){
if( map_get() == MAP_10_BGS_MR_VILE if( map_get() == MAP_10_BGS_MR_VILE
&& volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)
&& volatileFlag_get(VOLATILE_FLAG_7_HAS_SEEN_VILE_FF_MINIGAME) && volatileFlag_get(VOLATILE_FLAG_7_HAS_SEEN_VILE_FF_MINIGAME)
@@ -306,7 +306,7 @@ void __overlay_fp_release(void){
func_8039195C(); func_8039195C();
} }
void func_80322DE8(void){ void overlay_fp_init(void){
fp_sirslushgame_init(); fp_sirslushgame_init();
fp_snowmanButtonGame_init(); fp_snowmanButtonGame_init();
func_8038B7A4(); func_8038B7A4();
@@ -374,8 +374,8 @@ void func_80322FE4(void){
D_80383350.init = D_80383350.update = D_80383350.release = NULL; D_80383350.init = D_80383350.update = D_80383350.release = NULL;
D_80383350.draw = NULL; D_80383350.draw = NULL;
D_80383350.unk14 = NULL; D_80383350.unk14 = NULL;
for(i = 0; D_8036E2F8[i].unk0 != 0; i++){ for(i = 0; D_8036E2F8[i].overlay_id != 0; i++){
if(overlay_id == D_8036E2F8[i].unk0){ if(overlay_id == D_8036E2F8[i].overlay_id){
D_80383350.unk0 = D_8036E2F8[i].unk2; D_80383350.unk0 = D_8036E2F8[i].unk2;
D_80383350.unk1 = D_8036E2F8[i].unk3; D_80383350.unk1 = D_8036E2F8[i].unk3;
D_80383350.init = D_8036E2F8[i].init; D_80383350.init = D_8036E2F8[i].init;