diff --git a/include/context.h b/include/context.h index 4d0f0b4f..6a8156cc 100644 --- a/include/context.h +++ b/include/context.h @@ -99,7 +99,7 @@ extern UNK_TYPE F_801782E0; extern s32 gRadioMsgId; extern UNK_TYPE F_801782F0; extern s32 gMsgCharIsPrinting; -extern s32 gHideRadio; +extern bool gHideRadio; extern u16* gRadioMsg; extern ObjectInit* gLevelObjects; extern s32 gFogRed; @@ -314,7 +314,7 @@ extern s32 D_ctx_80177DB8[4]; extern s32 D_ctx_80177DD0[4][10]; extern s32 D_ctx_80177E74; extern s32 D_ctx_80177E7C; -extern s32 gChangeTo360; +extern bool gChangeTo360; extern Vec3f gTeamArrowsViewPos[10]; extern f32 D_ctx_80177F20[65]; extern f32 D_ctx_80178028[65]; diff --git a/src/engine/fox_360.c b/src/engine/fox_360.c index 174008ef..274f2345 100644 --- a/src/engine/fox_360.c +++ b/src/engine/fox_360.c @@ -461,7 +461,7 @@ void ActorAllRange_SpawnStarWolf(void) { } void ActorAllRange_PlayMessage(u16* msg, RadioCharacterId character) { - if ((gHideRadio == 0) && (gActors[0].state == STATE360_2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_STANDBY)) { + if (!gHideRadio && (gActors[0].state == STATE360_2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_STANDBY)) { Radio_PlayMessage(msg, character); } } diff --git a/src/engine/fox_context.c b/src/engine/fox_context.c index 32ffd48a..8a587074 100644 --- a/src/engine/fox_context.c +++ b/src/engine/fox_context.c @@ -104,7 +104,7 @@ UNK_TYPE F_801782E0; s32 gRadioMsgId; UNK_TYPE F_801782F0; bool gMsgCharIsPrinting; -s32 gHideRadio; +bool gHideRadio; u16* gRadioMsg; ObjectInit* gLevelObjects; UNK_TYPE F_80178318; @@ -345,7 +345,7 @@ s32 D_ctx_80177DB8[4]; s32 D_ctx_80177DD0[4][10]; s32 D_ctx_80177E74; s32 D_ctx_80177E7C; -s32 gChangeTo360; +bool gChangeTo360; Vec3f gTeamArrowsViewPos[10]; f32 D_ctx_80177F20[65]; // Seem to be an early implementation of RadarMark f32 D_ctx_80178028[65]; diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c index bc3483b7..55d34158 100644 --- a/src/engine/fox_play.c +++ b/src/engine/fox_play.c @@ -2574,7 +2574,7 @@ void Play_Init(void) { D_display_800CA230 = D_800D2F58 = 0.0f; gLevelMode = LEVELMODE_ON_RAILS; D_ctx_80177CE8 = D_bg_8015F968 = 0.0f; - D_hud_800D1970 = gVersusMode = gHideRadio = gChangeTo360 = 0; + D_hud_800D1970 = gVersusMode = gHideRadio = gChangeTo360 = false; if (gCurrentLevel >= LEVEL_FORTUNA) { gLevelMode = LEVELMODE_ALL_RANGE; if (gCurrentLevel == LEVEL_VERSUS) { diff --git a/src/engine/fox_radio.c b/src/engine/fox_radio.c index 0fd71173..5089c15b 100644 --- a/src/engine/fox_radio.c +++ b/src/engine/fox_radio.c @@ -670,7 +670,7 @@ void Radio_Draw(void) { case 7: gRadioPortraitScaleY -= 0.25f; if (gRadioPortraitScaleY == 0) { - gHideRadio = 0; + gHideRadio = false; gRadioMsgPri = 0; gRadioState = 0; } @@ -690,7 +690,7 @@ void Radio_Draw(void) { break; } - if (((gRadioState > 0) && (gRadioState != 100)) && (gHideRadio == 0)) { + if (((gRadioState > 0) && (gRadioState != 100)) && !gHideRadio) { func_radio_800BAAE8(); func_radio_800BB388(); @@ -773,7 +773,7 @@ void Radio_Draw(void) { } } - if (gHideRadio == 1) { + if (gHideRadio == true) { func_radio_800BA760(); } } diff --git a/src/overlays/ovl_ending/fox_end1.c b/src/overlays/ovl_ending/fox_end1.c index fb12bc0f..dc2538aa 100644 --- a/src/overlays/ovl_ending/fox_end1.c +++ b/src/overlays/ovl_ending/fox_end1.c @@ -376,7 +376,7 @@ void Ending_8018845C(void) { if (var_a2 != D_ending_8019858C) {} } - gHideRadio = 1; + gHideRadio = true; switch (gCsFrameCount) { case 10: @@ -570,7 +570,7 @@ void Ending_80189108(void) { switch (D_ending_80196D08[4].unk_38) { case 0: - gHideRadio = 1; + gHideRadio = true; switch (gCsFrameCount) { case 30: Radio_PlayMessage(gMsg_ID_21030, RCID_FOX); @@ -617,7 +617,7 @@ void Ending_80189108(void) { break; case 1: - gHideRadio = 0; + gHideRadio = false; if (gCsFrameCount == 20) { Radio_PlayMessage(gMsg_ID_21050, RCID_ROB64_TITLE); } @@ -630,7 +630,7 @@ void Ending_80189108(void) { break; case 2: - gHideRadio = 1; + gHideRadio = true; switch (gCsFrameCount) { case 20: Radio_PlayMessage(gMsg_ID_21060, RCID_FOX); diff --git a/src/overlays/ovl_i1/fox_co.c b/src/overlays/ovl_i1/fox_co.c index 990f4cde..b6bbad73 100644 --- a/src/overlays/ovl_i1/fox_co.c +++ b/src/overlays/ovl_i1/fox_co.c @@ -2691,7 +2691,7 @@ void Corneria_LevelStart(Player* player) { player->pos.x = 0.0f; } if (player->timer_1F8 == 270) { - gHideRadio = 0; + gHideRadio = false; Radio_PlayMessage(gMsg_ID_2005, RCID_FOX); } if (player->timer_1F8 == 180) { diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c index 4a45e26a..c9264953 100644 --- a/src/overlays/ovl_menu/fox_title.c +++ b/src/overlays/ovl_menu/fox_title.c @@ -1006,7 +1006,7 @@ void Title_8018994C(void) { D_menu_801B82B8 = 0; gRadioState = 0; - gHideRadio = 0; + gHideRadio = false; gRadioMsgPri = 0; break;