diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 20:17:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 20:17:55 +0100 |
| commit | 4b7d778a5ce4c2012966bb34b706dadd860804a1 (patch) | |
| tree | 59e554a52930bf67ef3c16ea314bfbbdd7f3bdd9 /include/battle_util.h | |
| parent | 541fef5368c334559cba946f61ab3fe08bf1575b (diff) | |
| parent | 802b505d7bc4f60e6dda62c9a2a4948b8ba765df (diff) | |
move mon data fix conflicts
Diffstat (limited to 'include/battle_util.h')
| -rw-r--r-- | include/battle_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_util.h b/include/battle_util.h index 81eb85dc7..56628c11d 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -48,8 +48,8 @@ u8 GetBattleBank(u8 caseId); void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move); void PressurePPLoseOnUsingPerishSong(u8 bankAtk); void PressurePPLoseOnUsingImprision(u8 bankAtk); -void MarkAllBufferBanksForExecution(void); // unused -void MarkBufferBankForExecution(u8 bank); +void MarkAllBattlersForControllerExec(void); // unused +void MarkBattlerForControllerExec(u8 bank); void sub_803F850(u8 arg0); void CancelMultiTurnMoves(u8 bank); bool8 WasUnableToUseMove(u8 bank); |