diff options
| author | Garak <garakmon@gmail.com> | 2018-08-07 22:21:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 22:21:10 -0400 |
| commit | 96ab357bedfb7d4e07a52b518e2bd02375b1f5f5 (patch) | |
| tree | 92c8775f554e682a05c5995c7baa2d130ebd8aa3 /include/constants/battle_script_commands.h | |
| parent | 1ab872c68e951837b6925dbbdf25c4e8d0b63c82 (diff) | |
| parent | 85ebd76cd03e1ee84f182585060b3a79b8653e85 (diff) | |
Merge pull request #3 from pret/master
syncing with source repo
Diffstat (limited to 'include/constants/battle_script_commands.h')
| -rw-r--r-- | include/constants/battle_script_commands.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index c820a1114..84ec9d512 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -17,7 +17,7 @@ #define sB_ANIM_TURN gBattleScripting + 0x18 #define sB_ANIM_TARGETS_HIT gBattleScripting + 0x19 #define sSTATCHANGER gBattleScripting + 0x1A -#define sFIELD_1B gBattleScripting + 0x1B +#define sSTAT_ANIM_PLAYED gBattleScripting + 0x1B #define sGIVEEXP_STATE gBattleScripting + 0x1C #define sBATTLE_STYLE gBattleScripting + 0x1D #define sLVLBOX_STATE gBattleScripting + 0x1E @@ -91,7 +91,16 @@ // atk48 #define ATK48_STAT_NEGATIVE 0x1 #define ATK48_STAT_BY_TWO 0x2 -#define ATK48_BIT_x4 0x4 +#define ATK48_ONLY_MULTIPLE 0x4 #define ATK48_DONT_CHECK_LOWER 0x8 +#define BIT_HP 0x1 +#define BIT_ATK 0x2 +#define BIT_DEF 0x4 +#define BIT_SPEED 0x8 +#define BIT_SPATK 0x10 +#define BIT_SPDEF 0x20 +#define BIT_ACC 0x40 +#define BIT_EVASION 0x80 + #endif // GUARD_CONSTANTS_BATTLE_SCRIPT_COMMANDS_H |