diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-28 18:18:51 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 18:18:51 -0600 |
| commit | c0357cea46635ec3867d18e43b341fb7a4a2fef2 (patch) | |
| tree | ba33bf4088bb73a504d24924c609fd40d63a41ca /include/battle_script_commands.h | |
| parent | bcef4e7d1c20bad3d4631c5a8314a8de8da80e49 (diff) | |
| parent | 20baa1bc7a8cdf7ba5e88384b26b352e0f488afa (diff) | |
Merge pull request #222 from DizzyEggg/decompile_battle_link_817C95C
Decompile battle_tv previously known as battle_link_817C95C
Diffstat (limited to 'include/battle_script_commands.h')
| -rw-r--r-- | include/battle_script_commands.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index 6c84d1f0f..142ac1f7b 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -4,16 +4,16 @@ #define WINDOW_CLEAR 0x1 #define WINDOW_x80 0x80 -void AI_CalcDmg(u8 bankAtk, u8 bankDef); -u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef); +void AI_CalcDmg(u8 battlerIdAtk, u8 battlerIdDef); +u8 TypeCalc(u16 move, u8 battlerIdAtk, u8 battlerIdDef); u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility); -u8 GetBattlerTurnOrderNum(u8 bank); +u8 GetBattlerTurnOrderNum(u8 battlerId); void SetMoveEffect(bool8 primary, u8 certain); void BattleDestroyYesNoCursorAt(u8 cursorPosition); void BattleCreateYesNoCursorAt(u8 cursorPosition); void BufferMoveToLearnIntoBattleTextBuff2(void); void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags); -bool8 UproarWakeUpCheck(u8 bank); +bool8 UproarWakeUpCheck(u8 battlerId); extern void (* const gBattleScriptingCommandsTable[])(void); extern const u8 gUnknown_0831C494[][4]; |