summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPokeCodec <doremylover456@gmail.com>2020-08-26 20:27:18 -0400
committerPokeCodec <doremylover456@gmail.com>2020-08-26 20:30:04 -0400
commit5054cff7e80b42321971782850f4f69eebd42030 (patch)
treef890ec97185d158b134f491cf53ca727986d8f6b /src
parent47e8a76f1e67361f0cca6d79da783938353e9d35 (diff)
removed fakematch
Diffstat (limited to 'src')
-rw-r--r--src/battle_main.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/battle_main.c b/src/battle_main.c
index 0ea19dfaa..799c2f79a 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;