diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_parameter.c | 4 | ||||
| -rw-r--r-- | src/code/z_player_lib.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 5a96c8a72..7760378d8 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1761,7 +1761,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) { } Interface_SetHudVisibility(HUD_VISIBILITY_B); - } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_82_08)) { + } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_PLAYING_SWORDSMAN_MINIGAME)) { // Swordsman's log minigame for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { @@ -2282,7 +2282,7 @@ void Interface_UpdateButtonsPart1(PlayState* play) { Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } else if ((gSaveContext.minigameStatus == MINIGAME_STATUS_ACTIVE) && CHECK_EVENTINF(EVENTINF_35)) { Interface_SetHudVisibility(HUD_VISIBILITY_B_MINIMAP); - } else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_82_08) && + } else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_PLAYING_SWORDSMAN_MINIGAME) && (gSaveContext.minigameStatus == MINIGAME_STATUS_ACTIVE)) { Interface_SetHudVisibility(HUD_VISIBILITY_B); } else if (play->bButtonAmmoPlusOne >= 2) { diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 85d224010..4a2889831 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -363,13 +363,13 @@ void func_80122F28(Player* player) { } } -bool func_80122F9C(PlayState* play) { +bool Player_IsBackJumping(PlayState* play) { Player* player = GET_PLAYER(play); return (player->stateFlags2 & PLAYER_STATE2_80000) && (player->av1.actionVar1 == 2); } -bool func_80122FCC(PlayState* play) { +bool Player_IsSideJumping(PlayState* play) { Player* player = GET_PLAYER(play); return (player->stateFlags2 & PLAYER_STATE2_80000) && |