diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-28 17:38:07 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-28 17:38:07 +0200 |
| commit | 6d4d58a8a7759517b327a4017e05332888662e84 (patch) | |
| tree | 472c89d23c6e93395761e07b381cfe9480c2e099 /include | |
| parent | 7273b8f26277e3f9a1b562454e2e7f88e5523731 (diff) | |
rename battle4 and battleai
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 3 | ||||
| -rw-r--r-- | include/battle_ai_script_commands.h (renamed from include/battle_ai.h) | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/battle.h b/include/battle.h index 158ae46b2..67d3d873d 100644 --- a/include/battle.h +++ b/include/battle.h @@ -898,7 +898,7 @@ void sub_80458B4(void); u8 GetMoveTarget(u16 move, u8 useMoveTarget); u8 IsPokeDisobedient(void); -// battle_4 +// battle_script_commands void AI_CalcDmg(u8 bankAtk, u8 bankDef); u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef); u8 AI_TypeCalc(u16 move, u16 species, u8 ability); @@ -910,6 +910,7 @@ void BufferMoveToLearnIntoBattleTextBuff2(void); void sub_8056A3C(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags); bool8 UproarWakeUpCheck(u8 bank); +extern void (* const gBattleScriptingCommandsTable[])(void); extern const u8 gUnknown_0831C494[]; // battle_5 diff --git a/include/battle_ai.h b/include/battle_ai_script_commands.h index 2a315059b..5fb422b41 100644 --- a/include/battle_ai.h +++ b/include/battle_ai_script_commands.h @@ -1,5 +1,5 @@ -#ifndef GUARD_BATTLE_AI_H -#define GUARD_BATTLE_AI_H +#ifndef GUARD_BATTLE_AI_SCRIPT_COMMANDS_H +#define GUARD_BATTLE_AI_SCRIPT_COMMANDS_H void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves); void BattleAI_SetupAIData(u8 defaultScoreMoves); @@ -10,4 +10,4 @@ void ClearBankAbilityHistory(u8 bank); void RecordItemEffectBattle(u8 bank, u8 itemEffect); void ClearBankItemEffectHistory(u8 bank); -#endif // GUARD_BATTLE_AI_H +#endif // GUARD_BATTLE_AI_SCRIPT_COMMANDS_H |