diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-27 10:27:36 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-27 10:27:36 +0800 |
| commit | ca130a8aeb39d05340495766a1f33dc854f6b4a1 (patch) | |
| tree | 37613c40377ae380446a62c7cfda0ed8c4175e5a /include/constants | |
| parent | a61be4c32d8b81bd0ee414f44e1b0c9095778148 (diff) | |
thru atkc0
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/battle.h | 2 | ||||
| -rw-r--r-- | include/constants/battle_script_commands.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/constants/battle.h b/include/constants/battle.h index f524a7643..b9026262a 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -174,7 +174,7 @@ #define HITMARKER_GRUDGE 0x01000000 #define HITMARKER_OBEYS 0x02000000 #define HITMARKER_x4000000 0x04000000 -#define HITMARKER_x8000000 0x08000000 +#define HITMARKER_CHARGING 0x08000000 #define HITMARKER_FAINTED(battler) (gBitTable[battler] << 0x1C) #define HITMARKER_UNK(battler) (0x10000000 << battler) diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index 32d656673..3809610ba 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -39,13 +39,13 @@ #define BS_EFFECT_BATTLER 2 #define BS_FAINTED 3 #define BS_BATTLER_0 7 -#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_status_icon_update +#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_updatestatusicon #define BS_ATTACKER_SIDE 8 // for atk1E_jumpifability #define BS_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability #define BS_SCRIPTING 10 #define BS_PLAYER1 11 #define BS_OPPONENT1 12 -#define BS_PLAYER2 13 +#define BS_PLAYER2 13 // for atk98_updatestatusicon #define BS_OPPONENT2 14 // atk 01, accuracy calc |