From a622448029e7849361d2aabcd2138ed0de207dd1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 5 Apr 2020 20:30:45 -0400 Subject: More quest log documentation amid other stuff --- src/battle_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_main.c') diff --git a/src/battle_main.c b/src/battle_main.c index d2735086f..572dda574 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; -- cgit v1.2.3 From 61a06dffe79d03c0d57f70db646655c74af7147a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 10 Apr 2020 10:57:20 -0400 Subject: Address review comments --- src/battle_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_main.c') diff --git a/src/battle_main.c b/src/battle_main.c index b74600730..f91386e6e 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -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; -- cgit v1.2.3