From 5054cff7e80b42321971782850f4f69eebd42030 Mon Sep 17 00:00:00 2001 From: PokeCodec Date: Wed, 26 Aug 2020 20:27:18 -0400 Subject: [PATCH] removed fakematch --- src/battle_main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/battle_main.c b/src/battle_main.c index 0ea19dfaa9..799c2f79ae 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4962,12 +4962,8 @@ static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void) } TryClearRageStatuses(); - gCurrentTurnActionNumber = 0; -{ - // something stupid needed to match - u8 zero; - gCurrentActionFuncId = gActionsByTurnOrder[(zero = 0)]; -} + gCurrentTurnActionNumber = 0; //See comment underneath + gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber]; //Should be gActionsByTurnOrder[gCurrentTurnActionNumber = 0], but that doesn't match gDynamicBasePower = 0; gBattleStruct->dynamicMoveType = 0; gBattleMainFunc = RunTurnActionsFunctions;