diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-08 13:27:26 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-08 13:27:26 -0500 |
| commit | ac824f62fc6bdbc63f2f9fb7bd17e4827a535f36 (patch) | |
| tree | 78eb17196fca085052cae87ae2997b0ac1b55657 /constants | |
| parent | c34264ddd89c2af4ba1370d4a2789009e9139b48 (diff) | |
More battle core labels
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_constants.asm | 2 | ||||
| -rw-r--r-- | constants/sprite_constants.asm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 99cc04d4d..804f223cb 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -98,6 +98,8 @@ const_value SET 3 const PAR const SLP ; 7 turns +ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP + ; substatus enum_start 7, -1 enum SUBSTATUS_IN_LOVE diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 209fbf59c..a017d41b0 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -219,7 +219,7 @@ NUM_SPRITEHEADER_FIELDS EQU const_value const SPRITEMOVEDATA_SUDOWOODO const SPRITEMOVEDATA_SMASHABLE_ROCK const SPRITEMOVEDATA_STRENGTH_BOULDER - const SPRITEMOVEDATA_1A + const SPRITEMOVEDATA_FOLLOWNOTEXACT const SPRITEMOVEDATA_1B const SPRITEMOVEDATA_1C const SPRITEMOVEDATA_1D @@ -254,7 +254,7 @@ SPRITEMOVEDATA_FIELDS EQU 6 const SPRITEMOVEFN_FOLLOW const SPRITEMOVEFN_SCRIPTED const SPRITEMOVEFN_STRENGTH - const SPRITEMOVEFN_12 + const SPRITEMOVEFN_FOLLOWNOTEXACT const SPRITEMOVEFN_13 const SPRITEMOVEFN_14 const SPRITEMOVEFN_BIG_SNORLAX |