diff --git a/data/event_scripts.s b/data/event_scripts.s
index 57d031846..37a5c3260 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1070,3 +1070,9 @@ Common_EventScript_LegendaryFlewAway::
 	.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"
diff --git a/data/layouts/LittlerootTown/map.bin b/data/layouts/LittlerootTown/map.bin
index 3d836fded..7278d2cab 100644
--- a/data/layouts/LittlerootTown/map.bin
+++ b/data/layouts/LittlerootTown/map.bin
@@ -1,3 +1,3 @@
-����������
0
0������������������
0
0��������
0
0
0
0
0
0
0
0
0
0
0
0
0
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/PetalburgWoods/map.bin b/data/layouts/PetalburgWoods/map.bin
index 9a8acd8e8..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
0
0�����������������������1
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�����������������������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�������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/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/map.bin b/data/layouts/Petalburgext/map.bin
index 182c71def..4676b7ac7 100644
--- a/data/layouts/Petalburgext/map.bin
+++ b/data/layouts/Petalburgext/map.bin
@@ -1 +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&4I25'��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
+�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/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 2a04b090d..ea3ab7e77 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -4480,6 +4480,36 @@
       "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"
     }
   ]
 }
diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json
index 3ecde2034..0eec2ff6c 100644
--- a/data/maps/LittlerootTown/map.json
+++ b/data/maps/LittlerootTown/map.json
@@ -159,6 +159,13 @@
       "elevation": 0,
       "dest_map": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB",
       "dest_warp_id": "0"
+    },
+    {
+      "x": 17,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_LEAFS_HOUSE",
+      "dest_warp_id": "0"
     }
   ],
   "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/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index ddf4ff933..62e44830a 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -730,7 +730,7 @@ LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou:
 	.string "important foster a strong bond\l"
 	.string "with your POKéMON.\p"
 	.string "They will follow you on your\n"
-	.string "adverntures if you let them.\p"
+	.string "adventures if you let them.\p"
 	.string "Why don't you try it with {STR_VAR_1}?$"
 
 LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay:
diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json
index 7e85e3dcf..5f58951b9 100644
--- a/data/maps/PetalburgWoods/map.json
+++ b/data/maps/PetalburgWoods/map.json
@@ -17,6 +17,11 @@
       "map": "MAP_PETALBURG_WOODS_EXT",
       "offset": 0,
       "direction": "right"
+    },
+    {
+      "map": "MAP_PETALBURG_WOODSEXT2",
+      "offset": 0,
+      "direction": "left"
     }
   ],
   "object_events": [
@@ -139,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,
@@ -188,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
index ed5456165..d17514e7f 100644
--- a/data/maps/PetalburgWoodsExt/map.json
+++ b/data/maps/PetalburgWoodsExt/map.json
@@ -3,7 +3,7 @@
   "name": "PetalburgWoodsExt",
   "layout": "LAYOUT_PETALBURG_WOODS_EXT",
   "music": "MUS_PETALBURG",
-  "region_map_section": "MAPSEC_PETALBURG_CITY",
+  "region_map_section": "MAPSEC_PETALBURG_WOODS",
   "requires_flash": false,
   "weather": "WEATHER_RAIN",
   "map_type": "MAP_TYPE_ROUTE",
diff --git a/data/maps/PetalburgWoodsExt/scripts.inc b/data/maps/PetalburgWoodsExt/scripts.inc
index 5a2bb5838..b7975ea8e 100644
--- a/data/maps/PetalburgWoodsExt/scripts.inc
+++ b/data/maps/PetalburgWoodsExt/scripts.inc
@@ -1,2 +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
index 69c2b4455..ce65612c3 100644
--- a/data/maps/Petalburgext/map.json
+++ b/data/maps/Petalburgext/map.json
@@ -41,6 +41,13 @@
 
   ],
   "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
index 884a5cd06..8280495ed 100644
--- a/data/maps/Petalburgext/scripts.inc
+++ b/data/maps/Petalburgext/scripts.inc
@@ -3,11 +3,18 @@ Petalburgext_MapScripts::
 
 Petalburgext_EventScript_Fisherman::
 	goto_if_set FLAG_RECEIVED_FEEBASS, Petalburgext_EventScript_Fisherman_thankyou
-	msgbox Petalburgext_Text_Fisherman, MSGBOX_DEFAULT
+	msgbox Petalburgext_Text_Fisherman, MSGBOX_NPC
 	msgbox Petalburgext_Text_Fisherman_request, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	goto_if_eq Petalburgext_EventScript_Fisherman_no
-	msgbox Petalburgext_Text_Fisherman_yes, MSGBOX_DEFAULT
+	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
@@ -17,30 +24,24 @@ Petalburgext_EventScript_Fisherman::
 	waitfanfare
 	hidemonpic
 	setflag FLAG_RECEIVED_FEEBASS
-	release
-	end
-
-Petalburgext_EventScript_Fisherman_thankyou::
-	msgbox Petalburgext_Text_Fisherman_thankyou, MSGBOX_DEFAULT
 	end
 	
 Petalburgext_EventScript_Fisherman_no::
-	msgbox Petalburgext_Text_Fisherman_no, MSGBOX_DEFAULT
+	msgbox Petalburgext_Text_Fisherman_no, MSGBOX_NPC
 	end
 
 Petalburgext_EventScript_Fisherman_partyfull::
-	msgbox Petalburgext_Text_Fisherman_partyfull MSGBOX_DEFAULT
+	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 thing is ugly..\p"
-	.string "but everytime I toss it back it\n"
-	.string "jumps back onto my fishing pole.\p"
-	.string ".....%"
-	
+	.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?$"
@@ -51,12 +52,18 @@ Petalburgext_Text_Fisherman_no:
 
 Petalburgext_Text_Fisherman_yes:
 	.string "Thank you!\p"
-	.string "Maybe I can catch some real\n"
-	.string "fish now.$"
+	.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/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/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/map_groups.json b/data/maps/map_groups.json
index b45e54cc7..5f07ad6cb 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -213,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",
@@ -436,7 +438,8 @@
     "TerraCave_End",
     "AlteringCave",
     "MeteorFalls_StevensCave",
-    "PetalburgWoodsExt"
+    "PetalburgWoodsExt",
+    "PetalburgWoodsext2"
   ],
   "gMapGroup_IndoorDynamic": [
     "SecretBase_RedCave1",
diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc
index af3528cad..ae53ff180 100644
--- a/data/scripts/item_ball_scripts.inc
+++ b/data/scripts/item_ball_scripts.inc
@@ -354,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
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 620e23f4b..6d405de55 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1222,8 +1222,8 @@
 #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_UNUSED_0x497                                           0x497 // Unused Flag
-#define FLAG_UNUSED_0x498                                           0x498 // Unused Flag
+#define FLAG_ITEM_PETALBURGEXT2_WOODS_REVIVE                        0x497 // Unused Flag
+#define FLAG_LEAFS_ARRIVED                                          0x498 // Unused Flag
 #define FLAG_UNUSED_0x499                                           0x499 // Unused Flag
 #define FLAG_UNUSED_0x49A                                           0x49A // Unused Flag
 #define FLAG_UNUSED_0x49B                                           0x49B // Unused Flag
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index 32aee8a00..40ae5fa44 100755
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -453,5 +453,8 @@
 #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
 
 #endif // GUARD_CONSTANTS_LAYOUTS_H
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index a1f85f448..6b5727ee8 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -184,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))
@@ -407,6 +409,7 @@
 #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))
 
 // gMapGroup_IndoorDynamic
 #define MAP_SECRET_BASE_RED_CAVE1    (0 | (25 << 8))
diff --git a/include/constants/opponents.h b/include/constants/opponents.h
index a8f2f5e58..4e333590a 100644
--- a/include/constants/opponents.h
+++ b/include/constants/opponents.h
@@ -857,12 +857,14 @@
 #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                      856
-#define MAX_TRAINERS_COUNT                  864
+#define TRAINERS_COUNT                      868
+#define MAX_TRAINERS_COUNT                  900//864
 
 #endif  // GUARD_CONSTANTS_OPPONENTS_H
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index c652c125c..56d0cc452 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -11,6 +11,29 @@ static const struct TrainerMonNoItemDefaultMoves sParty_bart[] = {
 	}
 };
 
+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 6885a3ee9..b1222dce0 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -10273,4 +10273,28 @@ const struct Trainer gTrainers[] = {
         .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_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
+        .party = ITEM_CUSTOM_MOVES(sParty_coleman),
+	},
 };
diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json
index 783f8387a..8e72ce4c0 100755
--- a/src/data/wild_encounters.json
+++ b/src/data/wild_encounters.json
@@ -11754,7 +11754,7 @@
             ]
           },
           "water_mons": {
-            "encounter_rate": 0,
+            "encounter_rate": 10,
             "mons": [
               {
                 "min_level": 2,
@@ -11784,7 +11784,7 @@
             ]
           },
           "fishing_mons": {
-            "encounter_rate": 0,
+            "encounter_rate": 20,
             "mons": [
               {
                 "min_level": 4,
@@ -11838,6 +11838,75 @@
               }
             ]
           }
+        },
+        {
+          "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"
+              }
+            ]
+          }
         }
       ]
     },