diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-02 21:26:20 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-02 21:26:20 -0400 |
commit | 04883f4bf9fa6c0bf935f1aac95d5d48abe3bb30 (patch) | |
tree | 3ff95e7bbb62d0decfb9e2cba9e3d54f61013706 /constants.asm | |
parent | 956d010d59ad225bea768aec172ccb56977b1775 (diff) | |
parent | 5fb7140613d6ea00ec1964fde18418c6257c2e27 (diff) |
Merge branch 'master' into build_more_roms
Diffstat (limited to 'constants.asm')
-rw-r--r-- | constants.asm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/constants.asm b/constants.asm index d9bf703..6909def 100644 --- a/constants.asm +++ b/constants.asm @@ -9,12 +9,16 @@ INCLUDE "constants/text_constants.asm" INCLUDE "constants/type_constants.asm" INCLUDE "constants/pokedex_constants.asm" +INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/pokemon_data_constants.asm" INCLUDE "constants/move_constants.asm" INCLUDE "constants/item_constants.asm" INCLUDE "constants/trainer_constants.asm" INCLUDE "constants/trainer_data_constants.asm" +INCLUDE "constants/sprite_constants.asm" INCLUDE "constants/battle_constants.asm" INCLUDE "constants/palette_constants.asm" INCLUDE "constants/serial_constants.asm" + +INCLUDE "constants/misc_constants.asm" |