From 5b54800b8416defc6748bd7deb48aa0f30443e01 Mon Sep 17 00:00:00 2001 From: Nabnut Date: Thu, 19 Sep 2024 12:31:41 +0200 Subject: [PATCH] Renaming game modes --- src/MM/crc.c | 2 +- src/MMM/code_47D0.c | 2 +- src/core2/code_5C870.c | 26 +++++++++++++------------- src/core2/code_956B0.c | 2 +- src/core2/code_AD5B0.c | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/MM/crc.c b/src/MM/crc.c index dfaf8c47..a775a979 100644 --- a/src/MM/crc.c +++ b/src/MM/crc.c @@ -16,7 +16,7 @@ void func_80387EC0(void) { u32 temp_a0; temp_v0 = (u32* )chmumbo_func_802D1724; - if (getGameMode() != 7) { + if (getGameMode() != GAME_MODE_7_ATTRACT_DEMO) { temp_a0 = (temp_v0[2] & 0x03FFFFFF)*4; //get offset temp_a0 += (u32)&temp_v0[3] & 0xF0000000; //get region ((u32 *)temp_a0)[0] = 0x03E00008; //jr $ra diff --git a/src/MMM/code_47D0.c b/src/MMM/code_47D0.c index 46df191f..7e15054f 100644 --- a/src/MMM/code_47D0.c +++ b/src/MMM/code_47D0.c @@ -16,7 +16,7 @@ typedef struct { /* .code */ void MMM_func_8038ABC0(s32 arg0) { - if (getGameMode() != 7) { + if (getGameMode() != GAME_MODE_7_ATTRACT_DEMO) { ability_setAllLearned(ability_getAllLearned() & ~arg0); } } diff --git a/src/core2/code_5C870.c b/src/core2/code_5C870.c index 1cb72504..d9d9b8d5 100644 --- a/src/core2/code_5C870.c +++ b/src/core2/code_5C870.c @@ -174,7 +174,7 @@ void func_802E3BF0(void){ } //_set_game_mode -void func_802E3BF8(enum game_mode_e next_mode, s32 arg1){ +void game_setMode(enum game_mode_e next_mode, s32 arg1){ s32 prev_mode = D_8037E8E0.game_mode; s32 sp20; s32 sp1C; @@ -261,7 +261,7 @@ void func_802E3E7C(enum game_mode_e mode){ map = D_8037E8E0.map; sp28 = D_8037E8E0.exit; prev_mode = D_8037E8E0.unk0; - func_802E3BF8(GAME_MODE_2_UNKNOWN, 0); + game_setMode(GAME_MODE_2_UNKNOWN, 0); if(!volatileFlag_getAndSet(VOLATILE_FLAG_21, 0) || map_getLevel(map_get()) == map_getLevel(D_8037E8E0.map)){ if(!volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) mapSavestate_save(map_get()); @@ -270,7 +270,7 @@ void func_802E3E7C(enum game_mode_e mode){ func_802E38E8(map, sp28, sp34); mapSavestate_apply(map); D_8037E8E0.unk0 = prev_mode; - func_802E3BF8(mode, sp30); + game_setMode(mode, sp30); jiggylist_map_actors(); func_80346CA8(); } @@ -357,7 +357,7 @@ void func_802E412C(s32 arg0, s32 arg1){ } void func_802E4170(void){ - func_802E3BF8(GAME_MODE_2_UNKNOWN,0); + game_setMode(GAME_MODE_2_UNKNOWN,0); defragManager_free(); func_802E5F68(); if(!func_802E4A08()) @@ -405,7 +405,7 @@ void func_802E4214(enum map_e map_id){ func_8033DC70(); func_8033DC04(); func_8031FBA0(); - D_8037E8E0.game_mode = 2; + D_8037E8E0.game_mode = GAME_MODE_2_UNKNOWN; D_8037E8E0.unk8 = 0.0f; func_8033DC9C(0.0f); func_8033DD04(0); @@ -414,7 +414,7 @@ void func_802E4214(enum map_e map_id){ func_802E3854(); func_802E38E8(map_id, 0, 0); D_8037E8E0.unk0 = 0; - func_802E3BF8(GAME_MODE_3_NORMAL,1); + game_setMode(GAME_MODE_3_NORMAL,1); } void func_802E4384(void){ @@ -512,7 +512,7 @@ bool func_802E4424(void) { } } if (D_8037E8E0.unk1A != 0) { - func_802E3BF8(D_8037E8E0.unk1A - 1, D_8037E8E0.unk1B); + game_setMode(D_8037E8E0.unk1A - 1, D_8037E8E0.unk1B); D_8037E8E0.unk1A = 0; } sp1C = func_80334ECC(); @@ -528,7 +528,7 @@ bool func_802E4424(void) { case GAME_MODE_9_BANJO_AND_KAZOOIE: func_8034BB90(); if ((func_8024E67C(0) == 1) && (D_8037E8E0.unk0 != 0)) { - func_802E3BF8(GAME_MODE_1_UNKNOWN, 0U); + game_setMode(GAME_MODE_1_UNKNOWN, 0U); } break; case GAME_MODE_3_NORMAL: /* switch 2 */ @@ -546,11 +546,11 @@ bool func_802E4424(void) { && levelSpecificFlags_validateCRC1() && dummy_func_80320248() ) { - func_802E3BF8(GAME_MODE_4_PAUSED, 0U); + game_setMode(GAME_MODE_4_PAUSED, 0U); } else if ((func_8024E67C(0) == 1) && (D_8037E8E0.unk0 != 0)) { - func_802E3BF8(GAME_MODE_1_UNKNOWN, 0U); + game_setMode(GAME_MODE_1_UNKNOWN, 0U); } else if (sp1C == 0) { - func_802E3BF8(GAME_MODE_3_NORMAL, 1U); + game_setMode(GAME_MODE_3_NORMAL, 1U); } break; @@ -561,7 +561,7 @@ bool func_802E4424(void) { func_8025A430(-1, 2000, 3); func_8025A2B0(); func_80335128(1); - func_802E3BF8(GAME_MODE_3_NORMAL, 0U); + game_setMode(GAME_MODE_3_NORMAL, 0U); } break; } @@ -577,7 +577,7 @@ bool func_802E4424(void) { } void func_802E48B8(enum game_mode_e mode, s32 arg1){ - func_802E3BF8(mode, arg1); + game_setMode(mode, arg1); } s32 game_defrag(void){ diff --git a/src/core2/code_956B0.c b/src/core2/code_956B0.c index c1f21473..35b85a1c 100644 --- a/src/core2/code_956B0.c +++ b/src/core2/code_956B0.c @@ -201,7 +201,7 @@ void func_8031CE70(f32 *arg0, s32 arg1, s32 arg2) { NodeProp *phi_s0; f32 phi_f2; - if ((D_80383190 == 0) && (getGameMode() != 8) && (getGameMode() != 7)) { + if ((D_80383190 == 0) && (getGameMode() != GAME_MODE_8_BOTTLES_BONUS) && (getGameMode() != GAME_MODE_7_ATTRACT_DEMO)) { if (arg0 != 0) { phi_s0 = func_80304ED0(&D_8036DDD0[1], arg0); } else { diff --git a/src/core2/code_AD5B0.c b/src/core2/code_AD5B0.c index 42669e0b..91f8fbd7 100644 --- a/src/core2/code_AD5B0.c +++ b/src/core2/code_AD5B0.c @@ -302,7 +302,7 @@ s32 func_80334ECC(void) { func_80356734(); func_802D5628(); itemPrint_update(); - if (getGameMode() != 4) { + if (getGameMode() != GAME_MODE_4_PAUSED) { func_802F7E54(); } if (D_803835DC == 0) {