diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
| commit | c51968f0de6b8420c141dde27339e82a42837c5b (patch) | |
| tree | 782f2b25f21adacb48fd516694b8a82864fe0b99 /constants.asm | |
| parent | c883ab4d34ecb4890010e808d6b6d533f5d8ad56 (diff) | |
| parent | 878092004956418bfd77bfdb9fc9dd7f640f80d2 (diff) | |
Merge remote-tracking branch 'origin/master' into master
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/constants.asm b/constants.asm index 16f50bb02..b8c38cc46 100644 --- a/constants.asm +++ b/constants.asm @@ -1,13 +1,12 @@ INCLUDE "macros.asm" -INCLUDE "gbhw.asm" INCLUDE "hram.asm" +INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/wram_constants.asm" INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/type_constants.asm" INCLUDE "constants/move_constants.asm" -INCLUDE "constants/effect_command_constants.asm" INCLUDE "constants/battle_constants.asm" INCLUDE "constants/map_dimension_constants.asm" INCLUDE "constants/map_constants.asm" @@ -22,6 +21,7 @@ INCLUDE "constants/music_constants.asm" INCLUDE "constants/sfx_constants.asm" INCLUDE "constants/animation_constants.asm" INCLUDE "constants/phone_constants.asm" +INCLUDE "constants/credits_constants.asm" INCLUDE "constants/gfx_constants.asm" INCLUDE "constants/input_constants.asm" INCLUDE "constants/pokemon_data_constants.asm" |