summaryrefslogtreecommitdiff
path: root/constants.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2018-06-10 10:58:08 -0400
committerGitHub <noreply@github.com>2018-06-10 10:58:08 -0400
commitbfdaa1151902023fc69c97328cf12bdd88816185 (patch)
tree7d83ac3340a0535aa85269e7247008164f9b8d7d /constants.asm
parent886ecea86b9257ba2755b4718ede90ee18dae96e (diff)
parentd89bd1ac8b1304313bae285ada7d24601cf67d09 (diff)
Merge pull request #1 from ISSOtm/master
Catch up
Diffstat (limited to 'constants.asm')
-rw-r--r--constants.asm2
1 files changed, 2 insertions, 0 deletions
diff --git a/constants.asm b/constants.asm
index 66383ba..88dd7ee 100644
--- a/constants.asm
+++ b/constants.asm
@@ -22,6 +22,7 @@ INCLUDE "constants/palette_constants.asm"
INCLUDE "constants/music_constants.asm"
INCLUDE "constants/landmark_constants.asm"
INCLUDE "constants/map_constants.asm"
+INCLUDE "constants/map_setup_constants.asm"
INCLUDE "constants/tileset_constants.asm"
INCLUDE "constants/map_data_constants.asm"
@@ -31,5 +32,6 @@ INCLUDE "constants/misc_constants.asm"
INCLUDE "constants/battle_anim_constants.asm"
INCLUDE "constants/menu_constants.asm"
+INCLUDE "constants/wram_constants.asm"
INCLUDE "constants/sgb_constants.asm"
INCLUDE "constants/map_object_constants.asm"