diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-05 09:15:33 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-05 09:15:33 -0400 |
| commit | 6df1b9338904542d653849439bce2ff16c36cc09 (patch) | |
| tree | 4e6224f0ca47ec072c6d6f04e7259d9d24bcd7a7 /constants.asm | |
| parent | 059680a04dc065b14800b0327c4aa2ce6176befa (diff) | |
| parent | 1a7f8044799a2d52c1124c7e791ca423449df00b (diff) | |
Merge branch 'master' into clean_shim
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/constants.asm b/constants.asm index d758d4b..9312d05 100644 --- a/constants.asm +++ b/constants.asm @@ -13,6 +13,7 @@ INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/pokemon_data_constants.asm" INCLUDE "constants/move_constants.asm" INCLUDE "constants/item_constants.asm" +INCLUDE "constants/item_data_constants.asm" INCLUDE "constants/trainer_constants.asm" INCLUDE "constants/trainer_data_constants.asm" INCLUDE "constants/sprite_constants.asm" @@ -23,3 +24,5 @@ INCLUDE "constants/music_constants.asm" INCLUDE "constants/serial_constants.asm" INCLUDE "constants/misc_constants.asm" + +INCLUDE "constants/battle_anim_constants.asm" |