diff options
| author | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
| commit | 973721491c38aa3014f5b28982227a618d2f6b59 (patch) | |
| tree | e01415064e6da53a471d75b2eb0113846650322b /constants.asm | |
| parent | a3c6931fa8edd09fcea678fd8d2e9988951380de (diff) | |
| parent | 0b5471f385d3cc66bb4ae7aa4191ce3af9f50cac (diff) | |
Merge remote-tracking branch 'kanzure/master' into gfx-script
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/constants.asm b/constants.asm index 183a22324..3b4fe7cd4 100644 --- a/constants.asm +++ b/constants.asm @@ -5,7 +5,6 @@ INCLUDE "gbhw.asm" INCLUDE "hram.asm" INCLUDE "constants/wram_constants.asm" - INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/type_constants.asm" INCLUDE "constants/move_constants.asm" @@ -20,7 +19,9 @@ INCLUDE "constants/engine_flags.asm" INCLUDE "constants/music_constants.asm" INCLUDE "constants/sfx_constants.asm" INCLUDE "constants/animation_constants.asm" +INCLUDE "constants/phone_constants.asm" INCLUDE "constants/gfx_constants.asm" INCLUDE "constants/pokemon_data_constants.asm" INCLUDE "constants/misc_constants.asm" INCLUDE "constants/std_constants.asm" +INCLUDE "constants/deco_constants.asm" |