summaryrefslogtreecommitdiff
path: root/data/maps/map_data.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-01-06 22:07:33 -0600
committerdannye <33dannye@gmail.com>2020-01-06 22:07:33 -0600
commite7be25948dfeef257697a7aa30706339f6ba014b (patch)
tree973d0ad95361a1dfd1c371be59a300be19532e47 /data/maps/map_data.asm
parent99d16d616d5f70754dd6aa567e478e587a733d8c (diff)
parent94ebdab6d350fd6ebfd43c5a84710ed14dade8ca (diff)
Merge branch 'master' into audio-macros
Diffstat (limited to 'data/maps/map_data.asm')
-rw-r--r--data/maps/map_data.asm2
1 files changed, 2 insertions, 0 deletions
diff --git a/data/maps/map_data.asm b/data/maps/map_data.asm
index 15ff249fe..ad29646ab 100644
--- a/data/maps/map_data.asm
+++ b/data/maps/map_data.asm
@@ -6,6 +6,8 @@ SECTION "Maps", ROMX
INCLUDE "data/maps/maps.asm"
INCLUDE "data/maps/attributes.asm"
+
INCLUDE "data/maps/blocks.asm"
+
INCLUDE "data/maps/scripts.asm"