diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-03-04 14:11:26 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-04 14:11:26 -0600 |
| commit | 29e51811f411dfeae825e6c0c259ffa3f9ac08b2 (patch) | |
| tree | d6e48a855ac49f1b7f0257e2de405b627f48a3bf /include/battle_util.h | |
| parent | 0a9f0d80f5f3d1cf02ae26a7bad1d771f8dedc52 (diff) | |
| parent | 1f052cc08d224e8e397a2aed23aa2f05f50e474f (diff) | |
Merge pull request #225 from DizzyEggg/clear_battle_files
Clean some battle files
Diffstat (limited to 'include/battle_util.h')
| -rw-r--r-- | include/battle_util.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/battle_util.h b/include/battle_util.h index d992faa47..e5c1aaf18 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -49,36 +49,36 @@ void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move); void PressurePPLoseOnUsingPerishSong(u8 bankAtk); void PressurePPLoseOnUsingImprision(u8 bankAtk); void MarkAllBattlersForControllerExec(void); // unused -void MarkBattlerForControllerExec(u8 bank); +void MarkBattlerForControllerExec(u8 battlerId); void sub_803F850(u8 arg0); -void CancelMultiTurnMoves(u8 bank); -bool8 WasUnableToUseMove(u8 bank); -void PrepareStringBattle(u16 stringId, u8 bank); +void CancelMultiTurnMoves(u8 battlerId); +bool8 WasUnableToUseMove(u8 battlerId); +void PrepareStringBattle(u16 stringId, u8 battlerId); void ResetSentPokesToOpponentValue(void); -void sub_803F9EC(u8 bank); -void sub_803FA70(u8 bank); +void sub_803F9EC(u8 battlerId); +void sub_803FA70(u8 battlerId); void BattleScriptPush(const u8* bsPtr); void BattleScriptPushCursor(void); void BattleScriptPop(void); u8 TrySetCantSelectMoveBattleScript(void); -u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check); +u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check); bool8 AreAllMovesUnusable(void); -u8 GetImprisonedMovesCount(u8 bank, u16 move); +u8 GetImprisonedMovesCount(u8 battlerId, u16 move); u8 UpdateTurnCounters(void); u8 TurnBasedEffects(void); bool8 HandleWishPerishSongOnTurnEnd(void); bool8 HandleFaintedMonActions(void); void TryClearRageStatuses(void); u8 AtkCanceller_UnableToUseMove(void); -bool8 sub_80423F4(u8 bank, u8 r1, u8 r2); -u8 CastformDataTypeChange(u8 bank); -u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg); +bool8 sub_80423F4(u8 battlerId, u8 r1, u8 r2); +u8 CastformDataTypeChange(u8 battlerId); +u8 AbilityBattleEffects(u8 caseID, u8 battlerId, u8 ability, u8 special, u16 moveArg); void BattleScriptExecute(const u8* BS_ptr); void BattleScriptPushCursorAndCallback(const u8* BS_ptr); -u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn); -void ClearFuryCutterDestinyBondGrudge(u8 bank); +u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn); +void ClearFuryCutterDestinyBondGrudge(u8 battlerId); void HandleAction_RunBattleScript(void); -u8 GetMoveTarget(u16 move, u8 useMoveTarget); +u8 GetMoveTarget(u16 move, u8 setTarget); u8 IsMonDisobedient(void); #endif // GUARD_BATTLE_UTIL_H |