diff options
| author | MegaMech <7255464+MegaMech@users.noreply.github.com> | 2024-11-20 12:30:04 -0700 |
|---|---|---|
| committer | MegaMech <7255464+MegaMech@users.noreply.github.com> | 2024-11-20 12:30:04 -0700 |
| commit | 93973e08c36ab1213f6d33a39c42c29add6e07b7 (patch) | |
| tree | 262e8402783a2ff951e7d1d974c087623660f3fc /src/code_80057C60.c | |
| parent | 7ca7f183668cad11ad12155fab3d418107a36b06 (diff) | |
First batch of widescreen fixes
Diffstat (limited to 'src/code_80057C60.c')
| -rw-r--r-- | src/code_80057C60.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/code_80057C60.c b/src/code_80057C60.c index 205e656d2..11a1d436e 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -151,7 +151,7 @@ UNUSED s8 D_801657E0; s8 D_801657E1; s8 D_801657E2; s8 D_801657E3; -s8 D_801657E4; +s8 gHUDModes; s8 D_801657E5; bool D_801657E6; u8 D_801657E7; @@ -963,7 +963,7 @@ void func_80058F78(void) { set_matrix_hud_screen(); if ((!gDemoMode) && (gIsHUDVisible != 0) && (D_801657D8 == 0)) { draw_item_window(PLAYER_ONE); - if (D_801657E4 != 2) { + if (gHUDModes != 2) { render_hud_timer(PLAYER_ONE); draw_simplified_lap_count(PLAYER_ONE); func_8004EB38(0); @@ -1059,7 +1059,7 @@ void func_800591B4(void) { } } } - if ((D_801657E4 != 2) && (gModeSelection == GRAND_PRIX) && (D_8018D2BC != 0)) { + if ((gHUDModes != 2) && (gModeSelection == GRAND_PRIX) && (D_8018D2BC != 0)) { func_80050320(); } func_800590D4(); @@ -1135,7 +1135,7 @@ void render_hud_lap_3p_4p(s32 playerId) { draw_lap_count(playerHUD[playerId].lapX - 12, playerHUD[playerId].lapY + 4, playerHUD[playerId].alsoLapCount); } - if (D_801657E4 == 2) { + if (gHUDModes == 2) { if (playerHUD[playerId].unk_74 && D_80165608) { func_80047910(playerHUD[playerId].unk_6C, playerHUD[playerId].unk_6E, 0, 1.0f, (u8*) common_tlut_portrait_bomb_kart_and_question_mark, common_texture_portrait_bomb_kart, @@ -1499,14 +1499,14 @@ void func_8005A3C0(void) { switch (gPlayerCountSelection1) { case 1: if (gControllerOne->buttonPressed & R_CBUTTONS) { - if (++D_801657E4 >= 3) { - D_801657E4 = 0; + if (++gHUDModes >= 3) { + gHUDModes = 0; } - if (D_801657E4 == 2) { + if (gHUDModes == 2) { D_801657E8 = false; D_801657E6 = false; D_801657F0 = true; - } else if (D_801657E4 == 1) { + } else if (gHUDModes == 1) { D_801657E8 = false; D_801657E6 = true; D_801657F0 = false; @@ -1544,14 +1544,14 @@ void func_8005A3C0(void) { if (gModeSelection != BATTLE) { D_801657F0 = (D_801657F0 + 1) & 1; } - D_801657E4 = (D_801657E4 + 1) & 1; + gHUDModes = (gHUDModes + 1) & 1; b = true; } break; case 4: if ((gControllerOne->buttonPressed & R_CBUTTONS) || (gControllerTwo->buttonPressed & R_CBUTTONS) || (gControllerThree->buttonPressed & R_CBUTTONS) || (gControllerFour->buttonPressed & R_CBUTTONS)) { - D_801657E4 = (D_801657E4 + 1) & 1; + gHUDModes = (gHUDModes + 1) & 1; D_801657F8 = (D_801657F8 + 1) & 1; D_80165800[0] = (D_80165800[0] + 1) & 1; if (gModeSelection != BATTLE) { @@ -2610,7 +2610,7 @@ void func_8005CB60(s32 playerId, s32 lapCount) { break; case 3: /* switch 1 */ if ((D_8018D114 == 0) || (D_8018D114 == 1)) { - D_801657E4 = 0; + gHUDModes = 0; D_801657E6 = 0; D_801657F0 = 0; D_801657E8 = 1; |
