summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/maps/FallarborTown_LeftoverRSContestHall/border.bin1
-rw-r--r--data/maps/FallarborTown_LeftoverRSContestHall/map.bin1
-rw-r--r--data/maps/FallarborTown_LeftoverRSContestLobby/border.bin1
-rw-r--r--data/maps/FallarborTown_LeftoverRSContestLobby/map.bin1
-rw-r--r--data/maps/UnknownMap_08417FC4/border.bin1
-rw-r--r--data/maps/UnknownMap_08417FC4/map.bin1
-rw-r--r--data/maps/UnknownMap_08428450/border.bin1
-rw-r--r--data/maps/UnknownMap_08428450/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_084294C4/border.bin1
-rw-r--r--data/maps/UnknownMap_084294C4/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_084294E8/border.bin1
-rw-r--r--data/maps/UnknownMap_084294E8/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E6C0/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E6C0/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E6E4/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E6E4/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E708/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E708/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E72C/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E72C/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E750/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E750/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E774/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E774/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E798/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E798/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E7BC/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E7BC/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E7E0/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E7E0/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E804/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E804/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E828/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E828/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E84C/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E84C/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E870/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E870/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E894/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E894/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_08447028/border.bin1
-rw-r--r--data/maps/UnknownMap_08447028/map.bin3
-rw-r--r--data/maps/UnknownMap_0845A394/border.bin1
-rw-r--r--data/maps/UnknownMap_0845A394/map.binbin0 -> 724 bytes
-rw-r--r--data/maps/UnknownMap_0845D470/border.bin1
-rw-r--r--data/maps/UnknownMap_0845D470/map.bin1
-rw-r--r--data/maps/UnknownMap_0845ECB4/border.bin1
-rw-r--r--data/maps/UnknownMap_0845ECB4/map.bin1
-rw-r--r--data/maps/UnknownMap_08469200/border.bin1
-rw-r--r--data/maps/UnknownMap_08469200/map.bin12
-rw-r--r--data/maps/UnknownMap_084693AC/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/UnknownMap_084693AC/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_08470BD8/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/UnknownMap_08470BD8/map.binbin0 -> 11200 bytes
-rw-r--r--data/maps/UnknownMap_08480DAC/border.bin1
-rw-r--r--data/maps/UnknownMap_08480DAC/map.binbin0 -> 340 bytes
-rw-r--r--data/maps/UnknownMap_08480F54/border.bin1
-rw-r--r--data/maps/UnknownMap_08480F54/map.bin1
-rw-r--r--data/maps/UnknownMap_084810FC/border.bin1
-rw-r--r--data/maps/UnknownMap_084810FC/map.bin1
-rw-r--r--data/maps/UnknownMap_084812A4/border.bin1
-rw-r--r--data/maps/UnknownMap_084812A4/map.bin1
-rw-r--r--data/maps/UnknownMap_0848144C/border.bin1
-rw-r--r--data/maps/UnknownMap_0848144C/map.bin1
-rw-r--r--data/maps/UnknownMap_084815F4/border.bin1
-rw-r--r--data/maps/UnknownMap_084815F4/map.bin1
-rw-r--r--data/maps/UnknownMap_08481B24/border.bin1
-rw-r--r--data/maps/UnknownMap_08481B24/map.bin1
-rw-r--r--data/maps/UnknownMap_08481DBC/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/UnknownMap_08481DBC/map.bin2
-rw-r--r--data/maps/_assets.inc921
-rw-r--r--data/maps/scripts/BattleFrontier_BattlePyramidEmptySquare.inc473
-rw-r--r--data/tilesets/headers.inc2
73 files changed, 1268 insertions, 188 deletions
diff --git a/data/maps/FallarborTown_LeftoverRSContestHall/border.bin b/data/maps/FallarborTown_LeftoverRSContestHall/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/FallarborTown_LeftoverRSContestHall/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/FallarborTown_LeftoverRSContestHall/map.bin b/data/maps/FallarborTown_LeftoverRSContestHall/map.bin
new file mode 100644
index 000000000..d65e7c489
--- /dev/null
+++ b/data/maps/FallarborTown_LeftoverRSContestHall/map.bin
@@ -0,0 +1 @@
+/////////////////////nnn€€€bbbbbbbbbbbbbbbbbbbbb 2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2"2(2`2`2              f2`2*2(2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2*2(2`2`2$%2%2hiiiiiiij%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q2�2qwBqr%2%2&f2`2*2(2`2`2$%2%2pq2q2q2‰2q2qq2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2*2(2`2`2$%2%2xyyk2l2m2yyz%2%2&f2`2*2(2`2`222222s2t2u222222f2`2*2(2`2`26s2t2u26f2`2*2(2`2`2Æ2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2*2(2`2J2`2`2J2`2`2`2`2`2`2`2`2`2J2`2`2J2`2*2(2`2R6`2`2R6`2`2`2`2`2`2`2R6`2`2R6`2*2 \ No newline at end of file
diff --git a/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin b/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin b/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin
new file mode 100644
index 000000000..87407546a
--- /dev/null
+++ b/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin
@@ -0,0 +1 @@
+[\]ÊËNËÊMÊÊÊÊÊÊcdeÌbVbÌbbÉbTb 2!2!2ÐÑ2Ò2Ó2ÔU2!2!2!2!2!2"2(2`2`2ØÙÚÛÜf2`2Ý`2`2`292(2`2`2Æ2_2_2_2_2g2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2Ý`292(2`2`2`2`2`2`2`2`2`2`2`2A2 \ No newline at end of file
diff --git a/data/maps/UnknownMap_08417FC4/border.bin b/data/maps/UnknownMap_08417FC4/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/UnknownMap_08417FC4/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_08417FC4/map.bin b/data/maps/UnknownMap_08417FC4/map.bin
new file mode 100644
index 000000000..17a14a8d5
--- /dev/null
+++ b/data/maps/UnknownMap_08417FC4/map.bin
@@ -0,0 +1 @@
+pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…Ó0000000000000Ô0†ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…0000000 0 0 000000Ô0†ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…0000000 0 0 0 0 0 0 0 000Ô0†ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…s00Æ000 0 0 0 0 0 0 0 0 0 000r†pppppppppppppppppppppppppppppppppppppppppppppppppppppppp…0000ÆÆÆ00 0 0 0 0 0 0 0 0 0 0 0000Ô0†ppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppp…0000ÆÆÆÆ00 0 0 0 0 0 0 0 0 0 0 0 0000Ô0†ppppPQppppppppppppppppppppppr´qkllmq´vppppuvppppPQprs000ÆÆÆÆÆ000 0 0 0 0 0 0 0 0 0 0 01110utpPQXYpppppr{{{{{{{vpppppppu´qk´qquqq|uvpp}~pu{vXYrss000ÆÆ0000000 0 0 0 0 0 0 0 1 5 10uutXYpuvpu{{´qklllmq´vppppuv‚‰q{|||}qt„}~pppppzq|­}sss0000000000ÆÆ4Æ400 0 0 0 0 01110uuu~¯p}~pzqqqk¾klm¾mq´vppp}~p‚y‰qqqty„ppu{{vpp‚y„µfsss00000000000ÆÆÆ4Æ4Æ4Æ400 0 0 00000uuug·ppuvzqqqsq{|}quqq|ppPQpppp‚yyy„ppppzqq|puvppµfsss00000000000ÆÆ4Æ4Æ4Æ4Æ4Æ40 000000uuug·uv}~‚‰qq{‰qqqt}qt„ppXYpppuvppppppuv‚yy„p}~ppµfss{|||‰00000000Æ4Æ4Æ4Æ4Æ4Æ4Æ400t|||}uug·}~ppp‚y‰q{|||}qt„puv{vppp}~pppppp}~pppPQppppµfs{©©©‰s0000000004Æ4Æ4Æ4Æ4Æ4Æ400ut©©©}ug·ppppPQp‚y‘‘‘‘‘y„pp}~q|ppppppppppPQppppXYppuvµf{©©©‰ss0000000000Æ4Æ4Æ4Æ44400uut©©©}g·ppppXYppppppppuvppppy„ppppppppppXYpppppppp}~µn‘‘‘‰ss{|||‰0000004444t|||}uut‘‘‘o·puvppppppppppp}~ppppppppppppppppppppppppuvppµ�1$1$1$1ˆs{©©©‰{||‰0000t||}t©©©}ur$1$1$1Ÿ1·p}~pppppuvppppppppppppuvpppppppppppppppp}~ppµ¥1¦1�1$1ˆ{©©©‰{©©‰{|22|}t©©}t©©©}r$1$1$1Ÿ1·pppppppp}~pppppppppppp}~u{vpppppppuvppppppppµž1ž1�1$1�‘‘‘‰{©©‰{©©22©©}t©©}t‘‘‘’$1$1$1Ÿ1·ppppppppppppppppppppuvppzt„ppppppp}~ppppppppµž1ž1�1$1$1$1"10x‘‘‰{©©©22©©©}t‘‘z00 1$1$1$1Ž1§1·pppppppppppppppppppp}~pp‚„pppppppppppppppppp½¾£¥1¦1�1$1"10000x‘‘‘‘22‘‘‘‘z00000 1$1$1Ž1§1¤¿ppppppppppppppppppppppppppppppppppppppppppppppµž1ž1�1$1$1100000000000000000001$1$1Ž1§1ž1·pppppppppppppppppppppppppppppppppppppppppppppppµž1ž1�1$1$1!11000000000000000011$1$1Ž1§1ž1¤¿pppppppppppppppppppppppppppppppppppppppppppppppµž1ž1¥1�1$1$1!11100000000000111$1$1$1$1Ÿ1ž1ž1·ppppppppppppppppppppppppppppppppppppppppppppppppµž1ž1ž1�1$1$1$1$1"100000000011$1$1$1$1$1$1Ž1§1ž1ž1·pppppppppppppppppppppppppppppppppppppppppppppppp½¾£ž1¥1¦1�1$1$1$1111111111$1$1$1$1$1$1$1$1Ÿ1ž1¤¾¿pppppppppPQpppppppuvppppppppppppppppppppppppppppppµž1ž1ž1�1$1$1$1$1$1$1$1$1$1$1$1$1$1$1Ž1¦1¦1¦1¦1¦1§1ž1·ppppppppPQpXYppr{{{v}~ppu{{vpppppppppppppppppppppppp½£ž1ž1¥1¦1�1$1$1$1$1$1$1$1$1$1$1$1$1Ÿ1ž1ž1ž1¤¾¾¾¿ppppppppXYpppr{´qqq´vpuv´qq|pppppppppppppppppppppppppµž1ž1ž1ž1¥1¦1¦1¦1¦1¦1¦1¦1¦1¦1¦1¦1¦1§1ž1ž1¤¿ppppppppppppppu{{´qqqqqq´v}~qqt„pPQpppppppppppppppppppppp½¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¿ppppppppppuvppp‚‰qqqqqqqqq´vpyy„uvXYPQu{vpuvpppppppPQppppppppppppppppppppppppppppppppppppp}~pppp‚y‰qqqqqqty„pppp}~ppXY‚y„p}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vpp‚yyyyyy„PQpppppppppppppuvpPQpppuvppzqqq´{vp}~ppppppuvppppppppppppppXYp}~p‚‰qq´vpppppppppXYupppppppppppp}~pXYu{v}~uv‚yy‰qq´vpuvpppPQ}~pppppppPQppppr{{{vppp‚‰ty„ppppppppppp}pppppPQppppppppppzq|pp}~ppp‚yyy„p}~PQpXYppu{{vpuvXYppr{´qkm´vppp‚„pppppppppppppppppppXYpppppppppp‚y„pppppppppppppppXYuvppp‚‰q´v}~pu{{´klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~pppp‚yy„ppp‚‰qq{|}qqt„ppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQp‚yy‘‘‘yy„pppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_08428450/border.bin b/data/maps/UnknownMap_08428450/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_08428450/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08428450/map.bin b/data/maps/UnknownMap_08428450/map.bin
new file mode 100644
index 000000000..ca93fa0e2
--- /dev/null
+++ b/data/maps/UnknownMap_08428450/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_084294C4/border.bin b/data/maps/UnknownMap_084294C4/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_084294C4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_084294C4/map.bin b/data/maps/UnknownMap_084294C4/map.bin
new file mode 100644
index 000000000..37f05b971
--- /dev/null
+++ b/data/maps/UnknownMap_084294C4/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_084294E8/border.bin b/data/maps/UnknownMap_084294E8/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_084294E8/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_084294E8/map.bin b/data/maps/UnknownMap_084294E8/map.bin
new file mode 100644
index 000000000..ca93fa0e2
--- /dev/null
+++ b/data/maps/UnknownMap_084294E8/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E6C0/border.bin b/data/maps/UnknownMap_0843E6C0/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E6C0/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E6C0/map.bin b/data/maps/UnknownMap_0843E6C0/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E6C0/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E6E4/border.bin b/data/maps/UnknownMap_0843E6E4/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E6E4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E6E4/map.bin b/data/maps/UnknownMap_0843E6E4/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E6E4/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E708/border.bin b/data/maps/UnknownMap_0843E708/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E708/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E708/map.bin b/data/maps/UnknownMap_0843E708/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E708/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E72C/border.bin b/data/maps/UnknownMap_0843E72C/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E72C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E72C/map.bin b/data/maps/UnknownMap_0843E72C/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E72C/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E750/border.bin b/data/maps/UnknownMap_0843E750/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E750/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E750/map.bin b/data/maps/UnknownMap_0843E750/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E750/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E774/border.bin b/data/maps/UnknownMap_0843E774/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E774/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E774/map.bin b/data/maps/UnknownMap_0843E774/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E774/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E798/border.bin b/data/maps/UnknownMap_0843E798/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E798/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E798/map.bin b/data/maps/UnknownMap_0843E798/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E798/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E7BC/border.bin b/data/maps/UnknownMap_0843E7BC/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E7BC/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E7BC/map.bin b/data/maps/UnknownMap_0843E7BC/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E7BC/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E7E0/border.bin b/data/maps/UnknownMap_0843E7E0/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E7E0/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E7E0/map.bin b/data/maps/UnknownMap_0843E7E0/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E7E0/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E804/border.bin b/data/maps/UnknownMap_0843E804/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E804/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E804/map.bin b/data/maps/UnknownMap_0843E804/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E804/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E828/border.bin b/data/maps/UnknownMap_0843E828/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E828/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E828/map.bin b/data/maps/UnknownMap_0843E828/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E828/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E84C/border.bin b/data/maps/UnknownMap_0843E84C/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E84C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E84C/map.bin b/data/maps/UnknownMap_0843E84C/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E84C/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E870/border.bin b/data/maps/UnknownMap_0843E870/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E870/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E870/map.bin b/data/maps/UnknownMap_0843E870/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E870/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E894/border.bin b/data/maps/UnknownMap_0843E894/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E894/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E894/map.bin b/data/maps/UnknownMap_0843E894/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E894/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_08447028/border.bin b/data/maps/UnknownMap_08447028/border.bin
new file mode 100644
index 000000000..9e4b3fb7a
--- /dev/null
+++ b/data/maps/UnknownMap_08447028/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08447028/map.bin b/data/maps/UnknownMap_08447028/map.bin
new file mode 100644
index 000000000..028da0526
--- /dev/null
+++ b/data/maps/UnknownMap_08447028/map.bin
@@ -0,0 +1,3 @@
+22222222222222222222222222222222222222222222222222222222222222222222222222662222222222222222222222222222222222222222222222226666 ò ò ò ò662222222222222222222222222òòòòòò ò ò ò òòòò ò ò
+ò2266662òòòòBBBBòò2222222222222222222222222666666BBBB66BBBB222222266666622222g2g2g2g2g2g2g2g22222222222202GG2NdedeOKLQ2$%&'22222g2g2g2g2g2g2g2g222222222222822222:$!&'2 !"#:VcccWcSTa2222222g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2H2222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f222222222222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222ò ò ò
+òIIIIB^_______Y222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222BBBB222222222222222222222222222222222222222222222822CEED22()*G22 ò ò ò ò22222222222222222222222222228223522 %"#:2BBBB222222222222222222222222222282235222:2+,-222222222222222222222222222222822GG2222222:2$%&'222222222222222222222222222222822222r2222H2<<222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282222q2222p222222222222222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282h2h2h2h2k2222s22CIIIIIID2222222222222222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2i22i2i22222235222:22222222222222222222222282222222222235222:22222222222222222222222282222222235222:222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845A394/border.bin b/data/maps/UnknownMap_0845A394/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/maps/UnknownMap_0845A394/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845A394/map.bin b/data/maps/UnknownMap_0845A394/map.bin
new file mode 100644
index 000000000..fd294d9b6
--- /dev/null
+++ b/data/maps/UnknownMap_0845A394/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0845D470/border.bin b/data/maps/UnknownMap_0845D470/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/UnknownMap_0845D470/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845D470/map.bin b/data/maps/UnknownMap_0845D470/map.bin
new file mode 100644
index 000000000..cd136de41
--- /dev/null
+++ b/data/maps/UnknownMap_0845D470/map.bin
@@ -0,0 +1 @@
+qqqqqqqqqqqt||}ut©|}€˜pppš�{‰qs{‰$1â4$1$1$1$1â4$1$1uuqu�pppppppppppppqqqqqqqqt||}qqt}u€‰‰˜pppppš�{‰{‰s$1$1$1$1$1$1$1$1t}ut}�ppppppppppppp||||||||}qqqt|}t}�pppppppppš�sqs{‰$1$1$1â4$1t|}quu€˜pppppppppppppqqqqqt©©©|||}qt}€˜pppppppppPesq{‰{‰â4$1$1t}qt|}u�ppppppppppppppqqt||}qqqt©©©|}€˜ppppppppppXm{‰q{‰{|||}qt}t|}�pppppppppppppp||}qt©|||}€‰‰‰‰˜ppuvpppppPQpš�{‰q{©©Ÿ©©|}qu€‰˜pppppppppppppp©©©|}€‰‰‰‰˜uvpu{vp}~pppppXYppš�{|©©©§0©©©©|}�pppppppppppppppp€‰Z[‰˜ppppp}~pzq|pppppppppPQppš‰‰�$1$1$1$1$1€‰Z[˜ppppPQpppppppppp˜pXYppppuvpppp‚y„pppppppuvXYppppp’$1$1$1$1$1�pXYu{{{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~pppppppš‰‰‰‰‰˜puv‚y‰q|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vppppppppppppp}~pp‚y„PQ}~ppppppppPQpp‚y„ppuvPQpppPQ}~pPQppzq|uvppppppppppuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYpp‚y„}~ppuvpppppu´|ppppppppu´qq´vpppppppppppXYppppp}~pppXYppppppppppp}~pppppzq|pppppppp‚yyyy„PQppppppppppppppppppppuvpppppppppppppppppuv‚y„pppppppuvppPQpXYu{pppppppppppppppppp}~u{vppppppppppppPQ}~pppppppppp}~ppXYpppzqppppppppppppppppppppzq´{vppppuvppuvXYpppppppu{vpppppPQppuv‚ypppppppppppppppppppp‚yyy„pppp}~uv}~pppppppu{´q|pppppXYpp}~pppppppppppppppppppppppppuvpppppp}~pppppppppzqqq|ppppppPQpppPQppppppppppppppppppppppp}~ppppppppppppppppp‚yyy„ppppppXYpppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvu´q|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~‚yy„pppppppppppppppppppppppppppppppppppppppppppppppppp‚yy„ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppz´vpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvpp‚‰´v}~pppppppppppPQ}~pppppppuv}~ppppppppPQ‚y{{{{tppp‚y„p}~uvp‚y„pppppppu{{vppXYpuvpppppp}~pppPQpuvppXYppqqqq´{tppppuvp}~ppuvpppppppzqq´{vppp}~uvpppu{{vppXYp}~puvpppllllmq´{{{t}~pppuv}~ppu{{vp‚‰qqq´vpppp}~ppu´qq´{{vu{{{v}~pppqqqq¿llmqq´{tppp}~ppu{´qq|uv‚yyyy„ppppppPQ‚yyy‰qq´´qqt„pppppqqqqqqq¿mqqqutppppppzqqqt„}~ppppppppppppXYpppp‚y‰qqqt„ppppPQqqqqqqqq¿llmuu{tppuv‚yyy„ppppppppppppppppppppppp‚yyy„pppppXYqqqqqqqqqqq¿¿¿l¿tp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845ECB4/border.bin b/data/maps/UnknownMap_0845ECB4/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/UnknownMap_0845ECB4/border.bin
@@ -0,0 +1 @@
+ññññ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845ECB4/map.bin b/data/maps/UnknownMap_0845ECB4/map.bin
new file mode 100644
index 000000000..ec344933f
--- /dev/null
+++ b/data/maps/UnknownMap_0845ECB4/map.bin
@@ -0,0 +1 @@
+ëùùùùùùùùùùùùùìññññññññññññòëùùùùùùùùùùùìðññññññññññññòòõ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ðøùùìñññññññññòôéõ2õ2õ2õ2õ2õ2õ2õ2õ2øùùìðñññññññññòññòõ2ö2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ððñññññññññôéêôåæçéõ2õ2õ2õ2õ2õ2õ2ððñññññññññññòñññññòõ2õ2õ2õ2õ2õ2õ2ððñññññññññññôééêññòëùù2ùùìðøìñññññññññññññòññòòõ2õ2õ2õ2õ2ððñðñññññññññññññòññòòõ2õ2õ2õ2õ2ððñøìññññññññññññòññòòõ2õ2õ2õ2õ2ðøìñðññññññññññññòñëúòëù2ùìðñðñðññññññññññññòñòëúòõ2õ2õ2ððñðñøìññññññññññëúñòòëúõ2õ2õ2ðøìøìñðññññññññññòññòòòõ2õ2õ2õ2øìðñðñøìññññññëùùúñëúòòõ2õ2õ2õ2õ2ððñðññðññññññòññññòëúò2ðøìðññðñññññùúñëùùúòëú222øìððññðññññññññòñññòò222ðððññðñññññëùùúñëùúò22222ðððññðñññññòññññòññò22222ððøùìøùùùùùòññëùúññò2ððññðññññññòñëúññëùú222ðøùìøùùùùùìúñòññëú222øùìøùùùùùìðùùúññò  222øùùùùìñððñëùùùú 222   ðñðøñò 2222222 ðñøùñò2222222222ðñññëú 2222222    #øùùìò 222    #ðò2222 #  ðò2222     ðò2222 #    ðò2222 efg  ðò222 # esdrfg ðò222efsd_ddrfgðò222qdd_d__ddpðò222qd______dpðò22222es_d____d_pðò22222 qdd______dpðò22222222#2#2bdd_d_d_dpðóóó222222222#2b_d_d_`a3a3#2ðñññóé22222222#2a3a3a3a3a3#2222ðñññóééé2222222222222ôôôñññññññññóééé222222ééôññññññññññññññññóééééééóññññññ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08469200/border.bin b/data/maps/UnknownMap_08469200/border.bin
new file mode 100644
index 000000000..c07869a9f
--- /dev/null
+++ b/data/maps/UnknownMap_08469200/border.bin
@@ -0,0 +1 @@
+ÙÙÙÙ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08469200/map.bin b/data/maps/UnknownMap_08469200/map.bin
new file mode 100644
index 000000000..67085fd37
--- /dev/null
+++ b/data/maps/UnknownMap_08469200/map.bin
@@ -0,0 +1,12 @@
+ÙÙÙÙÙÙÙÚÙÙÓáááâÚÙ2ÚÙ2Ù2ÙÙÙÙÙÓáá9áááááÔàÔàÔÙ2Ù2Ù2Ù2Ù2àááááááá9áÔÙ2Ù2Ù2Ù2Ù2ÙÙÙÙÓááâÙÙÚÙÓááâÓâÙ2Ù2Óáá9áâÓKLMÔàÔàÔàááááááááááááà9ááÔÙ2ÙÓááâÙÓáá9âÙÚÙ2Ù2Ù2ÚÙ2Ù2Ù2ÚÓáâ 
+  ØÙ2àÔàááááÔÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2 
+ ÔØÙ2áâÙÙÓáâÙáâÓááâÙ2Ù2Ù2ÚÚ 
+ Ù2Ù2%7'ØÙ2Ù2àÔÙ2Ù2Ù2Ù2àáKLMÙ2Ù2Ù2Ù2 
+ ØàáÙÙÓáâÙÓá 
+ UÙÚÓáááááâÚÙ2Ù2-?/àÔÙ2Ù2àÔ@AAAB ZÔÙ2Ù2Ù2àáÔááâÙÙÓâÙ2#$_ÓâÚÙ2Ù2Ù2Ù2Ù2Ù2Ú Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáÔÙ2àáÔÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2Ù2 Ù2Ù2ØÙÓKLMâÙ2Ù2+,_ÚÓâÙ2Ù2ÓáD2E2âÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2Ù2Ù2Ø@AAAAAAABÙ2àÓâ @AAFÙ2G\ÚÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2@AFÙ2Ù2GAAABàÔÙ2Ù2àááááD2áÔàááááááááÔÙ2Ù2âÙ%6'Ù2ÓábD2cáâÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÓábD2E2cááááÔàááááÔÙ2Ù2Ù2Ù2àááááá9ááÔØÙ2Ù2ÙÙ->/Ù2ÚÙ2ÓD2áááâÙ2Ù2Ù2ÚÓáááááááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáááÔÙàááD2ááááááÔØàáÔAAAAABÚÙ2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2ÓááááááááááááD2E2áááÔàÔÙÙÓD2áááááÔ 
+ ØàáÔàááááááâÓâÓáááááD2E2âÚÓáâÓáááááááááááD2E2ááÔØÙ2ØÙÙÚÙ2Ù2Ù2Ù2Ù2Ù2ØØÙ2Ù2ØÙ2Ù2Ù2ÓááááâÓâÙ2Ù2Ù2Ù2Ù2Ù2Ù2ÓâÚÓáâÙ2ÓáááááááááD2E2ÔÙ2ØàÔàááâ6Ù2Ù2Ù2Ù2Ù2Ù2Ø ØÙ2Ù2àáááâÙ2Óáááâ82Ù2ÓáááD2E2âÙ2ÚÚÓááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔàÔàááá9ááÔÙ2Ù2Ù2àÔÙ2Ù2àáÔÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÓáâÙ2Ù2Ù2Ù2Ù2Ù2ÓâÚÚ@AFÙ2Ù2GAAAAAAAABàÔàáááÔØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2àáÔÙ2ÓááâÙ2ÚT 
+ BÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÚÚÙ2ÓbD2E2cáQR[RSáÔÙ2Ù2àáÔTA 
+ ØØÙ2Ù2Ù2Ù2ØÙ282Ù2Ù2Ù2Ù2àÙ2;Ù2Ù2Ù2Ù2Ú^#$Ù2Ù2Ù2ÓáD2E2âÙ2ÚÚÙ2ÚÙ2Ù2Ù2Ù2Ó á!2á"ÔàááÔÙ2Ø^Ù2#$ØØÙ2Ù2Ù2Ù2àáááÔ2Ù2Ù2Ù2Ú^+,Ù2Ù2Ù2ÚÓD2E2ááâÚÙ2ÚÙ2Ù2Ù2Ù2Ú()2)2)2*óÙ2Ù2Ù2àÔØ^Ù2+,ØàÔÙ2Ù2Ù2Ù2 
+ à 
+ ÓKLM^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÓânÙ2Ù2oÚ0q0q0q02óÙ2Ù2Ù2Ù2ØØ^Ù2Ù2Ù2Ù2ØÙ2àD2E2áÔ Ù2Ú ^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÚÓbD2E2cýq0€6q0€6q0ûáÔÙ2Ù2ØØ^Ù2Ù2Ù2Ù2àááD2E2ÔØ%7'Ù2Ú%7']AAABÙ2Ù2ÚÚÙ2Ù2ÓáD2âÚÚq0q0q0q0q0q0€6q0€6q0q0q0ûáÔØØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØàááÔ-?/Ù2AABÚ-?/Ù2ÓáááD2E2âÚÙ2Ù2ÚÓD2áâÚq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØØ]ABÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2àáááÔáááâÓáááâÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2Ù2ÚÚÙ2Ù2Ù2Úq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØàáááD2E2áKLMÔàááÔÙ2Ù2Ù2Ù2àÙÙÓáâÙ2ÓáKLMáD2E2áâÓáâÚÙ2Ù2Ù2Úq0q0t||||||||||‰ÎàáÔTBÙ2Ù2Ù2 ØÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2áKLÙ2Ù2ÚTYZBÙ2Ù2ÓáâÓáâÓD2E2Íty}’““““““““”sÖáÔØ^Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2Ù2 Ù2Ù2Ú^Ù2Ù2Ù2ÚÓáâÙ2Ù2Úq0q0t}’“¢��������œ{y‰óØ^Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2Ù2Ù2%6'Ù2Ù2Ú^Ù2Ù2Ù2ÚÚk6l6l6m6Úq0q0u’¢����������¤“”sóØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔ Ù2ØÙ2Ù2Ù2Ù2->/Ù2Ù2Ú^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚ0123Úq0q0uš�������������œsóØ]AABÙ2Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2AAAABÓâ]AAAABÓâÚ89:;Úq0q0uš���˜™™™™ ����œsóà{|}~ÔÙ2Ù2Ù2Ù2ØÙ2Ù2ØÙ2Ù2Ù2Ù2ÓááâÓááááááâÓâABwÚq0q0uš��œŠ‹‹‹‹Œš���œsóTPQRSØÙ2Ù2Ù2Ù2àáD2ÔÙ2Ù2àÔÙ2Ù2ÓâÙ2ÓáâÙ2Ù2Ù2ÓáááâÙ2Ù2Ù2Ù2Ù2Úq0q0uš��œ¸¹º³»¼š���œsó^XYZ[ØÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2ÚÙ2Ù2ÚÙ2Ù2Ù2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Óýq0q0uš��œÀÁÂÅÃÄš���œsó^abvàáD2E2ÔÙ2Ù2Ù2àááÔàÔÓâÙ2Ù2ÚÓáKLMâÙ2Ù2Ù2Ù2Ù2ÓD2E2ýq0q0q0uš�œÓ0È1É1ÊÍËÌ1Ô0š��œsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àááÔÙ2Ù2Ù2ØÙ2ØâÙ2Ù2ÓâÚTYZBÙ2Ù2Ù2Ù2Óýq0q0q0q0q0q0uš�œ000000010š��œsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2222à9áÔØÙ2ØÙ2Ù2Ù2ÚÙ2Ú^Ù2Ù2Ù2Ù2Óýq0q0q0q0q0q0t}š�œ00000010š��œsó]BÙ2Ù2@AFÙ2Ù2 222ØØÙ2ØÙ2ÓáâÓâ^Ù2Ù2Ù2Ù2Úq0tÞßD2E2yz’¢�œ00000000š��œsûááD2E2áÔNÙ2Ù2 
+ ØØÙ2ØÓâÙ2Ù2ÚÙ2^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Úq0rÖ×0000š��œ00000000š��œ{yyyD2E2‰óNÙ2Ù2ØàÔØâÓááâÙ2]BÙ2Ù2Ù2Ù2Óáýq0ræç0000š��¤““““““““¢��¤”04000póNÙ2Ù2Ù2Ù2Ù2ØÙ2ØØÙ2ÚÙ2Ù2Óáááááááýtyyz0’““““¢���������������œ00000póV@AAAAAABàÔØàÓâÙ2ÓýqtyÞßÞßyz0000š��������������������œ00000pûáááááááÔÙÙØàÔÚÙÙ2Úqqr0Ö×Ö×000000š��������������������¤“”000xyyyy‰qqqóÙÙØÙØÚÙÙ2Úqqr0æåÜÝ000000š����������������������œ00000000xÞ߉ûÔÙàÔØÚÙÙ2Úqqr000ÔÕ000000š����������������������œ000000000Ö×pqóÙÙØØÚÙÙ2Úqqr000æç000000š��������´µ¶·�°±²³�����¤““”0000Î1Ï1ÜÝpqûÔÙØØÚÙÙ2Úqqr0000000Î1Ï100š��������¼½¾¿�¸¹º»��������œ0000ÖÕÔÕpqqóÙØØÜÒÙ2ìíqr0000000Ö×00š��������ÄÅÆÇ�ÀÁÂÃ��������œ0000ÜÝÜÝpqqóÙØØÙÚÙÙÜí¿iiij000ÜÝ’“¢�������������������������¤“““”ÔÕÔÕpqqóÙØØÙÜÑÑÒÜìììí¿ij0ÔÕš�������������������������������œæåäçpëìÛÙØØÙÙÙÙÜÑÑÒÙÜìír0æçš������������������������������î©i0i0i0i0¾0óÙÐÑÛÛÙÙÙÙÙÙÙÜÑÒÙÚ¿iijš�������������������������������qqqqëìÛÐØÙÙÙÑÑÑÒÙÙÙÙÙÚÙÜìíqrš������������������������¨¨¨©qëììÛÙÙØØÙÙÙÙÙÙÜÑÒÙÙÙÜÑÑÒÜírš�������������������������qqqqqqqóÙÙÙÐÑÛØÙÙÙÙÙÙÙÙÚÙÙÙÙÙÙÚÙÚrš���������¥¦¦¦§������¨©qqqqëììÛÙÙÙØÙÙØÙÙÙÙÙÙÙÙÜÑÒÙÙÙÙÜÒÚrš�������¥¦­‘‘‘¯¦§�����qqqqqqqëÛÐÑÑÑÑÑÛÐÑÛÙÙÙÙÙÙÙÙÙÙÚÙÙÙÙÙÚÚrš������¥­‘‘‘‘‘‘‘¯§����qqqqqëìÛÙØÙÙÙÙÐÑÛÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÙÙÚÚ©¨¨¨ï��¥­‘‘‘‘‘‘‘‘‘¯§î¨©qqëììÛÙÙÙØÐÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÙÙÚÚqqqq©¨¨ªªªªªªªªªªªªª©qqqqóÙÐÑÑÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÚÜíqqqqqqqqqqqqqqqqqqqqqëììÛÙØÐÑÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÚÙÜìììììììììììììììììììììÛÙÐÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÜÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÛÙÙÙØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙ \ No newline at end of file
diff --git a/data/maps/UnknownMap_084693AC/border.bin b/data/maps/UnknownMap_084693AC/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/UnknownMap_084693AC/border.bin
Binary files differ
diff --git a/data/maps/UnknownMap_084693AC/map.bin b/data/maps/UnknownMap_084693AC/map.bin
new file mode 100644
index 000000000..a179d8997
--- /dev/null
+++ b/data/maps/UnknownMap_084693AC/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_08470BD8/border.bin b/data/maps/UnknownMap_08470BD8/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/maps/UnknownMap_08470BD8/border.bin
Binary files differ
diff --git a/data/maps/UnknownMap_08470BD8/map.bin b/data/maps/UnknownMap_08470BD8/map.bin
new file mode 100644
index 000000000..0f7bbb958
--- /dev/null
+++ b/data/maps/UnknownMap_08470BD8/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_08480DAC/border.bin b/data/maps/UnknownMap_08480DAC/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_08480DAC/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08480DAC/map.bin b/data/maps/UnknownMap_08480DAC/map.bin
new file mode 100644
index 000000000..d1277f280
--- /dev/null
+++ b/data/maps/UnknownMap_08480DAC/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_08480F54/border.bin b/data/maps/UnknownMap_08480F54/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_08480F54/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08480F54/map.bin b/data/maps/UnknownMap_08480F54/map.bin
new file mode 100644
index 000000000..f0d9c299c
--- /dev/null
+++ b/data/maps/UnknownMap_08480F54/map.bin
@@ -0,0 +1 @@
+''''''''';<=''/////////CD2E//¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½289999:½2½2½2½2½2½2½2½2@AAAAB½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2IMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2"2#2½2½2½2½2½2½2 \ No newline at end of file
diff --git a/data/maps/UnknownMap_084810FC/border.bin b/data/maps/UnknownMap_084810FC/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_084810FC/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_084810FC/map.bin b/data/maps/UnknownMap_084810FC/map.bin
new file mode 100644
index 000000000..908158cf4
--- /dev/null
+++ b/data/maps/UnknownMap_084810FC/map.bin
@@ -0,0 +1 @@
+'';<='''';<=''//CD2E////CL2E//5252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424289999:4242424242424242@AAAAB4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242IMMMMJ42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 \ No newline at end of file
diff --git a/data/maps/UnknownMap_084812A4/border.bin b/data/maps/UnknownMap_084812A4/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_084812A4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_084812A4/map.bin b/data/maps/UnknownMap_084812A4/map.bin
new file mode 100644
index 000000000..d033bc4d2
--- /dev/null
+++ b/data/maps/UnknownMap_084812A4/map.bin
@@ -0,0 +1 @@
+'';<=';<=';<='//CL2E/CD2E/CD2E/¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½289999:½2½2½2½2½2½2½2½2@AAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2IMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2 \ No newline at end of file
diff --git a/data/maps/UnknownMap_0848144C/border.bin b/data/maps/UnknownMap_0848144C/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_0848144C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0848144C/map.bin b/data/maps/UnknownMap_0848144C/map.bin
new file mode 100644
index 000000000..eeccae9ae
--- /dev/null
+++ b/data/maps/UnknownMap_0848144C/map.bin
@@ -0,0 +1 @@
+'';<=';<=';<='//CD2E/CL2E/CL2E/525252525252525265252525252626266642424242424242426262426264242424242424289999:4242424242424242@AAAAB4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242IMMMMJ42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 \ No newline at end of file
diff --git a/data/maps/UnknownMap_084815F4/border.bin b/data/maps/UnknownMap_084815F4/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_084815F4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_084815F4/map.bin b/data/maps/UnknownMap_084815F4/map.bin
new file mode 100644
index 000000000..8507a4932
--- /dev/null
+++ b/data/maps/UnknownMap_084815F4/map.bin
@@ -0,0 +1 @@
+'';<='''';<=''//CL2E////CD2E//¾2¾2¾2¾2¾2¾2¾2¾2¾26¾2¾2¾2¾2½2½2½2½2½2½2½2½26½2½2½2½2½2½2½2½28999999:½2½2½2½2½2½2@AAAAAAB½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2IMMMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2 \ No newline at end of file
diff --git a/data/maps/UnknownMap_08481B24/border.bin b/data/maps/UnknownMap_08481B24/border.bin
new file mode 100644
index 000000000..e9d1c658c
--- /dev/null
+++ b/data/maps/UnknownMap_08481B24/border.bin
@@ -0,0 +1 @@
+ÁÁÁÁ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08481B24/map.bin b/data/maps/UnknownMap_08481B24/map.bin
new file mode 100644
index 000000000..2a47bca91
--- /dev/null
+++ b/data/maps/UnknownMap_08481B24/map.bin
@@ -0,0 +1 @@
+ÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁd2d2d2­6d2d2d2­6d2d2d2­6­6­6­6­6­6­6d2d2d2­6d2d2d2­6d24242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242''''''''''m�2ž2n';<='''''''''//////////j�2ž2k/CL2E/////////52525252525252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424242424242424242[[[[[[[[[[[[[[[[[[[[[[[[[[[¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08481DBC/border.bin b/data/maps/UnknownMap_08481DBC/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/UnknownMap_08481DBC/border.bin
Binary files differ
diff --git a/data/maps/UnknownMap_08481DBC/map.bin b/data/maps/UnknownMap_08481DBC/map.bin
new file mode 100644
index 000000000..603f55c93
--- /dev/null
+++ b/data/maps/UnknownMap_08481DBC/map.bin
@@ -0,0 +1,2 @@
+'
+  +/6666-7$%655555555556555555655555565555555555655 555555 \ No newline at end of file
diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc
index 2077a74cc..b97a32cab 100644
--- a/data/maps/_assets.inc
+++ b/data/maps/_assets.inc
@@ -764,7 +764,21 @@ Route129_MapAttributes: @ 84166A4
.4byte gTileset_Mossdeep
.align 2
- .incbin "baserom.gba", 0x4166bc, 0x1920
+UnknownMapBorder_08417FC4: @ 84166BC
+ .incbin "data/maps/UnknownMap_08417FC4/border.bin"
+
+ .align 2
+UnknownMapBlockdata_08417FC4: @ 84166C4
+ .incbin "data/maps/UnknownMap_08417FC4/map.bin"
+
+ .align 2
+UnknownMapAttributes_08417FC4: @ 8417FC4
+ .4byte 0x50
+ .4byte 0x28
+ .4byte UnknownMapBorder_08417FC4
+ .4byte UnknownMapBlockdata_08417FC4
+ .4byte gTileset_General
+ .4byte gTileset_Cave
.align 2
Route131_MapBorder: @ 8417FDC
@@ -899,7 +913,7 @@ LittlerootTown_BrendansHouse_1F_MapAttributes: @ 84268CC
.4byte 0x9
.4byte LittlerootTown_BrendansHouse_1F_MapBorder
.4byte LittlerootTown_BrendansHouse_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BrendansMaysHouse
.align 2
@@ -916,7 +930,7 @@ LittlerootTown_BrendansHouse_2F_MapAttributes: @ 842697C
.4byte 0x8
.4byte LittlerootTown_BrendansHouse_2F_MapBorder
.4byte LittlerootTown_BrendansHouse_2F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BrendansMaysHouse
.align 2
@@ -933,7 +947,7 @@ LittlerootTown_MaysHouse_1F_MapAttributes: @ 8426A64
.4byte 0x9
.4byte LittlerootTown_MaysHouse_1F_MapBorder
.4byte LittlerootTown_MaysHouse_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BrendansMaysHouse
.align 2
@@ -950,7 +964,7 @@ LittlerootTown_MaysHouse_2F_MapAttributes: @ 8426B14
.4byte 0x8
.4byte LittlerootTown_MaysHouse_2F_MapBorder
.4byte LittlerootTown_MaysHouse_2F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BrendansMaysHouse
.align 2
@@ -967,7 +981,7 @@ LittlerootTown_ProfessorBirchsLab_MapAttributes: @ 8426C88
.4byte 0xd
.4byte LittlerootTown_ProfessorBirchsLab_MapBorder
.4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Lab
.align 2
@@ -992,7 +1006,7 @@ VerdanturfTown_House_MapAttributes: @ 8426D5C
.4byte 0x9
.4byte OldaleTown_House1_MapBorder
.4byte OldaleTown_House1_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1020,7 +1034,7 @@ VerdanturfTown_FriendshipRatersHouse_MapAttributes: @ 8426E2C
.4byte 0x8
.4byte OldaleTown_House2_MapBorder
.4byte OldaleTown_House2_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1051,7 +1065,7 @@ VerdanturfTown_PokemonCenter_1F_MapAttributes: @ 8426F48
.4byte 0x9
.4byte OldaleTown_PokemonCenter_1F_MapBorder
.4byte OldaleTown_PokemonCenter_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_PokemonCenter
.align 2
@@ -1084,7 +1098,7 @@ VerdanturfTown_PokemonCenter_2F_MapAttributes: @ 8427080
.4byte 0xa
.4byte OldaleTown_PokemonCenter_2F_MapBorder
.4byte OldaleTown_PokemonCenter_2F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_PokemonCenter
.align 2
@@ -1113,7 +1127,7 @@ VerdanturfTown_Mart_MapAttributes: @ 8427150
.4byte 0x8
.4byte OldaleTown_Mart_MapBorder
.4byte OldaleTown_Mart_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Shop
.align 2
@@ -1132,7 +1146,7 @@ Route111_OldLadysRestStop_MapAttributes: @ 8427210
.4byte 0x8
.4byte DewfordTown_House1_MapBorder
.4byte DewfordTown_House1_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1149,7 +1163,7 @@ DewfordTown_Gym_MapAttributes: @ 8427620
.4byte 0x1c
.4byte DewfordTown_Gym_MapBorder
.4byte DewfordTown_Gym_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_DewfordGym
.align 2
@@ -1166,7 +1180,7 @@ DewfordTown_Hall_MapAttributes: @ 8427774
.4byte 0x9
.4byte DewfordTown_Hall_MapBorder
.4byte DewfordTown_Hall_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1184,7 +1198,7 @@ Route113_GlassWorkshop_MapAttributes: @ 8427848
.4byte 0x9
.4byte DewfordTown_House2_MapBorder
.4byte DewfordTown_House2_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1201,7 +1215,7 @@ LavaridgeTown_HerbShop_MapAttributes: @ 8427918
.4byte 0x8
.4byte LavaridgeTown_HerbShop_MapBorder
.4byte LavaridgeTown_HerbShop_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Shop
.align 2
@@ -1218,7 +1232,7 @@ LavaridgeTown_Gym_1F_MapAttributes: @ 8427BC0
.4byte 0x13
.4byte LavaridgeTown_Gym_1F_MapBorder
.4byte LavaridgeTown_Gym_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_LavaridgeGym
.align 2
@@ -1235,7 +1249,7 @@ LavaridgeTown_Gym_B1F_MapAttributes: @ 8427E68
.4byte 0x13
.4byte LavaridgeTown_Gym_B1F_MapBorder
.4byte LavaridgeTown_Gym_B1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_LavaridgeGym
.align 2
@@ -1252,11 +1266,42 @@ LavaridgeTown_PokemonCenter_1F_MapAttributes: @ 8427F84
.4byte 0x9
.4byte LavaridgeTown_PokemonCenter_1F_MapBorder
.4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_PokemonCenter
.align 2
- .incbin "baserom.gba", 0x427f9c, 0x408
+FallarborTown_LeftoverRSContestLobby_MapBorder: @ 8427F9C
+ .incbin "data/maps/FallarborTown_LeftoverRSContestLobby/border.bin"
+
+ .align 2
+FallarborTown_LeftoverRSContestLobby_MapBlockdata: @ 8427FA4
+ .incbin "data/maps/FallarborTown_LeftoverRSContestLobby/map.bin"
+
+ .align 2
+FallarborTown_LeftoverRSContestLobby_MapAttributes: @ 8428078
+ .4byte 0xf
+ .4byte 0x7
+ .4byte FallarborTown_LeftoverRSContestLobby_MapBorder
+ .4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
+ .align 2
+FallarborTown_LeftoverRSContestHall_MapBorder: @ 8428090
+ .incbin "data/maps/FallarborTown_LeftoverRSContestHall/border.bin"
+
+ .align 2
+FallarborTown_LeftoverRSContestHall_MapBlockdata: @ 8428098
+ .incbin "data/maps/FallarborTown_LeftoverRSContestHall/map.bin"
+
+ .align 2
+FallarborTown_LeftoverRSContestHall_MapAttributes: @ 82CF4A0
+ .4byte 0x15
+ .4byte 0x12
+ .4byte FallarborTown_LeftoverRSContestHall_MapBorder
+ .4byte FallarborTown_LeftoverRSContestHall_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
.align 2
LilycoveCity_House2_MapBorder: @ 84283A4
@@ -1272,11 +1317,25 @@ LilycoveCity_House2_MapAttributes: @ 842842C
.4byte 0x8
.4byte LilycoveCity_House2_MapBorder
.4byte LilycoveCity_House2_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
- .incbin "baserom.gba", 0x428444, 0x24
+UnknownMapBorder_08428450: @ 8428444
+ .incbin "data/maps/UnknownMap_08428450/border.bin"
+
+ .align 2
+UnknownMapBlockdata_08428450: @ 842844C
+ .incbin "data/maps/UnknownMap_08428450/map.bin"
+
+ .align 2
+UnknownMapAttributes_08428450: @ 8428450
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_08428450
+ .4byte UnknownMapBlockdata_08428450
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
.align 2
VerdanturfTown_WandasHouse_MapBorder: @ 8428468
@@ -1292,7 +1351,7 @@ VerdanturfTown_WandasHouse_MapAttributes: @ 8428580
.4byte 0x8
.4byte VerdanturfTown_WandasHouse_MapBorder
.4byte VerdanturfTown_WandasHouse_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1311,7 +1370,7 @@ PacifidlogTown_House5_MapAttributes: @ 8428654
.4byte 0x9
.4byte PacifidlogTown_House1_MapBorder
.4byte PacifidlogTown_House1_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1329,7 +1388,7 @@ PacifidlogTown_House4_MapAttributes: @ 8428728
.4byte 0x9
.4byte PacifidlogTown_House2_MapBorder
.4byte PacifidlogTown_House2_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1346,7 +1405,7 @@ PetalburgCity_Gym_MapAttributes: @ 8428F28
.4byte 0x70
.4byte PetalburgCity_Gym_MapBorder
.4byte PetalburgCity_Gym_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_PetalburgGym
.align 2
@@ -1365,7 +1424,7 @@ SlateportCity_House1_MapAttributes: @ 8428FE8
.4byte 0x8
.4byte PetalburgCity_House2_MapBorder
.4byte PetalburgCity_House2_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1403,7 +1462,38 @@ SlateportCity_SternsShipyard_2F_MapAttributes: @ 84294A0
.4byte gTileset_Facility
.align 2
- .incbin "baserom.gba", 0x4294b8, 0x48
+UnknownMapBorder_084294C4: @ 84294B8
+ .incbin "data/maps/UnknownMap_084294C4/border.bin"
+
+ .align 2
+UnknownMapBlockdata_084294C4: @ 84294C0
+ .incbin "data/maps/UnknownMap_084294C4/map.bin"
+
+ .align 2
+UnknownMapAttributes_084294C4: @ 84294C4
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_084294C4
+ .4byte UnknownMapBlockdata_084294C4
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
+ .align 2
+UnknownMapBorder_084294E8: @ 84294DC
+ .incbin "data/maps/UnknownMap_084294E8/border.bin"
+
+ .align 2
+UnknownMapBlockdata_084294E8: @ 84294E4
+ .incbin "data/maps/UnknownMap_084294E8/map.bin"
+
+ .align 2
+UnknownMapAttributes_084294E8: @ 84294E8
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_084294E8
+ .4byte UnknownMapBlockdata_084294E8
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
.align 2
SlateportCity_PokemonFanClub_MapBorder: @ 8429500
@@ -1419,7 +1509,7 @@ SlateportCity_PokemonFanClub_MapAttributes: @ 842963C
.4byte 0xb
.4byte SlateportCity_PokemonFanClub_MapBorder
.4byte SlateportCity_PokemonFanClub_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_PokemonFanClub
.align 2
@@ -1436,7 +1526,7 @@ SlateportCity_OceanicMuseum_1F_MapAttributes: @ 84297C4
.4byte 0x9
.4byte SlateportCity_OceanicMuseum_1F_MapBorder
.4byte SlateportCity_OceanicMuseum_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_OceanicMuseum
.align 2
@@ -1453,7 +1543,7 @@ SlateportCity_OceanicMuseum_2F_MapAttributes: @ 842994C
.4byte 0x9
.4byte SlateportCity_OceanicMuseum_2F_MapBorder
.4byte SlateportCity_OceanicMuseum_2F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_OceanicMuseum
.align 2
@@ -1488,7 +1578,7 @@ MauvilleCity_Gym_MapAttributes: @ 8429E00
.4byte 0x15
.4byte MauvilleCity_Gym_MapBorder
.4byte MauvilleCity_Gym_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_MauvilleGym
.align 2
@@ -1522,7 +1612,7 @@ MauvilleCity_GameCorner_MapAttributes: @ 842A0FC
.4byte 0xb
.4byte MauvilleCity_GameCorner_MapBorder
.4byte MauvilleCity_GameCorner_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_MauvilleGameCorner
.align 2
@@ -1539,7 +1629,7 @@ RustboroCity_DevonCorp_1F_MapAttributes: @ 842A274
.4byte 0x9
.4byte RustboroCity_DevonCorp_1F_MapBorder
.4byte RustboroCity_DevonCorp_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Facility
.align 2
@@ -1573,7 +1663,7 @@ RustboroCity_Gym_MapAttributes: @ 842A5C4
.4byte 0x14
.4byte RustboroCity_Gym_MapBorder
.4byte RustboroCity_Gym_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_RustboroGym
.align 2
@@ -1590,7 +1680,7 @@ RustboroCity_PokemonSchool_MapAttributes: @ 842A6EC
.4byte 0xb
.4byte RustboroCity_PokemonSchool_MapBorder
.4byte RustboroCity_PokemonSchool_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_PokemonSchool
.align 2
@@ -1608,7 +1698,7 @@ RustboroCity_House3_MapAttributes: @ 842A7E4
.4byte 0x9
.4byte RustboroCity_House2_MapBorder
.4byte RustboroCity_House2_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1625,7 +1715,7 @@ RustboroCity_House1_MapAttributes: @ 842A8D4
.4byte 0x8
.4byte RustboroCity_House1_MapBorder
.4byte RustboroCity_House1_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1642,7 +1732,7 @@ RustboroCity_CuttersHouse_MapAttributes: @ 842A9BC
.4byte 0x9
.4byte RustboroCity_CuttersHouse_MapBorder
.4byte RustboroCity_CuttersHouse_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1661,7 +1751,7 @@ FortreeCity_House5_MapAttributes: @ 842AA3C
.4byte 0x6
.4byte FortreeCity_House1_MapBorder
.4byte FortreeCity_House1_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1678,7 +1768,7 @@ FortreeCity_Gym_MapAttributes: @ 842AE44
.4byte 0x19
.4byte FortreeCity_Gym_MapBorder
.4byte FortreeCity_Gym_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_FortreeGym
.align 2
@@ -1696,7 +1786,7 @@ FortreeCity_House4_MapAttributes: @ 842AEC4
.4byte 0x6
.4byte FortreeCity_House2_MapBorder
.4byte FortreeCity_House2_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1713,7 +1803,7 @@ Route104_MrBrineysHouse_MapAttributes: @ 842AFBC
.4byte 0x9
.4byte Route104_MrBrineysHouse_MapBorder
.4byte Route104_MrBrineysHouse_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1730,7 +1820,7 @@ LilycoveCity_LilycoveMuseum_1F_MapAttributes: @ 842B228
.4byte 0xe
.4byte LilycoveCity_LilycoveMuseum_1F_MapBorder
.4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_LilycoveMuseum
.align 2
@@ -1747,7 +1837,7 @@ LilycoveCity_LilycoveMuseum_2F_MapAttributes: @ 842B484
.4byte 0xd
.4byte LilycoveCity_LilycoveMuseum_2F_MapBorder
.4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_LilycoveMuseum
.align 2
@@ -1764,7 +1854,7 @@ LilycoveCity_ContestLobby_MapAttributes: @ 842B78C
.4byte 0xc
.4byte LilycoveCity_ContestLobby_MapBorder
.4byte LilycoveCity_ContestLobby_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Contest
.align 2
@@ -1781,7 +1871,7 @@ LilycoveCity_ContestHall_MapAttributes: @ 842C4D4
.4byte 0x21
.4byte LilycoveCity_ContestHall_MapBorder
.4byte LilycoveCity_ContestHall_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Contest
.align 2
@@ -1798,7 +1888,7 @@ LilycoveCity_PokemonTrainerFanClub_MapAttributes: @ 842C644
.4byte 0xe
.4byte LilycoveCity_PokemonTrainerFanClub_MapBorder
.4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -1815,7 +1905,7 @@ MossdeepCity_Gym_MapAttributes: @ 842CDB4
.4byte 0x24
.4byte MossdeepCity_Gym_MapBorder
.4byte MossdeepCity_Gym_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_MossdeepGym
.align 2
@@ -1832,7 +1922,7 @@ SootopolisCity_Gym_1F_MapAttributes: @ 842D148
.4byte 0x1a
.4byte SootopolisCity_Gym_1F_MapBorder
.4byte SootopolisCity_Gym_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_SootopolisGym
.align 2
@@ -1849,7 +1939,7 @@ SootopolisCity_Gym_B1F_MapAttributes: @ 842D4DC
.4byte 0x1a
.4byte SootopolisCity_Gym_B1F_MapBorder
.4byte SootopolisCity_Gym_B1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_SootopolisGym
.align 2
@@ -1866,7 +1956,7 @@ EverGrandeCity_SidneysRoom_MapAttributes: @ 842D668
.4byte 0xe
.4byte EverGrandeCity_SidneysRoom_MapBorder
.4byte EverGrandeCity_SidneysRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_EliteFour
.align 2
@@ -1883,7 +1973,7 @@ EverGrandeCity_PhoebesRoom_MapAttributes: @ 842D7F4
.4byte 0xe
.4byte EverGrandeCity_PhoebesRoom_MapBorder
.4byte EverGrandeCity_PhoebesRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_EliteFour
.align 2
@@ -1900,7 +1990,7 @@ EverGrandeCity_GlaciasRoom_MapAttributes: @ 842D980
.4byte 0xe
.4byte EverGrandeCity_GlaciasRoom_MapBorder
.4byte EverGrandeCity_GlaciasRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_EliteFour
.align 2
@@ -1917,7 +2007,7 @@ EverGrandeCity_DrakesRoom_MapAttributes: @ 842DB0C
.4byte 0xe
.4byte EverGrandeCity_DrakesRoom_MapBorder
.4byte EverGrandeCity_DrakesRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_EliteFour
.align 2
@@ -1934,7 +2024,7 @@ EverGrandeCity_ChampionsRoom_MapAttributes: @ 842DC80
.4byte 0xd
.4byte EverGrandeCity_ChampionsRoom_MapBorder
.4byte EverGrandeCity_ChampionsRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_EliteFour
.align 2
@@ -1954,7 +2044,7 @@ EverGrandeCity_Hall5_MapAttributes: @ 842DDC0
.4byte 0xd
.4byte EverGrandeCity_Hall1_MapBorder
.4byte EverGrandeCity_Hall1_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_EliteFour
.align 2
@@ -1972,7 +2062,7 @@ Route104_PrototypePrettyPetalFlowerShop_MapAttributes: @ 842DEF0
.4byte 0x9
.4byte Route104_PrettyPetalFlowerShop_MapBorder
.4byte Route104_PrettyPetalFlowerShop_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_PrettyPetalFlowerShop
.align 2
@@ -2007,7 +2097,7 @@ Route114_FossilManiacsHouse_MapAttributes: @ 842E108
.4byte 0x8
.4byte Route114_FossilManiacsHouse_MapBorder
.4byte Route114_FossilManiacsHouse_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -2041,7 +2131,7 @@ Route114_LanettesHouse_MapAttributes: @ 842E49C
.4byte 0x8
.4byte Route114_LanettesHouse_MapBorder
.4byte Route114_LanettesHouse_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Lab
.align 2
@@ -2058,7 +2148,7 @@ Route116_TunnelersRestHouse_MapAttributes: @ 842E570
.4byte 0x9
.4byte Route116_TunnelersRestHouse_MapBorder
.4byte Route116_TunnelersRestHouse_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -2075,7 +2165,7 @@ Route117_PokemonDayCare_MapAttributes: @ 842E668
.4byte 0x9
.4byte Route117_PokemonDayCare_MapBorder
.4byte Route117_PokemonDayCare_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_PokemonDayCare
.align 2
@@ -2092,7 +2182,7 @@ Route121_SafariZoneEntrance_MapAttributes: @ 842E880
.4byte 0xe
.4byte Route121_SafariZoneEntrance_MapBorder
.4byte Route121_SafariZoneEntrance_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Shop
.align 2
@@ -2861,7 +2951,240 @@ ShoalCave_HighTideInnerRoom_MapAttributes: @ 843E69C
.4byte gTileset_Cave
.align 2
- .incbin "baserom.gba", 0x43e6b4, 0x1f8
+UnknownMapBorder_0843E6C0: @ 843E6B4
+ .incbin "data/maps/UnknownMap_0843E6C0/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0843E6C0: @ 843E6BC
+ .incbin "data/maps/UnknownMap_0843E6C0/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E6C0: @ 843E6C0
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E6C0
+ .4byte UnknownMapBlockdata_0843E6C0
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+ .align 2
+UnknownMapBorder_0843E6E4: @ 843E6D8
+ .incbin "data/maps/UnknownMap_0843E6E4/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0843E6E4: @ 843E6E0
+ .incbin "data/maps/UnknownMap_0843E6E4/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E6E4: @ 843E6E4
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E6E4
+ .4byte UnknownMapBlockdata_0843E6E4
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+ .align 2
+UnknownMapBorder_0843E708: @ 843E6FC
+ .incbin "data/maps/UnknownMap_0843E708/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0843E708: @ 843E704
+ .incbin "data/maps/UnknownMap_0843E708/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E708: @ 843E708
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E708
+ .4byte UnknownMapBlockdata_0843E708
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+ .align 2
+UnknownMapBorder_0843E72C: @ 843E720
+ .incbin "data/maps/UnknownMap_0843E72C/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0843E72C: @ 843E728
+ .incbin "data/maps/UnknownMap_0843E72C/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E72C: @ 843E72C
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E72C
+ .4byte UnknownMapBlockdata_0843E72C
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+ .align 2
+UnknownMapBorder_0843E750: @ 843E744
+ .incbin "data/maps/UnknownMap_0843E750/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0843E750: @ 843E74C
+ .incbin "data/maps/UnknownMap_0843E750/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E750: @ 843E750
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E750
+ .4byte UnknownMapBlockdata_0843E750
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+ .align 2
+UnknownMapBorder_0843E774: @ 843E768
+ .incbin "data/maps/UnknownMap_0843E774/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0843E774: @ 843E770
+ .incbin "data/maps/UnknownMap_0843E774/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E774: @ 843E774
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E774
+ .4byte UnknownMapBlockdata_0843E774
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+ .align 2
+UnknownMapBorder_0843E798: @ 843E78C
+ .incbin "data/maps/UnknownMap_0843E798/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0843E798: @ 843E794
+ .incbin "data/maps/UnknownMap_0843E798/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E798: @ 843E798
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E798
+ .4byte UnknownMapBlockdata_0843E798
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+ .align 2
+UnknownMapBorder_0843E7BC: @ 843E7B0
+ .incbin "data/maps/UnknownMap_0843E7BC/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0843E7BC: @ 843E7B8
+ .incbin "data/maps/UnknownMap_0843E7BC/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E7BC: @ 843E7BC
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E7BC
+ .4byte UnknownMapBlockdata_0843E7BC
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+ .align 2
+UnknownMapBorder_0843E7E0: @ 843E7D4
+ .incbin "data/maps/UnknownMap_0843E7E0/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0843E7E0: @ 843E7DC
+ .incbin "data/maps/UnknownMap_0843E7E0/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E7E0: @ 843E7E0
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E7E0
+ .4byte UnknownMapBlockdata_0843E7E0
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+ .align 2
+UnknownMapBorder_0843E804: @ 843E7F8
+ .incbin "data/maps/UnknownMap_0843E804/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0843E804: @ 843E800
+ .incbin "data/maps/UnknownMap_0843E804/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E804: @ 843E804
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E804
+ .4byte UnknownMapBlockdata_0843E804
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+ .align 2
+UnknownMapBorder_0843E828: @ 843E81C
+ .incbin "data/maps/UnknownMap_0843E828/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0843E828: @ 843E824
+ .incbin "data/maps/UnknownMap_0843E828/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E828: @ 843E828
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E828
+ .4byte UnknownMapBlockdata_0843E828
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+ .align 2
+UnknownMapBorder_0843E84C: @ 843E840
+ .incbin "data/maps/UnknownMap_0843E84C/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0843E84C: @ 843E848
+ .incbin "data/maps/UnknownMap_0843E84C/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E84C: @ 843E84C
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E84C
+ .4byte UnknownMapBlockdata_0843E84C
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+ .align 2
+UnknownMapBorder_0843E870: @ 843E864
+ .incbin "data/maps/UnknownMap_0843E870/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0843E870: @ 843E86C
+ .incbin "data/maps/UnknownMap_0843E870/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E870: @ 843E870
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E870
+ .4byte UnknownMapBlockdata_0843E870
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_0843E894: @ 843E888
+ .incbin "data/maps/UnknownMap_0843E894/border.bin"
+
+UnknownMapBlockdata_0843E894: @ 843E890
+ .incbin "data/maps/UnknownMap_0843E894/map.bin"
+
+ .align 2
+UnknownMapAttributes_0843E894: @ 843E894
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_0843E894
+ .4byte UnknownMapBlockdata_0843E894
+ .4byte gTileset_General
+ .4byte gTileset_Cave
.align 2
NewMauville_Entrance_MapBorder: @ 843E8AC
@@ -3506,7 +3829,7 @@ SingleBattleColosseum_MapAttributes: @ 8442448
.4byte 0x9
.4byte SingleBattleColosseum_MapBorder
.4byte SingleBattleColosseum_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_CableClub
.align 2
@@ -3523,7 +3846,7 @@ TradeCenter_MapAttributes: @ 8442540
.4byte 0x9
.4byte TradeCenter_MapBorder
.4byte TradeCenter_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_CableClub
.align 2
@@ -3540,7 +3863,7 @@ RecordCorner_MapAttributes: @ 84426F0
.4byte 0xa
.4byte RecordCorner_MapBorder
.4byte RecordCorner_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_CableClub
.align 2
@@ -3557,7 +3880,7 @@ DoubleBattleColosseum_MapAttributes: @ 844280C
.4byte 0x9
.4byte DoubleBattleColosseum_MapBorder
.4byte DoubleBattleColosseum_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_CableClub
.align 2
@@ -3591,7 +3914,7 @@ UnknownMap_25_29_MapAttributes: @ 844299C
.4byte 0x1
.4byte UnknownMap_25_29_MapBorder
.4byte UnknownMap_25_29_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Contest
.align 2
@@ -3608,7 +3931,7 @@ UnknownMap_25_30_MapAttributes: @ 84429C0
.4byte 0x1
.4byte UnknownMap_25_30_MapBorder
.4byte UnknownMap_25_30_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Contest
.align 2
@@ -3625,7 +3948,7 @@ UnknownMap_25_31_MapAttributes: @ 84429E4
.4byte 0x1
.4byte UnknownMap_25_31_MapBorder
.4byte UnknownMap_25_31_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Contest
.align 2
@@ -3642,7 +3965,7 @@ UnknownMap_25_32_MapAttributes: @ 8442A08
.4byte 0x1
.4byte UnknownMap_25_32_MapBorder
.4byte UnknownMap_25_32_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Contest
.align 2
@@ -3659,7 +3982,7 @@ UnknownMap_25_33_MapAttributes: @ 8442A2C
.4byte 0x1
.4byte UnknownMap_25_33_MapBorder
.4byte UnknownMap_25_33_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Contest
.align 2
@@ -3676,7 +3999,7 @@ UnknownMap_25_34_MapAttributes: @ 8442A50
.4byte 0x1
.4byte UnknownMap_25_34_MapBorder
.4byte UnknownMap_25_34_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Contest
.align 2
@@ -3850,7 +4173,21 @@ SafariZone_South_MapAttributes: @ 8446440
.4byte gTileset_Lilycove
.align 2
- .incbin "baserom.gba", 0x446458, 0xbe8
+UnknownMapBorder_08447028: @ 8446458
+ .incbin "data/maps/UnknownMap_08447028/border.bin"
+
+ .align 2
+UnknownMapBlockdata_08447028: @ 8446460
+ .incbin "data/maps/UnknownMap_08447028/map.bin"
+
+ .align 2
+UnknownMapAttributes_08447028: @ 8447028
+ .4byte 0x3A
+ .4byte 0x1A
+ .4byte UnknownMapBorder_08447028
+ .4byte UnknownMapBlockdata_08447028
+ .4byte gTileset_General
+ .4byte 0
.align 2
Route109_SeashoreHouse_MapBorder: @ 8447040
@@ -3866,7 +4203,7 @@ Route109_SeashoreHouse_MapAttributes: @ 8447174
.4byte 0xa
.4byte Route109_SeashoreHouse_MapBorder
.4byte Route109_SeashoreHouse_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_SeashoreHouse
.align 2
@@ -3883,7 +4220,7 @@ Route110_TrickHouseEntrance_MapAttributes: @ 8447254
.4byte 0x8
.4byte Route110_TrickHouseEntrance_MapBorder
.4byte Route110_TrickHouseEntrance_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -3900,7 +4237,7 @@ Route110_TrickHouseEnd_MapAttributes: @ 8447334
.4byte 0x8
.4byte Route110_TrickHouseEnd_MapBorder
.4byte Route110_TrickHouseEnd_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -3917,7 +4254,7 @@ Route110_TrickHouseCorridor_MapAttributes: @ 8447624
.4byte 0x18
.4byte Route110_TrickHouseCorridor_MapBorder
.4byte Route110_TrickHouseCorridor_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -3934,7 +4271,7 @@ Route110_TrickHousePuzzle1_MapAttributes: @ 84478D8
.4byte 0x16
.4byte Route110_TrickHousePuzzle1_MapBorder
.4byte Route110_TrickHousePuzzle1_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrickHousePuzzle
.align 2
@@ -3951,7 +4288,7 @@ Route110_TrickHousePuzzle2_MapAttributes: @ 8447B8C
.4byte 0x16
.4byte Route110_TrickHousePuzzle2_MapBorder
.4byte Route110_TrickHousePuzzle2_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrickHousePuzzle
.align 2
@@ -3968,7 +4305,7 @@ Route110_TrickHousePuzzle3_MapAttributes: @ 8447E40
.4byte 0x16
.4byte Route110_TrickHousePuzzle3_MapBorder
.4byte Route110_TrickHousePuzzle3_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrickHousePuzzle
.align 2
@@ -3985,7 +4322,7 @@ Route110_TrickHousePuzzle4_MapAttributes: @ 84480F4
.4byte 0x16
.4byte Route110_TrickHousePuzzle4_MapBorder
.4byte Route110_TrickHousePuzzle4_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrickHousePuzzle
.align 2
@@ -4002,7 +4339,7 @@ Route110_TrickHousePuzzle5_MapAttributes: @ 84483A8
.4byte 0x16
.4byte Route110_TrickHousePuzzle5_MapBorder
.4byte Route110_TrickHousePuzzle5_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrickHousePuzzle
.align 2
@@ -4019,7 +4356,7 @@ Route110_TrickHousePuzzle6_MapAttributes: @ 844865C
.4byte 0x16
.4byte Route110_TrickHousePuzzle6_MapBorder
.4byte Route110_TrickHousePuzzle6_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrickHousePuzzle
.align 2
@@ -4036,7 +4373,7 @@ Route110_TrickHousePuzzle7_MapAttributes: @ 8448910
.4byte 0x16
.4byte Route110_TrickHousePuzzle7_MapBorder
.4byte Route110_TrickHousePuzzle7_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrickHousePuzzle
.align 2
@@ -4053,7 +4390,7 @@ Route110_TrickHousePuzzle8_MapAttributes: @ 8448BC4
.4byte 0x16
.4byte Route110_TrickHousePuzzle8_MapBorder
.4byte Route110_TrickHousePuzzle8_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrickHousePuzzle
.align 2
@@ -4070,7 +4407,7 @@ FortreeCity_DecorationShop_MapAttributes: @ 8448C44
.4byte 0x6
.4byte FortreeCity_DecorationShop_MapBorder
.4byte FortreeCity_DecorationShop_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -4088,7 +4425,7 @@ Route110_SeasideCyclingRoadEntrance2_MapAttributes: @ 8448D18
.4byte 0x6
.4byte Route110_SeasideCyclingRoadEntrance1_MapBorder
.4byte Route110_SeasideCyclingRoadEntrance1_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Shop
.align 2
@@ -4105,7 +4442,7 @@ LilycoveCity_DepartmentStore_1F_MapAttributes: @ 8448E58
.4byte 0x8
.4byte LilycoveCity_DepartmentStore_1F_MapBorder
.4byte LilycoveCity_DepartmentStore_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Shop
.align 2
@@ -4122,7 +4459,7 @@ LilycoveCity_DepartmentStore_2F_MapAttributes: @ 8448F98
.4byte 0x8
.4byte LilycoveCity_DepartmentStore_2F_MapBorder
.4byte LilycoveCity_DepartmentStore_2F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Shop
.align 2
@@ -4139,7 +4476,7 @@ LilycoveCity_DepartmentStore_3F_MapAttributes: @ 84490D8
.4byte 0x8
.4byte LilycoveCity_DepartmentStore_3F_MapBorder
.4byte LilycoveCity_DepartmentStore_3F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Shop
.align 2
@@ -4156,7 +4493,7 @@ LilycoveCity_DepartmentStore_4F_MapAttributes: @ 8449218
.4byte 0x8
.4byte LilycoveCity_DepartmentStore_4F_MapBorder
.4byte LilycoveCity_DepartmentStore_4F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Shop
.align 2
@@ -4173,7 +4510,7 @@ LilycoveCity_DepartmentStore_5F_MapAttributes: @ 8449358
.4byte 0x8
.4byte LilycoveCity_DepartmentStore_5F_MapBorder
.4byte LilycoveCity_DepartmentStore_5F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Shop
.align 2
@@ -4190,7 +4527,7 @@ LilycoveCity_DepartmentStoreRooftop_MapAttributes: @ 8449528
.4byte 0xc
.4byte LilycoveCity_DepartmentStoreRooftop_MapBorder
.4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Shop
.align 2
@@ -4224,7 +4561,7 @@ BattleFrontier_BattleTowerLobby_MapAttributes: @ 844B05C
.4byte 0xa
.4byte BattleFrontier_BattleTowerLobby_MapBorder
.4byte BattleFrontier_BattleTowerLobby_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFrontier
.align 2
@@ -4259,7 +4596,7 @@ TrainerHill_Elevator_MapAttributes: @ 844D064
.4byte 0x7
.4byte BattleFrontier_BattleTowerElevator_MapBorder
.4byte BattleFrontier_BattleTowerElevator_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFrontier
.align 2
@@ -4276,7 +4613,7 @@ BattleFrontier_BattleTowerCorridor_MapAttributes: @ 844D130
.4byte 0x5
.4byte BattleFrontier_BattleTowerCorridor_MapBorder
.4byte BattleFrontier_BattleTowerCorridor_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFrontier
.align 2
@@ -4294,7 +4631,7 @@ BattleFrontier_BattleTowerBattleRoom_MapAttributes: @ 844D204
.4byte 0x9
.4byte BattleFrontier_BattleTowerBattleRoom_MapBorder
.4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFrontier
.align 2
@@ -4311,7 +4648,7 @@ RustboroCity_DevonCorp_3F_MapAttributes: @ 844D37C
.4byte 0x9
.4byte RustboroCity_DevonCorp_3F_MapBorder
.4byte RustboroCity_DevonCorp_3F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Facility
.align 2
@@ -4328,7 +4665,7 @@ EverGrandeCity_PokemonLeague_1F_MapAttributes: @ 844D564
.4byte 0xc
.4byte EverGrandeCity_PokemonLeague_1F_MapBorder
.4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_PokemonCenter
.align 2
@@ -4345,7 +4682,7 @@ Route119_WeatherInstitute_1F_MapAttributes: @ 844D78C
.4byte 0xd
.4byte Route119_WeatherInstitute_1F_MapBorder
.4byte Route119_WeatherInstitute_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Lab
.align 2
@@ -4362,7 +4699,7 @@ Route119_WeatherInstitute_2F_MapAttributes: @ 844D964
.4byte 0xb
.4byte Route119_WeatherInstitute_2F_MapBorder
.4byte Route119_WeatherInstitute_2F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_Lab
.align 2
@@ -4379,7 +4716,7 @@ LilycoveCity_DepartmentStoreElevator_MapAttributes: @ 844D9C0
.4byte 0x6
.4byte LilycoveCity_DepartmentStoreElevator_MapBorder
.4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFrontier
.align 2
@@ -4736,7 +5073,7 @@ RustboroCity_Flat2_1F_MapAttributes: @ 8456BBC
.4byte 0x9
.4byte RustboroCity_Flat2_1F_MapBorder
.4byte RustboroCity_Flat2_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -4753,7 +5090,7 @@ RustboroCity_Flat2_2F_MapAttributes: @ 8456CD8
.4byte 0x9
.4byte RustboroCity_Flat2_2F_MapBorder
.4byte RustboroCity_Flat2_2F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -4770,7 +5107,7 @@ RustboroCity_Flat2_3F_MapAttributes: @ 8456DF4
.4byte 0x9
.4byte RustboroCity_Flat2_3F_MapBorder
.4byte RustboroCity_Flat2_3F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -4787,7 +5124,7 @@ SootopolisCity_LotadAndSeedotHouse_MapAttributes: @ 8456E84
.4byte 0x7
.4byte SootopolisCity_LotadAndSeedotHouse_MapBorder
.4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -4804,7 +5141,7 @@ EverGrandeCity_HallOfFame_MapAttributes: @ 84570A4
.4byte 0x11
.4byte EverGrandeCity_HallOfFame_MapBorder
.4byte EverGrandeCity_HallOfFame_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_CableClub
.align 2
@@ -4821,7 +5158,7 @@ LilycoveCity_CoveLilyMotel_1F_MapAttributes: @ 845719C
.4byte 0x9
.4byte LilycoveCity_CoveLilyMotel_1F_MapBorder
.4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -4838,7 +5175,7 @@ LilycoveCity_CoveLilyMotel_2F_MapAttributes: @ 8457294
.4byte 0x9
.4byte LilycoveCity_CoveLilyMotel_2F_MapBorder
.4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -4855,7 +5192,7 @@ Route124_DivingTreasureHuntersHouse_MapAttributes: @ 8457368
.4byte 0x9
.4byte Route124_DivingTreasureHuntersHouse_MapBorder
.4byte Route124_DivingTreasureHuntersHouse_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -4923,7 +5260,7 @@ MossdeepCity_GameCorner_1F_MapAttributes: @ 8459638
.4byte 0xa
.4byte MossdeepCity_GameCorner_1F_MapBorder
.4byte MossdeepCity_GameCorner_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_MossdeepGameCorner
.align 2
@@ -4940,7 +5277,7 @@ MossdeepCity_GameCorner_B1F_MapAttributes: @ 8459730
.4byte 0x9
.4byte MossdeepCity_GameCorner_B1F_MapBorder
.4byte MossdeepCity_GameCorner_B1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -4959,7 +5296,7 @@ SootopolisCity_House7_MapAttributes: @ 84597C0
.4byte 0x7
.4byte SootopolisCity_House1_MapBorder
.4byte SootopolisCity_House1_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -4977,7 +5314,7 @@ SootopolisCity_House5_MapAttributes: @ 8459850
.4byte 0x7
.4byte SootopolisCity_House2_MapBorder
.4byte SootopolisCity_House2_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -4995,7 +5332,7 @@ SootopolisCity_House6_MapAttributes: @ 84598E0
.4byte 0x7
.4byte SootopolisCity_House3_MapBorder
.4byte SootopolisCity_House3_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -5033,7 +5370,21 @@ ScorchedSlab_MapAttributes: @ 845A0A0
.4byte gTileset_Cave
.align 2
- .incbin "baserom.gba", 0x45a0b8, 0x2f4
+UnknownMapBorder_0845A394: @ 845A0B8
+ .incbin "data/maps/UnknownMap_0845A394/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0845A394: @ 845A0C0
+ .incbin "data/maps/UnknownMap_0845A394/map.bin"
+
+ .align 2
+UnknownMapAttributes_0845A394: @ 845A394
+ .4byte 0x13
+ .4byte 0x13
+ .4byte UnknownMapBorder_0845A394
+ .4byte UnknownMapBlockdata_0845A394
+ .4byte gTileset_General
+ .4byte gTileset_Cave
.align 2
RustboroCity_Flat1_1F_MapBorder: @ 845A3AC
@@ -5049,7 +5400,7 @@ RustboroCity_Flat1_1F_MapAttributes: @ 845A494
.4byte 0x8
.4byte RustboroCity_Flat1_1F_MapBorder
.4byte RustboroCity_Flat1_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -5066,7 +5417,7 @@ RustboroCity_Flat1_2F_MapAttributes: @ 845A594
.4byte 0x8
.4byte RustboroCity_Flat1_2F_MapBorder
.4byte RustboroCity_Flat1_2F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -5083,7 +5434,7 @@ EverGrandeCity_Hall4_MapAttributes: @ 845A8A0
.4byte 0x22
.4byte EverGrandeCity_Hall4_MapBorder
.4byte EverGrandeCity_Hall4_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_EliteFour
.align 2
@@ -5138,7 +5489,21 @@ AquaHideout_UnusedRubyMap3_MapAttributes: @ 845C190
.4byte gTileset_Facility
.align 2
- .incbin "baserom.gba", 0x45c1a8, 0x12e0
+UnknownMapBorder_0845D470: @ 845C1A8
+ .incbin "data/maps/UnknownMap_0845D470/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0845D470: @ 845C1B0
+ .incbin "data/maps/UnknownMap_0845D470/map.bin"
+
+ .align 2
+UnknownMapAttributes_0845D470: @ 845D470
+ .4byte 0x3C
+ .4byte 0x28
+ .4byte UnknownMapBorder_0845D470
+ .4byte UnknownMapBlockdata_0845D470
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
.align 2
SkyPillar_Entrance_MapBorder: @ 845D488
@@ -5243,7 +5608,21 @@ SkyPillar_4F_MapAttributes: @ 845E2E0
.4byte gTileset_Pacifidlog
.align 2
- .incbin "baserom.gba", 0x45e2f8, 0x9d4
+UnknownMapBorder_0845ECB4: @ 845E2F8
+ .incbin "data/maps/UnknownMap_0845ECB4/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0845ECB4: @ 845E300
+ .incbin "data/maps/UnknownMap_0845ECB4/map.bin"
+
+ .align 2
+UnknownMapAttributes_0845ECB4: @ 845ECB4
+ .4byte 0x1B
+ .4byte 0x2E
+ .4byte UnknownMapBorder_0845ECB4
+ .4byte UnknownMapBlockdata_0845ECB4
+ .4byte gTileset_General
+ .4byte gTileset_Cave
.align 2
MossdeepCity_StevensHouse_MapBorder: @ 845ECCC
@@ -5259,7 +5638,7 @@ MossdeepCity_StevensHouse_MapAttributes: @ 845ED84
.4byte 0x8
.4byte MossdeepCity_StevensHouse_MapBorder
.4byte MossdeepCity_StevensHouse_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -5293,7 +5672,7 @@ SafariZone_RestHouse_MapAttributes: @ 845F328
.4byte 0x9
.4byte SafariZone_RestHouse_MapBorder
.4byte SafariZone_RestHouse_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_GenericBuilding
.align 2
@@ -5344,7 +5723,7 @@ BattleFrontier_BattleDomeLobby_MapAttributes: @ 845FD30
.4byte 0x11
.4byte BattleFrontier_BattleDomeLobby_MapBorder
.4byte BattleFrontier_BattleDomeLobby_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleDome
.align 2
@@ -5361,7 +5740,7 @@ BattleFrontier_BattleDomeCorridor_MapAttributes: @ 845FFF0
.4byte 0x7
.4byte BattleFrontier_BattleDomeCorridor_MapBorder
.4byte BattleFrontier_BattleDomeCorridor_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleDome
.align 2
@@ -5378,7 +5757,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapAttributes: @ 84600A0
.4byte 0x8
.4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder
.4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleDome
.align 2
@@ -5395,7 +5774,7 @@ BattleFrontier_BattleDomeBattleRoom_MapAttributes: @ 8460250
.4byte 0xa
.4byte BattleFrontier_BattleDomeBattleRoom_MapBorder
.4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleDome
.align 2
@@ -5514,7 +5893,7 @@ BattleFrontier_BattlePalaceLobby_MapAttributes: @ 8463AA4
.4byte 0xc
.4byte BattleFrontier_BattlePalaceLobby_MapBorder
.4byte BattleFrontier_BattlePalaceLobby_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePalace
.align 2
@@ -5582,7 +5961,7 @@ BattleFrontier_BattleFactoryLobby_MapAttributes: @ 8466874
.4byte 0xc
.4byte BattleFrontier_BattleFactoryLobby_MapBorder
.4byte BattleFrontier_BattleFactoryLobby_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFactory
.align 2
@@ -5599,7 +5978,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes: @ 8466A70
.4byte 0xe
.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder
.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFactory
.align 2
@@ -5616,7 +5995,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapAttributes: @ 8466BC8
.4byte 0xc
.4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder
.4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFactory
.align 2
@@ -5633,7 +6012,7 @@ BattleFrontier_BattlePikeLobby_MapAttributes: @ 8466D08
.4byte 0xd
.4byte BattleFrontier_BattlePikeLobby_MapBorder
.4byte BattleFrontier_BattlePikeLobby_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePike
.align 2
@@ -5650,7 +6029,7 @@ BattleFrontier_BattlePikeCorridor_MapAttributes: @ 8466E08
.4byte 0x8
.4byte BattleFrontier_BattlePikeCorridor_MapBorder
.4byte BattleFrontier_BattlePikeCorridor_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePike
.align 2
@@ -5667,7 +6046,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapAttributes: @ 8466F48
.4byte 0xb
.4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder
.4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePike
.align 2
@@ -5684,7 +6063,7 @@ BattleFrontier_BattlePikeRandomRoom1_MapAttributes: @ 8466FF8
.4byte 0x8
.4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder
.4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePike
.align 2
@@ -5701,7 +6080,7 @@ BattleFrontier_BattlePikeRandomRoom2_MapAttributes: @ 8467068
.4byte 0x8
.4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder
.4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePike
.align 2
@@ -5718,7 +6097,7 @@ BattleFrontier_BattleArenaLobby_MapAttributes: @ 8467228
.4byte 0xd
.4byte BattleFrontier_BattleArenaLobby_MapBorder
.4byte BattleFrontier_BattleArenaLobby_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleArena
.align 2
@@ -5735,7 +6114,7 @@ BattleFrontier_BattleArenaCorridor_MapAttributes: @ 8467440
.4byte 0xe
.4byte BattleFrontier_BattleArenaCorridor_MapBorder
.4byte BattleFrontier_BattleArenaCorridor_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleArena
.align 2
@@ -5752,11 +6131,25 @@ BattleFrontier_BattleArenaBattleRoom_MapAttributes: @ 84675C0
.4byte 0xb
.4byte BattleFrontier_BattleArenaBattleRoom_MapBorder
.4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleArena
.align 2
- .incbin "baserom.gba", 0x4675d8, 0x1c40
+UnknownMapBorder_08469200: @ 84675D8
+ .incbin "data/maps/UnknownMap_08469200/border.bin"
+
+ .align 2
+UnknownMapBlockdata_08469200: @ 84675E0
+ .incbin "data/maps/UnknownMap_08469200/map.bin"
+
+ .align 2
+UnknownMapAttributes_08469200: @ 8469200
+ .4byte 0x3C
+ .4byte 0x3C
+ .4byte UnknownMapBorder_08469200
+ .4byte UnknownMapBlockdata_08469200
+ .4byte gTileset_General
+ .4byte gTileset_Sootopolis
.align 2
BattleFrontier_BattlePikeRandomRoom3_MapBorder: @ 8469218
@@ -5772,11 +6165,25 @@ BattleFrontier_BattlePikeRandomRoom3_MapAttributes: @ 8469388
.4byte 0x14
.4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder
.4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePike
.align 2
- .incbin "baserom.gba", 0x4693a0, 0x24
+UnknownMapBorder_084693AC: @ 84693A0
+ .incbin "data/maps/UnknownMap_084693AC/border.bin"
+
+ .align 2
+UnknownMapBlockdata_084693AC: @ 84693A8
+ .incbin "data/maps/UnknownMap_084693AC/map.bin"
+
+ .align 2
+UnknownMapAttributes_084693AC: @ 84693AC
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_084693AC
+ .4byte UnknownMapBlockdata_084693AC
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePike
.align 2
BattleFrontier_BattlePyramidLobby_MapBorder: @ 84693C4
@@ -5792,7 +6199,7 @@ BattleFrontier_BattlePyramidLobby_MapAttributes: @ 84695E8
.4byte 0x12
.4byte BattleFrontier_BattlePyramidLobby_MapBorder
.4byte BattleFrontier_BattlePyramidLobby_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -5809,7 +6216,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapAttributes: @ 8469688
.4byte 0x8
.4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder
.4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -5826,7 +6233,7 @@ BattlePyramidSquare01_MapAttributes: @ 8469728
.4byte 0x8
.4byte BattlePyramidSquare01_MapBorder
.4byte BattlePyramidSquare01_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -5843,7 +6250,7 @@ BattlePyramidSquare02_MapAttributes: @ 84697C8
.4byte 0x8
.4byte BattlePyramidSquare02_MapBorder
.4byte BattlePyramidSquare02_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -5860,7 +6267,7 @@ BattlePyramidSquare03_MapAttributes: @ 8469868
.4byte 0x8
.4byte BattlePyramidSquare03_MapBorder
.4byte BattlePyramidSquare03_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -5877,7 +6284,7 @@ BattlePyramidSquare04_MapAttributes: @ 8469908
.4byte 0x8
.4byte BattlePyramidSquare04_MapBorder
.4byte BattlePyramidSquare04_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -5894,7 +6301,7 @@ BattlePyramidSquare05_MapAttributes: @ 84699A8
.4byte 0x8
.4byte BattlePyramidSquare05_MapBorder
.4byte BattlePyramidSquare05_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -5911,7 +6318,7 @@ BattlePyramidSquare06_MapAttributes: @ 8469A48
.4byte 0x8
.4byte BattlePyramidSquare06_MapBorder
.4byte BattlePyramidSquare06_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -5928,7 +6335,7 @@ BattlePyramidSquare07_MapAttributes: @ 8469AE8
.4byte 0x8
.4byte BattlePyramidSquare07_MapBorder
.4byte BattlePyramidSquare07_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -5945,7 +6352,7 @@ BattlePyramidSquare08_MapAttributes: @ 8469B88
.4byte 0x8
.4byte BattlePyramidSquare08_MapBorder
.4byte BattlePyramidSquare08_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -5962,7 +6369,7 @@ BattlePyramidSquare09_MapAttributes: @ 8469C28
.4byte 0x8
.4byte BattlePyramidSquare09_MapBorder
.4byte BattlePyramidSquare09_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -5979,7 +6386,7 @@ BattlePyramidSquare10_MapAttributes: @ 8469CC8
.4byte 0x8
.4byte BattlePyramidSquare10_MapBorder
.4byte BattlePyramidSquare10_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -5996,7 +6403,7 @@ BattlePyramidSquare11_MapAttributes: @ 8469D68
.4byte 0x8
.4byte BattlePyramidSquare11_MapBorder
.4byte BattlePyramidSquare11_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -6013,7 +6420,7 @@ BattlePyramidSquare12_MapAttributes: @ 8469E08
.4byte 0x8
.4byte BattlePyramidSquare12_MapBorder
.4byte BattlePyramidSquare12_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -6030,7 +6437,7 @@ BattlePyramidSquare13_MapAttributes: @ 8469EA8
.4byte 0x8
.4byte BattlePyramidSquare13_MapBorder
.4byte BattlePyramidSquare13_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -6047,7 +6454,7 @@ BattlePyramidSquare14_MapAttributes: @ 8469F48
.4byte 0x8
.4byte BattlePyramidSquare14_MapBorder
.4byte BattlePyramidSquare14_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -6064,7 +6471,7 @@ BattlePyramidSquare15_MapAttributes: @ 8469FE8
.4byte 0x8
.4byte BattlePyramidSquare15_MapBorder
.4byte BattlePyramidSquare15_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -6081,7 +6488,7 @@ BattlePyramidSquare16_MapAttributes: @ 846A088
.4byte 0x8
.4byte BattlePyramidSquare16_MapBorder
.4byte BattlePyramidSquare16_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -6098,7 +6505,7 @@ BattleFrontier_BattlePyramidTop_MapAttributes: @ 846A6C4
.4byte 0x17
.4byte BattleFrontier_BattlePyramidTop_MapBorder
.4byte BattleFrontier_BattlePyramidTop_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattlePyramid
.align 2
@@ -6202,7 +6609,7 @@ VerdanturfTown_BattleTentLobby_MapAttributes: @ 846C004
.4byte 0xa
.4byte FallarborTown_BattleTentLobby_MapBorder
.4byte FallarborTown_BattleTentLobby_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleTent
.align 2
@@ -6221,7 +6628,7 @@ VerdanturfTown_BattleTentCorridor_MapAttributes: @ 846C074
.4byte 0x8
.4byte FallarborTown_BattleTentCorridor_MapBorder
.4byte FallarborTown_BattleTentCorridor_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleTent
.align 2
@@ -6239,7 +6646,7 @@ SlateportCity_BattleTentBattleRoom_MapAttributes: @ 846C148
.4byte 0x9
.4byte FallarborTown_BattleTentBattleRoom_MapBorder
.4byte FallarborTown_BattleTentBattleRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleTent
.align 2
@@ -6307,7 +6714,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes: @ 846DF2C
.4byte 0xf
.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder
.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFrontier
.align 2
@@ -6324,11 +6731,25 @@ BattleFrontier_BattleTowerCorridor2_MapAttributes: @ 846DFF8
.4byte 0x5
.4byte BattleFrontier_BattleTowerCorridor2_MapBorder
.4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFrontier
.align 2
- .incbin "baserom.gba", 0x46e010, 0x2be0
+UnknownMapBorder_08470BD8: @ 846E010
+ .incbin "data/maps/UnknownMap_08470BD8/border.bin"
+
+ .align 2
+UnknownMapBlockdata_08470BD8: @ 846E018
+ .incbin "data/maps/UnknownMap_08470BD8/map.bin"
+
+ .align 2
+UnknownMapAttributes_08470BD8: @ 8470BD8
+ .4byte 0x28
+ .4byte 0x8C
+ .4byte UnknownMapBorder_08470BD8
+ .4byte UnknownMapBlockdata_08470BD8
+ .4byte gTileset_General
+ .4byte gTileset_Mauville
.align 2
UnionRoom_MapBorder: @ 8470BF0
@@ -6344,7 +6765,7 @@ UnionRoom_MapAttributes: @ 8470D60
.4byte 0xc
.4byte UnionRoom_MapBorder
.4byte UnionRoom_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_UnionRoom
.align 2
@@ -6395,7 +6816,7 @@ BattleFrontier_RankingHall_MapAttributes: @ 8472CF8
.4byte 0xf
.4byte BattleFrontier_RankingHall_MapBorder
.4byte BattleFrontier_RankingHall_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFrontierRankingHall
.align 2
@@ -6413,7 +6834,7 @@ BattleFrontier_Lounge5_MapAttributes: @ 8472DE8
.4byte 0x8
.4byte BattleFrontier_Lounge2_MapBorder
.4byte BattleFrontier_Lounge2_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFrontier
.align 2
@@ -6430,7 +6851,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes: @ 8472F54
.4byte 0xb
.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder
.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFrontier
.align 2
@@ -6703,7 +7124,7 @@ TrainerHill_Entrance_MapAttributes: @ 847C634
.4byte 0x11
.4byte TrainerHill_Entrance_MapBorder
.4byte TrainerHill_Entrance_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrainerHill
.align 2
@@ -6720,7 +7141,7 @@ TrainerHill_1F_MapAttributes: @ 847C8F4
.4byte 0x15
.4byte TrainerHill_1F_MapBorder
.4byte TrainerHill_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrainerHill
.align 2
@@ -6737,7 +7158,7 @@ TrainerHill_2F_MapAttributes: @ 847CBB4
.4byte 0x15
.4byte TrainerHill_2F_MapBorder
.4byte TrainerHill_2F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrainerHill
.align 2
@@ -6754,7 +7175,7 @@ TrainerHill_3F_MapAttributes: @ 847CE74
.4byte 0x15
.4byte TrainerHill_3F_MapBorder
.4byte TrainerHill_3F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrainerHill
.align 2
@@ -6771,7 +7192,7 @@ TrainerHill_4F_MapAttributes: @ 847D134
.4byte 0x15
.4byte TrainerHill_4F_MapBorder
.4byte TrainerHill_4F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrainerHill
.align 2
@@ -6788,7 +7209,7 @@ TrainerHill_Roof_MapAttributes: @ 847D474
.4byte 0x10
.4byte TrainerHill_Roof_MapBorder
.4byte TrainerHill_Roof_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_TrainerHill
.align 2
@@ -6977,7 +7398,7 @@ BattleFrontier_Lounge9_MapAttributes: @ 8480418
.4byte 0xa
.4byte BattleFrontier_Lounge1_MapBorder
.4byte BattleFrontier_Lounge1_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFrontier
.align 2
@@ -6994,7 +7415,7 @@ BattleFrontier_ScottsHouse_MapAttributes: @ 8480498
.4byte 0x8
.4byte BattleFrontier_ScottsHouse_MapBorder
.4byte BattleFrontier_ScottsHouse_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_BattleFrontier
.align 2
@@ -7015,7 +7436,123 @@ MeteorFalls_StevensCave_MapAttributes: @ 8480C38
.4byte gTileset_MeteorFalls
.align 2
- .incbin "baserom.gba", 0x480c50, 0xeec
+UnknownMapBorder_08480DAC: @ 8480C50
+ .incbin "data/maps/UnknownMap_08480DAC/border.bin"
+
+ .align 2
+UnknownMapBlockdata_08480DAC: @ 8480C58
+ .incbin "data/maps/UnknownMap_08480DAC/map.bin"
+
+ .align 2
+UnknownMapAttributes_08480DAC: @ 8480DAC
+ .4byte 0xD
+ .4byte 0xD
+ .4byte UnknownMapBorder_08480DAC
+ .4byte UnknownMapBlockdata_08480DAC
+ .4byte gTileset_Building
+ .4byte gTileset_Lab
+
+ .align 2
+UnknownMapBorder_08480F54: @ 8480DC4
+ .incbin "data/maps/UnknownMap_08480F54/border.bin"
+
+ .align 2
+UnknownMapBlockdata_08480F54: @ 8480DCC
+ .incbin "data/maps/UnknownMap_08480F54/map.bin"
+
+ .align 2
+UnknownMapAttributes_08480F54: @ 8480F54
+ .4byte 0xE
+ .4byte 0xE
+ .4byte UnknownMapBorder_08480F54
+ .4byte UnknownMapBlockdata_08480F54
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
+ .align 2
+UnknownMapBorder_084810FC: @ 8480F6C
+ .incbin "data/maps/UnknownMap_084810FC/border.bin"
+
+ .align 2
+UnknownMapBlockdata_084810FC: @ 8480F74
+ .incbin "data/maps/UnknownMap_084810FC/map.bin"
+
+ .align 2
+UnknownMapAttributes_084810FC: @ 84810FC
+ .4byte 0xE
+ .4byte 0xE
+ .4byte UnknownMapBorder_084810FC
+ .4byte UnknownMapBlockdata_084810FC
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
+ .align 2
+UnknownMapBorder_084812A4: @ 8480F6C
+ .incbin "data/maps/UnknownMap_084812A4/border.bin"
+
+ .align 2
+UnknownMapBlockdata_084812A4: @ 8480F74
+ .incbin "data/maps/UnknownMap_084812A4/map.bin"
+
+ .align 2
+UnknownMapAttributes_084812A4: @ 84812A4
+ .4byte 0xE
+ .4byte 0xE
+ .4byte UnknownMapBorder_084812A4
+ .4byte UnknownMapBlockdata_084812A4
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
+ .align 2
+UnknownMapBorder_0848144C: @ 848144C
+ .incbin "data/maps/UnknownMap_0848144C/border.bin"
+
+ .align 2
+UnknownMapBlockdata_0848144C: @ 848144C
+ .incbin "data/maps/UnknownMap_0848144C/map.bin"
+
+ .align 2
+UnknownMapAttributes_0848144C: @ 848144C
+ .4byte 0xE
+ .4byte 0xE
+ .4byte UnknownMapBorder_0848144C
+ .4byte UnknownMapBlockdata_0848144C
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
+ .align 2
+UnknownMapBorder_084815F4: @ 848144C
+ .incbin "data/maps/UnknownMap_084815F4/border.bin"
+
+ .align 2
+UnknownMapBlockdata_084815F4: @ 848144C
+ .incbin "data/maps/UnknownMap_084815F4/map.bin"
+
+ .align 2
+UnknownMapAttributes_084815F4: @ 84815F4
+ .4byte 0xE
+ .4byte 0xE
+ .4byte UnknownMapBorder_084815F4
+ .4byte UnknownMapBlockdata_084815F4
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
+ .align 2
+UnknownMapBorder_08481B24: @ 848160C
+ .incbin "data/maps/UnknownMap_08481B24/border.bin"
+
+ .align 2
+UnknownMapBlockdata_08481B24: @ 8481614
+ .incbin "data/maps/UnknownMap_08481B24/map.bin"
+
+ .align 2
+UnknownMapAttributes_08481B24: @ 8481B24
+ .4byte 0x1B
+ .4byte 0x18
+ .4byte UnknownMapBorder_08481B24
+ .4byte UnknownMapBlockdata_08481B24
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
.align 2
SootopolisCity_MysteryEventsHouse_1F_MapBorder: @ 8481B3C
@@ -7031,7 +7568,7 @@ SootopolisCity_MysteryEventsHouse_1F_MapAttributes: @ 8481BF4
.4byte 0x8
.4byte SootopolisCity_MysteryEventsHouse_1F_MapBorder
.4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_MysteryEventsHouse
.align 2
@@ -7048,8 +7585,22 @@ SootopolisCity_MysteryEventsHouse_B1F_MapAttributes: @ 8481CEC
.4byte 0x9
.4byte SootopolisCity_MysteryEventsHouse_B1F_MapBorder
.4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata
- .4byte gTileset_InsideBuilding
+ .4byte gTileset_Building
.4byte gTileset_MysteryEventsHouse
.align 2
- .incbin "baserom.gba", 0x481d04, 0xd0
+UnknownMapBorder_08481DBC: @ 8481D04
+ .incbin "data/maps/UnknownMap_08481DBC/border.bin"
+
+ .align 2
+UnknownMapBlockdata_08481DBC: @ 8481D0C
+ .incbin "data/maps/UnknownMap_08481DBC/map.bin"
+
+ .align 2
+UnknownMapAttributes_08481DBC: @ 8481DBC
+ .4byte 0xB
+ .4byte 0x8
+ .4byte UnknownMapBorder_08481DBC
+ .4byte UnknownMapBlockdata_08481DBC
+ .4byte gTileset_Building
+ .4byte gTileset_MysteryEventsHouse
diff --git a/data/maps/scripts/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/scripts/BattleFrontier_BattlePyramidEmptySquare.inc
index 640cff797..85fd5e417 100644
--- a/data/maps/scripts/BattleFrontier_BattlePyramidEmptySquare.inc
+++ b/data/maps/scripts/BattleFrontier_BattlePyramidEmptySquare.inc
@@ -185,5 +185,474 @@ BattleFrontier_BattlePyramidEmptySquare_Text_252CA7:: @ 8252CA7
.string "saved so that you may quit for now.\l"
.string "Is that okay?$"
-gUnknown_08252CFB:: @ 8252CFB
- .incbin "baserom.gba", 0x252cfb, 0x23a6
+BattleFrontier_BattlePyramidEmptySquare_Text_252CFB:: @ 8252CFB
+ .string "Are you sure you want to quit your\n"
+ .string "PYRAMID quest?$"
+
+ .string "This floor’s exit is in\n"
+ .string "that direction: {UP_ARROW}$"
+
+ .string "This floor’s exit is in\n"
+ .string "that direction: {LEFT_ARROW}$"
+
+ .string "This floor’s exit is in\n"
+ .string "that direction: {RIGHT_ARROW}$"
+
+ .string "This floor’s exit is in\n"
+ .string "that direction: {DOWN_ARROW}$"
+
+ .string "The exit on this floor is in\n"
+ .string "the {UP_ARROW} direction.$"
+
+ .string "The exit on this floor is in\n"
+ .string "the {LEFT_ARROW} direction.$"
+
+ .string "The exit on this floor is in\n"
+ .string "the {RIGHT_ARROW} direction.$"
+
+ .string "The exit on this floor is in\n"
+ .string "the {DOWN_ARROW} direction.$"
+
+ .string "The exit is over\n"
+ .string "that {UP_ARROW} way.$"
+
+ .string "The exit is over\n"
+ .string "that {LEFT_ARROW} way.$"
+
+ .string "The exit is over\n"
+ .string "that {RIGHT_ARROW} way.$"
+
+ .string "The exit is over\n"
+ .string "that {DOWN_ARROW} way.$"
+
+ .string "On this floor, the exit is somewhere\n"
+ .string "in the {UP_ARROW} direction.$"
+
+ .string "On this floor, the exit is somewhere\n"
+ .string "in the {LEFT_ARROW} direction.$"
+
+ .string "On this floor, the exit is somewhere\n"
+ .string "in the {RIGHT_ARROW} direction.$"
+
+ .string "On this floor, the exit is somewhere\n"
+ .string "in the {DOWN_ARROW} direction.$"
+
+ .string "The exit?\n"
+ .string "It’s that {UP_ARROW} way.$"
+
+ .string "The exit?\n"
+ .string "It’s that {LEFT_ARROW} way.$"
+
+ .string "The exit?\n"
+ .string "It’s that {RIGHT_ARROW} way.$"
+
+ .string "The exit?\n"
+ .string "It’s that {DOWN_ARROW} way.$"
+
+ .string "The exit happens to be in\n"
+ .string "the {UP_ARROW} direction.$"
+
+ .string "The exit happens to be in\n"
+ .string "the {LEFT_ARROW} direction.$"
+
+ .string "The exit happens to be in\n"
+ .string "the {RIGHT_ARROW} direction.$"
+
+ .string "The exit happens to be in\n"
+ .string "the {DOWN_ARROW} direction.$"
+
+ .string "Are you looking for items?\p"
+ .string "There are eight items left to\n"
+ .string "be found.$"
+
+ .string "Are you looking for items?\p"
+ .string "There are seven items left to\n"
+ .string "be found.$"
+
+ .string "Are you looking for items?\p"
+ .string "There are six items left to\n"
+ .string "be found.$"
+
+ .string "Are you looking for items?\p"
+ .string "There are five items left to\n"
+ .string "be found.$"
+
+ .string "Are you looking for items?\p"
+ .string "There are four items left to\n"
+ .string "be found.$"
+
+ .string "Are you looking for items?\p"
+ .string "There are three items left to\n"
+ .string "be found.$"
+
+ .string "Are you looking for items?\p"
+ .string "There are two items left to\n"
+ .string "be found.$"
+
+ .string "Are you looking for items?\p"
+ .string "There is one item left to\n"
+ .string "be found.$"
+
+ .string "Are you looking for items?\p"
+ .string "There isn’t anything left to\n"
+ .string "be found!$"
+
+ .string "Because you won, I’ll tell you\n"
+ .string "a little secret!\p"
+ .string "There are eight items\n"
+ .string "lying around here.$"
+
+ .string "Because you won, I’ll tell you\n"
+ .string "a little secret!\p"
+ .string "There are seven items left\n"
+ .string "lying around here.$"
+
+ .string "Because you won, I’ll tell you\n"
+ .string "a little secret!\p"
+ .string "There are six items left\n"
+ .string "lying around here.$"
+
+ .string "Because you won, I’ll tell you\n"
+ .string "a little secret!\p"
+ .string "There are five items left\n"
+ .string "lying around here.$"
+
+ .string "Because you won, I’ll tell you\n"
+ .string "a little secret!\p"
+ .string "There are four items left\n"
+ .string "lying around here.$"
+
+ .string "Because you won, I’ll tell you\n"
+ .string "a little secret!\p"
+ .string "There are three items left\n"
+ .string "lying around here.$"
+
+ .string "Because you won, I’ll tell you\n"
+ .string "a little secret!\p"
+ .string "There are two items left\n"
+ .string "lying around here.$"
+
+ .string "Because you won, I’ll tell you\n"
+ .string "a little secret!\p"
+ .string "There is just one item\n"
+ .string "lying around here.$"
+
+ .string "Because you won, I’ll tell you\n"
+ .string "a little secret!\p"
+ .string "There isn’t anything left\n"
+ .string "lying around here.$"
+
+ .string "How’s your stock of items holding up?\p"
+ .string "I reckon there are eight items left\n"
+ .string "waiting to be found on this floor.$"
+
+ .string "How’s your stock of items holding up?\p"
+ .string "I reckon there are seven items left\n"
+ .string "waiting to be found on this floor.$"
+
+ .string "How’s your stock of items holding up?\p"
+ .string "I reckon there are six items left\n"
+ .string "waiting to be found on this floor.$"
+
+ .string "How’s your stock of items holding up?\p"
+ .string "I reckon there are five items left\n"
+ .string "waiting to be found on this floor.$"
+
+ .string "How’s your stock of items holding up?\p"
+ .string "I reckon there are four items left\n"
+ .string "waiting to be found on this floor.$"
+
+ .string "How’s your stock of items holding up?\p"
+ .string "I reckon there are three items left\n"
+ .string "waiting to be found on this floor.$"
+
+ .string "How’s your stock of items holding up?\p"
+ .string "I reckon there are two items left\n"
+ .string "waiting to be found on this floor.$"
+
+ .string "How’s your stock of items holding up?\p"
+ .string "I reckon there’s but one item left\n"
+ .string "waiting to be found on this floor.$"
+
+ .string "How’s your stock of items holding up?\p"
+ .string "I reckon there are no more items\n"
+ .string "waiting to be found on this floor.\l"
+ .string "You take care now!$"
+
+ .string "You’re strong, so you’ve earned\n"
+ .string "a hint!\p"
+ .string "There appear to be eight more\n"
+ .string "items on the ground.$"
+
+ .string "You’re strong, so you’ve earned\n"
+ .string "a hint!\p"
+ .string "There appear to be seven more\n"
+ .string "items on the ground.$"
+
+ .string "You’re strong, so you’ve earned\n"
+ .string "a hint!\p"
+ .string "There appear to be six more\n"
+ .string "items on the ground.$"
+
+ .string "You’re strong, so you’ve earned\n"
+ .string "a hint!\p"
+ .string "There appear to be five more\n"
+ .string "items on the ground.$"
+
+ .string "You’re strong, so you’ve earned\n"
+ .string "a hint!\p"
+ .string "There appear to be four more\n"
+ .string "items on the ground.$"
+
+ .string "You’re strong, so you’ve earned\n"
+ .string "a hint!\p"
+ .string "There appear to be three more\n"
+ .string "items on the ground.$"
+
+ .string "You’re strong, so you’ve earned\n"
+ .string "a hint!\p"
+ .string "There appear to be two more\n"
+ .string "items on the ground.$"
+
+ .string "You’re strong, so you’ve earned\n"
+ .string "a hint!\p"
+ .string "There appears to be only one more\n"
+ .string "item on the ground.$"
+
+ .string "You’re strong, so you’ve earned\n"
+ .string "a hint!\p"
+ .string "There appear to be no more\n"
+ .string "items on the ground.$"
+
+ .string "On this floor of the PYRAMID,\n"
+ .string "I hear there are eight items…$"
+
+ .string "On this floor of the PYRAMID,\n"
+ .string "I hear there are seven items…$"
+
+ .string "On this floor of the PYRAMID,\n"
+ .string "I hear there are six items…$"
+
+ .string "On this floor of the PYRAMID,\n"
+ .string "I hear there are five items…$"
+
+ .string "On this floor of the PYRAMID,\n"
+ .string "I hear there are four items…$"
+
+ .string "On this floor of the PYRAMID,\n"
+ .string "I hear there are three items…$"
+
+ .string "On this floor of the PYRAMID,\n"
+ .string "I hear there are two items…$"
+
+ .string "On this floor of the PYRAMID,\n"
+ .string "I hear there is one item…$"
+
+ .string "On this floor of the PYRAMID,\n"
+ .string "I hear there are no items…$"
+
+ .string "Have you collected any items?\p"
+ .string "I believe there are eight more\n"
+ .string "items on this floor.$"
+
+ .string "Have you collected any items?\p"
+ .string "I believe there are seven more\n"
+ .string "items on this floor.$"
+
+ .string "Have you collected any items?\p"
+ .string "I believe there are six more\n"
+ .string "items on this floor.$"
+
+ .string "Have you collected any items?\p"
+ .string "I believe there are five more\n"
+ .string "items on this floor.$"
+
+ .string "Have you collected any items?\p"
+ .string "I believe there are four more\n"
+ .string "items on this floor.$"
+
+ .string "Have you collected any items?\p"
+ .string "I believe there are three more\n"
+ .string "items on this floor.$"
+
+ .string "Have you collected any items?\p"
+ .string "I believe there are two more\n"
+ .string "items on this floor.$"
+
+ .string "Have you collected any items?\p"
+ .string "I believe there is one more\n"
+ .string "item on this floor.$"
+
+ .string "Have you collected any items?\p"
+ .string "I believe there are no more\n"
+ .string "items on this floor.$"
+
+ .string "You were really awesome!\p"
+ .string "But there are still seven tough\n"
+ .string "TRAINERS other than me!$"
+
+ .string "You were really awesome!\p"
+ .string "But there are still six tough\n"
+ .string "TRAINERS other than me!$"
+
+ .string "You were really awesome!\p"
+ .string "But there are still five tough\n"
+ .string "TRAINERS other than me!$"
+
+ .string "You were really awesome!\p"
+ .string "But there are still four tough\n"
+ .string "TRAINERS other than me!$"
+
+ .string "You were really awesome!\p"
+ .string "But there are still three tough\n"
+ .string "TRAINERS other than me!$"
+
+ .string "You were really awesome!\p"
+ .string "But there are still two tough\n"
+ .string "TRAINERS other than me!$"
+
+ .string "You were really awesome!\p"
+ .string "But there’s still one tough\n"
+ .string "TRAINER other than me!$"
+
+ .string "You were really awesome!\p"
+ .string "There’s no one left that\n"
+ .string "can beat you!$"
+
+ .string "This is so upsetting!\p"
+ .string "But there are seven TRAINERS left!\n"
+ .string "Someone will humble you!$"
+
+ .string "This is so upsetting!\p"
+ .string "But there are six TRAINERS left!\n"
+ .string "Someone will humble you!$"
+
+ .string "This is so upsetting!\p"
+ .string "But there are five TRAINERS left!\n"
+ .string "Someone will humble you!$"
+
+ .string "This is so upsetting!\p"
+ .string "But there are four TRAINERS left!\n"
+ .string "Someone will humble you!$"
+
+ .string "This is so upsetting!\p"
+ .string "But there are three TRAINERS left!\n"
+ .string "Someone will humble you!$"
+
+ .string "This is so upsetting!\p"
+ .string "But there are two TRAINERS left!\n"
+ .string "Someone will humble you!$"
+
+ .string "This is so upsetting!\p"
+ .string "But there’s one TRAINER left!\n"
+ .string "I’m sure you will be humbled!$"
+
+ .string "This is so upsetting!\p"
+ .string "But there are no more TRAINERS\n"
+ .string "who can engage you!$"
+
+ .string "That’s pretty impressive!\p"
+ .string "But there are seven more TRAINERS\n"
+ .string "on this floor. Can you beat them all?$"
+
+ .string "That’s pretty impressive!\p"
+ .string "But there are six more TRAINERS\n"
+ .string "on this floor. Can you beat them all?$"
+
+ .string "That’s pretty impressive!\p"
+ .string "But there are five more TRAINERS\n"
+ .string "on this floor. Can you beat them all?$"
+
+ .string "That’s pretty impressive!\p"
+ .string "But there are four more TRAINERS\n"
+ .string "on this floor. Can you beat them all?$"
+
+ .string "That’s pretty impressive!\p"
+ .string "But there are three more TRAINERS\n"
+ .string "on this floor. Can you beat them all?$"
+
+ .string "That’s pretty impressive!\p"
+ .string "But there are two more TRAINERS\n"
+ .string "on this floor. Can you beat them both?$"
+
+ .string "That’s pretty impressive!\p"
+ .string "But there’s still one more TRAINER\n"
+ .string "on this floor. Can you prevail?$"
+
+ .string "That’s pretty impressive!\p"
+ .string "You’ve gone through all the TRAINERS\n"
+ .string "on this floor.$"
+
+ .string "Maybe you could sweep through\n"
+ .string "the seven TRAINERS left on this floor.$"
+
+ .string "Maybe you could sweep through\n"
+ .string "the six TRAINERS left on this floor.$"
+
+ .string "Maybe you could sweep through\n"
+ .string "the five TRAINERS left on this floor.$"
+
+ .string "Maybe you could sweep through\n"
+ .string "the four TRAINERS left on this floor.$"
+
+ .string "Maybe you could sweep through\n"
+ .string "the three TRAINERS left on this floor.$"
+
+ .string "Maybe you could sweep through\n"
+ .string "the two TRAINERS left on this floor.$"
+
+ .string "Maybe you could complete your sweep\n"
+ .string "with the one TRAINER left on this floor.$"
+
+ .string "There isn’t a single person left who\n"
+ .string "can defeat you now…$"
+
+ .string "You may have what it takes to beat\n"
+ .string "the seven expert TRAINERS who remain.$"
+
+ .string "You may have what it takes to beat\n"
+ .string "the six expert TRAINERS who remain.$"
+
+ .string "You may have what it takes to beat\n"
+ .string "the five expert TRAINERS who remain.$"
+
+ .string "You may have what it takes to beat\n"
+ .string "the four expert TRAINERS who remain.$"
+
+ .string "You may have what it takes to beat\n"
+ .string "the three expert TRAINERS who remain.$"
+
+ .string "You may have what it takes to beat\n"
+ .string "the two expert TRAINERS who remain.$"
+
+ .string "You may have what it takes to beat\n"
+ .string "the one expert TRAINER who remains.$"
+
+ .string "Your skills are beyond reproach.\p"
+ .string "There are no more TRAINERS here\n"
+ .string "who have any chance of beating you.$"
+
+ .string "Can you keep winning against\n"
+ .string "the seven remaining TRAINERS?$"
+
+ .string "Can you keep winning against\n"
+ .string "the six remaining TRAINERS?$"
+
+ .string "Can you keep winning against\n"
+ .string "the five remaining TRAINERS?$"
+
+ .string "Can you keep winning against\n"
+ .string "the four remaining TRAINERS?$"
+
+ .string "Can you keep winning against\n"
+ .string "the three remaining TRAINERS?$"
+
+ .string "Can you keep winning against\n"
+ .string "the two remaining TRAINERS?$"
+
+ .string "Can you keep winning against\n"
+ .string "the last remaining TRAINER?$"
+
+ .string "There aren’t any TRAINERS left that\n"
+ .string "can take you on now…$"
+
diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc
index a342dc973..2083e17df 100644
--- a/data/tilesets/headers.inc
+++ b/data/tilesets/headers.inc
@@ -175,7 +175,7 @@ gTileset_BattleFrontierOutsideEast:: @ 83DF86C
.4byte TilesetCb_BattleFrontierOutsideEast
.align 2
-gTileset_InsideBuilding:: @ 83DF884
+gTileset_Building:: @ 83DF884
.byte TRUE @ is compressed
.byte FALSE @ is secondary tileset
.2byte 0 @ padding