summaryrefslogtreecommitdiff
path: root/constants.asm
diff options
context:
space:
mode:
authorehw <Knuckles500@gmail.com>2018-06-09 19:31:23 -0400
committerGitHub <noreply@github.com>2018-06-09 19:31:23 -0400
commit311187e6c8dcccf7ef69085f2d69cda0dc8d9ab8 (patch)
treea0bf4b69ac161ed90120d56ada6117fd015bf715 /constants.asm
parent04dbd44cb88d311081114054aaba1294db27c136 (diff)
parent38f3f4126994b19ac30eff61b912e89ed9387991 (diff)
Merge pull request #11 from pret/master
Merge master
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 cac62a5..538941e 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,3 +32,4 @@ INCLUDE "constants/misc_constants.asm"
INCLUDE "constants/battle_anim_constants.asm"
INCLUDE "constants/menu_constants.asm"
+INCLUDE "constants/wram_constants.asm"