summaryrefslogtreecommitdiff
path: root/constants.asm
diff options
context:
space:
mode:
authorJimB16 <f1@jimb.de>2015-10-26 03:26:53 +0100
committerJimB16 <f1@jimb.de>2015-10-26 03:26:53 +0100
commit9a9cb38e39c991e102a1c6da7e8e16b2a1c61e07 (patch)
tree46c064628b3d8015da22d6396b3c711e80646745 /constants.asm
parent3b9a3cc3bee8934e45f5e4d3fd9704b3fa619560 (diff)
parent0d17d4a75866d053f5e0b48c66deb2508071d98b (diff)
merge with newest update
Diffstat (limited to 'constants.asm')
-rw-r--r--constants.asm3
1 files changed, 3 insertions, 0 deletions
diff --git a/constants.asm b/constants.asm
index 2d3c19fa2..1c3791396 100644
--- a/constants.asm
+++ b/constants.asm
@@ -10,6 +10,7 @@ INCLUDE "constants/type_constants.asm"
INCLUDE "constants/move_constants.asm"
INCLUDE "constants/battle_constants.asm"
INCLUDE "constants/map_constants.asm"
+INCLUDE "constants/map_setup_constants.asm"
INCLUDE "constants/landmark_constants.asm"
INCLUDE "constants/item_constants.asm"
INCLUDE "constants/trainer_constants.asm"
@@ -26,3 +27,5 @@ INCLUDE "constants/misc_constants.asm"
INCLUDE "constants/std_constants.asm"
INCLUDE "constants/deco_constants.asm"
INCLUDE "constants/radio_constants.asm"
+INCLUDE "constants/sprite_constants.asm"
+INCLUDE "constants/tilemap_constants.asm"