diff options
author | Kurausukun <lord.uber1@gmail.com> | 2020-10-22 05:45:53 -0400 |
---|---|---|
committer | Kurausukun <lord.uber1@gmail.com> | 2020-10-22 05:45:53 -0400 |
commit | 64ba8c806111ab6baa6bde485f64925c07378f89 (patch) | |
tree | 26f82c9eecc1ac7f06b47cfe5c7b433d2de88a1c /src/battle_main.c | |
parent | 9c4dddf870e4420fb7c8619071d7588b5b703367 (diff) |
port fakematch fixes from #1155
Diffstat (limited to 'src/battle_main.c')
-rw-r--r-- | src/battle_main.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 0c3e84c1e..d2763b000 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4962,11 +4962,7 @@ static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void) TryClearRageStatuses(); gCurrentTurnActionNumber = 0; -{ - // something stupid needed to match - u8 zero; - gCurrentActionFuncId = gActionsByTurnOrder[(zero = 0)]; -} + gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber]; gDynamicBasePower = 0; gBattleStruct->dynamicMoveType = 0; gBattleMainFunc = RunTurnActionsFunctions; |