summaryrefslogtreecommitdiff
path: root/data/maps/map_data.asm
diff options
context:
space:
mode:
authorThomas Winwood <twwinwood@gmail.com>2018-07-21 02:06:31 +0100
committerGitHub <noreply@github.com>2018-07-21 02:06:31 +0100
commit23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch)
tree63c20c67efbdf8334c6e273f78065b83135e3886 /data/maps/map_data.asm
parent17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff)
parent2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff)
Merge branch 'master' into the-diffening
Diffstat (limited to 'data/maps/map_data.asm')
-rw-r--r--data/maps/map_data.asm1
1 files changed, 0 insertions, 1 deletions
diff --git a/data/maps/map_data.asm b/data/maps/map_data.asm
index 2e1b7c618..15ff249fe 100644
--- a/data/maps/map_data.asm
+++ b/data/maps/map_data.asm
@@ -6,7 +6,6 @@ SECTION "Maps", ROMX
INCLUDE "data/maps/maps.asm"
INCLUDE "data/maps/attributes.asm"
-
INCLUDE "data/maps/blocks.asm"
INCLUDE "data/maps/scripts.asm"