diff --git a/data/event_scripts.s b/data/event_scripts.s
index 7e44c0df8..012b51c3b 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1060,3 +1060,25 @@ Common_EventScript_LegendaryFlewAway::
 	.include "data/text/frontier_brain.inc"
 	.include "data/text/save.inc"
 	.include "data/text/birch_speech.inc"
+
+	.include "data/maps/Route101ext/scripts.inc"
+
+	.include "data/maps/Route102ext/scripts.inc"
+
+	.include "data/maps/NewMap1/scripts.inc"
+
+	.include "data/maps/Petalburgext/scripts.inc"
+
+	.include "data/maps/PetalburgCity_OldResearchBuilding/scripts.inc"
+
+	.include "data/maps/PetalburgWoodsExt/scripts.inc"
+
+	.include "data/maps/Route103ext/scripts.inc"
+
+	.include "data/maps/PetalburgWoodsext2/scripts.inc"
+
+	.include "data/maps/RustboroCity_LeafsHouse/scripts.inc"
+
+	.include "data/maps/RustboroCity_LeafsHouse_2F/scripts.inc"
+
+	.include "data/maps/GraniteCave_B3F/scripts.inc"
diff --git a/data/layouts/GraniteCave_B3F/border.bin b/data/layouts/GraniteCave_B3F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/GraniteCave_B3F/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/GraniteCave_B3F/map.bin b/data/layouts/GraniteCave_B3F/map.bin
new file mode 100644
index 000000000..48dfb6dcf
--- /dev/null
+++ b/data/layouts/GraniteCave_B3F/map.bin
@@ -0,0 +1,8 @@
+222222222BBBBBBBBBBBB222BBBB�
2
2
2
2
2
2�BBB22BBBBB
2
2
2
2
2
2
2
2
2
2
2
2
2BBB222BBB
2
2
2
2
2
2
2
2
2
2
2
2
2
2BBB22BBB
2
2
2
2
2!B!B!B!B!B!B!B!B!B!BBBB222BBB
2
2
2
2
2
2B!B!B
+BBBBBBLBRBRBRB222BBB
2
2
2
2
2BBBRBRBRBOBBBBBB222BBB
2
2
2
2
2
2BBBBBBBBBBBB22B
2
2
2
2
2BB�222BBB!B
+
2
2
2
2
2
2BB
2
2
2
2VW
2BBBB
22!2!2!2
+2
2BB
2
2
2
2VW
2BBBBBBB
222222
2BB
2
2
2
2VW
2BBB22222
2BB
2
2
2
2
2BB
2
2
2
2
222222
2BB
2
2
2
2
2
2
2B
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2B2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2!!!
2
2!B!B!B!B!B!B!B!B!B!B!B!B!B!B!B!B
+
2!!!
2
2
2B>BBBBBBBBBBBBBBB
2
2
2
2BBBBBBBBBBBB�
22
2
2
2BBBB
2
2
2
22
2
2
2
2
2
2
2
2BBB��2
2
2
2
2
2
2
2
2
2BBBB
"
"
"
"
"
"2
2
2
2
2
2
2
2
2
2
2!!!
+
"
"
"
"
"
"2
2
2
2
2
2
2
2
2
2222
"
"
"
"
"
"2
2
2
2
2
2
2
2
2222
"
"
"
"
"
"2!2!2
+
2
2
2
2
22!2
+2
"
"
"
"
"
"22
2
2
2
2
2222
"
"Y#
"
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
\ No newline at end of file
diff --git a/data/layouts/LittlerootTown/map.bin b/data/layouts/LittlerootTown/map.bin
index 9af76f90e..7278d2cab 100644
--- a/data/layouts/LittlerootTown/map.bin
+++ b/data/layouts/LittlerootTown/map.bin
@@ -1,3 +1,3 @@
-����������5
0
0������������������
0
0����������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0����
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0��
0
02	2	2	2
+����������
0
0������������������
0
0���� @1�
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0(H9�
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0��
0
02	2	2	2
 2
0
0
0
0
0
02	2	2	2
 2
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0"20@!
0
0
0
0
0
0 @12#
000
0*:8H)4
0
0
0
04(H9:+0
0
00
0
0
0
2
0
0
0
0
0
0
0
0
2
0
0
0
000
0
�0
0
0
0
0
0
0
0
�
0
0
0
00
00
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
02B2C2
2
2
22
0
0
0
0
0
0
0
0
0
0
0
0
0JK
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0,A-
0
0
0
0
0
0
0
0�1�1
0
0
0&4I5'
0
0
0
0
0
0
0
0���1�1
0000
2
0
0
0
0
0
0
0
0�1�1����
0000
0
0
0
0
0
0
0
0
0
0�������1�1�1�1�1�1�1�1�1�1�1�1�1�1����
\ No newline at end of file
diff --git a/data/layouts/NewMap1/border.bin b/data/layouts/NewMap1/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/NewMap1/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/NewMap1/map.bin b/data/layouts/NewMap1/map.bin
new file mode 100644
index 000000000..3ac590beb
--- /dev/null
+++ b/data/layouts/NewMap1/map.bin
@@ -0,0 +1 @@
+
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
\ No newline at end of file
diff --git a/data/layouts/OldaleTown/map.bin b/data/layouts/OldaleTown/map.bin
index 28b17c441..fc4e77f22 100644
--- a/data/layouts/OldaleTown/map.bin
+++ b/data/layouts/OldaleTown/map.bin
@@ -1 +1 @@
-��������
0�1�1
0�����������������1�1�1
0������������
0
0
0
0�1�1�1�1
0
0
0
0��������
0
0
0
0�1�1�1�1
0(0)0)0������
0
0l2m2m2n2�1�1�1�1
00123
0����
00tuuv�1�1�1�1�189:;
0����0
0|}~�1�1�1�1�1`ABC
0����
00�����1�1�1�1�1�1�1�1�1�1����0
0
0�1�1�1�1
0
00�1�1�1�1�1�1�1
0��
0�1�1�1�1�1�10
0�1�1�1�1�1�1�1
02
0�1�1�1�1�1�1�1
00
0�1�1�1�1�1�1
0
02�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1
0�1�1��
0
0
0�1�1�1�1�1�1�1�1�1�1
0
0
0����
0
0
0H0I0�2�2�1�1�1�1�1l2m2m2n2����
0
0
0PQRS�1�1�1�1
0tuuv�����1�1
0XYZ[�1�1�1�1
0|}~������
0`abc�1�1�1�1
0����������
0
0
0�1�1�1�1�1
0
0
0
0�1�1������
0
0
0�1�1�1�1�1
0
0
0
0���������1�1�1x2�1�1�1�1�1�1�1�1����
\ No newline at end of file
+��������
0�1�1
0�����������������1�1�1
0������������
0
0
0
0�1�1�1�1
0
0
0
0��������
0
0
0
0�1�1�1�1
0(0)0)0������
0
0l2m2m2n2�1�1�1�1
00123
0����
00tuuv�1�1�1�1�189:;
0����0
0|}~�1�1�1�1�1`ABC
0����
00�����1�1�1�1�1�1�1�1�1�1����0
0
0�1�1�1�1
0
00�1�1�1�1�1�1�1�1��
0�1�1�1�1�1�10
0�1�1�1�1�1�1�1�12
0�1�1�1�1�1�1�1
00
0�1�1�1�1�1�1�1�12�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1
0�1�1��
0
0
0�1�1�1�1�1�1�1�1�1�1
0
0
0����
0
0
0H0I0�2�2�1�1�1�1�1l2m2m2n2����
0
0
0PQRS�1�1�1�1
0tuuv�����1�1
0XYZ[�1�1�1�1
0|}~������
0`abc�1�1�1�1
0����������
0
0
0�1�1�1�1�1
0
0
0
0�1�1������
0
0
0�1�1�1�1�1
0
0
0
0���������1�1�1x2�1�1�1�1�1�1�1�1����
\ No newline at end of file
diff --git a/data/layouts/PetalburgCity/map.bin b/data/layouts/PetalburgCity/map.bin
index 35f0172ca..f6fb70058 100644
--- a/data/layouts/PetalburgCity/map.bin
+++ b/data/layouts/PetalburgCity/map.bin
@@ -1,4 +1,4 @@
 ����������������������������������UNMNMNV�����������������������D			
 F��������
0
0
0������������LL�5�������5���������������TL?������?���������������0 !"LL������L���������������001100LL������L���������������00 1"100LL������L���������������
0
0 1"1
0<2fL�1�1����1L��������������5�5
0
0 1"1deT
0
011101T00000P2Q2XY����
0
0
0
0 1"1
0
0
0
0
0
0 1!1"11
0
0
0
0
0
00123���5�5
0
0
0
0 1"1
0
0
0
0
0
0 1!1"1
0
0
0
0
0
0
089:;��
0
01111!1!1111111!1!1"1
0
0
0
0
0
0
0`ABC���1�1(1)1)1)1)1R2S2)1)1)1)1)1)1!1"1
0
0H0I0J0K0
0
011
0�����������
0
0
0
0
0
0 1"1
0
0PQRS
0
0 1"1
0�����������
0
0
0
0
0
0 1"1
0
0XYZ[
0
0 1"1
0�5����������0	0	0
-0
0
0 1"1
0`abc
0
0 1"1
0
0
0���������
0
0 1!111111111!1!11
0
0���������
0
0 1!1)1)1)1)1)1)1)1)1)1)1*1
0
0��������5�5 !"
0
0 1"1
0
0
0
0
0
0
0
0
0�1�1�1�1�������
0
0
0
2
0
0
0
0 1"1
0<2=2=2=2=2=2=2>2�����������
0
0
0
0
0
0
0
0 1"1
0D		
-EEF�����������
0
0
0
0
0
0
0
0 1"1
0LL�����������������1�1
0 1"1
0TL������������������0 1"10
0 !"00L������������������
0 1!111111
000L������������������0(1)1)1)1)1)1*1
0
0
0T�������������������1�1�1�1�1�1�1�1�1�1�1�1������000������0���������������������1�1�1�������1������������������
\ No newline at end of file
+0
0
0 1"1
0`abc
0
0 1"1
0
0
0���������
0
0 1!111111111!1!11
0
0���������
0
0 1!1)1)1)1)1)1)1)1)1)1)1*1
0
0��������5�5 !"
0
0 1"1
0
0
0
0
0
0
0
0
0�1�1�1�1�������
0
0
0
2
0
0
0
0 1"1
0<2=2=2=2=2=2=2>2�����������
0
0
0
0
0
0
0
0 1"1
0D		
+EEF�����������
0
0
0
0
0
0
0
0 1"1
0LL�����������������1�1
0 1"1
0TL������������������0 1"10
0 !"00L������������������
0 1!111111
000L������������������0 1!1)1)1)1)1*1
0
0
0T������������������
0 1"1
0�1�1�1�1�1�1�1�1���������������0��
0 1"1
0������������������������1��
0 1"1
0UNMNMNMN����
\ No newline at end of file
diff --git a/data/layouts/PetalburgCity_OldResearchBuilding/border.bin b/data/layouts/PetalburgCity_OldResearchBuilding/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/PetalburgCity_OldResearchBuilding/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/PetalburgCity_OldResearchBuilding/map.bin b/data/layouts/PetalburgCity_OldResearchBuilding/map.bin
new file mode 100644
index 000000000..ac9d268da
Binary files /dev/null and b/data/layouts/PetalburgCity_OldResearchBuilding/map.bin differ
diff --git a/data/layouts/PetalburgWoods/map.bin b/data/layouts/PetalburgWoods/map.bin
index a032b4c43..61faba292 100644
--- a/data/layouts/PetalburgWoods/map.bin
+++ b/data/layouts/PetalburgWoods/map.bin
@@ -1 +1 @@
-����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
0
0
0
0
0
0
0
0
0
0
0
0����������������IIII��������������
0
0
0
0
0�1�1�1�1
0
0
0����������������
0
0
0
0
0
0��������
0����
0
0
0
0
0
0�5�5�5�5
0
0
0
0
0��������������
0
0
0
0
0
0��������
0����
0
0
0
0
0
0����
0
0
0
0
0������
0
0
0
0
0
0
04
0
0
0
0
0
0������
0
0
0
0
0
0
0
0
0
0
0
0
0���������������
0
0
0
0
0
0
0
0
0
0
0
0
0
0������
0
0
0
0�1�1�1�1�1�1
0
0
0����
0
0
0
0
0������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�5�5�5�5�5�5
0
0
0
0
0
0
0
0
0
0
0
0������
0
0
0
0�1�1�1�1�1�1
0
0
0
0�1�1�1�1�1�1�1�1�1�1�������1�1�1�1�1�1
0
0
0
0
0
0������
0
0
0
0�5�5�5�5�5�5
0
0
0
0�5�5�5�5�5�5�5�5�5�5��������5�5�5�5�5
0
0
0
0
0
0������
0
0
0
0������
0
0
0
0�����������������������1
0
0
0
0
0������
0
0
0
0���������������������������������5
0
0
0
0
0������
0
0
0
0������
0
0
0
0
0�����������������������1
0
0
0
0������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0��������������5
0
0
0
0������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0��������������
0
0
0
0������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0��������������
0
0
0
0�������1�1�1�1�1�1�1�1
0
0
0
0�1�1�1�1�1�1�1�1�1�1
0
0��������������
0
0
0
0�������5�5�5�5�5�5�5�5
0
0
0
0�5�5�5�5�5�5�5�5�5�5
0
0������
0
0������������������������
0
0
0
0����������
0
0������
0
0������
0
0
0
0����������������������������
0
0����
0
0
0
0
0
0����
0
0
0
0��������������
0
0
0
0����������
0
0����
0
0
0
0
0
0����
0
0
0
0��������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0����
0
0
0
0
0
0
0
0
0
0
0
0
0
0��������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0����
0
0
0
0�1�1
0
0
0
0
0
0
0
0������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0����
0
0
0
0�5�5
0
0
0
0
0
0
0
0������
0
0
0
0
0
0�1�1�1�1�1�1
0
0
0
0
0
0�1�1�1�1�1�1����
0
0
0
0���1�1
0
0
0
0�1�1������
0
0
0
0
0
0�5����5�5
0
0
0
0
0
0�5�5�5�5�5�5����
0
0
0
0����5
0
0
0
0�5�������
0
0
0
0
0
0������
0
0
0
0
0
0����������
0
0
0
0�����1�1�1�1��������
0
0
0
0
0
0����������������������
0
0
0
0����������������
0
0
0
0
0
0������
0
0
0
0
0
0����������
0
0
0
0����������������
0
0
0
0
0
0
0
0
0
04
0
0
0
0
0
0
0
0
0
0
0���������������������������1�1
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0������
0
0
0
0������������������5
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�������������1�1�1�1�1�1�1�1
0
0
0
0
0
0�1�1�1�1�1�1�1�1�1�1�1�1�1�1
0
0
0
0
0
0
0
0��������������������5
0
0
0
0
0
0�5�������������5
0
0
0
0
0
0
0
0��������������������
0
0
0
0
0
0��������������
0
0
0
0
0
0�1�1��������������������IIII��������������IIII�5�����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
\ No newline at end of file
+����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
0
0
0
0
0
0
0
0
0
0
0
0����������������IIII��������������
0
0
0
0
0�1�1�1�1
0
0
0����������������
0
0
0
0
0
0��������
0����
0
0
0
0
0
0�5�5�5�5
0
0
0
0
0��������������
0
0
0
0
0
0��������
0����
0
0
0
0
0
0����
0
0
0
0
0��
0
0
0
0
0
0
0
0
0
0
04
0
0
0
0
0
0������
0
0
0
0
0
0
0
0
0
0
0
0
0������������1�1�1�1
0
0
0
0
0
0
0
0
0
0
0
0
0
0������
0
0
0
0�1�1�1�1�1�1
0
0
0����
0
0
0
0
0������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�5�5�5�5�5�5
0
0
0
0
0
0
0
0
0
0
0
0������
0
0
0
0�1�1�1�1�1�1
0
0
0
0�1�1�1�1�1�1�1�1�1�1�������1�1�1�1�1�1
0
0
0
0
0
0������
0
0
0
0�5�5�5�5�5�5
0
0
0
0�5�5�5�5�5�5�5�5�5�5��������5�5�5�5�5
0
0
0
0
0
0
0
0����
0
0
0
0������
0
0
0
0�����������������������1
0
0
0
0
0
0
0�������
0���������������������������������5
0
0
0
0
0
0
0����
0
0
0
0������
0
0
0
0
0�����������������������1
0
0
0
0�1�1����
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0��������������5
0
0
0
0������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0��������������
0
0
0
0��
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0��������������
0
0
0
0���1�1�1�1�1�1�1�1�1�1�1�1
0
0
0
0�1�1�1�1�1�1�1�1�1�1
0
0��������������
0
0
0
0�������5�5�5�5�5�5�5�5
0
0
0
0�5�5�5�5�5�5�5�5�5�5
0
0������
0
0������������������������
0
0
0
0����������
0
0������
0
0������
0
0
0
0����������������������������
0
0����
0
0
0
0
0
0����
0
0
0
0��������������
0
0
0
0����������
0
0����
0
0
0
0
0
0����
0
0
0
0��������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0����
0
0
0
0
0
0
0
0
0
0
0
0
0
0��������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0����
0
0
0
0�1�1
0
0
0
0
0
0
0
0������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0����
0
0
0
0�5�5
0
0
0
0
0
0
0
0������
0
0
0
0
0
0�1�1�1�1�1�1
0
0
0
0
0
0�1�1�1�1�1�1����
0
0
0
0���1�1
0
0
0
0�1�1������
0
0
0
0
0
0�5����5�5
0
0
0
0
0
0�5�5�5�5�5�5����
0
0
0
0����5
0
0
0
0�5�������
0
0
0
0
0
0������
0
0
0
0
0
0����������
0
0
0
0�����1�1�1�1��������
0
0
0
0
0
0����������������������
0
0
0
0����������������
0
0
0
0
0
0������
0
0
0
0
0
0����������
0
0
0
0����������������
0
0
0
0
0
0
0
0
0
04
0
0
0
0
0
0
0
0
0
0
0���������������������������1�1
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0������
0
0
0
0������������������5
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�������������1�1�1�1�1�1�1�1
0
0
0
0
0
0�1�1�1�1�1�1�1�1�1�1�1�1�1�1
0
0
0
0
0
0
0
0��������������������5
0
0
0
0
0
0�5�������������5
0
0
0
0
0
0
0
0��������������������
0
0
0
0
0
0��������������
0
0
0
0
0
0�1�1��������������������IIII��������������IIII�5�����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/PetalburgWoodsExt/border.bin b/data/layouts/PetalburgWoodsExt/border.bin
new file mode 100644
index 000000000..eec1c07e9
--- /dev/null
+++ b/data/layouts/PetalburgWoodsExt/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/PetalburgWoodsExt/map.bin b/data/layouts/PetalburgWoodsExt/map.bin
new file mode 100644
index 000000000..011b5f63a
--- /dev/null
+++ b/data/layouts/PetalburgWoodsExt/map.bin
@@ -0,0 +1 @@
+�������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
0
00
0
0
0
0
0
0
00
0
0
0
0�����
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0����
0����������
0
0�1�1
0
0
0
0��
0
0������
0���������������
0
0
0
0
0
0
0
0
0
0
0�����������
00
0
0
0
0
0
0
00000
0
0
0�1�1
0����
0����������
0
0��
0
0
0
0��
0
0������
0���������������
0
0
0
00
0��������������������
0
0
0
000000�
0
0��
0����
0
0��
0
0
0
0
0
0
0
0
0��
0
0
0
0
0
0
0
0
0
0
0
0
0�1�1�������������������������������������������0
0222
0
0
0
0
0��
0����
0�1���0�0�0�0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0��������������������������������0��������������������
0
0
0
0
0��
0
0
0��
0�0�0�0�0�0�0�0�0�0�0
0
00
0�1�1
0
0
0
0
0
0
0
0������������������������������00
0���������������������
0
0����
00
0��
0
0
0�0�0�0�0�0�0�0�0
0
00
0��
0
0
0
0
0
0
0
0�������������������������00000
0�1�1��������������������
0
0���
0
0
0X2Z2
0
0
0
0
0�0�0�0�0
0�0�0�0
000��
0
0
0
0
0
0�1�1�������������������������
0
0
0
0
0
0��0�����
������������������
0
0
0`2a2Y2Y2Y2Y2Y2Y2Y2Z2
0
0�0�0�0
000
0
000000
0����0000������������������0
0
0
0
0
0
0��
0����

�����������������
0`2a2a2a2a20a2a2a2Y2Y2Z2�0�0�0200000000
0����
0
0
0
0�����������������0
0�0�0�0�0�0�0
0
0
00���



����������000����
0&'`2a2a2a2a2a2i2a2a2a2b2�0�0�0
000000000
0
0
0��
0
0
0
0���������������00
0
0�0�0�0�0�0�0
0�1�1
00���������0000���
0
0
00000
0
0
0h2i2i2i2i2a2b2
0h2a2a2a2Z2�0�0
022000000
0
0
0��
0
0
0
00��������������
0
0
0
0�0�0�0�0�0�0
0��
0K0��������
0
0
0
0000
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0h2j2
0
0h2a2a2a2b2�0�0�0
0
0000002
0
0
0��
0
0
0
0
000���������000
0
0
0
0�0�0�0�00
0
0��
0S
0�������0
0
0
0
0
0111111111111
0
0
00
0
0
0�1�1
0h2a2a2b2�0�0�0
0
020000
0
0
0��
0
0
0
0
0
0
00000000002
0
0X2Y2Z200
0
0
0
0
0
0
0
0
0
0
00��0000
0
01111!1!1)1)1)1)1)1)1)1)1!1!111
0
0
0
0
0��
0
0h2a2b2
0�0�0
0
0
0�2�2�220
0
0��
0
0
0
011
0
022222222
0
0
0h2a2a200
0
0
0
0
0111111
�B�B
11111!1!1)1)1)1*1
0
0
0
00
0
0
0(1)1!1!1111
0
0��
0
0
0h2j2
0
0
0
00
0pqr
0
0
0
0
0��
0
0
0
0 1!11
0
0X2Y2Y2i2KK�0�0
0
0
0h2i222
0
0111!1!1)1)1)1)1*
�B�B(
)1)1)1)1)1)1*100
0
0
0000
0�1�1
0
0
0(1)1)1!1!111
0
0
0
0
0
0
00
0
0
00
0
0�1�1�1�1
0
0
0
0
0
0
0
0
0(1!1!111h2i2i2i2SS�0�0
0
0
0
0
0
0
011!1!1)1)1*1
0
0
0
0
0���
0
0
0
0
0
0
000
0
0
0000
0��
0
0�1�1
0
0(1)1!1!11111
0
0
0
0
0
0
0
0
0
0�1�1��
0
0
0
0
0
0
0
0
0
0(1)1!1!11111
0
0
0
0
0
0
0
0
011!1!1)1*1
0X2Y2Y2Y2Z2
0
00���
0
0
0
0�1�122
0
0
0222
0��
0
0��
0
0
0
0(1)1)1)1!1!11111
0
0�1�1�1�1�1�1��
0
000

0
0
0
0
0
0
0(1)1)1)1!1!1111111111!1!1)1*1K
0X2a2a2i2X2b2
0
0
0���
0
00
0��
0
0
0
0
0
0
0
0
0
0
0
0
0��X2Y2Y2Z2
0
0
0
0(1)1)1)1)1*1�1�1������
0
0�1�100

0
0
0
0
0
0
0
0
0�0�0(1)1)1)1)1)1)1)1)1)1)1)1*1
0
0S
0h2i2j2
0h2j2
0
0
0���
0
0
0
0�������
0
0
0
0
0
0
0
0
0
0h2i2
0a2Z2
0
0
0
0
0
0
0
0
0���������1�1�1�1000
0
0
0
0
0
0
0
0�0�0�0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�0�0�0
0
0K����
0
0
0
0
0������
0
0
0
0
0
0
0
0
0
0
0h2a2a2Y2Z2
0
0
0
0
0���������1�1�1�1220
00000
0
0�0�0�0
0
0
0
0
0�0�0
0
0
0
0
0
0
0
0X2Y2Z2
0�0�0�0�0�0
0
0S������
0
0��������
0
0����
0
0
0
0
0h2i2
0a2Z2
0
0
0
0
0
0������
0
0X2Y2Z2
00
00000
0
0�0�0�0�0�0�0
0
0�0�0�0�0�0
0�1�1X2Y2a2
0�1�1�0�0�0�0�0
0
0
0������������������������
0
0
0
0
0h2i2j2
0�1�1�0�0�0�0
0����
0
0
0X2a2a2j2
02�1�1000
0�0�0�0�0�0�0�0
0
0�0�0�0�0�0�0��h2i2i2j2���0�0�0�0
0X2Z2
00�����������������0000�������
0
0
0
0���0�0�0�0
0����Y20000j2
0
0
0��
0
0
0
0�0�0�0
0
0
0
0
0
0
0
0
0�0�0�0��
0
0
0
0��
0
0
0
0
0h2j20
000������������000
0
0
0
000000���
0
0
0���0�0
0
0
0��X2a2a22222
0
0�1�1���1�1�1�1�1�1�10�1�1�1�1�1�1�1�1
0�1�1�1�1�1
0
0
0
0�1�1�1�1�1�1�1�1�1�1�1�10000����0000
0
0
0
0000
0
0
0
0
0000
0�1�1�1�1�1�1�1�1�1���10000�1�1�1�1�1�1������������������������
0X2Z2
0������������
0
0
0
0����
0
0
0
0
0
0
0
0222
0
0��
0
0
0
0������������0022�����1�1������������������������
0`2b2
0�������������1�1�1�1�����
0�1�1�1�1�1�1�1�1�1�1
0���
0
0
0������������00�1�1����$0$0������������������������
0`2b2
0���������������������0����������
00��
0
0
0
0
0
0
0
0
0
0������00�������1�1������������������������
0`2a2Z2���������������������0����������
0
0���0����0
0
0
0������00�������1�1������������������������
0`2a2b2
0
0�������������������2��������
0
0
0
0����������
0
0������000000��I1I1������������������������
0`2a2b2
0
0��������������00000
0��������
0
0
0�����������
0
0������000000���1�1
0
0
0
0
0
0
0
0
0
0
0
0������������X2a2i2j2
0
011111
0
0
0
00����X2Y2Y2Y2Z2
0��������
0
0��������0000
00������****00����
0�0�0�0
0
0
0�0�0�0�0
0������������h2j2
0
0
0
01111
10
0
0
0
0�����1�1�1�1�1�1��������
0���������
0
0�1�1�1�1������STST00����
0�0�0�0�0�0�0�0�0�0�0
0
0
0
00��0
0
0
0
0
0
0
0
0�1�1�111111�1�1�1
0
0������������������
0000000000
0
0��������000000000000
0�0�0�0�0�0�0�0�0X2Y2Z20K
0
0��
0
0�1�1KK
0
0�1�1�1�1�1�1�1�1�1�1�1�1
0
0�������������������1�1�1�1�1�1�1�1�1�1�1�1��������002200222200
0�0�0�0�0�0�0�0
0h2i2j22S
0
0��00��SS0
0�1�1�1�1�1�1�1�1�1�1
0
0
0
0��������������������������������������020
000
0
0
0
000�1�1�1�0�0�0�1�1�1�1�1�1
0X2Y2Z2��00����
0�1�1�1�1�1�1�1�1�1�1�1
0
0
0
0��������������������������������������000000
0
00000������������
0`2a2j20000����
0�1�1�1�1�1�1�1�1
0
0
0
0
0
0
0��������������������������00
0
0000000222222
002222�������������1�1�1�12222�����1�1�1�1�1�1�1�1�1
0
0
0�1�1�1�1��������������������������000
0222&'000�1�1�1�1�1�1�1�1�1�1�1�1��������������������������
0�1�1�1�1�1
0
0
0
0������������������������������22
0
0
00
0
0
0222����������������������������������
0
0���1�1�1�1�1�1�1�1�1�1�������������������������������1�1�1�1�1�1�1�1�1�1�1�1������������
\ No newline at end of file
diff --git a/data/layouts/PetalburgWoodsext2/border.bin b/data/layouts/PetalburgWoodsext2/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/PetalburgWoodsext2/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/PetalburgWoodsext2/map.bin b/data/layouts/PetalburgWoodsext2/map.bin
new file mode 100644
index 000000000..01eb60fef
--- /dev/null
+++ b/data/layouts/PetalburgWoodsext2/map.bin
@@ -0,0 +1 @@
+����������������������������������������
0
0
0
0
0
0
0
0
0
0
0
0��������
0
0
0
0
0
0
0
0
0
0
0
0��������
0
0
0
0
0
0
0
0
0
0
0
0��
0
0
0
0
0
0
0
0
0
0
0�1�1�1�1�1�1
0��
0
0�1�1
0
0
0
0
0
0
0������
0
0
0
0
0��
0
0
0
0
0
0
0�������������
0
0
0
0
0
0
0��
0
0
0
0
0
0
0
0
0��
0
0
0
0
0
0
0��
0
0
0�1�1
0
0
0
0��
0
0
0
0
0
0
0
0
0
0
0
0��
0
0
0
0��
0
0
0
0
0
0
0
0
0
0
0
0��
0
0
0
0����
0�1�1�1�1�1�1�1�1
0
0
0
0
0
0
0��
0
0
0��������
0
0
0
0
0
0
0��
0
0
0���������1�1
0
0
0�1�1�1�1�1�1
0
0
0
0
0������
0
0
0������
0
0
0
0
0������
0
0
0�������1�1�1�1
0
0
0��
0�1�1�1�1
0
0
0
0
0
0����
0
0
0��
0����
0
0
0
0
0
0�����1�1�1�1�1�1����
0
0�1�1�1�1
\ No newline at end of file
diff --git a/data/layouts/Petalburgext/border.bin b/data/layouts/Petalburgext/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/Petalburgext/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Petalburgext/map.bin b/data/layouts/Petalburgext/map.bin
new file mode 100644
index 000000000..4676b7ac7
--- /dev/null
+++ b/data/layouts/Petalburgext/map.bin
@@ -0,0 +1 @@
+�1�1�5��1�1�5��1�1�5�������������I 1"1IL2B2C2
2B2C22��1�5��1�1�1�1�1�1�1�1�1�1�1������������� 1"1LJKJK��1�1�1�1�1�1�1�1�1�1�1�1�1�1������������� 1"1L��1�1�1�1�1�1�1�1�1�1�1�1�1�1����q�������� 1"1L,A-��1�1�1�1�1�1�1�1�1�1�1�1�1�1�������������I 1"1IT&4I5'��1�1�1�1�1�1�1�1�1�1�1�1�1�1�������������
0 1!1111111100��1�1�1�1�1�1�1�1�1�1�1�1�1�1�������������
0(1)1)1)1)1)1)1)1*1
0
0��1�1�1�1�1�1�1�1�1�1�1�1�1�1�������������
0
0
0
0
0
0
0
0
0
0
0
0��1�1�1�1�1�1�1�1�1�1�1�1�1�1���������
0
0
0
0
0
0
0
0
0
0
0
00
00
0��1�1�1�1�1�1�1�1�1�1�1�1�1�1���������
0
0
0
0
0
0
0
0
0
0
00�1�1�1�1��1�1�1�1�1�1�1�1�1�1�1�1�1�1���������
0
0
0
0
0
0
0
0
0
0
0
0������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�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�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�1�1�1�1�1�1�1�1�00�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�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�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�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�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�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�1�1�1�1�1�1�1
\ No newline at end of file
diff --git a/data/layouts/Route101/map.bin b/data/layouts/Route101/map.bin
index fab3a1d69..eecbbe745 100644
--- a/data/layouts/Route101/map.bin
+++ b/data/layouts/Route101/map.bin
@@ -1 +1 @@
-���������1�1�1
0�����������������1�1�1
0����������
0
0
0
0
0
0
0
0
0
0
0
0
0
0������5
0
0
0
0
0
0
0
0
0
0
0
0
0
0����
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0���1�1
0
0
0
0
0
0
0
0
0�1�1
0
0
0
0
0����
0
0
0
0n�������1�1
0
0
0
0
0�������
0
0
0
0����
0
0�1�1
0���1�1
0
0
0
0
0
0
0����
0�1�1�1
0����
0
0�1�1�1
0��
0
0
0�1�1�1�1����
0�1�1�1�1�1
0
0
0
0
0
0
0�1�1�1����
0�1�1�1�1�1
0
0
0
0
0
0
0
0�1�1����
0
0�1�1�1
0
0
0
0
0
0
0
0
0
0
0��
0
0
0
0
0
0�����1�1
0
0
0
0�1�1
0
0
0
0
0
0
0
0
0
0
0
0��
0
0
0
0���1�1
0
0
0
0
0
0
0
0
0
0���1�1�1�1����
0
0
0
0
0
0
0
0
0
0�����������1�1�1�1�1�1�1�1
0
0������������������
0
0������������������
0
0��������
\ No newline at end of file
+���������1�1�1
0�����������������1�1�1
0����������
0
0
0
0
0
0
0
0
0
0
0
0
0
0������5
0
0
0
0
0
0
0
0
0
0
0
0
0
0����
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0���1�1
0
0
0
0
0
0
0
0
0�1�1
0
0
0
0
0����
0
0
0
0n�������1�1
0
0
0
0
0�������
0
0
0
0����
0
0�1�1
0���1�1
0
0
0
0
0
0
0����
0�1�1�1
0����
0
0�1�1�1
0��
0
0
0�1�1�1�1����
0�1�1�1�1�1
0
0
0
0
0
0
0�1�1�1����
0�1�1�1�1�1
0
0
0
0
0
0
0
0�1�1����
0
0�1�1�1
0
0
0
0
0
0
0
0
0
0
0��
0
0
0
0
0
0�����1�1
0
0
0
0�1�1
0
0
0
0
0
0
0
0
0
0
0
0��
0
0
0
0���1�1
0
0
0
0
0
0
0
0
0
0���1�1�1�1����
0
0
0
0
0
0
0
0
0
0�����������1�1�1�1�1�1�1�1
0
0������������������
0
0������������������
0
0��������
\ No newline at end of file
diff --git a/data/layouts/Route101ext/border.bin b/data/layouts/Route101ext/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/Route101ext/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route101ext/map.bin b/data/layouts/Route101ext/map.bin
new file mode 100644
index 000000000..d5f779480
--- /dev/null
+++ b/data/layouts/Route101ext/map.bin
@@ -0,0 +1,2 @@
+���pPQPQppppppppp�%%�pppXYXYppppppppp����pppppppppppppppp����ppppppppppppp			
+00000000�ppp�0
0�1�1�1�1
0
0
0
0�ppp�
00����
0
0
0�0�pp�
0 !"
0����
0
0
0
00000
0B
0
0
0
0
0�1�1�1�1�1
0
0
0
0
0
08IIJ
0
0
0
0
0�1�1�1�1�1�1
0
000
0@
0
0
0
0
00
0
0�1�1
0�1�1�1
0
0&0'0
0@0
0
0
0�
0
0
0
0
0
0�1�1�1
0
0
0
0
0@
0
0
0
0
0
0
0
0�0�0�0
0�1�1�1�1
0
0
0@�1�1
0
0
0
0
0
0�0�0�0�0�1�1�1�1�1
0
0@��
0
0
0
0
0
00�0�0�0
0
0�1�1�1�1
0@��
0
0
0
0
0
0
0
0�0�0�0�0
0�1�1�1�1@
0
0
0
0
0
0
0
0
0
0�0�0�0�0
0
0�1�1�1HIIII
0III
0
0
0�0�0�0
0
0
0�1�1�1
0
0
0
0
0
0
0
0
0
00�0�0�0
0�1�1
0�1�1
0
0
0�1�1
0
0
0
0�0�0�0�0
0
0��
0�1�1
0
0
0��
0
0
00�0�0�0�0
0
0��
0�1�1
0
0
0��
0
0
0
0�0�0
0
0
0
0
0
0�1�1�1
0
0
0
0
0
0
0
0�0�0�0
0
0
0
0�1�1�1�1�1
0
0
0
0
0
0�1�1�0�0�0
0
0
0�1�1�1�1�1
0�1�1
0
0
0
0��
0�1�1
0
0�1�1�1�1
0
0
0��
0
0
0
0��
0��
0
0�1�1�1
0
0
0
0��
0
0
0
0
0
0
0��
0
0�1�1�1
0
0
0
0
0
0
0
00
0
0
0
0
0
0
0
0�1�1�1
0
0
0
0
0
0
0
0
0
0�1�1�1�1
0�1�1�1�1�1
0
0
0
0
0
0
0
0
0
0���1�1�1�1�1�1�1
0
0
0
00
0
0
0
0
0
0���1�1�1�1
0
0
0
0
0
0
0
0
0
0
0�1�1
0
00�1�1�1
0
0�1�1
0
0
0
0
0
0
0
0��
0�1�1
0
0
0
0
0��
0
0
0
0
0
0
0
0��
0��
0
0
0
0
0��
0
0
0
0
0�1�1
0
0
0
0��
0
0
0
0
0
0
0
0
0
00
0��
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0��
0
0
0
00
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�1�1
0
0
0
00
0
0
0
0
0
0
0
0
0
0
0
0
0��
0
0
0
0
0
0
0
0
0
00
0
0
0
0
0
0
0��
0
0�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1
\ No newline at end of file
diff --git a/data/layouts/Route102/map.bin b/data/layouts/Route102/map.bin
index 7378bb44b..8d1494945 100644
--- a/data/layouts/Route102/map.bin
+++ b/data/layouts/Route102/map.bin
@@ -1 +1 @@
-������������������������������������������������������������������������������������������������������������
0
0
0
0
0
0
0
0
0
0
0
0
0
0�2�6�6�2
0��������
0
0
0
0������������������
0
0
0
0
0
0�1�1�1�1
0
0
0
0
01111
0��������
0
0
0
0������������
0
0
0
0
0
0
0
0
0
0�1�1�1�1�1�1�1�1
0
0
0
0
0
0
0
0
0
0
0
0
00�
0
0
0
0
0������������
0
0
0
0
0
0
0
0
0�1�1�1q2y2�1�1�1�1
0
0
0
0
0
0
0
0
0
0�1�10
0�
0
0
0
0
0����������
0
0
0
0
0
0
0
0
0
0
0�1�1�1����
0
0�������1�1�1�1��
00�
0
0
0
0
0����������
0
0
0
0
0
0
0
0
0
0
0�1r2�1��
0
0
0
0
0
0
0
0
0
0�������1�1�
0
0
0
0
0000000����
0
0
0
0
0
0
0
0
0
0
0
0����
0
0
0
0
0
0
0
0
0
0��������{
0
0
0
0
0
0
0
0
0
0
0
0
0���1�1�1�1�1�1�1�1
0
0
0
0����
0
0
0
0
0
0
0
0
0
0���������1�1
0
0
0
0
0
0
0
0
0
0
0����������
0
0�1�1����
0
0
0
0
0
0
0
0
0
0����������
0
0
0
0
0�1�1�1�1
0
0
0
0
0��������
0
0������
0
0
0
0
0
0
0
0
0
0����������
0
0�1�1�1�1�1�1�1
0
0
0�1�1������
0
0
0
0������
0
0
0
0
0�1�1
0
0
0����
0
0�����1�1�1�1�1�1�1�1�1
0
0
0��������
0
0���������1�1
0
0
0���1�1
0
0
0
0
0
0
0�����1�1�1�1�1�1�1
0�1�1�1�1��������
0
0
0
0
0
0������
0
0
0����
0
0
0
0
0
0
0
0
0
0�1�1�1�1�1�1
0
0
0������������
0
0
0
0�1�1������
0
0
0
0
0��
0
0
0
0
0
0
0
0
0
0�1�1�1
0
0�1�1�1�1������������
0
0
0
0��������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�����������������1�1�1�1���������1�1�1�1�1�1
0
0
0
0
0
0
0
0�1�1�1�1�1�1�1�1����������������������������������
0
0
0
0
0
0
0
0�������������������������������������������1�1�1�1�1�1�1�1������������������
\ No newline at end of file
+������������������������������������������������������������������������������������������������������������
0
0
0
0
0
0
0
0
0
0
0
0
0
0�2�6�6�2
0��������
0
0
0
0������������������
0
0
0
0
0
0�1�1�1�1
0
0
0
0
01111
0��������
0
0
0
0������������
0
0
0
0
0
0
0
0
0
0�1�1�1�1�1�1�1�1
0
0
0
0
0
0
0
0
0
0
0
0
00�
0
0
0
0
0������������
0
0
0
0
0
0
0
0
0�1�1�1q2y2�1�1�1�1
0
0
0
0
0
0
0
0
0
0�1�10
0�
0
0
0
0
0����������
0
0
0
0
0
0
0
0
0
0
0�1�1�1����
0
0�������1�1�1�1��
00�
0
0
0
0
0����������
0
0
0
0
0
0
0
0
0
0
0�1r2�1��
0
0
0
0
0
0
0
0
0
0�������1�1�
0
0
0
0
0000000����
0
0
0
0
0
0
0
0
0
0
0
0����
0
0
0
0
0
0
0
0
0
0��������{
0
0
0
0
0
0
0
0
0
0
0
0
0���1�1�1�1�1�1�1�1
0
0
0
0����
0
0
0
0
0
0
0
0
0
0���������1�1
0
0
0
0
0
0
0
0
0
0
0����������
0
0�1�1����
0
0
0
0
0
0
0
0
0
0����������
0
0
0
0
0�1�1�1�1
0
0
0
0
0��������
0
0������
0
0
0
0
0
0
0
0
0
0����������
0
0�1�1�1�1�1�1�1
0
0
0�1�1������
0
0
0
0������
0
0
0
0
0�1�1
0
0
0����
0
0�����1�1�1�1�1�1�1�1�1
0
0
0��������
0
0���������1�1
0
0
0���1�1
0
0
0
0
0
0
0�����1�1�1�1�1�1�1
0�1�1�1�1��������
0
0
0
0
0
0������
0
0
0����
0
0
0
0
0
0
0
0
0
0�1�1�1�1�1�1
0
0
0������������
0
0
0
0�1�1������
0
0
0
0
0��
0
0
0
0
0
0
0
0
0
0�1�1�1
0
0�1�1�1�1������������
0
0
0
0��������
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�����������������1�1
0
0���������1�1�1�1�1�1
0
0
0
0
0
0
0
0�1�1�1�1�1�1�1�1������������������
0
0��������������
0
0
0
0
0
0
0
0��������������������������
0
0��������������
0
0
0
0�1�1�1�1������������������
\ No newline at end of file
diff --git a/data/layouts/Route102ext/border.bin b/data/layouts/Route102ext/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/Route102ext/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route102ext/map.bin b/data/layouts/Route102ext/map.bin
new file mode 100644
index 000000000..37bb391ee
--- /dev/null
+++ b/data/layouts/Route102ext/map.bin
@@ -0,0 +1 @@
+
0�1�1�1
0
0
0
0��������
0
0
0
0
0�1�1�1�1�1�1
0��������
0
0
0
0
0
0�1�1�1�1�1
0��������
0
0
0
0
0
0
0
0
0�1�1�1��������
00
0
0
0
0
0
0
0�1�1�1��������
0
0
0
0
0
0
0
0
0�1�1
0��������
0
0
0
0
0
0
0
0
0
0
0
0
0
0��������
0
0
0
0
0
0
0
0
0
0
0
0��������
0
0
0
0
0
0
0
0
0
0
0
0�
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�
0�1�1
0
0
0hij
0
0
0
0
0
0
0hiij
0��
0
0
0xyz
0
0
0
0
0�1�1pqqr0��
0
0
0
0
0
0
00
0
0
0��pklqij
0
0
0
0
0
0
0
0
0
0
0
0��psqqquimij
0
0
0
0
00
0
0
0
0psqqququqr
0
0
0
0
0
0
0
0
0
0psqqququqr
0
0
0
00
0
0
0
0
0psqt|�|}qr
0
0
0
0
0
0
0
0hi�squt�0yyyz
0
0
00
0
0�iqqq{|}r
2
0
0
0
0
0
0
0�1�1�1��������z�1�1�1�1�1�1�1�1
\ No newline at end of file
diff --git a/data/layouts/Route103/map.bin b/data/layouts/Route103/map.bin
index 44518dc92..5e5082ba5 100644
--- a/data/layouts/Route103/map.bin
+++ b/data/layouts/Route103/map.bin
@@ -1 +1 @@
-���������������������������pppppppppp�sq{�sqqqt}qsqqqqqqqqqqqqqqqqqqqqqqqt|}qqqu���������������������������uvpppppppp�{|�s{�qquqq{�qqqqt|||||||�qqqqqqqqt}qqqqqu����
0
0
0
0
0
0
0
0
0
0
0
0�����������}~pppppppp���s{�sqquqt�{||||}qt����q{||||||||}qqqqqqu����
0
0
0�1�1�1�1
0
0
0
0
0�����������ppppppuvPQpp�{�s{�ququ{��|||||}qqq{|����������||||||}��
0
0
0
0
0�1�1�1�1
0
0
0
0
0
0
0���������puvppp}~XYpp��s{�{|}t}t��������yyy���������������������
0
0
0
0�4�4�4�4�4�4�4o4
0
0
0
0������dQpp}~uvPQpppuvPesq{|||}qr
0000000K1L5L5L5M1��0
00
0����������
0
0
0
0
0
0
0
0
0
0
0�4�4�4�4�4�4�4����lYuvpp}~XYppp}~Xm{|�����yz0������1111100
0
00�0����
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�����p}~pppppppppppp����
0
0
0
0
0
0�����
0
0
0
0
0
0�
0
0
00
0
0
0
0����
0�
0��
0
0
0
0
0
0
0
0
0
0
0�1�1�1�1�1
0
0
0
0���pppppppppppppppppp������
0
0
0����0
00
00
0000
0
000
0�
0
0���1�1
0
0
0
0
0
0
04
0�1�1�1�1�1�1
0
0
0�ppppppppppppppppppppppppp�
0
0
0
0���0�0�0
0
0
00�
0
0
0
0111����
0
0
0
0
0
0
0
0
0
0
0�1�1�1�1
0
0
0�ppppppppppppppppppppppppp�
01111
0���000000
0
0
0
011!1!1)1����
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�ppppppppppppppppppppppppp�
0(1)1!1!11111
0
0
0
0
0
011!1!1)1*10�����4�4�4�4�4�4�4�4�4�4
0
0
0
0
0
0
0
00�0yppppppppppppppppppppppp�
0
0
0(1)1)1)1!1!1111111111111111!1!1)1*1
0
0�����
0
0
0
0
0
0
0
0
0
0
0
0
0
0�1�1�1�1�1�1dQPQppppppppppuvppppp����
0
0000
00(1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1*1
0
000�����
0
0
0
0
0
0
0
0
0
0
0
0
0
0�5�5�5�5��lYXYuvppppPQPQ}~puvpx���000���0�00
00
00
00
00
00
00
00
000
00��������1�1
0
0
0
0
0
0�1�1�1�1�1�1�������2�2yp}~uvPQXYXYpPQ}~Pe������������00000000�0����������
0
0
0
0
0
0�5��������������ppp}~XYpppppXYppXm������������000000000������������1�1
0
0
0
0���������������uvppppppppppppppp��������������0�0�0�0�0�0�0�0�0������������5�5
0
0
0
0���������������}~ppppppppppppppx0�������������������������������������������
0
0
0
0���������������pppppppppppppppp��������������������������������������������5�5
0
0
0
0���������������pppppppppppppppp���������������������������������������������
0
0
0
0���������������pppppppppppppppp�������������������������������������
\ No newline at end of file
+���������������������������pppppppppp�sq{�sqqqt}qsqqqqqqqqqqqqqqqqqqqqqqqt|}qqqu���������������������������uvpppppppp�{|�s{�qquqq{�qqqqt|||||||�qqqqqqqqt}qqqqqu����
0
0
0
0
0
0
0
0
0
0
0
0�����������}~pppppppp���s{�sqquqt�{||||}qt����q{||||||||}qqqqqqu����
0
0
0�1�1�1�1
0
0
0
0
0�����������ppppppuvPQpp�{�s{�ququ{��|||||}qqq{|����������||||||}��
0
0
0
0
0�1�1�1�1
0
0
0
0
0
0
0���������puvppp}~XYpp��s{�{|}t}t��������yyy���������������������
0
0
0
0�4�4�4�4�4�4�4o4
0
0
0
0������dQpp}~uvPQpppuvPesq{|||}qr
0000000K1L5L5L5M1��0
00
0����������
0
0
0
0
0
0
0
0
0
0
0�4�4�4�4�4�4�4����lYuvpp}~XYppp}~Xm{|�����yz0������1111100
0
00�0����
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�����p}~pppppppppppp����
0
0
0
0
0
0�����
0
0
0
0
0
0�
0
0
00
0
0
0
0����
0�
0
0
0
0
0
0
0
0
0
0
0
0
0
0�1�1�1�1�1
0
0
0
0���pppppppppppppppppp������
0
0
0����0
00
00
0000
0
000
0�
0
0�1�1�1�1
0
0
0
0
0
0
04
0�1�1�1�1�1�1
0
0
0�ppppppppppppppppppppppppp�
0
0
0
0���0�0�0
0
0
00�
0
0
0
0111����
0
0
0
0
0
0
0
0
0
0
0�1�1�1�1
0
0
0�ppppppppppppppppppppppppp�
01111
0���000000
0
0
0
011!1!1)1����
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�ppppppppppppppppppppppppp�
0(1)1!1!11111
0
0
0
0
0
011!1!1)1*10�����4�4�4�4�4�4�4�4�4�4
0
0
0
0
0
0
0
00�0yppppppppppppppppppppppp�
0
0
0(1)1)1)1!1!1111111111111111!1!1)1*1
0
0�����
0
0
0
0
0
0
0
0
0
0
0
0
0
0�1�1�1�1�1�1dQPQppppppppppuvppppp����
0
0000
00(1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1*1
0
000�����
0
0
0
0
0
0
0
0
0
0
0
0
0
0�5�5�5�5��lYXYuvppppPQPQ}~puvpx���000���0�00
00
00
00
00
00
00
00
000
00��������1�1
0
0
0
0
0
0�1�1�1�1�1�1�������2�2yp}~uvPQXYXYpPQ}~Pe������������00000000�0����������
0
0
0
0
0
0�5��������������ppp}~XYpppppXYppXm������������000000000������������1�1
0
0
0
0���������������uvppppppppppppppp��������������0�0�0�0�0�0�0�0�0������������5�5
0
0
0
0���������������}~ppppppppppppppx0�������������������������������������������
0
0
0
0���������������pppppppppppppppp��������������������������������������������5�5
0
0
0
0����������
0
0
0
0�pppppppppppppppp���������������������������������������������
0
0
0
0���������������pppppppppppp��1�1�1�1������������������������������������
\ No newline at end of file
diff --git a/data/layouts/Route103ext/border.bin b/data/layouts/Route103ext/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/Route103ext/border.bin
@@ -0,0 +1 @@
+�
�
�
�

\ No newline at end of file
diff --git a/data/layouts/Route103ext/map.bin b/data/layouts/Route103ext/map.bin
new file mode 100644
index 000000000..dd68365e2
--- /dev/null
+++ b/data/layouts/Route103ext/map.bin
@@ -0,0 +1 @@
+��������������������������������������������������00����������������&'�1�1����������������
0
0������������������
0
0��������������
0
0
0
0
0
0
0
0����
0
0������
0
0
0
0
0
0
0
0����
0
0������
0
0
0
0
0
0
0
0
0
0��
0
0������
0
0�1�1�1�1
0
0
0
0��
0
0������
0
0����
0
0
0
0��
0
0������
0
0����
0
0
0
0��
0
00
0
0
0
0
0
0
0����
0
0
0
0��
0
0
0
0�1�1
0
0
0
0�����1�1
0
0��
0
000��
0
0
0
0������
0
0
0
0
0
000���1�1�1�1�������1�1
0
00
022��������������
0
0
0
0$0$0��������������
0
0
0
0������������������
0
0�������������������1�1
\ No newline at end of file
diff --git a/data/layouts/RustboroCity/map.bin b/data/layouts/RustboroCity/map.bin
index 06736e47e..c4ab8897c 100644
Binary files a/data/layouts/RustboroCity/map.bin and b/data/layouts/RustboroCity/map.bin differ
diff --git a/data/layouts/RustboroCity_LeafsHouse/border.bin b/data/layouts/RustboroCity_LeafsHouse/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/RustboroCity_LeafsHouse/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/RustboroCity_LeafsHouse/map.bin b/data/layouts/RustboroCity_LeafsHouse/map.bin
new file mode 100644
index 000000000..c4e586b8c
Binary files /dev/null and b/data/layouts/RustboroCity_LeafsHouse/map.bin differ
diff --git a/data/layouts/RustboroCity_LeafsHouse_2F/border.bin b/data/layouts/RustboroCity_LeafsHouse_2F/border.bin
new file mode 100644
index 000000000..f496f458e
Binary files /dev/null and b/data/layouts/RustboroCity_LeafsHouse_2F/border.bin differ
diff --git a/data/layouts/RustboroCity_LeafsHouse_2F/map.bin b/data/layouts/RustboroCity_LeafsHouse_2F/map.bin
new file mode 100644
index 000000000..ecf397667
--- /dev/null
+++ b/data/layouts/RustboroCity_LeafsHouse_2F/map.bin
@@ -0,0 +1 @@
+
RQVnn

0
0
0
0
0
0ZY&CD

0
0
0
0
0
0E222`2a2]2f2KL

0
0
0
0
0
02
2
2
2
2
2
2
2
2

0
0
0
0
0
02�2�2�2�2�2�2
2p

0
0
0
0
0
02�2�2�2�2�2�2
2q

0
0
0
0
0
02�2�2�2�2�2�2�2�2

0
0
0
0
0
02j
2
2
2
2�2�2�2

0
0
0
0
0
02r
2
2
2
2�2��2

0
0
0
0
0
0










0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
\ No newline at end of file
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index b8d841f72..3aa7e6678 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -4410,6 +4410,116 @@
       "secondary_tileset": "gTileset_MysteryEventsHouse",
       "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin",
       "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE101EXT",
+      "name": "Route101ext_Layout",
+      "width": 20,
+      "height": 40,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Petalburg",
+      "border_filepath": "data/layouts/Route101ext/border.bin",
+      "blockdata_filepath": "data/layouts/Route101ext/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE102EXT",
+      "name": "Route102ext_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Petalburg",
+      "border_filepath": "data/layouts/Route102ext/border.bin",
+      "blockdata_filepath": "data/layouts/Route102ext/map.bin"
+    },
+    {
+      "id": "LAYOUT_NEW_MAP1",
+      "name": "NewMap1_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Petalburg",
+      "border_filepath": "data/layouts/NewMap1/border.bin",
+      "blockdata_filepath": "data/layouts/NewMap1/map.bin"
+    },
+    {
+      "id": "LAYOUT_PETALBURGEXT",
+      "name": "Petalburgext_Layout",
+      "width": 40,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Petalburg",
+      "border_filepath": "data/layouts/Petalburgext/border.bin",
+      "blockdata_filepath": "data/layouts/Petalburgext/map.bin"
+    },
+    {
+      "id": "LAYOUT_PETALBURG_CITY_OLD_RESEARCH_BUILDING",
+      "name": "PetalburgCity_OldResearchBuilding_Layout",
+      "width": 35,
+      "height": 20,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
+      "border_filepath": "data/layouts/PetalburgCity_OldResearchBuilding/border.bin",
+      "blockdata_filepath": "data/layouts/PetalburgCity_OldResearchBuilding/map.bin"
+    },
+    {
+      "id": "LAYOUT_PETALBURG_WOODS_EXT",
+      "name": "PetalburgWoodsExt_Layout",
+      "width": 90,
+      "height": 44,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Fortree",
+      "border_filepath": "data/layouts/PetalburgWoodsExt/border.bin",
+      "blockdata_filepath": "data/layouts/PetalburgWoodsExt/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE103EXT",
+      "name": "Route103ext_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Fortree",
+      "border_filepath": "data/layouts/Route103ext/border.bin",
+      "blockdata_filepath": "data/layouts/Route103ext/map.bin"
+    },
+    {
+      "id": "LAYOUT_PETALBURG_WOODSEXT2",
+      "name": "PetalburgWoodsext2_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Petalburg",
+      "border_filepath": "data/layouts/PetalburgWoodsext2/border.bin",
+      "blockdata_filepath": "data/layouts/PetalburgWoodsext2/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE",
+      "name": "RustboroCity_LeafsHouse_Layout",
+      "width": 16,
+      "height": 13,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding",
+      "border_filepath": "data/layouts/RustboroCity_LeafsHouse/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_LeafsHouse/map.bin"
+    },
+    {
+      "id": "LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE_2F",
+      "name": "RustboroCity_LeafsHouse_2F_Layout",
+      "width": 16,
+      "height": 13,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BrendansMaysHouse",
+      "border_filepath": "data/layouts/RustboroCity_LeafsHouse_2F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_LeafsHouse_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_GRANITE_CAVE_B3F",
+      "name": "GraniteCave_B3F_Layout",
+      "width": 30,
+      "height": 30,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/GraniteCave_B3F/border.bin",
+      "blockdata_filepath": "data/layouts/GraniteCave_B3F/map.bin"
     }
   ]
 }
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json
index 245e68b8d..7462422b8 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json
@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 3,
@@ -58,7 +60,9 @@
       "dest_warp_id": "8"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json
index 905c85335..a6756079c 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -132,7 +132,9 @@
       "dest_warp_id": "5"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "hidden_item",
diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json
index ac40311cf..d0d5baa07 100644
--- a/data/maps/AlteringCave/map.json
+++ b/data/maps/AlteringCave/map.json
@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 18,
@@ -23,6 +25,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json
index 0f4c37556..f89133576 100644
--- a/data/maps/AncientTomb/map.json
+++ b/data/maps/AncientTomb/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_REGISTEEL",
@@ -51,7 +51,9 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.json b/data/maps/AquaHideout_UnusedRubyMap1/map.json
index a2aefc63b..9a19f303c 100644
--- a/data/maps/AquaHideout_UnusedRubyMap1/map.json
+++ b/data/maps/AquaHideout_UnusedRubyMap1/map.json
@@ -12,9 +12,17 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_MAGMA",
-  "connections": null,
-  "object_events": [],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "connections": 0,
+  "object_events": [
+
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.json b/data/maps/AquaHideout_UnusedRubyMap2/map.json
index 50175b5d5..35b21251c 100644
--- a/data/maps/AquaHideout_UnusedRubyMap2/map.json
+++ b/data/maps/AquaHideout_UnusedRubyMap2/map.json
@@ -12,9 +12,17 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_MAGMA",
-  "connections": null,
-  "object_events": [],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "connections": 0,
+  "object_events": [
+
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json
index d424b07d5..e45ec0e78 100644
--- a/data/maps/ArtisanCave_1F/map.json
+++ b/data/maps/ArtisanCave_1F/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -44,6 +44,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json
index 292c006c2..18dda9eeb 100644
--- a/data/maps/CaveOfOrigin_1F/map.json
+++ b/data/maps/CaveOfOrigin_1F/map.json
@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 11,
@@ -30,6 +32,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json
index 166f79998..c224f0674 100644
--- a/data/maps/CaveOfOrigin_B1F/map.json
+++ b/data/maps/CaveOfOrigin_B1F/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_WALLACE",
@@ -37,6 +37,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json
index b603bd515..e4d26b8b0 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json
@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 5,
@@ -30,6 +32,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json
index f073a7436..73aea8287 100644
--- a/data/maps/DewfordTown/map.json
+++ b/data/maps/DewfordTown/map.json
@@ -128,7 +128,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json
index 58978b7ff..6e0b5f707 100644
--- a/data/maps/EverGrandeCity/map.json
+++ b/data/maps/EverGrandeCity/map.json
@@ -19,7 +19,9 @@
       "direction": "left"
     }
   ],
-  "object_events": [],
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 18,
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json
index 305a1f16f..dfef15dec 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/map.json
+++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_WALLACE",
@@ -70,6 +70,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json
index 249e244d0..cb19e82bb 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/map.json
+++ b/data/maps/EverGrandeCity_DrakesRoom/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_DRAKE",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_DRAKE",
@@ -44,6 +44,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json
index fd861a55b..4022726c9 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/map.json
+++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GLACIA",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_GLACIA",
@@ -44,6 +44,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/EverGrandeCity_Hall1/map.json b/data/maps/EverGrandeCity_Hall1/map.json
index 7e430832e..abf4d6ede 100644
--- a/data/maps/EverGrandeCity_Hall1/map.json
+++ b/data/maps/EverGrandeCity_Hall1/map.json
@@ -12,8 +12,10 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 5,
@@ -44,6 +46,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/EverGrandeCity_Hall2/map.json b/data/maps/EverGrandeCity_Hall2/map.json
index 3ff291251..7dd9c4d02 100644
--- a/data/maps/EverGrandeCity_Hall2/map.json
+++ b/data/maps/EverGrandeCity_Hall2/map.json
@@ -12,8 +12,10 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 5,
@@ -44,6 +46,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/EverGrandeCity_Hall3/map.json b/data/maps/EverGrandeCity_Hall3/map.json
index a12fe19b3..2df85e96d 100644
--- a/data/maps/EverGrandeCity_Hall3/map.json
+++ b/data/maps/EverGrandeCity_Hall3/map.json
@@ -12,8 +12,10 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 5,
@@ -44,6 +46,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/EverGrandeCity_Hall4/map.json b/data/maps/EverGrandeCity_Hall4/map.json
index 09cf73961..2cf467a80 100644
--- a/data/maps/EverGrandeCity_Hall4/map.json
+++ b/data/maps/EverGrandeCity_Hall4/map.json
@@ -12,8 +12,10 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 5,
@@ -30,6 +32,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/EverGrandeCity_Hall5/map.json b/data/maps/EverGrandeCity_Hall5/map.json
index b63907630..8870eec85 100644
--- a/data/maps/EverGrandeCity_Hall5/map.json
+++ b/data/maps/EverGrandeCity_Hall5/map.json
@@ -12,8 +12,10 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 5,
@@ -44,6 +46,10 @@
       "dest_warp_id": "2"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json
index 82219dfd4..bc24f2be6 100644
--- a/data/maps/EverGrandeCity_HallOfFame/map.json
+++ b/data/maps/EverGrandeCity_HallOfFame/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_WALLACE",
@@ -37,6 +37,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json
index 7fdc61651..422ac269e 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/map.json
+++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_PHOEBE",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_PHOEBE",
@@ -44,6 +44,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
index 6dd97c0b7..a0f1a34cf 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
@@ -104,6 +104,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json
index dfe6fe36c..405e47b00 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/map.json
+++ b/data/maps/EverGrandeCity_SidneysRoom/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_SIDNEY",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_SIDNEY",
@@ -44,6 +44,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json
index 4888640a5..f59fd7716 100644
--- a/data/maps/FallarborTown/map.json
+++ b/data/maps/FallarborTown/map.json
@@ -115,7 +115,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json
index 007d8b22d..9efc51a7f 100644
--- a/data/maps/FortreeCity/map.json
+++ b/data/maps/FortreeCity/map.json
@@ -182,7 +182,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json
index c254c4b00..988cf9995 100644
--- a/data/maps/GraniteCave_1F/map.json
+++ b/data/maps/GraniteCave_1F/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_HIKER",
@@ -71,6 +71,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json
index 8c6a112a6..23d0ee76e 100644
--- a/data/maps/GraniteCave_B1F/map.json
+++ b/data/maps/GraniteCave_B1F/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -79,6 +79,10 @@
       "dest_warp_id": "4"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json
index e3748ee4b..46b32d68b 100644
--- a/data/maps/GraniteCave_B2F/map.json
+++ b/data/maps/GraniteCave_B2F/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -169,7 +169,9 @@
       "dest_warp_id": "6"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "hidden_item",
diff --git a/data/maps/GraniteCave_B3F/map.json b/data/maps/GraniteCave_B3F/map.json
new file mode 100644
index 000000000..4912c19f8
--- /dev/null
+++ b/data/maps/GraniteCave_B3F/map.json
@@ -0,0 +1,105 @@
+{
+  "id": "MAP_GRANITE_CAVE_B3F",
+  "name": "GraniteCave_B3F",
+  "layout": "LAYOUT_GRANITE_CAVE_B3F",
+  "music": "MUS_PETALBURG_WOODS",
+  "region_map_section": "MAPSEC_GRANITE_CAVE",
+  "requires_flash": true,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": 0,
+  "object_events": [
+    {
+      "graphics_id": "OBJ_EVENT_GFX_STEVEN",
+      "x": 9,
+      "y": 25,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
+      "x": 2,
+      "y": 17,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B3F_EventScript_ItemRevive",
+      "flag": "FLAG_ITEM_GRANITE_CAVE_3F_REVIVE"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
+      "x": 16,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B3F_EventScript_ItemSuperPotion",
+      "flag": "FLAG_ITEM_GRANITE_CAVE_3F_SUPERPOTION"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_AGGRON",
+      "x": 22,
+      "y": 24,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_LAIRON",
+      "x": 26,
+      "y": 28,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_ARON",
+      "x": 18,
+      "y": 13,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 3,
+      "movement_range_y": 3,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}
diff --git a/data/maps/GraniteCave_B3F/scripts.inc b/data/maps/GraniteCave_B3F/scripts.inc
new file mode 100644
index 000000000..1a3b2fa0f
--- /dev/null
+++ b/data/maps/GraniteCave_B3F/scripts.inc
@@ -0,0 +1,2 @@
+GraniteCave_B3F_MapScripts::
+	.byte 0
diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json
index 280af56c8..8989666f6 100644
--- a/data/maps/GraniteCave_StevensRoom/map.json
+++ b/data/maps/GraniteCave_StevensRoom/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_STEVEN",
@@ -26,6 +26,32 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "GraniteCave_StevensRoom_EventScript_Steven",
       "flag": "FLAG_HIDE_GRANITE_CAVE_STEVEN"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK",
+      "x": -7,
+      "y": -7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BALTOY",
+      "x": -7,
+      "y": -6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
     }
   ],
   "warp_events": [
@@ -37,6 +63,10 @@
       "dest_warp_id": "3"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc
index 384e648ee..705aa1876 100644
--- a/data/maps/GraniteCave_StevensRoom/scripts.inc
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
@@ -7,9 +7,9 @@ GraniteCave_StevensRoom_EventScript_Steven::
 	lock
 	faceplayer
 	msgbox GraniteCave_StevensRoom_Text_ImStevenLetterForMe, MSGBOX_DEFAULT
-	setvar VAR_0x8004, ITEM_LETTER
-	call Common_EventScript_PlayerHandedOverTheItem
-	setflag FLAG_DELIVERED_STEVEN_LETTER
+	//setvar VAR_0x8004, ITEM_LETTER
+	//call Common_EventScript_PlayerHandedOverTheItem
+	//setflag FLAG_DELIVERED_STEVEN_LETTER
 	msgbox GraniteCave_StevensRoom_Text_ThankYouTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_TM47
 	call_if_eq VAR_RESULT, FALSE, GraniteCave_StevensRoom_EventScript_BagFull
@@ -22,6 +22,8 @@ GraniteCave_StevensRoom_EventScript_Steven::
 	closemessage
 	delay 30
 	setflag FLAG_REGISTERED_STEVEN_POKENAV
+	//insert own script here
+	goto GraniteCave_StevensRoom_EventScript_Steven_AskForHelp
 	msgbox GraniteCave_StevensRoom_Text_IveGotToHurryAlong, MSGBOX_DEFAULT
 	closemessage
 	call_if_eq VAR_FACING, DIR_NORTH, GraniteCave_StevensRoom_EventScript_StevenExitNorth
@@ -118,4 +120,95 @@ GraniteCave_StevensRoom_Text_IveGotToHurryAlong:
 GraniteCave_StevensRoom_Text_OhBagIsFull:
 	.string "Oh, your BAG is full…\n"
 	.string "That's too bad, then.$"
+	
+//Extra
+GraniteCave_StevensRoom_EventScript_Steven_AskForHelp::
+	msgbox GraniteCave_StevensRoom_Text_CouldUseSomeHelp, MSGBOX_YESNO
+	//goto_if_eq VAR_RESULT, YES, GraniteCave_StevensRoom_EventScript_CouldUseSomeHelp_Yes
+	//msgbox GraniteCave_StevensRoom_Text_CouldUseSomeHelp_No, MSGBOX_NPC
+	closemessage
+	goto GraniteCave_StevensRoom_EventScript_Colapse
+	end
+
+GraniteCave_StevensRoom_Text_CouldUseSomeHelp:
+	.string "While I have you, maybe you could help\n"
+	.string "me. Would you mind?$"
+	
+GraniteCave_StevensRoom_Movement_CheckDoor:
+	walk_up
+	delay_16
+	walk_down
+	step_end
+
+GraniteCave_StevensRoom_Movement_StevenLookAround:
+	face_left
+	delay_16
+	face_right
+	delay_16
+	face_down
+	delay_16
+	step_end
+	
+GraniteCave_StevensRoom_Text_AfterFall:
+	.string "That was... interesting.\p"
+	.string "Looks like you will be helping me\n"
+	.string "afterall.\p"
+	.string "....................$"
+
+GraniteCave_StevensRoom_Text_UseDig:
+	.string "I have an Idea.\p"
+	.string "Baltoy, use dig!$"
+
+GraniteCave_StevensRoom_Movement_ReleaseBaltoy:
+	face_left
+	walk_faster_left
+	face_down
+	step_end
+
+GraniteCave_StevensRoom_EventScript_Colapse::
+	lock
+	delay 16
+	setvar VAR_0x8004, 0  @ vertical pan
+	setvar VAR_0x8005, 2   @ horizontal pan
+	setvar VAR_0x8006, 40  @ num shakes
+	setvar VAR_0x8007, 4   @ shake delay
+	special ShakeCamera
+	playse SE_M_EARTHQUAKE 
+	delay 64
+	fadescreen 1 //screen to black
+	setobjectxyperm 2, 7, 4 //set rock to location
+	removeobject 2
+	setflag FLAG_STEVENS_CAVE_ROCK
+	clearflag FLAG_STEVENS_CAVE_ROCK
+	showobjectat 2, MAP_GRANITE_CAVE_STEVENS_ROOM
+	applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_StevensRoom_Movement_CheckDoor
+	waitstate // wait for shake
+	waitse
+	fadescreen 0 //fade back to normal
+	applymovement LOCALID_STEVEN, GraniteCave_StevensRoom_Movement_StevenLookAround
+	delay 128
+	lockall
+	faceplayer
+	msgbox GraniteCave_StevensRoom_Text_AfterFall, MSGBOX_NPC
+	delay 64
+	msgbox GraniteCave_StevensRoom_Text_UseDig
+	delay 32
+	fadescreen 3
+	//applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_StevensRoom_Movement_ReleaseBaltoy
+	setobjectxyperm 3, 6, 8
+	showobjectat 3, MAP_GRANITE_CAVE_STEVENS_ROOM
+	addobject 3
+	fadescreen 2
+	delay 64
+	setvar VAR_0x8004, 0  @ vertical pan
+	setvar VAR_0x8005, 2   @ horizontal pan
+	setvar VAR_0x8006, 30  @ num shakes
+	setvar VAR_0x8007, 2   @ shake delay
+	special ShakeCamera
+	waitstate
+	warp MAP_RUSTBORO_CITY, 0, 0, 0
+	release
+	end
+	
+	
 
diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json
index 4b027853a..a76f2c939 100644
--- a/data/maps/InsideOfTruck/map.json
+++ b/data/maps/InsideOfTruck/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX",
diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json
index b8518ac94..930ce7238 100644
--- a/data/maps/IslandCave/map.json
+++ b/data/maps/IslandCave/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_REGICE",
@@ -51,7 +51,9 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json
index ba4cdf3e0..a250a626d 100644
--- a/data/maps/JaggedPass/map.json
+++ b/data/maps/JaggedPass/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_HIKER",
diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json
index 398cf219e..8d43ea846 100644
--- a/data/maps/LilycoveCity/map.json
+++ b/data/maps/LilycoveCity/map.json
@@ -412,7 +412,9 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json
index 8311ffaa3..8dee69c0f 100644
--- a/data/maps/LittlerootTown/map.json
+++ b/data/maps/LittlerootTown/map.json
@@ -123,6 +123,32 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "0x0",
       "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCH"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
+      "x": 0,
+      "y": 17,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LITTLEROOT_EventScript_ItemPokeBall",
+      "flag": "FLAG_ITEM_TOWN_LITTLEROOT_POTION"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_TAILLOW",
+      "x": 7,
+      "y": 11,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
     }
   ],
   "warp_events": [
@@ -146,6 +172,13 @@
       "elevation": 0,
       "dest_map": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB",
       "dest_warp_id": "0"
+    },
+    {
+      "x": 17,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_GRANITE_CAVE_1F",
+      "dest_warp_id": "3"
     }
   ],
   "coord_events": [
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json
index 4e4887003..ad09a2f8c 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/map.json
+++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_MOM",
@@ -167,5 +167,7 @@
       "script": "LittlerootTown_MaysHouse_1F_EventScript_MeetRival2"
     }
   ],
-  "bg_events": []
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json
index ce3a5f570..4f60b46fa 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/map.json
+++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_RIVAL_MAY_NORMAL",
@@ -232,7 +232,9 @@
       "dest_warp_id": "2"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json
index ac8710804..d5b596d6a 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
@@ -122,7 +122,9 @@
       "dest_warp_id": "2"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index bf0377b41..62e44830a 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -725,7 +725,13 @@ LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou:
 	.string "PROF. BIRCH: Great!\n"
 	.string "{RIVAL} should be happy, too.\p"
 	.string "Get {RIVAL} to teach you what it\n"
-	.string "means to be a TRAINER.$"
+	.string "means to be a TRAINER.\p"
+	.string "Oh! Before I forget. It's\n"
+	.string "important foster a strong bond\l"
+	.string "with your POKéMON.\p"
+	.string "They will follow you on your\n"
+	.string "adventures if you let them.\p"
+	.string "Why don't you try it with {STR_VAR_1}?$"
 
 LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay:
 	.string "PROF. BIRCH: Oh, don't be that way.\n"
diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json
index f4da4222b..eda6ec7fe 100644
--- a/data/maps/MauvilleCity/map.json
+++ b/data/maps/MauvilleCity/map.json
@@ -230,7 +230,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json
index 71f1d1cc5..1b9d322ac 100644
--- a/data/maps/MeteorFalls_1F_1R/map.json
+++ b/data/maps/MeteorFalls_1F_1R/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json
index e9bb08f1b..019fd4fbe 100644
--- a/data/maps/MeteorFalls_B1F_1R/map.json
+++ b/data/maps/MeteorFalls_B1F_1R/map.json
@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 5,
@@ -58,6 +60,10 @@
       "dest_warp_id": "4"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json
index 8e329fc0d..bc3fb1863 100644
--- a/data/maps/MeteorFalls_StevensCave/map.json
+++ b/data/maps/MeteorFalls_StevensCave/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_STEVEN",
@@ -37,6 +37,10 @@
       "dest_warp_id": "5"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json
index 55bd065cb..2efd2dc11 100644
--- a/data/maps/MtChimney/map.json
+++ b/data/maps/MtChimney/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ARCHIE",
@@ -435,7 +435,9 @@
       "dest_warp_id": "3"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json
index 417a38d97..0938444ff 100644
--- a/data/maps/MtPyre_Exterior/map.json
+++ b/data/maps/MtPyre_Exterior/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json
index 49fd8b9f7..372e401dc 100644
--- a/data/maps/MtPyre_Summit/map.json
+++ b/data/maps/MtPyre_Summit/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
diff --git a/data/maps/NewMap1/map.json b/data/maps/NewMap1/map.json
new file mode 100644
index 000000000..d024a5dbb
--- /dev/null
+++ b/data/maps/NewMap1/map.json
@@ -0,0 +1,28 @@
+{
+  "id": "MAP_NEW_MAP1",
+  "name": "NewMap1",
+  "layout": "LAYOUT_NEW_MAP1",
+  "music": "MUS_PETALBURG",
+  "region_map_section": "MAPSEC_PETALBURG_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_TOWN",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": 0,
+  "object_events": [
+
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}
diff --git a/data/maps/NewMap1/scripts.inc b/data/maps/NewMap1/scripts.inc
new file mode 100644
index 000000000..79ae3fd9e
--- /dev/null
+++ b/data/maps/NewMap1/scripts.inc
@@ -0,0 +1,2 @@
+NewMap1_MapScripts::
+	.byte 0
diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json
index 302ef5e9d..b5a1963e8 100644
--- a/data/maps/OldaleTown/map.json
+++ b/data/maps/OldaleTown/map.json
@@ -27,13 +27,18 @@
       "map": "MAP_ROUTE102",
       "offset": 0,
       "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE101EXT",
+      "offset": 0,
+      "direction": "right"
     }
   ],
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_GIRL_3",
-      "x": 16,
-      "y": 11,
+      "x": 12,
+      "y": 14,
       "elevation": 3,
       "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
       "movement_range_x": 0,
diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json
index d653e46ae..ac34c0d13 100644
--- a/data/maps/PetalburgCity/map.json
+++ b/data/maps/PetalburgCity/map.json
@@ -22,6 +22,11 @@
       "map": "MAP_ROUTE102",
       "offset": 10,
       "direction": "right"
+    },
+    {
+      "map": "MAP_PETALBURGEXT",
+      "offset": -10,
+      "direction": "down"
     }
   ],
   "object_events": [
@@ -105,7 +110,7 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
-      "x": 3,
+      "x": 11,
       "y": 28,
       "elevation": 3,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json
index ef5849171..c4aa091b9 100644
--- a/data/maps/PetalburgCity_Gym/map.json
+++ b/data/maps/PetalburgCity_Gym/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_NORMAN",
@@ -426,7 +426,9 @@
       "dest_warp_id": "33"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json
index 2b1e96648..5e97c9734 100644
--- a/data/maps/PetalburgCity_House1/map.json
+++ b/data/maps/PetalburgCity_House1/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_GIRL_1",
@@ -57,6 +57,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json
index 74d128759..ace33822c 100644
--- a/data/maps/PetalburgCity_House2/map.json
+++ b/data/maps/PetalburgCity_House2/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
@@ -57,6 +57,10 @@
       "dest_warp_id": "4"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json
index 7c8a70b28..479c07bd8 100644
--- a/data/maps/PetalburgCity_Mart/map.json
+++ b/data/maps/PetalburgCity_Mart/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE",
@@ -83,6 +83,10 @@
       "dest_warp_id": "5"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/PetalburgCity_OldResearchBuilding/map.json b/data/maps/PetalburgCity_OldResearchBuilding/map.json
new file mode 100644
index 000000000..c2fdb1d2f
--- /dev/null
+++ b/data/maps/PetalburgCity_OldResearchBuilding/map.json
@@ -0,0 +1,28 @@
+{
+  "id": "MAP_PETALBURG_CITY_OLD_RESEARCH_BUILDING",
+  "name": "PetalburgCity_OldResearchBuilding",
+  "layout": "LAYOUT_PETALBURG_CITY_OLD_RESEARCH_BUILDING",
+  "music": "MUS_PETALBURG",
+  "region_map_section": "MAPSEC_PETALBURG_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_cycling": false,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": 0,
+  "object_events": [
+
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}
diff --git a/data/maps/PetalburgCity_OldResearchBuilding/scripts.inc b/data/maps/PetalburgCity_OldResearchBuilding/scripts.inc
new file mode 100644
index 000000000..67713c27e
--- /dev/null
+++ b/data/maps/PetalburgCity_OldResearchBuilding/scripts.inc
@@ -0,0 +1,2 @@
+PetalburgCity_OldResearchBuilding_MapScripts::
+	.byte 0
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json
index 12b7810df..d45fcfb77 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
@@ -103,6 +103,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json
index b2078e495..0fadc587d 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_TEALA",
@@ -90,6 +90,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json
index f2fd03e7f..573a3064a 100644
--- a/data/maps/PetalburgCity_WallysHouse/map.json
+++ b/data/maps/PetalburgCity_WallysHouse/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
@@ -57,6 +57,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json
index 2979e7e46..5f58951b9 100644
--- a/data/maps/PetalburgWoods/map.json
+++ b/data/maps/PetalburgWoods/map.json
@@ -12,7 +12,18 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": [
+    {
+      "map": "MAP_PETALBURG_WOODS_EXT",
+      "offset": 0,
+      "direction": "right"
+    },
+    {
+      "map": "MAP_PETALBURG_WOODSEXT2",
+      "offset": 0,
+      "direction": "left"
+    }
+  ],
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
@@ -133,8 +144,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
-      "x": 4,
-      "y": 14,
+      "x": 11,
+      "y": 10,
       "elevation": 3,
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT",
       "movement_range_x": 0,
@@ -182,6 +193,19 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "PetalburgWoods_EventScript_Girl",
       "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
+      "x": 7,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EventScript_CutTree",
+      "flag": "FLAG_TEMP_13"
     }
   ],
   "warp_events": [
diff --git a/data/maps/PetalburgWoodsExt/map.json b/data/maps/PetalburgWoodsExt/map.json
new file mode 100644
index 000000000..d17514e7f
--- /dev/null
+++ b/data/maps/PetalburgWoodsExt/map.json
@@ -0,0 +1,72 @@
+{
+  "id": "MAP_PETALBURG_WOODS_EXT",
+  "name": "PetalburgWoodsExt",
+  "layout": "LAYOUT_PETALBURG_WOODS_EXT",
+  "music": "MUS_PETALBURG",
+  "region_map_section": "MAPSEC_PETALBURG_WOODS",
+  "requires_flash": false,
+  "weather": "WEATHER_RAIN",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "map": "MAP_PETALBURG_WOODS",
+      "offset": 0,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "OBJ_EVENT_GFX_SWAMPERT",
+      "x": 6,
+      "y": 37,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 3,
+      "movement_range_y": 3,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
+      "x": 22,
+      "y": 36,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EventScript_StrengthBoulder",
+      "flag": "FLAG_TEMP_16"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 88,
+      "y": 29,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE103EXT",
+      "dest_warp_id": "0"
+    },
+    {
+      "x": 89,
+      "y": 29,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE103EXT",
+      "dest_warp_id": "1"
+    }
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}
diff --git a/data/maps/PetalburgWoodsExt/scripts.inc b/data/maps/PetalburgWoodsExt/scripts.inc
new file mode 100644
index 000000000..b7975ea8e
--- /dev/null
+++ b/data/maps/PetalburgWoodsExt/scripts.inc
@@ -0,0 +1,3 @@
+PetalburgWoodsExt_MapScripts::
+	.byte 0
+
diff --git a/data/maps/PetalburgWoodsext2/map.json b/data/maps/PetalburgWoodsext2/map.json
new file mode 100644
index 000000000..cc6c0cbfd
--- /dev/null
+++ b/data/maps/PetalburgWoodsext2/map.json
@@ -0,0 +1,72 @@
+{
+  "id": "MAP_PETALBURG_WOODSEXT2",
+  "name": "PetalburgWoodsext2",
+  "layout": "LAYOUT_PETALBURG_WOODSEXT2",
+  "music": "MUS_PETALBURG_WOODS",
+  "region_map_section": "MAPSEC_PETALBURG_WOODS",
+  "requires_flash": false,
+  "weather": "WEATHER_SHADE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "map": "MAP_PETALBURG_WOODS",
+      "offset": 0,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
+      "x": 1,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "PetalburgWoodsext2_EventScript_ItemRevive",
+      "flag": "FLAG_ITEM_PETALBURGEXT2_WOODS_REVIVE"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
+      "x": 8,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NORMAL",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "PetalburgWoodsext2_EventScript_Lewis",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
+      "x": 4,
+      "y": 15,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NORMAL",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "PetalburgWoodsext2_EventScript_Coleman",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}
diff --git a/data/maps/PetalburgWoodsext2/scripts.inc b/data/maps/PetalburgWoodsext2/scripts.inc
new file mode 100644
index 000000000..f80fec3a2
--- /dev/null
+++ b/data/maps/PetalburgWoodsext2/scripts.inc
@@ -0,0 +1,33 @@
+PetalburgWoodsext2_MapScripts::
+	.byte 0
+
+PetalburgWoodsext2_EventScript_Coleman::
+	trainerbattle_single TRAINER_COLEMAN, PetalburgWoodsext2_Text_ColemanIntro, PetalburgWoodsext2_Text_ColemanDefeated
+	msgbox PetalburgWoodsext2_Text_ColemanPostBattle, MSGBOX_AUTOCLOSE
+	end
+	
+PetalburgWoodsext2_Text_ColemanIntro:
+	.string "I promise that I'm not lost.$"
+
+PetalburgWoodsext2_Text_ColemanDefeated:
+	.string "Maybe it's time to turn around.$"
+
+PetalburgWoodsext2_Text_ColemanPostBattle:
+	.string "I found some cool POKéMON in the\n"
+	.string "east side of this forrest.$"
+	
+PetalburgWoodsext2_EventScript_Lewis::
+	trainerbattle_single TRAINER_LEWIS, PetalburgWoodsext2_Text_LewisIntro, PetalburgWoodsext2_Text_LewisDefeated
+	msgbox PetalburgWoodsext2_Text_LewisPostBattle, MSGBOX_AUTOCLOSE
+	end
+	
+PetalburgWoodsext2_Text_LewisIntro:
+	.string "I travel the world looking for\n"
+	.string "rare bug POKéMON. Wanna see?$"
+
+PetalburgWoodsext2_Text_LewisDefeated:
+	.string "Might be time to Pupate...$"
+
+PetalburgWoodsext2_Text_LewisPostBattle:
+	.string "Every region has it's own special\n"
+	.string "bug POKéMON.$"
diff --git a/data/maps/Petalburgext/map.json b/data/maps/Petalburgext/map.json
new file mode 100644
index 000000000..ce65612c3
--- /dev/null
+++ b/data/maps/Petalburgext/map.json
@@ -0,0 +1,53 @@
+{
+  "id": "MAP_PETALBURGEXT",
+  "name": "Petalburgext",
+  "layout": "LAYOUT_PETALBURGEXT",
+  "music": "MUS_PETALBURG",
+  "region_map_section": "MAPSEC_PETALBURG_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_TOWN",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "map": "MAP_PETALBURG_CITY",
+      "offset": 10,
+      "direction": "up"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "OBJ_EVENT_GFX_FISHERMAN",
+      "x": 20,
+      "y": 8,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Petalburgext_EventScript_Fisherman",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 32,
+      "y": 5,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Petalburgext_EventScript_Sign"
+    }
+  ]
+}
diff --git a/data/maps/Petalburgext/scripts.inc b/data/maps/Petalburgext/scripts.inc
new file mode 100644
index 000000000..8280495ed
--- /dev/null
+++ b/data/maps/Petalburgext/scripts.inc
@@ -0,0 +1,69 @@
+Petalburgext_MapScripts::
+	.byte 0
+
+Petalburgext_EventScript_Fisherman::
+	goto_if_set FLAG_RECEIVED_FEEBASS, Petalburgext_EventScript_Fisherman_thankyou
+	msgbox Petalburgext_Text_Fisherman, MSGBOX_NPC
+	msgbox Petalburgext_Text_Fisherman_request, MSGBOX_YESNO
+	goto_if_eq VAR_RESULT, NO, Petalburgext_EventScript_Fisherman_no
+	goto_if_eq VAR_RESULT, YES, Petalburgext_EventScript_Fisherman_yes
+	end
+
+Petalburgext_EventScript_Fisherman_thankyou::
+	msgbox Petalburgext_Text_Fisherman_thankyou, MSGBOX_NPC
+	end
+
+Petalburgext_EventScript_Fisherman_yes::	
+	msgbox Petalburgext_Text_Fisherman_yes, MSGBOX_NPC
+	getpartysize
+	compare VAR_RESULT, 6
+	goto_if_eq Petalburgext_EventScript_Fisherman_partyfull
+	givemon SPECIES_FEEBAS, 5, ITEM_NONE
+	showmonpic SPECIES_FEEBAS, 10, 3
+	playfanfare MUS_OBTAIN_ITEM
+	waitfanfare
+	hidemonpic
+	setflag FLAG_RECEIVED_FEEBASS
+	end
+	
+Petalburgext_EventScript_Fisherman_no::
+	msgbox Petalburgext_Text_Fisherman_no, MSGBOX_NPC
+	end
+
+Petalburgext_EventScript_Fisherman_partyfull::
+	msgbox Petalburgext_Text_Fisherman_partyfull MSGBOX_NPC
+	end	
+
+Petalburgext_Text_Fisherman_thankyou:
+	.string "Please keep that thing away from me.$"
+
+Petalburgext_Text_Fisherman:
+	.string "Eww, this ugly fish thing again..\p"
+	.string "but everytime I toss it back it jumps\n"
+	.string "right back onto my fishing pole.\p"
+	.string ".....$"
+
+Petalburgext_Text_Fisherman_request:
+	.string "Maybe you could take it?$"
+	
+Petalburgext_Text_Fisherman_no:
+	.string "Ah, of course you won't.\n"
+	.string "I wouldn't want it either!$"
+
+Petalburgext_Text_Fisherman_yes:
+	.string "Thank you!\p"
+	.string "Now I can catch some real fish.$"
+	
+Petalburgext_Text_Fisherman_partyfull:
+	.string "Looks like you can't hold anymore\n"
+	.string "POKéMON right now.\p"
+	.string "Guess I'll toss it back again.$"
+	
+Petalburgext_EventScript_Sign::
+	msgbox Petalburgext_Text_Sign, MSGBOX_NPC
+	end
+
+Petalburgext_Text_Sign:
+	.string "Closed for renovations$"
+	
+	
\ No newline at end of file
diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json
index 1abb23030..3705785ac 100644
--- a/data/maps/Route101/map.json
+++ b/data/maps/Route101/map.json
@@ -22,13 +22,18 @@
       "map": "MAP_LITTLEROOT_TOWN",
       "offset": 0,
       "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE101EXT",
+      "offset": -20,
+      "direction": "right"
     }
   ],
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
-      "x": 16,
-      "y": 8,
+      "x": 7,
+      "y": 5,
       "elevation": 3,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 0,
@@ -104,7 +109,9 @@
       "flag": "FLAG_HIDE_ROUTE_101_BOY"
     }
   ],
-  "warp_events": [],
+  "warp_events": [
+
+  ],
   "coord_events": [
     {
       "type": "trigger",
diff --git a/data/maps/Route101ext/map.json b/data/maps/Route101ext/map.json
new file mode 100644
index 000000000..cfe2f0b8d
--- /dev/null
+++ b/data/maps/Route101ext/map.json
@@ -0,0 +1,154 @@
+{
+  "id": "MAP_ROUTE101EXT",
+  "name": "Route101ext",
+  "layout": "LAYOUT_ROUTE101EXT",
+  "music": "MUS_ROUTE101",
+  "region_map_section": "MAPSEC_ROUTE_101",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "map": "MAP_ROUTE101",
+      "offset": 20,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_OLDALE_TOWN",
+      "offset": 0,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE103",
+      "offset": -20,
+      "direction": "up"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
+      "x": 12,
+      "y": 17,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route101ext_EventScript_BugCatcher",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
+      "x": 16,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EventScript_CutTree",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
+      "x": 11,
+      "y": 34,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route101ext_EventScript_FatMan",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_TAILLOW",
+      "x": 18,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
+      "x": 16,
+      "y": 22,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route101ext_EventScript_ItemPokeBall",
+      "flag": "FLAG_ITEM_ROUTE_101ext_POTION"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
+      "x": 7,
+      "y": 4,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route101ext_EventScript_LonelyWoman",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK",
+      "x": 5,
+      "y": 24,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "FLAG_STEVENS_CAVE_ROCK"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
+      "x": 7,
+      "y": 24,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_StevensRoom_EventScript_Colapse",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route101ext_EventScript_Sign"
+    }
+  ]
+}
diff --git a/data/maps/Route101ext/scripts.inc b/data/maps/Route101ext/scripts.inc
new file mode 100644
index 000000000..1ab272567
--- /dev/null
+++ b/data/maps/Route101ext/scripts.inc
@@ -0,0 +1,67 @@
+Route101ext_MapScripts::
+	.byte 0
+
+Route101ext_EventScript_BugCatcher::
+	msgbox Route101ext_Text_StrangeHouse, MSGBOX_NPC
+	end
+	
+Route101ext_EventScript_FatMan::
+	msgbox Route101ext_Text_DailyWalk, MSGBOX_NPC
+	end
+
+Route101ext_EventScript_LonelyWoman::
+	msgbox Route101ext_Text_MassiveWorld, MSGBOX_NPC
+	end
+	
+Route101ext_EventScript_Sign::
+	msgbox Route101ext_Text_Sign, MSGBOX_NPC
+	end
+	
+Route101ext_EventScript_RockTest::
+	goto_if_set FLAG_STEVENS_CAVE_ROCK, Route101ext_EventScript_RockTest_on
+	removeobject 7
+	setflag FLAG_STEVENS_CAVE_ROCK
+	
+	delay 16
+	setvar VAR_0x8004, 0  @ vertical pan
+	setvar VAR_0x8005, 2   @ horizontal pan
+	setvar VAR_0x8006, 40  @ num shakes
+	setvar VAR_0x8007, 4   @ shake delay
+	special ShakeCamera
+	waitstate
+	
+	end
+
+Route101ext_EventScript_RockTest_on::
+	clearflag FLAG_STEVENS_CAVE_ROCK
+	setobjectxyperm 7, 5, 24
+	delay 16
+	setvar VAR_0x8004, 1  @ vertical pan
+	setvar VAR_0x8005, 2   @ horizontal pan
+	setvar VAR_0x8006, 3  @ num shakes
+	setvar VAR_0x8007, 1   @ shake delay
+	special ShakeCamera
+	waitstate
+	end
+
+Route101ext_Text_Sign:
+	.string "{LEFT_ARROW} OLDALE TOWN\n"
+	.string "{DOWN_ARROW} LITTLEROOT$"
+
+Route101ext_Text_DailyWalk:
+	.string "Usually there are many paths between\n"
+	.string "towns.\p"
+	.string "I like taking the long way between\n"
+	.string "OLDALE and LITTLEROOT.$"
+	
+Route101ext_Text_StrangeHouse:
+	.string "See that house over there?\n"
+	.string "It has been empty for years.\p"
+	.string "I wonder if there are any spooky Bug\n"
+	.string "POKéMON in there.$"
+	
+Route101ext_Text_MassiveWorld:
+	.string "The world just seems to get larger\n"
+	.string "and larger.\p"
+	.string "There must be so much that we have\n"
+	.string "yet to discover.$"
diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json
index 68e3549db..39474687a 100644
--- a/data/maps/Route102/map.json
+++ b/data/maps/Route102/map.json
@@ -22,6 +22,11 @@
       "map": "MAP_OLDALE_TOWN",
       "offset": 0,
       "direction": "right"
+    },
+    {
+      "map": "MAP_ROUTE102EXT",
+      "offset": 8,
+      "direction": "down"
     }
   ],
   "object_events": [
@@ -143,8 +148,12 @@
       "flag": "0"
     }
   ],
-  "warp_events": [],
-  "coord_events": [],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Route102ext/map.json b/data/maps/Route102ext/map.json
new file mode 100644
index 000000000..20f8f1f4a
--- /dev/null
+++ b/data/maps/Route102ext/map.json
@@ -0,0 +1,72 @@
+{
+  "id": "MAP_ROUTE102EXT",
+  "name": "Route102ext",
+  "layout": "LAYOUT_ROUTE102EXT",
+  "music": "MUS_ROUTE101",
+  "region_map_section": "MAPSEC_ROUTE_102",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "map": "MAP_ROUTE102",
+      "offset": -8,
+      "direction": "up"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK",
+      "x": 17,
+      "y": 8,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EventScript_RockSmash",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
+      "x": 11,
+      "y": 8,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route102ext_EventScript_ItemRareCandy",
+      "flag": "FLAG_ITEM_ROUTE_102ext_RARECANDY"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BOY_3",
+      "x": 1,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NORMAL",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route102ext_EventScript_Bart",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}
diff --git a/data/maps/Route102ext/scripts.inc b/data/maps/Route102ext/scripts.inc
new file mode 100644
index 000000000..afd9f4581
--- /dev/null
+++ b/data/maps/Route102ext/scripts.inc
@@ -0,0 +1,18 @@
+Route102ext_MapScripts::
+	.byte 0
+	
+Route102ext_EventScript_Bart::
+	trainerbattle_single TRAINER_BART, Route102_Text_BartIntro, Route102_Text_BartDefeated
+	msgbox Route102ext_Text_BartPostBattle, MSGBOX_AUTOCLOSE
+	end
+	
+Route102_Text_BartIntro:
+	.string "Woah! Where did you catch\n"
+	.string "that?!$"
+	
+Route102_Text_BartDefeated:
+	.string "It's too strong for me...$"
+
+Route102ext_Text_BartPostBattle:
+	.string "Maybe I should focus on\n"
+	.string "training my own POKéMON.$"
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index 9bc6fed67..a06749c08 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -22,6 +22,16 @@
       "map": "MAP_ROUTE110",
       "offset": -60,
       "direction": "right"
+    },
+    {
+      "map": "MAP_ROUTE101EXT",
+      "offset": 20,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE103EXT",
+      "offset": 0,
+      "direction": "left"
     }
   ],
   "object_events": [
@@ -30,7 +40,7 @@
       "x": 49,
       "y": 12,
       "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT",
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
@@ -284,6 +294,45 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "Route103_EventScript_ItemPPUp",
       "flag": "FLAG_ITEM_ROUTE_103_PP_UP"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
+      "x": 0,
+      "y": 8,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EventScript_CutTree",
+      "flag": "FLAG_TEMP_16"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
+      "x": 0,
+      "y": 9,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EventScript_CutTree",
+      "flag": "FLAG_TEMP_15"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
+      "x": 1,
+      "y": 8,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "Route103_EventScript_PicnickerTree",
+      "flag": "0"
     }
   ],
   "warp_events": [
@@ -295,7 +344,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index 557db64e2..ce560e90f 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -352,4 +352,15 @@ Route103_Text_ShortcutToOldale:
 Route103_Text_RouteSign:
 	.string "ROUTE 103\n"
 	.string "{DOWN_ARROW} OLDALE TOWN$"
+	
+Route103_EventScript_PicnickerTree::
+	msgbox Route103_Text_PicnickerTree, MSGBOX_NPC
+	end
+
+Route103_Text_PicnickerTree:
+	.string "These small trees have been growing\n"
+	.string "rapidly in this area recently.\p"
+	.string "I heard there is a man in RUSTBORO\n"
+	.string "that can teach your POKéMON how to\l"
+	.string "remove them.$"
 
diff --git a/data/maps/Route103ext/map.json b/data/maps/Route103ext/map.json
new file mode 100644
index 000000000..4378c51c4
--- /dev/null
+++ b/data/maps/Route103ext/map.json
@@ -0,0 +1,47 @@
+{
+  "id": "MAP_ROUTE103EXT",
+  "name": "Route103ext",
+  "layout": "LAYOUT_ROUTE103EXT",
+  "music": "MUS_ROUTE101",
+  "region_map_section": "MAPSEC_ROUTE_103",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "map": "MAP_ROUTE103",
+      "offset": 0,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+
+  ],
+  "warp_events": [
+    {
+      "x": 0,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_WOODS_EXT",
+      "dest_warp_id": "0"
+    },
+    {
+      "x": 1,
+      "y": 17,
+      "elevation": 0,
+      "dest_map": "MAP_PETALBURG_WOODS_EXT",
+      "dest_warp_id": "1"
+    }
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}
diff --git a/data/maps/Route103ext/scripts.inc b/data/maps/Route103ext/scripts.inc
new file mode 100644
index 000000000..9f3c3b961
--- /dev/null
+++ b/data/maps/Route103ext/scripts.inc
@@ -0,0 +1,2 @@
+Route103ext_MapScripts::
+	.byte 0
diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json
index a15458bf6..9315e6616 100644
--- a/data/maps/Route104_Prototype/map.json
+++ b/data/maps/Route104_Prototype/map.json
@@ -12,9 +12,17 @@
   "allow_running": false,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "connections": 0,
+  "object_events": [
+
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json
index 7abd76e3d..10d1d092d 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json
@@ -12,9 +12,17 @@
   "allow_running": false,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "connections": 0,
+  "object_events": [
+
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json
index ae9bb6a5a..88ca381a6 100644
--- a/data/maps/Route105/map.json
+++ b/data/maps/Route105/map.json
@@ -144,7 +144,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "hidden_item",
diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json
index 5a0a38dc9..8c99ac285 100644
--- a/data/maps/Route106/map.json
+++ b/data/maps/Route106/map.json
@@ -100,7 +100,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "hidden_item",
diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json
index ee15509cd..c7ff529db 100644
--- a/data/maps/Route107/map.json
+++ b/data/maps/Route107/map.json
@@ -117,7 +117,13 @@
       "flag": "0"
     }
   ],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json
index 405ae3401..2f580cb04 100644
--- a/data/maps/Route108/map.json
+++ b/data/maps/Route108/map.json
@@ -126,7 +126,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "hidden_item",
diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json
index 49357f0a0..1d9feabb7 100644
--- a/data/maps/Route109/map.json
+++ b/data/maps/Route109/map.json
@@ -347,7 +347,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json
index 5340680ea..951c9fac1 100644
--- a/data/maps/Route112/map.json
+++ b/data/maps/Route112/map.json
@@ -257,7 +257,9 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json
index 17c483c0f..e7a6ad4c1 100644
--- a/data/maps/Route114/map.json
+++ b/data/maps/Route114/map.json
@@ -414,7 +414,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json
index a4143fad3..6d0f03a4f 100644
--- a/data/maps/Route115/map.json
+++ b/data/maps/Route115/map.json
@@ -348,7 +348,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "secret_base",
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json
index 80304ddf4..ccf67bbcd 100644
--- a/data/maps/Route117/map.json
+++ b/data/maps/Route117/map.json
@@ -347,7 +347,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json
index fe21fe773..4817f3fe8 100644
--- a/data/maps/Route122/map.json
+++ b/data/maps/Route122/map.json
@@ -24,7 +24,9 @@
       "direction": "down"
     }
   ],
-  "object_events": [],
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 22,
@@ -34,6 +36,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json
index 21e2ecd06..cd9f5b5cc 100644
--- a/data/maps/Route124/map.json
+++ b/data/maps/Route124/map.json
@@ -206,7 +206,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json
index 148014b99..39931b32e 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_MAN_5",
@@ -44,7 +44,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json
index cc8bdf09c..624d06e04 100644
--- a/data/maps/Route125/map.json
+++ b/data/maps/Route125/map.json
@@ -170,7 +170,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "secret_base",
diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json
index 0997e46b1..01ec8fe8e 100644
--- a/data/maps/Route126/map.json
+++ b/data/maps/Route126/map.json
@@ -148,7 +148,13 @@
       "flag": "0"
     }
   ],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json
index 30652264e..a7ea4df6a 100644
--- a/data/maps/Route127/map.json
+++ b/data/maps/Route127/map.json
@@ -179,8 +179,12 @@
       "flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY"
     }
   ],
-  "warp_events": [],
-  "coord_events": [],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "secret_base",
diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json
index 464aa83fc..3749f30e9 100644
--- a/data/maps/Route128/map.json
+++ b/data/maps/Route128/map.json
@@ -166,8 +166,12 @@
       "flag": "0"
     }
   ],
-  "warp_events": [],
-  "coord_events": [],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "hidden_item",
diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json
index 427b70bd1..da424ca3c 100644
--- a/data/maps/Route129/map.json
+++ b/data/maps/Route129/map.json
@@ -96,7 +96,13 @@
       "flag": "0"
     }
   ],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json
index 7b37a10ed..19a9709c9 100644
--- a/data/maps/Route130/map.json
+++ b/data/maps/Route130/map.json
@@ -78,7 +78,13 @@
       "flag": "0"
     }
   ],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json
index 18cdecc6e..208f0373a 100644
--- a/data/maps/Route131/map.json
+++ b/data/maps/Route131/map.json
@@ -139,6 +139,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json
index 698dd050f..43a3227d9 100644
--- a/data/maps/Route132/map.json
+++ b/data/maps/Route132/map.json
@@ -156,7 +156,13 @@
       "flag": "FLAG_ITEM_ROUTE_132_PROTEIN"
     }
   ],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json
index 106546ef5..37b6651c1 100644
--- a/data/maps/Route133/map.json
+++ b/data/maps/Route133/map.json
@@ -156,7 +156,13 @@
       "flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE"
     }
   ],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json
index f516f16de..a294aa2c4 100644
--- a/data/maps/Route134/map.json
+++ b/data/maps/Route134/map.json
@@ -169,7 +169,13 @@
       "flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE"
     }
   ],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json
index 3d77404ee..df11f79a2 100644
--- a/data/maps/RustboroCity/map.json
+++ b/data/maps/RustboroCity/map.json
@@ -323,6 +323,13 @@
       "elevation": 0,
       "dest_map": "MAP_RUSTBORO_CITY_HOUSE3",
       "dest_warp_id": "0"
+    },
+    {
+      "x": 32,
+      "y": 46,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_LEAFS_HOUSE",
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [
diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json
index 16394a68b..946f5d249 100644
--- a/data/maps/RustboroCity_CuttersHouse/map.json
+++ b/data/maps/RustboroCity_CuttersHouse/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
@@ -57,6 +57,10 @@
       "dest_warp_id": "8"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json
index 1ed8aafd1..1fde12360 100644
--- a/data/maps/RustboroCity_Flat1_1F/map.json
+++ b/data/maps/RustboroCity_Flat1_1F/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_MAN_3",
@@ -64,6 +64,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json
index bb8767062..36104fda0 100644
--- a/data/maps/RustboroCity_Flat1_2F/map.json
+++ b/data/maps/RustboroCity_Flat1_2F/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
@@ -128,6 +128,10 @@
       "dest_warp_id": "2"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json
index 21c1d5d7f..a728e4da3 100644
--- a/data/maps/RustboroCity_Flat2_1F/map.json
+++ b/data/maps/RustboroCity_Flat2_1F/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_SKITTY",
@@ -64,6 +64,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json
index 8494c5232..22e353793 100644
--- a/data/maps/RustboroCity_Flat2_2F/map.json
+++ b/data/maps/RustboroCity_Flat2_2F/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
@@ -57,6 +57,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json
index d7f47d6a0..826b495db 100644
--- a/data/maps/RustboroCity_Flat2_3F/map.json
+++ b/data/maps/RustboroCity_Flat2_3F/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_DEVON_EMPLOYEE",
@@ -50,6 +50,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json
index ad8e9d7ff..7b35c24e7 100644
--- a/data/maps/RustboroCity_House1/map.json
+++ b/data/maps/RustboroCity_House1/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_CAMPER",
@@ -57,6 +57,10 @@
       "dest_warp_id": "7"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json
index 398c3ca2a..ed893d820 100644
--- a/data/maps/RustboroCity_House2/map.json
+++ b/data/maps/RustboroCity_House2/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
@@ -57,6 +57,10 @@
       "dest_warp_id": "9"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json
index 94a9f1ba9..814d1bdbb 100644
--- a/data/maps/RustboroCity_House3/map.json
+++ b/data/maps/RustboroCity_House3/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
@@ -70,6 +70,10 @@
       "dest_warp_id": "11"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/RustboroCity_LeafsHouse/map.json b/data/maps/RustboroCity_LeafsHouse/map.json
new file mode 100644
index 000000000..d853e9d9b
--- /dev/null
+++ b/data/maps/RustboroCity_LeafsHouse/map.json
@@ -0,0 +1,73 @@
+{
+  "id": "MAP_RUSTBORO_CITY_LEAFS_HOUSE",
+  "name": "RustboroCity_LeafsHouse",
+  "layout": "LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE",
+  "music": "MUS_RUSTBORO",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_cycling": false,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": 0,
+  "object_events": [
+    {
+      "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
+      "x": 11,
+      "y": 5,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LeafsHouse_EventScript_grandmother",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_UNUSED_SQUIRTLE_DOLL",
+      "x": 9,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "LeafsHouse_EventScript_doll",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": "12"
+    },
+    {
+      "x": 2,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": "12"
+    },
+    {
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_LEAFS_HOUSE_2F",
+      "dest_warp_id": "0"
+    }
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}
diff --git a/data/maps/RustboroCity_LeafsHouse/scripts.inc b/data/maps/RustboroCity_LeafsHouse/scripts.inc
new file mode 100644
index 000000000..79abd1937
--- /dev/null
+++ b/data/maps/RustboroCity_LeafsHouse/scripts.inc
@@ -0,0 +1,46 @@
+RustboroCity_LeafsHouse_MapScripts::
+	.byte 0
+
+//grand mother scripts
+LeafsHouse_EventScript_grandmother::
+	goto_if_set FLAG_LEAFS_ARRIVED, LeafsHouse_EventScript_grandmother_leafsarrive
+	msgbox LeafsHouse_Text_grandmother_hello, MSGBOX_NPC
+	end
+	
+LeafsHouse_EventScript_grandmother_leafsarrive::
+	msgbox LeafsHouse_EventScript_grandmother_happyleafishome
+	end
+
+LeafsHouse_EventScript_grandmother_happyleafishome:
+	.string "Leaf's Grandma: Leaf is a very popular\n"
+	.string "trainer in her hometown.\l"
+	.string "Don't tell her know that you know. hehe$"
+
+LeafsHouse_Text_grandmother_hello:
+	.string "Old Lady: Hello little one.You have the\n"
+	.string "look of a Trainer in your eyes.\p"
+	.string "My granddaughter is also a trainer.\n"
+	.string "She'll be visiting from KANTO soon\l"
+	.string "You should come by later and meet her.$"
+	
+
+//Doll scrips
+LeafsHouse_EventScript_doll::
+	goto_if_set FLAG_LEAFS_ARRIVED, LeafsHouse_EventScript_doll_afterleaf
+	msgbox LeafsHouse_Text_doll, MSGBOX_NPC
+	end
+	
+LeafsHouse_Text_doll:
+	.string "Old Lady: That belonged to my\n"
+	.string "granddaughter when she was little.$"
+	
+LeafsHouse_EventScript_doll_afterleaf::
+	msgbox LeafsHouse_Text_doll_afterleaf, MSGBOX_NPC
+	end
+
+LeafsHouse_Text_doll_afterleaf:
+	.string "Leaf's Grandma: Leaf used to carry\n"
+	.string "that thing everywhere with her when\l"
+	.string "she would visit me in the winters.$"
+	
+	
\ No newline at end of file
diff --git a/data/maps/RustboroCity_LeafsHouse_2F/map.json b/data/maps/RustboroCity_LeafsHouse_2F/map.json
new file mode 100644
index 000000000..8e7e4eb45
--- /dev/null
+++ b/data/maps/RustboroCity_LeafsHouse_2F/map.json
@@ -0,0 +1,53 @@
+{
+  "id": "MAP_RUSTBORO_CITY_LEAFS_HOUSE_2F",
+  "name": "RustboroCity_LeafsHouse_2F",
+  "layout": "LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE_2F",
+  "music": "MUS_RUSTBORO",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_cycling": false,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": 0,
+  "object_events": [
+    {
+      "graphics_id": "OBJ_EVENT_GFX_MEOWTH",
+      "x": 7,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "RustboroCity_LeafsHouse_2F_EventScript_meowth",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_LEAFS_HOUSE",
+      "dest_warp_id": "2"
+    }
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 6,
+      "y": 1,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "RustboroCity_LeafsHouse_2F_EventScript_Gamecube"
+    }
+  ]
+}
diff --git a/data/maps/RustboroCity_LeafsHouse_2F/scripts.inc b/data/maps/RustboroCity_LeafsHouse_2F/scripts.inc
new file mode 100644
index 000000000..36dbe91bc
--- /dev/null
+++ b/data/maps/RustboroCity_LeafsHouse_2F/scripts.inc
@@ -0,0 +1,22 @@
+RustboroCity_LeafsHouse_2F_MapScripts::
+	.byte 0
+
+//gamecube
+RustboroCity_LeafsHouse_2F_EventScript_Gamecube::
+	msgbox RustboroCity_LeafsHouse_2F_Text_cube, MSGBOX_SIGN
+	end
+
+RustboroCity_LeafsHouse_2F_Text_cube:
+	.string "Looks a bit dusty and most of the\n"
+	.string "games are remakes.$"
+
+//meowth
+RustboroCity_LeafsHouse_2F_EventScript_meowth::
+	playmoncry SPECIES_MEOWTH, 0
+	waitmoncry
+	msgbox RustboroCity_LeafsHouse_2F_Text_sleepingMeowth, MSGBOX_SIGN
+	end
+	
+RustboroCity_LeafsHouse_2F_Text_sleepingMeowth:
+	.string "Meowth is sleeping without a care in\n"
+	.string "the world.$"
\ No newline at end of file
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json
index 5c9c5d42e..f8df7f440 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/map.json
+++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json
@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_TEALA",
@@ -90,6 +90,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json
index 06e30f049..b7ec20b82 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/map.json
+++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
@@ -71,7 +71,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Underwater_Route105/map.json b/data/maps/Underwater_Route105/map.json
index 069ccab4d..b276de28d 100644
--- a/data/maps/Underwater_Route105/map.json
+++ b/data/maps/Underwater_Route105/map.json
@@ -19,7 +19,9 @@
       "direction": "emerge"
     }
   ],
-  "object_events": [],
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 13,
@@ -36,6 +38,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json
index ae40730c0..2d1df93ed 100644
--- a/data/maps/VerdanturfTown/map.json
+++ b/data/maps/VerdanturfTown/map.json
@@ -129,7 +129,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
index 44a2bca66..a3c8314c2 100644
--- a/data/maps/VictoryRoad_1F/map.json
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_MAN_3",
diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json
index 6f339a1c2..2410f1875 100644
--- a/data/maps/VictoryRoad_B1F/map.json
+++ b/data/maps/VictoryRoad_B1F/map.json
@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
@@ -339,6 +339,10 @@
       "dest_warp_id": "3"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index ebef431b3..278b07d04 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -92,7 +92,13 @@
     "Underwater_Route128",
     "Underwater_Route129",
     "Underwater_Route105",
-    "Underwater_Route125"
+    "Underwater_Route125",
+    "Route101ext",
+    "Route102ext",
+    "NewMap1",
+    "Petalburgext",
+    "PetalburgCity_OldResearchBuilding",
+    "Route103ext"
   ],
   "gMapGroup_IndoorLittleroot": [
     "LittlerootTown_BrendansHouse_1F",
@@ -207,7 +213,9 @@
     "RustboroCity_Flat2_1F",
     "RustboroCity_Flat2_2F",
     "RustboroCity_Flat2_3F",
-    "RustboroCity_House3"
+    "RustboroCity_House3",
+    "RustboroCity_LeafsHouse",
+    "RustboroCity_LeafsHouse_2F"
   ],
   "gMapGroup_IndoorFortree": [
     "FortreeCity_House1",
@@ -429,7 +437,10 @@
     "TerraCave_Entrance",
     "TerraCave_End",
     "AlteringCave",
-    "MeteorFalls_StevensCave"
+    "MeteorFalls_StevensCave",
+    "PetalburgWoodsExt",
+    "PetalburgWoodsext2",
+    "GraniteCave_B3F"
   ],
   "gMapGroup_IndoorDynamic": [
     "SecretBase_RedCave1",
@@ -620,72 +631,5 @@
   ],
   "gMapGroup_IndoorRoute124": [
     "Route124_DivingTreasureHuntersHouse"
-  ],
-  "connections_include_order": [
-    "LittlerootTown",
-    "OldaleTown",
-    "DewfordTown",
-    "LavaridgeTown",
-    "FallarborTown",
-    "VerdanturfTown",
-    "PacifidlogTown",
-    "PetalburgCity",
-    "SlateportCity",
-    "MauvilleCity",
-    "RustboroCity",
-    "FortreeCity",
-    "LilycoveCity",
-    "MossdeepCity",
-    "SootopolisCity",
-    "EverGrandeCity",
-    "Route101",
-    "Route102",
-    "Route103",
-    "Route104",
-    "Route105",
-    "Route106",
-    "Route107",
-    "Route108",
-    "Route109",
-    "Route110",
-    "Route111",
-    "Route112",
-    "Route113",
-    "Route114",
-    "Route115",
-    "Route116",
-    "Route117",
-    "Route118",
-    "Route119",
-    "Route120",
-    "Route121",
-    "Route122",
-    "Route123",
-    "Route124",
-    "Route125",
-    "Route126",
-    "Route127",
-    "Route128",
-    "Route129",
-    "Route130",
-    "Route131",
-    "Route132",
-    "Route133",
-    "Route134",
-    "Underwater_Route105",
-    "Underwater_Route124",
-    "Underwater_Route125",
-    "Underwater_Route126",
-    "Underwater_Route127",
-    "Underwater_Route128",
-    "Underwater_Route129",
-    "SafariZone_Northwest",
-    "SafariZone_North",
-    "SafariZone_Southwest",
-    "SafariZone_South",
-    "SafariZone_Northeast",
-    "SafariZone_Southeast",
-    "BattleFrontier_OutsideWest",
-    "BattleFrontier_OutsideEast"
   ]
 }
diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc
index 5ad4037cb..fd3c86d00 100644
--- a/data/scripts/item_ball_scripts.inc
+++ b/data/scripts/item_ball_scripts.inc
@@ -1,7 +1,19 @@
+LITTLEROOT_EventScript_ItemPokeBall::
+	finditem ITEM_POTION
+	end
+
+Route101ext_EventScript_ItemPokeBall::
+	finditem ITEM_POKE_BALL
+	end
+	
 Route102_EventScript_ItemPotion::
 	finditem ITEM_POTION
 	end
 
+Route102ext_EventScript_ItemRareCandy::
+	finditem ITEM_RARE_CANDY
+	end
+
 Route103_EventScript_ItemGuardSpec::
 	finditem ITEM_GUARD_SPEC
 	end
@@ -342,6 +354,10 @@ PetalburgWoods_EventScript_ItemParalyzeHeal::
 	finditem ITEM_PARALYZE_HEAL
 	end
 
+PetalburgWoodsext2_EventScript_ItemRevive::
+	finditem ITEM_REVIVE
+	end
+
 RusturfTunnel_EventScript_ItemPokeBall::
 	finditem ITEM_POKE_BALL
 	end
@@ -365,6 +381,14 @@ GraniteCave_B2F_EventScript_ItemRepel::
 GraniteCave_B2F_EventScript_ItemRareCandy::
 	finditem ITEM_RARE_CANDY
 	end
+	
+GraniteCave_B3F_EventScript_ItemRevive::
+	finditem ITEM_REVIVE
+	end
+
+GraniteCave_B3F_EventScript_ItemSuperPotion::
+	finditem ITEM_SUPER_POTION
+	end
 
 JaggedPass_EventScript_ItemBurnHeal::
 	finditem ITEM_BURN_HEAL
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
index 0c265d804..6383a052d 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -492,207 +492,6 @@
 #define OBJ_EVENT_GFX_HOOH_FOLLOWER              488
 #define OBJ_EVENT_GFX_CELEBI                     489
 
-#ifndef POKEMON_EXPANSION
-
-#define OBJ_EVENT_GFX_GREAT_BALL                 490
-#define OBJ_EVENT_GFX_ULTRA_BALL                 491
-#define OBJ_EVENT_GFX_MASTER_BALL                492
-#define OBJ_EVENT_GFX_SAFARI_BALL                493
-#define OBJ_EVENT_GFX_NET_BALL                   494
-#define OBJ_EVENT_GFX_DIVE_BALL                  495
-#define OBJ_EVENT_GFX_NEST_BALL                  496
-#define OBJ_EVENT_GFX_REPEAT_BALL                497
-#define OBJ_EVENT_GFX_TIMER_BALL                 498
-#define OBJ_EVENT_GFX_LUXURY_BALL                499
-#define OBJ_EVENT_GFX_PREMIER_BALL               500
-#define OBJ_EVENT_GFX_HEAL_BALL                  501
-#define OBJ_EVENT_GFX_DUSK_BALL                  502
-#define OBJ_EVENT_GFX_QUICK_BALL                 503
-#define OBJ_EVENT_GFX_LEVEL_BALL                 504
-#define OBJ_EVENT_GFX_LURE_BALL                  505
-#define OBJ_EVENT_GFX_MOON_BALL                  506
-#define OBJ_EVENT_GFX_FRIEND_BALL                507
-#define OBJ_EVENT_GFX_LOVE_BALL                  508
-#define OBJ_EVENT_GFX_FAST_BALL                  509
-#define OBJ_EVENT_GFX_HEAVY_BALL                 510
-#define OBJ_EVENT_GFX_DREAM_BALL                 511
-#define OBJ_EVENT_GFX_SPORT_BALL                 512
-#define OBJ_EVENT_GFX_PARK_BALL                  513
-#define OBJ_EVENT_GFX_CHERISH_BALL               514
-
-// Jump in numbers due to SPECIES_OLD_UNOWN constants
-#define OBJ_EVENT_GFX_TREECKO                    515
-#define OBJ_EVENT_GFX_GROVYLE                    516
-#define OBJ_EVENT_GFX_SCEPTILE                   517
-#define OBJ_EVENT_GFX_TORCHIC                    518
-#define OBJ_EVENT_GFX_COMBUSKEN                  519
-#define OBJ_EVENT_GFX_BLAZIKEN                   520
-#define OBJ_EVENT_GFX_MUDKIP                     521
-#define OBJ_EVENT_GFX_MARSHTOMP                  522
-#define OBJ_EVENT_GFX_SWAMPERT                   523
-#define OBJ_EVENT_GFX_POOCHYENA_FOLLOWER         524
-#define OBJ_EVENT_GFX_MIGHTYENA                  525
-#define OBJ_EVENT_GFX_ZIGZAGOON_FOLLOWER         526
-#define OBJ_EVENT_GFX_LINOONE                    527
-#define OBJ_EVENT_GFX_WURMPLE                    528
-#define OBJ_EVENT_GFX_SILCOON                    529
-#define OBJ_EVENT_GFX_BEAUTIFLY                  530
-#define OBJ_EVENT_GFX_CASCOON                    531
-#define OBJ_EVENT_GFX_DUSTOX                     532
-#define OBJ_EVENT_GFX_LOTAD                      533
-#define OBJ_EVENT_GFX_LOMBRE                     534
-#define OBJ_EVENT_GFX_LUDICOLO                   535
-#define OBJ_EVENT_GFX_SEEDOT                     536
-#define OBJ_EVENT_GFX_NUZLEAF                    537
-#define OBJ_EVENT_GFX_SHIFTRY                    538
-#define OBJ_EVENT_GFX_NINCADA                    539
-#define OBJ_EVENT_GFX_NINJASK                    540
-#define OBJ_EVENT_GFX_SHEDINJA                   541
-#define OBJ_EVENT_GFX_TAILLOW                    542
-#define OBJ_EVENT_GFX_SWELLOW                    543
-#define OBJ_EVENT_GFX_SHROOMISH                  544
-#define OBJ_EVENT_GFX_BRELOOM                    545
-#define OBJ_EVENT_GFX_SPINDA                     546
-#define OBJ_EVENT_GFX_WINGULL_FOLLOWER           547
-#define OBJ_EVENT_GFX_PELIPPER                   548
-#define OBJ_EVENT_GFX_SURSKIT                    549
-#define OBJ_EVENT_GFX_MASQUERAIN                 550
-#define OBJ_EVENT_GFX_WAILMER                    551
-#define OBJ_EVENT_GFX_WAILORD                    552
-#define OBJ_EVENT_GFX_SKITTY_FOLLOWER            553
-#define OBJ_EVENT_GFX_DELCATTY                   554
-#define OBJ_EVENT_GFX_KECLEON_FOLLOWER           555
-#define OBJ_EVENT_GFX_BALTOY                     556
-#define OBJ_EVENT_GFX_CLAYDOL                    557
-#define OBJ_EVENT_GFX_NOSEPASS                   558
-#define OBJ_EVENT_GFX_TORKOAL                    559
-#define OBJ_EVENT_GFX_SABLEYE                    560
-#define OBJ_EVENT_GFX_BARBOACH                   561
-#define OBJ_EVENT_GFX_WHISCASH                   562
-#define OBJ_EVENT_GFX_LUVDISC                    563
-#define OBJ_EVENT_GFX_CORPHISH                   564
-#define OBJ_EVENT_GFX_CRAWDAUNT                  565
-#define OBJ_EVENT_GFX_FEEBAS                     566
-#define OBJ_EVENT_GFX_MILOTIC                    567
-#define OBJ_EVENT_GFX_CARVANHA                   568
-#define OBJ_EVENT_GFX_SHARPEDO                   569
-#define OBJ_EVENT_GFX_TRAPINCH                   570
-#define OBJ_EVENT_GFX_VIBRAVA                    571
-#define OBJ_EVENT_GFX_FLYGON                     572
-#define OBJ_EVENT_GFX_MAKUHITA                   573
-#define OBJ_EVENT_GFX_HARIYAMA                   574
-#define OBJ_EVENT_GFX_ELECTRIKE                  575
-#define OBJ_EVENT_GFX_MANECTRIC                  576
-#define OBJ_EVENT_GFX_NUMEL                      577
-#define OBJ_EVENT_GFX_CAMERUPT                   578
-#define OBJ_EVENT_GFX_SPHEAL                     579
-#define OBJ_EVENT_GFX_SEALEO                     580
-#define OBJ_EVENT_GFX_WALREIN                    581
-#define OBJ_EVENT_GFX_CACNEA                     582
-#define OBJ_EVENT_GFX_CACTURNE                   583
-#define OBJ_EVENT_GFX_SNORUNT                    584
-#define OBJ_EVENT_GFX_GLALIE                     585
-#define OBJ_EVENT_GFX_LUNATONE                   586
-#define OBJ_EVENT_GFX_SOLROCK                    587
-#define OBJ_EVENT_GFX_AZURILL_FOLLOWER           588
-#define OBJ_EVENT_GFX_SPOINK                     589
-#define OBJ_EVENT_GFX_GRUMPIG                    590
-#define OBJ_EVENT_GFX_PLUSLE                     591
-#define OBJ_EVENT_GFX_MINUN                      592
-#define OBJ_EVENT_GFX_MAWILE                     593
-#define OBJ_EVENT_GFX_MEDITITE                   594
-#define OBJ_EVENT_GFX_MEDICHAM                   595
-#define OBJ_EVENT_GFX_SWABLU                     596
-#define OBJ_EVENT_GFX_ALTARIA                    597
-#define OBJ_EVENT_GFX_WYNAUT                     598
-#define OBJ_EVENT_GFX_DUSKULL                    599
-#define OBJ_EVENT_GFX_DUSCLOPS_FOLLOWER          600
-#define OBJ_EVENT_GFX_ROSELIA                    601
-#define OBJ_EVENT_GFX_SLAKOTH                    602
-#define OBJ_EVENT_GFX_VIGOROTH_FOLLOWER          603
-#define OBJ_EVENT_GFX_SLAKING                    604
-#define OBJ_EVENT_GFX_GULPIN                     605
-#define OBJ_EVENT_GFX_SWALOT                     606
-#define OBJ_EVENT_GFX_TROPIUS                    607
-#define OBJ_EVENT_GFX_WHISMUR                    608
-#define OBJ_EVENT_GFX_LOUDRED                    609
-#define OBJ_EVENT_GFX_EXPLOUD                    610
-#define OBJ_EVENT_GFX_CLAMPERL                   611
-#define OBJ_EVENT_GFX_HUNTAIL                    612
-#define OBJ_EVENT_GFX_GOREBYSS                   613
-#define OBJ_EVENT_GFX_ABSOL                      614
-#define OBJ_EVENT_GFX_SHUPPET                    615
-#define OBJ_EVENT_GFX_BANETTE                    616
-#define OBJ_EVENT_GFX_SEVIPER                    617
-#define OBJ_EVENT_GFX_ZANGOOSE                   618
-#define OBJ_EVENT_GFX_RELICANTH                  619
-#define OBJ_EVENT_GFX_ARON                       620
-#define OBJ_EVENT_GFX_LAIRON                     621
-#define OBJ_EVENT_GFX_AGGRON                     622
-#define OBJ_EVENT_GFX_CASTFORM                   623
-#define OBJ_EVENT_GFX_VOLBEAT                    624
-#define OBJ_EVENT_GFX_ILLUMISE                   625
-#define OBJ_EVENT_GFX_LILEEP                     626
-#define OBJ_EVENT_GFX_CRADILY                    627
-#define OBJ_EVENT_GFX_ANORITH                    628
-#define OBJ_EVENT_GFX_ARMALDO                    629
-#define OBJ_EVENT_GFX_RALTS                      630
-#define OBJ_EVENT_GFX_KIRLIA_FOLLOWER            631
-#define OBJ_EVENT_GFX_GARDEVOIR                  632
-#define OBJ_EVENT_GFX_BAGON                      633
-#define OBJ_EVENT_GFX_SHELGON                    634
-#define OBJ_EVENT_GFX_SALAMENCE                  635
-#define OBJ_EVENT_GFX_BELDUM                     636
-#define OBJ_EVENT_GFX_METANG                     637
-#define OBJ_EVENT_GFX_METAGROSS                  638
-#define OBJ_EVENT_GFX_REGIROCK_FOLLOWER          639
-#define OBJ_EVENT_GFX_REGICE_FOLLOWER            640
-#define OBJ_EVENT_GFX_REGISTEEL_FOLLOWER         641
-#define OBJ_EVENT_GFX_KYOGRE                     642
-#define OBJ_EVENT_GFX_GROUDON                    643
-#define OBJ_EVENT_GFX_RAYQUAZA_FOLLOWER          644
-#define OBJ_EVENT_GFX_LATIAS_FOLLOWER            645
-#define OBJ_EVENT_GFX_LATIOS_FOLLOWER            646
-#define OBJ_EVENT_GFX_JIRACHI                    647
-#define OBJ_EVENT_GFX_DEOXYS_NORMAL              648
-#define OBJ_EVENT_GFX_CHIMECHO                   649
-
-// Other forms
-#define OBJ_EVENT_GFX_DEOXYS_ATTACK              650
-#define OBJ_EVENT_GFX_DEOXYS_DEFENSE             651
-#define OBJ_EVENT_GFX_DEOXYS_SPEED               652
-#define OBJ_EVENT_GFX_UNOWN_B                    653
-#define OBJ_EVENT_GFX_UNOWN_C                    654
-#define OBJ_EVENT_GFX_UNOWN_D                    655
-#define OBJ_EVENT_GFX_UNOWN_E                    656
-#define OBJ_EVENT_GFX_UNOWN_F                    657
-#define OBJ_EVENT_GFX_UNOWN_G                    658
-#define OBJ_EVENT_GFX_UNOWN_H                    659
-#define OBJ_EVENT_GFX_UNOWN_I                    660
-#define OBJ_EVENT_GFX_UNOWN_J                    661
-#define OBJ_EVENT_GFX_UNOWN_K                    662
-#define OBJ_EVENT_GFX_UNOWN_L                    663
-#define OBJ_EVENT_GFX_UNOWN_M                    664
-#define OBJ_EVENT_GFX_UNOWN_N                    665
-#define OBJ_EVENT_GFX_UNOWN_O                    666
-#define OBJ_EVENT_GFX_UNOWN_P                    667
-#define OBJ_EVENT_GFX_UNOWN_Q                    668
-#define OBJ_EVENT_GFX_UNOWN_R                    669
-#define OBJ_EVENT_GFX_UNOWN_S                    670
-#define OBJ_EVENT_GFX_UNOWN_T                    671
-#define OBJ_EVENT_GFX_UNOWN_U                    672
-#define OBJ_EVENT_GFX_UNOWN_V                    673
-#define OBJ_EVENT_GFX_UNOWN_W                    674
-#define OBJ_EVENT_GFX_UNOWN_X                    675
-#define OBJ_EVENT_GFX_UNOWN_Y                    676
-#define OBJ_EVENT_GFX_UNOWN_Z                    677
-#define OBJ_EVENT_GFX_UNOWN_EXCLAMATION          678
-#define OBJ_EVENT_GFX_UNOWN_QUESTION             679
-
-#define OBJ_EVENT_GFX_EXPANDING_SPARKLE          680
-
-#else
-// There are no OLD_UNOWN constants in the pokemon_expansion, and the species constants are reordered
 
 #define OBJ_EVENT_GFX_TREECKO                    490
 #define OBJ_EVENT_GFX_GROVYLE                    491
@@ -889,7 +688,6 @@
 #define OBJ_EVENT_GFX_CHERISH_BALL               679
 #define OBJ_EVENT_GFX_EXPANDING_SPARKLE          680
 
-#endif
 
 #define NUM_OBJ_EVENT_GFX                        681
 
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 36a38a6e2..c71d5b240 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1218,15 +1218,15 @@
 #define FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET                     0x491
 #define FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL                  0x492
 
-#define FLAG_UNUSED_0x493                                           0x493 // Unused Flag
-#define FLAG_UNUSED_0x494                                           0x494 // Unused Flag
-#define FLAG_UNUSED_0x495                                           0x495 // Unused Flag
-#define FLAG_UNUSED_0x496                                           0x496 // Unused Flag
-#define FLAG_UNUSED_0x497                                           0x497 // Unused Flag
-#define FLAG_UNUSED_0x498                                           0x498 // Unused Flag
-#define FLAG_UNUSED_0x499                                           0x499 // Unused Flag
-#define FLAG_UNUSED_0x49A                                           0x49A // Unused Flag
-#define FLAG_UNUSED_0x49B                                           0x49B // Unused Flag
+#define FLAG_ITEM_ROUTE_101ext_POTION                               0x493
+#define FLAG_ITEM_ROUTE_102ext_RARECANDY                            0x494 // Unused Flag
+#define FLAG_ITEM_TOWN_LITTLEROOT_POTION                            0x495 // Unused Flag
+#define FLAG_RECEIVED_FEEBASS                                       0x496 // Unused Flag
+#define FLAG_ITEM_PETALBURGEXT2_WOODS_REVIVE                        0x497 // Unused Flag
+#define FLAG_LEAFS_ARRIVED                                          0x498 // Unused Flag
+#define FLAG_STEVENS_CAVE_ROCK                                      0x499 // Unused Flag
+#define FLAG_ITEM_GRANITE_CAVE_3F_SUPERPOTION                       0x49A // Unused Flag
+#define FLAG_ITEM_GRANITE_CAVE_3F_REVIVE                            0x49B // Unused Flag
 #define FLAG_UNUSED_0x49C                                           0x49C // Unused Flag
 #define FLAG_UNUSED_0x49D                                           0x49D // Unused Flag
 #define FLAG_UNUSED_0x49E                                           0x49E // Unused Flag
diff --git a/include/constants/global.h b/include/constants/global.h
index ca6f336cb..0d7445837 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -170,6 +170,6 @@
 #define SIDEWAYS_STAIRS_IMPLEMENTED FALSE
 #define POST_BATTLE_FOLLOWER_FIX    FALSE
 
-#define FAST_FOLLOWERS FALSE
+#define FAST_FOLLOWERS TRUE
 
 #endif // GUARD_CONSTANTS_GLOBAL_H
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index db92c9594..f767cc81e 100755
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -446,5 +446,16 @@
 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F 439
 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440
 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED 441
+#define LAYOUT_ROUTE101EXT 442
+#define LAYOUT_ROUTE102EXT 443
+#define LAYOUT_NEW_MAP1 444
+#define LAYOUT_PETALBURGEXT 445
+#define LAYOUT_PETALBURG_CITY_OLD_RESEARCH_BUILDING 446
+#define LAYOUT_PETALBURG_WOODS_EXT 447
+#define LAYOUT_ROUTE103EXT 448
+#define LAYOUT_PETALBURG_WOODSEXT2 449
+#define LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE 450
+#define LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE_2F 451
+#define LAYOUT_GRANITE_CAVE_B3F 452
 
 #endif // GUARD_CONSTANTS_LAYOUTS_H
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index eaf40a525..5e05a156d 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -6,63 +6,69 @@
 //
 
 // gMapGroup_TownsAndRoutes
-#define MAP_PETALBURG_CITY      (0 | (0 << 8))
-#define MAP_SLATEPORT_CITY      (1 | (0 << 8))
-#define MAP_MAUVILLE_CITY       (2 | (0 << 8))
-#define MAP_RUSTBORO_CITY       (3 | (0 << 8))
-#define MAP_FORTREE_CITY        (4 | (0 << 8))
-#define MAP_LILYCOVE_CITY       (5 | (0 << 8))
-#define MAP_MOSSDEEP_CITY       (6 | (0 << 8))
-#define MAP_SOOTOPOLIS_CITY     (7 | (0 << 8))
-#define MAP_EVER_GRANDE_CITY    (8 | (0 << 8))
-#define MAP_LITTLEROOT_TOWN     (9 | (0 << 8))
-#define MAP_OLDALE_TOWN         (10 | (0 << 8))
-#define MAP_DEWFORD_TOWN        (11 | (0 << 8))
-#define MAP_LAVARIDGE_TOWN      (12 | (0 << 8))
-#define MAP_FALLARBOR_TOWN      (13 | (0 << 8))
-#define MAP_VERDANTURF_TOWN     (14 | (0 << 8))
-#define MAP_PACIFIDLOG_TOWN     (15 | (0 << 8))
-#define MAP_ROUTE101            (16 | (0 << 8))
-#define MAP_ROUTE102            (17 | (0 << 8))
-#define MAP_ROUTE103            (18 | (0 << 8))
-#define MAP_ROUTE104            (19 | (0 << 8))
-#define MAP_ROUTE105            (20 | (0 << 8))
-#define MAP_ROUTE106            (21 | (0 << 8))
-#define MAP_ROUTE107            (22 | (0 << 8))
-#define MAP_ROUTE108            (23 | (0 << 8))
-#define MAP_ROUTE109            (24 | (0 << 8))
-#define MAP_ROUTE110            (25 | (0 << 8))
-#define MAP_ROUTE111            (26 | (0 << 8))
-#define MAP_ROUTE112            (27 | (0 << 8))
-#define MAP_ROUTE113            (28 | (0 << 8))
-#define MAP_ROUTE114            (29 | (0 << 8))
-#define MAP_ROUTE115            (30 | (0 << 8))
-#define MAP_ROUTE116            (31 | (0 << 8))
-#define MAP_ROUTE117            (32 | (0 << 8))
-#define MAP_ROUTE118            (33 | (0 << 8))
-#define MAP_ROUTE119            (34 | (0 << 8))
-#define MAP_ROUTE120            (35 | (0 << 8))
-#define MAP_ROUTE121            (36 | (0 << 8))
-#define MAP_ROUTE122            (37 | (0 << 8))
-#define MAP_ROUTE123            (38 | (0 << 8))
-#define MAP_ROUTE124            (39 | (0 << 8))
-#define MAP_ROUTE125            (40 | (0 << 8))
-#define MAP_ROUTE126            (41 | (0 << 8))
-#define MAP_ROUTE127            (42 | (0 << 8))
-#define MAP_ROUTE128            (43 | (0 << 8))
-#define MAP_ROUTE129            (44 | (0 << 8))
-#define MAP_ROUTE130            (45 | (0 << 8))
-#define MAP_ROUTE131            (46 | (0 << 8))
-#define MAP_ROUTE132            (47 | (0 << 8))
-#define MAP_ROUTE133            (48 | (0 << 8))
-#define MAP_ROUTE134            (49 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE124 (50 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE126 (51 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE127 (52 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE128 (53 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE129 (54 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE105 (55 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE125 (56 | (0 << 8))
+#define MAP_PETALBURG_CITY                       (0 | (0 << 8))
+#define MAP_SLATEPORT_CITY                       (1 | (0 << 8))
+#define MAP_MAUVILLE_CITY                        (2 | (0 << 8))
+#define MAP_RUSTBORO_CITY                        (3 | (0 << 8))
+#define MAP_FORTREE_CITY                         (4 | (0 << 8))
+#define MAP_LILYCOVE_CITY                        (5 | (0 << 8))
+#define MAP_MOSSDEEP_CITY                        (6 | (0 << 8))
+#define MAP_SOOTOPOLIS_CITY                      (7 | (0 << 8))
+#define MAP_EVER_GRANDE_CITY                     (8 | (0 << 8))
+#define MAP_LITTLEROOT_TOWN                      (9 | (0 << 8))
+#define MAP_OLDALE_TOWN                          (10 | (0 << 8))
+#define MAP_DEWFORD_TOWN                         (11 | (0 << 8))
+#define MAP_LAVARIDGE_TOWN                       (12 | (0 << 8))
+#define MAP_FALLARBOR_TOWN                       (13 | (0 << 8))
+#define MAP_VERDANTURF_TOWN                      (14 | (0 << 8))
+#define MAP_PACIFIDLOG_TOWN                      (15 | (0 << 8))
+#define MAP_ROUTE101                             (16 | (0 << 8))
+#define MAP_ROUTE102                             (17 | (0 << 8))
+#define MAP_ROUTE103                             (18 | (0 << 8))
+#define MAP_ROUTE104                             (19 | (0 << 8))
+#define MAP_ROUTE105                             (20 | (0 << 8))
+#define MAP_ROUTE106                             (21 | (0 << 8))
+#define MAP_ROUTE107                             (22 | (0 << 8))
+#define MAP_ROUTE108                             (23 | (0 << 8))
+#define MAP_ROUTE109                             (24 | (0 << 8))
+#define MAP_ROUTE110                             (25 | (0 << 8))
+#define MAP_ROUTE111                             (26 | (0 << 8))
+#define MAP_ROUTE112                             (27 | (0 << 8))
+#define MAP_ROUTE113                             (28 | (0 << 8))
+#define MAP_ROUTE114                             (29 | (0 << 8))
+#define MAP_ROUTE115                             (30 | (0 << 8))
+#define MAP_ROUTE116                             (31 | (0 << 8))
+#define MAP_ROUTE117                             (32 | (0 << 8))
+#define MAP_ROUTE118                             (33 | (0 << 8))
+#define MAP_ROUTE119                             (34 | (0 << 8))
+#define MAP_ROUTE120                             (35 | (0 << 8))
+#define MAP_ROUTE121                             (36 | (0 << 8))
+#define MAP_ROUTE122                             (37 | (0 << 8))
+#define MAP_ROUTE123                             (38 | (0 << 8))
+#define MAP_ROUTE124                             (39 | (0 << 8))
+#define MAP_ROUTE125                             (40 | (0 << 8))
+#define MAP_ROUTE126                             (41 | (0 << 8))
+#define MAP_ROUTE127                             (42 | (0 << 8))
+#define MAP_ROUTE128                             (43 | (0 << 8))
+#define MAP_ROUTE129                             (44 | (0 << 8))
+#define MAP_ROUTE130                             (45 | (0 << 8))
+#define MAP_ROUTE131                             (46 | (0 << 8))
+#define MAP_ROUTE132                             (47 | (0 << 8))
+#define MAP_ROUTE133                             (48 | (0 << 8))
+#define MAP_ROUTE134                             (49 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE124                  (50 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE126                  (51 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE127                  (52 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE128                  (53 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE129                  (54 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE105                  (55 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE125                  (56 | (0 << 8))
+#define MAP_ROUTE101EXT                          (57 | (0 << 8))
+#define MAP_ROUTE102EXT                          (58 | (0 << 8))
+#define MAP_NEW_MAP1                             (59 | (0 << 8))
+#define MAP_PETALBURGEXT                         (60 | (0 << 8))
+#define MAP_PETALBURG_CITY_OLD_RESEARCH_BUILDING (61 | (0 << 8))
+#define MAP_ROUTE103EXT                          (62 | (0 << 8))
 
 // gMapGroup_IndoorLittleroot
 #define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F    (0 | (1 << 8))
@@ -178,6 +184,8 @@
 #define MAP_RUSTBORO_CITY_FLAT2_2F          (14 | (11 << 8))
 #define MAP_RUSTBORO_CITY_FLAT2_3F          (15 | (11 << 8))
 #define MAP_RUSTBORO_CITY_HOUSE3            (16 | (11 << 8))
+#define MAP_RUSTBORO_CITY_LEAFS_HOUSE       (17 | (11 << 8))
+#define MAP_RUSTBORO_CITY_LEAFS_HOUSE_2F    (18 | (11 << 8))
 
 // gMapGroup_IndoorFortree
 #define MAP_FORTREE_CITY_HOUSE1            (0 | (12 << 8))
@@ -400,6 +408,9 @@
 #define MAP_TERRA_CAVE_END                           (105 | (24 << 8))
 #define MAP_ALTERING_CAVE                            (106 | (24 << 8))
 #define MAP_METEOR_FALLS_STEVENS_CAVE                (107 | (24 << 8))
+#define MAP_PETALBURG_WOODS_EXT                      (108 | (24 << 8))
+#define MAP_PETALBURG_WOODSEXT2                      (109 | (24 << 8))
+#define MAP_GRANITE_CAVE_B3F                         (110 | (24 << 8))
 
 // gMapGroup_IndoorDynamic
 #define MAP_SECRET_BASE_RED_CAVE1    (0 | (25 << 8))
diff --git a/include/constants/opponents.h b/include/constants/opponents.h
index c9cf9239d..4e333590a 100644
--- a/include/constants/opponents.h
+++ b/include/constants/opponents.h
@@ -856,12 +856,15 @@
 #define TRAINER_LEAF                        852
 #define TRAINER_BRENDAN_PLACEHOLDER         853
 #define TRAINER_MAY_PLACEHOLDER             854
+#define TRAINER_BART						855
+#define TRAINER_LEWIS						856
+#define TRAINER_COLEMAN						867
 
 // NOTE: Because each Trainer uses a flag to determine when they are defeated, there is only space for 9 additional trainers before trainer flag space overflows
 //       More space can be made by shifting flags around in constants/flags.h or changing how trainer flags are handled
 //       MAX_TRAINERS_COUNT can be increased but will take up additional saveblock space
 
-#define TRAINERS_COUNT                      855
-#define MAX_TRAINERS_COUNT                  864
+#define TRAINERS_COUNT                      868
+#define MAX_TRAINERS_COUNT                  900//864
 
 #endif  // GUARD_CONSTANTS_OPPONENTS_H
diff --git a/include/global.h b/include/global.h
index ceef6f5c6..e5063e379 100644
--- a/include/global.h
+++ b/include/global.h
@@ -150,6 +150,7 @@
 // Converts a string to a compound literal, essentially making it a pointer to const u8
 #define COMPOUND_STRING(str) (const u8[]) _(str)
 
+
 // This produces an error at compile-time if expr is zero.
 // It looks like file.c:line: size of array `id' is negative
 #define STATIC_ASSERT(expr, id) typedef char id[(expr) ? 1 : -1];
diff --git a/src/data/map_group_count.h b/src/data/map_group_count.h
index 4fe8a21b3..0c1f1bb95 100644
--- a/src/data/map_group_count.h
+++ b/src/data/map_group_count.h
@@ -1 +1 @@
-static const u8 MAP_GROUP_COUNT[] = {57, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 17, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 108, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};
+static const u8 MAP_GROUP_COUNT[] = {63, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 19, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 111, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index 1759120b7..ed302f3bf 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -1,3 +1,39 @@
+static const struct TrainerMonNoItemDefaultMoves sParty_bart[] = {
+    {
+    .iv = 0,
+    .lvl = 4,
+    .species = SPECIES_GEODUDE,
+    },
+	{
+	.iv = 0,
+	.lvl = 3,
+	.species = SPECIES_RALTS,
+	}
+};
+
+static const struct TrainerMonNoItemDefaultMoves sParty_lewis[] = {
+    {
+    .iv = 0,
+    .lvl = 6,
+    .species = SPECIES_WEEDLE,
+    },
+	{
+	.iv = 0,
+	.lvl = 7,
+	.species = SPECIES_LEDYBA,
+	}
+};
+
+static const struct TrainerMonItemCustomMoves sParty_coleman[] = {
+    {
+    .iv = 255,
+    .lvl = 11,
+    .species = SPECIES_WOOPER,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = {MOVE_CURSE, MOVE_MUD_SHOT, MOVE_WATER_GUN, MOVE_ATTRACT}
+    }
+};
+
 static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer1[] = {
     {
     .iv = 0,
diff --git a/src/data/trainers.h b/src/data/trainers.h
index 75f7edc8b..a8696497a 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -1,4 +1,5 @@
 const struct Trainer gTrainers[] = {
+	
     [TRAINER_NONE] =
     {
         .partyFlags = 0,
@@ -10260,4 +10261,40 @@ const struct Trainer gTrainers[] = {
         .aiFlags = 0,
         .party = NO_ITEM_DEFAULT_MOVES(sParty_MayLinkPlaceholder),
     },
+	
+	[TRAINER_BART] =
+	{
+		.trainerClass = TRAINER_CLASS_COOLTRAINER,
+        .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
+        .trainerName = _("BART"),
+        .items = {},
+        .doubleBattle = FALSE,
+        .aiFlags = 0,
+        .party = NO_ITEM_DEFAULT_MOVES(sParty_bart),
+	},
+	
+	[TRAINER_LEWIS] =
+	{
+		.trainerClass = TRAINER_CLASS_BUG_CATCHER,
+        .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
+        .trainerPic = TRAINER_PIC_BUG_CATCHER,
+        .trainerName = _("LEWIS"),
+        .items = {},
+        .doubleBattle = FALSE,
+        .aiFlags = 0,
+        .party = NO_ITEM_DEFAULT_MOVES(sParty_lewis),
+	},
+	
+	[TRAINER_COLEMAN] =
+	{
+		.trainerClass = TRAINER_CLASS_CAMPER,
+        .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
+        .trainerPic = TRAINER_PIC_CAMPER,
+        .trainerName = _("COLEMAN"),
+        .items = {},
+        .doubleBattle = FALSE,
+        .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
+        .party = ITEM_CUSTOM_MOVES(sParty_coleman),
+	},
 };
diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json
index 0b30c0f65..8e72ce4c0 100755
--- a/src/data/wild_encounters.json
+++ b/src/data/wild_encounters.json
@@ -7,30 +7,71 @@
         {
           "type": "land_mons",
           "encounter_rates": [
-            20, 20, 10, 10, 10, 10, 5, 5, 4, 4, 1, 1
+            10,
+            10,
+            10,
+            10,
+            10,
+            10,
+            5,
+            5,
+            10,
+            10,
+            6,
+            4
           ]
         },
         {
           "type": "water_mons",
           "encounter_rates": [
-            60, 30, 5, 4, 1
+            10,
+            10,
+            6,
+            10,
+            10
           ]
         },
         {
           "type": "rock_smash_mons",
           "encounter_rates": [
-            60, 30, 5, 4, 1
+            60,
+            30,
+            5,
+            4,
+            1
           ]
         },
         {
           "type": "fishing_mons",
           "encounter_rates": [
-            70, 30, 60, 20, 20, 40, 40, 15, 4, 1
+            70,
+            30,
+            60,
+            20,
+            20,
+            20,
+            20,
+            15,
+            4,
+            1
           ],
           "groups": {
-            "old_rod": [0, 1],
-            "good_rod": [2, 3, 4],
-            "super_rod": [5, 6, 7, 8, 9]
+            "old_rod": [
+              0,
+              1
+            ],
+            "good_rod": [
+              2,
+              3,
+              4
+            ],
+            "super_rod": [
+              5,
+              6,
+              7,
+              8,
+              9
+            ]
           }
         }
       ],
@@ -11450,6 +11491,422 @@
               }
             ]
           }
+        },
+        {
+          "map": "MAP_ROUTE101EXT",
+          "base_label": "gRoute101ext0",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 2,
+                "max_level": 2,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 2,
+                "max_level": 2,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 2,
+                "max_level": 2,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 2,
+                "max_level": 2,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 2,
+                "max_level": 2,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_ZIGZAGOON"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 0,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 15,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 15,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 5,
+                "max_level": 20,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 20,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_NONE"
+              },
+              {
+                "min_level": 10,
+                "max_level": 25,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 25,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_NONE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_NONE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_FEEBAS"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE102EXT",
+          "base_label": "gRoute102ext0",
+          "land_mons": {
+            "encounter_rate": 0,
+            "mons": [
+              {
+                "min_level": 2,
+                "max_level": 4,
+                "species": "SPECIES_SEEDOT"
+              },
+              {
+                "min_level": 2,
+                "max_level": 5,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 2,
+                "max_level": 4,
+                "species": "SPECIES_RALTS"
+              },
+              {
+                "min_level": 2,
+                "max_level": 4,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 2,
+                "max_level": 6,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 2,
+                "max_level": 4,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 2,
+                "max_level": 6,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 2,
+                "max_level": 6,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 2,
+                "max_level": 3,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 2,
+                "max_level": 4,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 2,
+                "max_level": 4,
+                "species": "SPECIES_PICHU"
+              },
+              {
+                "min_level": 4,
+                "max_level": 8,
+                "species": "SPECIES_PIKACHU"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_PETALBURG_WOODS_EXT",
+          "base_label": "gPetalburgWoodsExt0",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 3,
+                "max_level": 5,
+                "species": "SPECIES_WOOPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 6,
+                "species": "SPECIES_WOOPER"
+              },
+              {
+                "min_level": 8,
+                "max_level": 11,
+                "species": "SPECIES_QUAGSIRE"
+              },
+              {
+                "min_level": 3,
+                "max_level": 7,
+                "species": "SPECIES_LOTAD"
+              },
+              {
+                "min_level": 6,
+                "max_level": 9,
+                "species": "SPECIES_LOTAD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GLOOM"
+              },
+              {
+                "min_level": 5,
+                "max_level": 8,
+                "species": "SPECIES_TOTODILE"
+              },
+              {
+                "min_level": 10,
+                "max_level": 12,
+                "species": "SPECIES_DUSTOX"
+              },
+              {
+                "min_level": 2,
+                "max_level": 5,
+                "species": "SPECIES_POLIWAG"
+              },
+              {
+                "min_level": 5,
+                "max_level": 7,
+                "species": "SPECIES_POLIWAG"
+              },
+              {
+                "min_level": 2,
+                "max_level": 7,
+                "species": "SPECIES_GASTLY"
+              },
+              {
+                "min_level": 13,
+                "max_level": 15,
+                "species": "SPECIES_HAUNTER"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 2,
+                "max_level": 5,
+                "species": "SPECIES_SURSKIT"
+              },
+              {
+                "min_level": 5,
+                "max_level": 7,
+                "species": "SPECIES_SURSKIT"
+              },
+              {
+                "min_level": 5,
+                "max_level": 8,
+                "species": "SPECIES_SLOWPOKE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_POLIWAG"
+              },
+              {
+                "min_level": 7,
+                "max_level": 9,
+                "species": "SPECIES_POLIWAG"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 4,
+                "max_level": 6,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 4,
+                "max_level": 6,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 5,
+                "max_level": 9,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 5,
+                "max_level": 9,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 8,
+                "max_level": 11,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 5,
+                "max_level": 16,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MUDKIP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 18,
+                "species": "SPECIES_WOOPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 22,
+                "species": "SPECIES_WOOPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_FEEBAS"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_PETALBURG_WOODSEXT2",
+          "base_label": "gPetalburgWoodsext20",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SHROOMISH"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SILCOON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CASCOON"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_SHROOMISH"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SLAKOTH"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_SLAKOTH"
+              }
+            ]
+          }
         }
       ]
     },
diff --git a/src/follow_me.c b/src/follow_me.c
index 31af6212e..00b24087c 100644
--- a/src/follow_me.c
+++ b/src/follow_me.c
@@ -1528,7 +1528,9 @@ void ShowFollower(void)
 	gObjectEvents[gSaveBlock2Ptr->follower.objId].invisible = FALSE;
 }
 
+
 void SetFollowerWarpPosition(void)
 {
     gSaveBlock2Ptr->follower.createSurfBlob = 1;
 }
+
diff --git a/src/new_game.c b/src/new_game.c
index 356c9f282..abf0b5a67 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -127,6 +127,7 @@ static void ClearFrontierRecord(void)
 static void WarpToTruck(void)
 {
     SetWarpDestination(MAP_GROUP(INSIDE_OF_TRUCK), MAP_NUM(INSIDE_OF_TRUCK), WARP_ID_NONE, -1, -1);
+	//SetWarpDestination(MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), -1, 6, 18);
     WarpIntoMap();
 }