diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-10 12:48:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-10 12:48:58 -0400 |
| commit | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (patch) | |
| tree | 331837d61614da6f73e983a7230796ace13c9ea6 /src/battle_main.c | |
| parent | a81edaba1d5e0f84336fd8a57a48b2a970171ba4 (diff) | |
| parent | 5f7ed93363db01da8667aadf47d78cb6515bb450 (diff) | |
Merge pull request #323 from PikalaxALT/various_documentation
Document various parts of the source tree
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 841985c48..f91386e6e 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -569,7 +569,7 @@ static void (*const sTurnActionsFuncsTable[])(void) = [B_ACTION_RUN] = HandleAction_Run, [B_ACTION_SAFARI_WATCH_CAREFULLY] = HandleAction_WatchesCarefully, [B_ACTION_SAFARI_BALL] = HandleAction_SafariZoneBallThrow, - [B_ACTION_SAFARI_POKEBLOCK] = HandleAction_ThrowBait, + [B_ACTION_SAFARI_BAIT] = HandleAction_ThrowBait, [B_ACTION_SAFARI_GO_NEAR] = HandleAction_ThrowRock, [B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun, [B_ACTION_OLDMAN_THROW] = HandleAction_OldManBallThrow, @@ -3260,7 +3260,7 @@ static void HandleTurnActionSelectionState(void) case B_ACTION_SAFARI_BALL: ++gBattleCommunication[gActiveBattler]; break; - case B_ACTION_SAFARI_POKEBLOCK: + case B_ACTION_SAFARI_BAIT: case B_ACTION_SAFARI_GO_NEAR: ++gBattleCommunication[gActiveBattler]; break; @@ -3771,7 +3771,7 @@ static void HandleEndTurn_FinishBattle(void) } TrySetQuestLogBattleEvent(); if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) - sub_810CB90(); + ClearRematchStateByTrainerId(); BeginFastPaletteFade(3); FadeOutMapMusic(5); gBattleMainFunc = FreeResetData_ReturnToOvOrDoEvolutions; |