summaryrefslogtreecommitdiff
path: root/data/layouts
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-12-25 11:02:41 -0600
committerMarcus Huderle <huderlem@gmail.com>2018-12-25 11:46:35 -0600
commitdcbc8db6a32e70651163a132950d486d93a58254 (patch)
treed01743eafe18c60ba9c25c48ae312fa603360135 /data/layouts
parentc7971ecb20c39b5fb0b28f867af637f9e075be0f (diff)
Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)
Diffstat (limited to 'data/layouts')
-rw-r--r--data/layouts/Route111_NoMirageTower/border.bin (renamed from data/layouts/UnknownMap_08470BD8/border.bin)bin8 -> 8 bytes
-rw-r--r--data/layouts/Route111_NoMirageTower/layout.inc14
-rw-r--r--data/layouts/Route111_NoMirageTower/map.bin (renamed from data/layouts/UnknownMap_08470BD8/map.bin)bin11200 -> 11200 bytes
-rw-r--r--data/layouts/UnknownMap_08470BD8/layout.inc15
4 files changed, 14 insertions, 15 deletions
diff --git a/data/layouts/UnknownMap_08470BD8/border.bin b/data/layouts/Route111_NoMirageTower/border.bin
index 4531975c7..4531975c7 100644
--- a/data/layouts/UnknownMap_08470BD8/border.bin
+++ b/data/layouts/Route111_NoMirageTower/border.bin
Binary files differ
diff --git a/data/layouts/Route111_NoMirageTower/layout.inc b/data/layouts/Route111_NoMirageTower/layout.inc
new file mode 100644
index 000000000..acd390ada
--- /dev/null
+++ b/data/layouts/Route111_NoMirageTower/layout.inc
@@ -0,0 +1,14 @@
+Route111_NoMirageTower_MapBorder::
+ .incbin "data/layouts/Route111_NoMirageTower/border.bin"
+
+Route111_NoMirageTower_MapBlockdata::
+ .incbin "data/layouts/Route111_NoMirageTower/map.bin"
+
+ .align 2
+Route111_NoMirageTower_Layout::
+ .4byte 0x28
+ .4byte 0x8C
+ .4byte Route111_NoMirageTower_MapBorder
+ .4byte Route111_NoMirageTower_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mauville
diff --git a/data/layouts/UnknownMap_08470BD8/map.bin b/data/layouts/Route111_NoMirageTower/map.bin
index 0f7bbb958..0f7bbb958 100644
--- a/data/layouts/UnknownMap_08470BD8/map.bin
+++ b/data/layouts/Route111_NoMirageTower/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_08470BD8/layout.inc b/data/layouts/UnknownMap_08470BD8/layout.inc
deleted file mode 100644
index 671127587..000000000
--- a/data/layouts/UnknownMap_08470BD8/layout.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-UnknownMap_08470BD8_MapBorder::
- .incbin "data/layouts/UnknownMap_08470BD8/border.bin"
-
-UnknownMap_08470BD8_MapBlockdata::
- .incbin "data/layouts/UnknownMap_08470BD8/map.bin"
-
- .align 2
-UnknownMap_08470BD8_Layout::
- .4byte 0x28
- .4byte 0x8C
- .4byte UnknownMap_08470BD8_MapBorder
- .4byte UnknownMap_08470BD8_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mauville
-