Added additional map, PEtalburg North

data/event_scripts.s

@@ -1090,3 +1090,5 @@ Common_EventScript_LegendaryFlewAway::
 	.include "data/maps/NewMap2/scripts.inc"
 
 	.include "data/maps/RustboroCityEast/scripts.inc"
+
+	.include "data/maps/PetalburfForrestRiver/scripts.inc"

data/layouts/LittlerootTown/map.bin

@@ -1,3 +1,3 @@
-ÔÕÔÕÔÕÔÕÔÕ
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
+ÔÕÔÕÔÕÔÕÔÕ
0
0ÔÕÔÕÔÕÔÕæåæåæåæåæå
0
0æåäåæåÜÝ
0
0
0
0
0
0
0
0
0
0
0
0
0
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
 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άέάέ

data/layouts/PetalburfForrestRiver/border.bin

@@ -0,0 +1 @@
+�
�
�
�

data/layouts/PetalburfForrestRiver/map.bin

@@ -0,0 +1 @@
+p0s0s0s0i0i0i0i0i0i0i0i0i0i0i0i0Ã0±0±0±0Ä0i0i0i0i0i0i0i0u0u0u0j0p0s0s0s0q0q0q0q0q0q0q0q0q0q0q0q0¸0¡0¡0¡0º0q0q0q0q0q0q0q0u0u0u0r0p0s0s0s0q0q0q0q0q0q0q0q0q0q0q0q0¸0¡0¡0¡0º0q0q0q0q0q0q0q0u0u0u0r0p0s0s0s0q0q0q0q0q0q0q0q0q0q0q0á0¸0¡0¡0¡0º0q0q0q0q0q0á0q0u0u0u0r0p0s0s0s0q0q0q0q0q0q0q0q0á0q0q0á0¸0¡0¡0¡0º0á0q0q0q0q0q0á0u0u0u0r0p0s0s0s0q0q0q0t0|0|0|0|0|0|0|0|0»0³0³0³0¼0|0|0|0|0|0|0|0}0u0u0r0p0s0s0s0q0q0q0u0t0|0|0|0|0|0|0|0³0³0³0³0³0|0|0|0|0Ÿ0|0|0|0}0u0r0p0s0s0s0q0q0q0u0u0t0|0|0|0|0|0|0³0³0³0³0³0|0|0|0¨1§0y0|0|0‰0u0r0p0s0s0s0q0q0q0u0u0u0t0y0y0y0y0y0³0³0³0³0³0y0y0‰0X2Z20t0‰0s0u0r0p0s0s0s0q0q0q0u0u0u0u0Ã0±0±0±0±0Á0Á0Á0Á0Á0±0±0 0j2j2h2u0p0s0u0r0p0s0s0s0q0q0q0u0u0u0u0¸0¡0¡0¡0¡0Å0¡0Å0¡0Å0Å0Å0 0X2Z2X2u0p0s0u0r0p0s0s0s0q0q0q0u0u0u0¿0¿0™0á0š0Å0¡0Å0¡0Å0¡0Å0Ë0x0y0¯0y0z0p0s0u0r0p0s0s0s0q0q0q0u0u0u0q0q0q0q0¢0ƒ1¡0¡0Å0¡0¡0¡0º0
0
0
0
0
0p0s0u0r0p0s0s0s0q0q0q0u0u0u0q0q0q0q0¢0ƒ1¡0¡0¡0¡0¡0¡0º0
0
0
0
0
0p0s0u0r0p0s0s0s0q0q0q0u0u0u0q0q0q0q0¢0ƒ1¡0¡0¡0¡0¡0¡0º00
0
0
0
0p0{0}0r0p0s0s0s0q0q0q0u0u0u0q0q0á0t0ª0ƒ1¡0¡0¡0¡0¡0¡0º0
0
0
0
0
0x0y0y0z0p0s0s0s0q0q0q0u0u0u0q0q0t0ª0ƒ1¡0¡0¡0¡0¡0¡0¡0º0
0Ð1Ñ1Ñ1Ò10
0
0
0p0s0s0s0q0q0á0u0u0u0q0q0¢0ƒ1¡0¡0¡0¡0¡0¡0Ë000
0Ø1Ù1Ù1Ù1Ñ1Ò1
0
0p0s0s0{0|0|0|0}0u0u0q0t0ª0ƒ1¡0¡0¡0¡0¡0¡0º0
0
0Ð1Ù1Ù1Ù1Ù1Ù1Ù1Ò1
0p0s0{0|0|0|0|0|0}0u0á0¢0ƒ1¡0¡0¡0¡0¡0¡0Ë00
0Ð1Ù1Ù1Ù1Ù1Ù1Ù1á1â1
0p0{0|0|0|0|0|0|0|0}0t0ª0ƒ1¡0¡0¡0¡0¡0Ë00
0
0à1á1á1á1Ù1Ù1Ú1Î1Ï1
0p0q0q0q0q0q0q0q0q0t0ª0ƒ1¡0¡0¡0¡0Ë000
0
0
0
0
0Î1Ï1à1á1â1Ö1×1
0p0q0q0q0q0q0á0q0t0ª0ƒ1¡0¡0¡0-0-0º0
0
0
0
0
00
0Ö1×1
00
0ä1å1
0p0á0q0q0q0q0q0q0u0¸0¡0¡0¡0Ë0000
0
0
0
0
0
0
0ä1å1
0
0ƒ0„0
0
0p0q0q0q0q0q0q0q0¿0¿0š0¡0¡0º0
0
0
00
0
0
0
0
0
0
0
0
0
0‹0Œ0Î1Ï1p0q0q0q0q0q0q0q0q0á0u0¸0¡0º0
0
0
0
0
0
0
0
0
000
0
000
0Ö1×1p0q0q0q0q0q0q0q0t0|0}0¸0¡0º0
0
0
0
0
0
0
0
0
0Æ0Ç000Æ0Ç0
0ä1å1p0q0q0á0q0q0t0y0z0Ã0±0À0¡0Â0²0
0
0
0
0
0
0
0
0Æ0Ç0Æ0Ç0Æ0ô1Ï1
0
0p0q0q0q0q0t0z0
0
0¸0¡0Å0¡0¡0º0
0
0
0
0
0
0
0
000Æ0Ç00Ö1×100p0k0l0l0m0r0
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Ç0p0s0q0q0u0r0
0
0
0¸0¡0¡0¡0¡0¡0¡0¡0¡0¡0¡0¡0¡0¡0º0
0Æ0Ç0
0
0
0Æ0Ç0p0s0q0q0u0q0l0l0l0l0l0™0š0¡0¡0¡0¡0Å0¡0¡0¡0¡0¡0º0
0Æ0Ç0
0
0
0Æ0Ç0p0s0á0q0¿0l0l0l0l0l0·0á0¿0™0š0-0-0¡0¡0¡0¡0¡0¡0º0
000
00Æ0Ç0Ç0p0s0q0k0l0l0l0l0l0m0¿0l0l0m0r0000Ì0¡0¡0¡0¡0Â0±0±0±0²00Æ0Ç00p0{0‰0s0q0q0q0á0q0u0q0q0q0u0¿0i0j0
0¸0Å0-0-0¡0¡0¡0¡0¡0º000ô1Ï1p0q0s0s0q0q0q0q0q0u0q0á0q0¿0m0q0r0
00000Ì0¡0¡0¡0¡0º00
0Ö1×1x0‰0s0s0q0q0q0q0q0¿0l0m0q0q0u0q0¿0i0j0
0
0
0¸0¡0¡0¡0¡0º00a2ä1å1
0p0s0s0á0q0q0q0q0q0q0¿0l0l0l0l0m0m0r0
0
0
0¸0¡0¡0¡0¡0º02a2a2a2
0p0s0s0q0q0q0q0q0q0q0q0q0q0á0á0u0u0r0
0
0
0¸0¡0¡0¡0¡0º0Î1Ï10a2
0p0s0{0|0|0|0|0|0|0|0|0|0|0|0|0}0u0r0
0
0°0À0¡0¡0¡0¡0º0Ö1×100
0p0{0|0‰0á0q0q0q0t0|0|0|0|0|0|0|0}0r0
0
0¸0¡0¡0¡0¡0¡0º0ä1å100
0p0q0q0{0|0|0|0|0}0á0q0q0q0q0q0t0y0z0
0
0¸0¡0¡0¡0¡0¡0Â0±0²000
0x0‰0q0q0q0q0q0q0q0q0t0y0y0y0y0z0
0
0
0
0¸0¡0¡0¡0¡0¡0¡0Å0º000
0
0p0q0t0y0y0y0y0y0y0z0
0
0
0
0
0
0
0
0
0¸0¡0¡0¡0¡0Ë000000
0h0q0t0z0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0¸0Å0¡0¡0¡0º0
0È0Ê002
0x0y0z0
0
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
0
0
0
0
0
0°0À0¡0¡0¡0¡0¡0¡0¡0º0
0
0
0
0
0
0¸0¡0Ë0000Y2Ð0Ò0Y2Z2
0
0
0°0±0À0¡0Å0¡0¡0¡0¡0¡0¡0Â0±0±0²0
0
0
0¸0¡0º0
0h2a2a2Ð0Ñ0Ê0b2
0
0°0À0¡0¡0¡0¡0¡0¡0¡0¡0¡0¡0¡0¡0Å0º0
0
0
0¸0¡0º0
0
0h2a2Ø0Ù0Ñ0Ê0°0±0À0¡0¡0¡0-0-0¡0-0-0-0¡0¡0Å0¡0¡0Â0±0±0±0À0¡0º0
0
0K2h2i2a2Ø0Ú0¸0¡0¡0¡0¡0Ë0000Æ000000¸0¡0¡0¡0¡0¡0¡0¡0º0
0
0S2K2K2h2j2a2¸0¡0¡0¡0¡0º0
0
0
0000
000¸0¡0¡0¡0¡0¡0¡0Å0º0
0
0
0Æ0Ç0K2a2
0¸0¡0¡0¡0¡0Â0±0±0²0
022000000000000
000Æ0Ç00j2a2¸0Å0¡0¡0¡0¡0¡0¡0º0
0
0
00000Æ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²0
0Æ0Ç0Æ0Ç0Æ0Ç0Æ0Ç0Æ0Ç0Æ0Ç0Æ0Ç0Æ0Ç0000è1é10Ì0¡0Å0¡0¡0¡0¡0¡0º0
000Æ0Ç0Æ0Ç0Æ0Ç0Æ0Ç0Æ0Ç0Æ0Ç0Æ0Ç00ô1õ1Ô1Õ1
0¸0¡0¡0¡0¡0¡0¡0¡0º0
000Æ0Ç0Æ0Ç0Æ0Ç0Æ0Ç0Æ0Ç0Æ0Ç0Æ0Ç00Ö1×1Ü1Ý1Î1é1è1é1Ì0¡0¡0¡0Å0º0
02200ô1õ1ô1õ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²00
0Ö1×1Ö1×1Ö1×1Ö1×1Ö1×1Ö1×1Ö1×1
0Ü1Ý1Ü1Ý1Ü1Ý1¸0¡0¡0¡0¡0¡0¡0¡0º00Æ1ó1ò1ó1ò1ó1ò1ó1ò1ó1ò1ó1ò1ó1å1
0Ô1Õ1Ô1Õ1Ô1Õ1¸0¡0-0-0¡0Å0¡0¡0º00Ö1×1Ö1×1Ö1×1Ö1×1Ö1×1Ö1×1Ö1×1
0
0Ü1Ý1Ü1Ý1Ü1Ý10000Ì0¡0¡0¡0º00ä1ò1ó1ò1ó1ò1ó1ò1ó1ò1ó1ò1ó1ò1Ç1
0Ô1Õ1Ô1Õ1Ô1Õ122
0
0¸0¡0¡0¡0º00
0Ö1×1Ö1×1Ö1×1Ö1×1Ö1×1Ö1×1Ö1×1
0Ü1Ý1Ü1Ý1Ü1Ý1Æ1Ç1Î1Ï1¸0¡0¡0¡0º02Æ1ó1ò1ó1ò1ó1ò1ó1ò1ó1ò1ó1ò1ó1ò1Ç1

data/layouts/PetalburgWoodsExt/map.bin

@@ -1 +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ф1Line truncated
+жвжвжвжвжвжвжвжвжвжвжвжвжвжв╦║║║╨
0жвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвчъчъДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕ╦║║║╨
0ДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕчъчъДРСРСРСРСРСЕДЕДЕДЕДРСЕДРСРСРСЕжвжв
0╟╠╠╠╠╠╠╡
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
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жвжвжвжв╦║║║║║║║║║║║║║║║║к0
0
0
0
0
0
0ФГ
0╦║║╨

л║║║║║е║║║║║║║║║╨
0`2a2a2a2a20a2a2a2Y2Y2Z2п0я0й0200000000
0ФГчъчъчъ╦║║║║║║║║║║║║║║║к0
0х0и0и0и0и0й0
0
0
00л║╨



╦║║║║║║║║к000л║║╨
0&'`2a2a2a2a2a2i2a2a2a2b2ь0я0р0
000000000
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
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жв
000л║║║║║║║к000
0
0
0
0ь0ы0ы0з00
0
0ФГ
0S
0╦║║║║║к0
0
0
0
0
0п1я1я1я1я1я1я1я1я1я1я1р1
0
0
00
0
0
0н1о1
0h2a2a2b2ь0я0р0
0
020000
0
0
0чъ
0
0чъ
0
0
00000000002
0
0X2Y2Z200
0
0
0
0
0
0
0
0
0
0
00л╨0000
0
0п1я1я1я1ы1ы1А1А1А1А1А1А1А1А1ы1ы1я1р1
0
0
0
0
0жв
0
0h2a2b2
0ь0з0
0
0
0│2┌2┐220
0
0жв
0
0жвп1р1
0
022222222
0
0
0h2a2a200
0
0
0
0
0Y2Y2Y2п1я1я1р
┘B┤Bп
я1я1я1я1я1ы1ы1А1А1А1Б1
0
0
0
00
0
0
0Ю1А1ы1ы1я1я1р1
0
0ФГ
0
0
0h2j2
0
0
0
00
0pqr
0
0
0
0
0ФГ
0
0ФГь1ы1р1
0
0X2Y2Y2i2KKх0й0
0
0
0h2i222
0
0п1я1я1я1р1Y2Ю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ы1я1р1
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ы1я1р1h2i2i2i2SSь0з0
0
0
0
0
0
0
0п1я1ы1ы1А1А1Б1Y2Y2
0
0
0╦б╡
0
0
0
0
0
0
000
0
0
0000
0жв
0
0н1о1
0
0Ю1А1ы1ы1я1я1я1р1
0
0
0
0
0
0
0
0
0
0Ю1Б1жв
0
0
0
0
0ф1г1
0
0
0Ю1А1ы1ы1я1я1я1р1
0
0
0
0
0
0
0
0
0п1я1ы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ы1я1я1я1р1
0
0н1о1н1о1н1о1ФГ
0
000
жв
0
0
0
0
0Ю1А1А1А1ы1ы1я1я1я1я1я1р1
0п1я1ы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
чъф1о1
0
0
0
0
0х0й0Ю1А1А1А1А1А1А1Б1
0Ю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
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чъчъ0
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жвжв0
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чъчъ0
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
0h2j20
000л║║║║║║║║║║к000
0
0
0
000000лб╡
0
0
0ФГь0з0
0
0
0жвX2a2a22222
0
0п1р1чъчън1г1н1о1
0
0
0
0н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ф1Line truncated

data/layouts/RustboroCityEast/map.bin

@@ -1,6 +1,5 @@
-ÔÕÔÕÔÕÔÕÔÕ
0
0
0
0
0
0
0Ð1Ñ1Ò1
0
0Æ1Ç1Ô1ÜÝÜÝÜÝäåäå
0
0
0
0
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Æ1Ï1Î1Ç1
0
0Ø1Ù1â1Æ1Ç1Ö×
0ÔÕÜÔÕÔÕ
0
0
0
0ÔÕÔÕ
0
0Ø1Ú1
0Ö×äòÇ1ÜÝÔÜÝÜÝ
0
0Æ1Ï1ÜÝÜÝ
0
0à1â1
0äòÏ1ÔÕÔÕÜÔÕÔÕ
0
0ÔÕÔÕÔÕ
0
0
0
0
0
0ÔÕÜÝÜÝÔäåäå
0
0äåäòóòÏ1
0
0
0Î1Ï1ÜÝÔÕÔÕÜ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Î1Ï1
0
0
0Ð1Ñ1Ò1ÔÕÔÕÜÝÜÝÔ
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Ø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Ð1Ñ1Ù1â1
0
0
0
00äåÜÝÔ
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Ð1Ñ1Ñ1Ù1Ù1Ñ1Ñ1Ù1Ú1
0
0È0É0Ê0
0
0
0
0äåÔ
0
0
0
0à1á1á1á1á1á1á1á1â1
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
0
0
0ÔÎ1Ï1
08IIIIII11IIIIII:Õ‡‡‡ÖÜÖ×
0@00000 1"1
000000Bà
0
0Î1Ï1ÔäòÏ1@
0
0
0
0
0 1"1
0
0
0
0
0B
0
0
0Ö×Ü
0Ö×@00000
0 1"1
000000B
0
0
0äåÔ
0äå@
0
0
0
0
0 1"1
0
0
0
0
0BÕ‡‡‡ÖÜ
0
0
0@00000
0 1"1
000000B
0
0
0
0
0Ô
0
0
0@
0
0
0
0
0 1"1
0
0
0
0
0B
0
0
0
0àÜ
0
0
0@00000
0 1"1
000000B
0
0
0
0
0Ô
0
0
0@
0
0
0
0
0 1"1
0
0
0
0
0BÕ‡‡‡ÖÜ
0
0
0@00000
0 1"1
000000B
0
0
0Î1Ï1Ô
0
0
0@
0
0
0
0
0 1"1
0
0
0
0
0Bà
0
0Ö1×1Ü
0
0
0@00000
0 1"1
000000B
0
0
0ä1å1Ô
0
0
0HIIIIII 1"1IIIIIIJÕ‡‡‡ÖÜ
0
0
0 1"1
0
0
0
0
0ÔÎ1Ï1
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 1"1
0
0
0
0
0
0
0
0
0
0
0
0ÔäòÏ1
0Ø0Ù0Ñ0Ò0
0
0 1"1
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Ô
0äå
0111111!1"1
0
0
0
0
0
0
0
0
0äòÏ1ÜÎ1Ï1
0
0 1!1)1)1)1)1)1*1
0
0
0
0
0
0
0
0
0
0Ö×ÔÖ×
0
0 1"100
0
0=>>>>>>?äåÜäå
0
0 1"100
0
0E0
0
00
00
0
0
00GF0
0Ô
0
0
0
0 1!111
0
0
0
0
00
00
00
0
0
0GÎ1Ï1Ü
0
0
0
0 1!1!1"1
0
0
0
0
0
00
0
0
0
0
0
0GÖ×Ô
0
0
0
0 1!1)1*1
0
0
0
00
0
0
00
00
0
0GäåÜÆ1Ç1
0
0 1"1
0
0
0
0E
0
00
00
0
0
00
0GF0
0ÔÖ×
0
0 1"1à
0
0
0MNNNNNNOF0
0ÜäòÏ1
0 1!1111
0
0
0
0
0
0
0
0
0
0
0Î1Ï1
0
0Ô
0Ö×
0(1)1)1!1"1
0
0
0
0
0
0
0Î1Ï1
0
0Ö×Æ1Ç1Ü
0äå
0
0
0
0 1"1
0
0
0
0
0
0
0Ö×
0Î1óåÖ×Ô±±±±±²
0 1"1
0
0
0È0Ê0
0
0Þß
0Ö×
0ÞßÜ
-	º
0 1"1
0
0
0Ø0Ú0
0
0Ö×
0äå
0Ö×Ô
-	º
0 1"1
0
0
0
0
0Î1Ï1ÞßÆ1Ç1
0
0ÞßÜ
-	º
0 1"1
0È0É0Ê0
0Ö×Ö×Ö×
0
0Ö×Ô
-	º
0 1"1
0Ð0Ñ0Ò0
0ÞßÞßÞßÆ1Ç1ÞßÜ
-	º
0 1"1
0Ø0Ù0Ú0
0Ö×Ö×Ö×Ö×Ö×ÔD3D3D3D3D3ºà 1"1
0
0
0Î1Ï1ÞßÞßÞßÞßÞßÜL3L3L3L3L3º
0 1"1
0
0
0Ö×Ö×Ö×Ö×Ö×Ö×ÔV3W3º(1*1
0Î1Ï1ÞßÞßÞßÞßÞßÞßÜ444
0
00
0
0
0
0Ö×Ö×Ö×Ö×Ö×Ö×Ö×ÔÆ1Ç1Æ1Ç1Î1Ï1Î1Ï1Î1Ï1ÞßÞßÞßÞßÞßÞßÞßÜ
+тутутутуту
0
0
0
0
0
0
0п1я1р1
0
0ф1г1т1эщэщэщДЕДЕ
0
0
0
0
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ф1о1н1г1
0
0ь1ы1Б1ф1г1жв
0туэтуту
0
0
0
0туту
0
0ь1з1
0жвДРг1эщтэщэщ
0
0ф1о1эщэщ
0
0Ю1Б1
0ДРо1тутуэтуту
0
0тутуту
0
0
0
0
0
0туэщэщтДЕДЕ
0
0ДЕДРСРо1
0
0
0н1о1эщтутуэ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н1о1
0
0
0п1я1р1тутуэщэщт
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ь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п1я1ы1Б1
0
0
0
00ДЕэщт
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п1я1я1ы1ы1я1я1ы1з1
0
0х0и0й0
0
0
0
0ДЕт
0
0
0
0Ю1А1А1А1А1А1А1А1Б1
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
0
0
0тн1о1
08IIIIII11IIIIII:у┤┤┤жэжв
0@00000 1"1
000000BЮ
0
0н1о1тДРо1@
0
0
0
0
0 1"1
0
0
0
0
0B
0
0
0жвэ
0жв@00000
0 1"1
000000B
0
0
0ДЕт
0ДЕ@
0
0
0
0
0 1"1
0
0
0
0
0Bу┤┤┤жэ
0
0
0@00000
0 1"1
000000B
0
0
0
0
0т
0
0
0@
0
0
0
0
0 1"1
0
0
0
0
0B
0
0
0
0Юэ
0
0
0@00000
0 1"1
000000B
0
0
0
0
0т
0
0
0@
0
0
0
0
0 1"1
0
0
0
0
0Bу┤┤┤жэ
0
0
0@00000
0 1"1
000000B
0
0
0н1о1т
0
0
0@
0
0
0
0
0 1"1
0
0
0
0
0BЮ
0
0ж1в1э
0
0
0@00000
0 1"1
000000B
0
0
0Д1Е1т
0
0
0HIIIIII 1"1IIIIIIJу┤┤┤жэ
0
0
0 1"1
0
0
0
0
0тн1о1
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 1"1
0
0
0
0
0
0
0
0
0
0
0
0тДРо1
0ь0ы0я0р0
0
0 1"1
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т
0ДЕ
0111111!1"1
0
0
0
0
0
0
0
0
0ДРо1эн1о1
0
0 1!1)1)1)1)1)1*1
0
0
0
0
0
0
0
0
0
0жвтжв
0
0 1"100
0
0=>>>>>>?ДЕэДЕ
0
0 1"100
0
0E0
0
00
00
0
0
00GF0
0т
0
0
0
0 1!111
0
0
0
0
00
00
00
0
0
0GF0
0э
0
0
0
0 1!1!1"1
0
0
0
0
0
00
0
0
0
0
0
0GF0
0т
0
0
0
0 1!1)1*1
0
0
0
00
0
0
00
00
0
0GF0
0эф1г1
0
0 1"1
0
0
0
0E
0
00
00
0
0
00
0GF0
0тжв
0
0 1"1Ю
0
0
0MNNNNNNOF0
0эДРо1
0 1!1111
0
0
0
0
0
0
0
0
0
0
0н1о1
0
0т
0жв
0(1)1)1!1"1
0
0
0
0
0
0
0н1о1
0
0жвф1г1э
0ДЕ
0
0
0
0 1"1
0
0
0
0
0
0
0жв
0н1СЕжвт╠╠╠╠╠╡
0 1"1
0
0
0х0й0
0
0чъ
0жв
0чъэ
+	╨
0 1"1
0
0
0ь0з0
0
0жв
0ДЕ
0жвт

+	╨
0 1"1
0
0
0
0
0н1о1чъф1г1
0
0чъэ

+╨
0 1"1
0х0и0й0
0жвжвжв
0
0жвт
╨
0 1"1
0п0я0р0
0чъчъчъф1г1чъэ
╨
0 1"1
0ь0ы0з0
0жвжвжвжвжвтD3D3D3D3D3╨Ю 1"1
0
0
0н1о1чъчъчъчъчъэL3L3L3L3L3╨
0 1"1
0
0
0жвжвжвжвжвжвт
+	V3W3╨(1*1
0н1о1чъчъчъчъчъчъэ444
0
00
0
0
0
0жвжвжвжвжвжвжвтф1г1ф1г1н1о1н1о1н1о1чъчъчъчъчъчъчъэ

data/layouts/layouts.json

@@ -4560,6 +4560,16 @@
       "secondary_tileset": "gTileset_Rustboro",
       "border_filepath": "data/layouts/RustboroCityEast/border.bin",
       "blockdata_filepath": "data/layouts/RustboroCityEast/map.bin"
+    },
+    {
+      "id": "LAYOUT_PETALBURF_FORREST_RIVER",
+      "name": "PetalburfForrestRiver_Layout",
+      "width": 32,
+      "height": 64,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Fortree",
+      "border_filepath": "data/layouts/PetalburfForrestRiver/border.bin",
+      "blockdata_filepath": "data/layouts/PetalburfForrestRiver/map.bin"
     }
   ]
 }

data/maps/LittlerootTown/map.json

@@ -164,8 +164,8 @@
       "x": 17,
       "y": 2,
       "elevation": 0,
-      "dest_map": "MAP_GRANITE_CAVE_1F",
-      "dest_warp_id": "3"
+      "dest_map": "MAP_RUSTBORO_CITY",
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [

data/maps/PetalburfForrestRiver/map.json

@@ -0,0 +1,34 @@
+{
+  "id": "MAP_PETALBURF_FORREST_RIVER",
+  "name": "PetalburfForrestRiver",
+  "layout": "LAYOUT_PETALBURF_FORREST_RIVER",
+  "music": "MUS_PETALBURG_WOODS",
+  "region_map_section": "MAPSEC_PETALBURG_WOODS",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "map": "MAP_PETALBURG_WOODS_EXT",
+      "offset": -18,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}

data/maps/PetalburfForrestRiver/scripts.inc

@@ -0,0 +1,2 @@
+PetalburfForrestRiver_MapScripts::
+	.byte 0

data/maps/PetalburgWoodsExt/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_PETALBURG_WOODS_EXT",
   "name": "PetalburgWoodsExt",
   "layout": "LAYOUT_PETALBURG_WOODS_EXT",
-  "music": "MUS_PETALBURG",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_PETALBURG_WOODS",
   "requires_flash": false,
   "weather": "WEATHER_RAIN",
@@ -17,6 +17,11 @@
       "map": "MAP_PETALBURG_WOODS",
       "offset": 0,
       "direction": "left"
+    },
+    {
+      "map": "MAP_PETALBURF_FORREST_RIVER",
+      "offset": 18,
+      "direction": "up"
     }
   ],
   "object_events": [
@@ -45,6 +50,32 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_16"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
+      "x": 32,
+      "y": 35,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "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_BERRY_TREE",
+      "x": 33,
+      "y": 34,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "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": [
@@ -67,6 +98,40 @@
 
   ],
   "bg_events": [
-
+    {
+      "type": "secret_base",
+      "x": 58,
+      "y": 11,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE2_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 59,
+      "y": 11,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE4_3"
+    },
+    {
+      "type": "secret_base",
+      "x": 81,
+      "y": 16,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_SHRUB2_1"
+    },
+    {
+      "type": "secret_base",
+      "x": 73,
+      "y": 41,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE4_2"
+    },
+    {
+      "type": "secret_base",
+      "x": 74,
+      "y": 41,
+      "elevation": 0,
+      "secret_base_id": "SECRET_BASE_TREE1_1"
+    }
   ]
 }

data/maps/Route116/map.json

@@ -97,8 +97,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
-      "x": 13,
-      "y": 17,
+      "x": 7,
+      "y": 15,
       "elevation": 3,
       "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
       "movement_range_x": 0,
@@ -123,8 +123,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
-      "x": 10,
-      "y": 17,
+      "x": 5,
+      "y": 15,
       "elevation": 3,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 0,
@@ -241,7 +241,7 @@
     {
       "graphics_id": "OBJ_EVENT_GFX_GIRL_3",
       "x": 22,
-      "y": 16,
+      "y": 14,
       "elevation": 3,
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP",
       "movement_range_x": 0,

data/maps/RustboroCity/map.json

@@ -242,6 +242,19 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "RustboroCity_EventScript_Boy1",
       "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK",
+      "x": 34,
+      "y": 32,
+      "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": "Eventscript_GiveTestngPokemon",
+      "flag": "0"
     }
   ],
   "warp_events": [

data/maps/RustboroCity/scripts.inc

@@ -5,6 +5,11 @@
 .set LOCALID_RIVAL, 14
 .set LOCALID_SCIENTIST, 15
 
+Eventscript_GiveTestngPokemon::
+	givemon SPECIES_DRATINI, 15
+	givemon SPECIES_TOTODILE, 15
+	end
+
 RustboroCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_OnFrame

data/maps/RustboroCityEast/map.json

@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "NULL",
+      "script": "RustboroCityEast_EventScript_FlowerWoman",
       "flag": "0"
     },
     {
@@ -48,12 +48,12 @@
       "x": 18,
       "y": 40,
       "elevation": 0,
-      "movement_type": "MOVEMENT_TYPE_NONE",
+      "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": "NULL",
+      "script": "RustboroCityEast_EventScript_Father",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "NULL",
+      "script": "RustboroCityEast_EventScript_Daughter",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 2,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "NULL",
+      "script": "RustboroCityEast_EventScript_Plusle",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 4,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "NULL",
+      "script": "RustboroCityEast_EventScript_Beautifly",
       "flag": "0"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "NULL",
+      "script": "RustboroCityEast_EventScript_Fisherman",
       "flag": "0"
     },
     {
@@ -116,9 +116,9 @@
       "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": "NULL",
+      "trainer_type": "TRAINER_TYPE_NORMAL",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "RustboroCityEast_EventScript_Amber",
       "flag": "0"
     },
     {
@@ -129,9 +129,9 @@
       "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": "NULL",
+      "trainer_type": "TRAINER_TYPE_NORMAL",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "RustboroCityEast_EventScript_Andy",
       "flag": "0"
     },
     {
@@ -142,9 +142,9 @@
       "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": "NULL",
+      "trainer_type": "TRAINER_TYPE_NORMAL",
+      "trainer_sight_or_berry_tree_id": "4",
+      "script": "RustboroCityEast_EventScript_Berry",
       "flag": "0"
     }
   ],

data/maps/RustboroCityEast/scripts.inc

@@ -1,2 +1,109 @@
 RustboroCityEast_MapScripts::
 	.byte 0
+
+RustboroCityEast_EventScript_Father::
+	msgbox RustboroCityEast_Text_Father, MSGBOX_NPC
+	end
+
+RustboroCityEast_Text_Father:
+	.string "I take my daughter to this park every day\n"
+	.string "after school.\p"
+	.string "Recently she's made friends with that\n"
+	.string "PLUSLE. It doesn't seem to have a trainer\l"
+	.string "but it's always here waiting for us.$"
+	
+RustboroCityEast_EventScript_Daughter::
+	msgbox RustboroCityEast_Text_Daughter, MSGBOX_NPC
+	end
+	
+RustboroCityEast_Text_Daughter:
+	.string "PLUSLE is my best friend!$"
+	
+RustboroCityEast_EventScript_Plusle::
+	playmoncry SPECIES_PLUSLE, 0
+	waitmoncry
+	msgbox RustboroCityEast_Text_Plusle, MSGBOX_NPC
+	end
+	
+RustboroCityEast_Text_Plusle:
+	.string "It seems very close to the small child.$"
+	
+RustboroCityEast_Text_AmberIntro:
+	.string "I'm the top of my class at battling.$"
+	
+RustboroCityEast_Text_AmberDefeated:
+	.string "No fair!$"
+
+RustboroCityEast_Text_AmberPostBattle:
+	.string "I won't be making the same mistake the\n"
+	.string "next time we battle!$"
+
+RustboroCityEast_EventScript_Amber::
+	trainerbattle_single TRAINER_AMBER, RustboroCityEast_Text_AmberIntro, RustboroCityEast_Text_AmberDefeated
+	msgbox RustboroCityEast_Text_AmberPostBattle, MSGBOX_AUTOCLOSE
+	end
+	
+RustboroCityEast_Text_AndyIntro:
+	.string "My Mom says I need to get out and see the\n"
+	.string "world more.\p"
+	.string "Well, here I am.$"
+	
+RustboroCityEast_Text_AndyDefeated:
+	.string "Aww man, I knew this was going to happen..$"
+	
+RustboroCityEast_Text_AndyPostBattle:
+	.string "I guess I can't give up that easily. I'll\n"
+	.string "try again tomorrow!$"
+
+RustboroCityEast_EventScript_Andy::
+	trainerbattle_single TRAINER_ANDY, RustboroCityEast_Text_AndyIntro, RustboroCityEast_Text_AndyDefeated
+	msgbox RustboroCityEast_Text_AndyPostBattle, MSGBOX_AUTOCLOSE
+	end
+	
+RustboroCityEast_Text_Beautifly:
+	.string "BEAUTIFLY is peacfully bouncing from\n"
+	.string "flower to flower.$"
+	
+RustboroCityEast_EventScript_Beautifly::
+	playmoncry SPECIES_BEAUTIFLY, 0
+	msgbox RustboroCityEast_Text_Beautifly, MSGBOX_NPC
+	waitmoncry
+	end
+	
+RustboroCityEast_Text_FlowerWoman:
+	.string "My sister works at the flower shop over\n"
+	.string "on ROUTE 104. She supplies me with all the\p"
+	.string "seeds that I need to keep this community\n"
+	.string "area perfectly beautiful.\p"
+	.string "You should go visit her if you have the\n"
+	.string "chance!$"
+	
+RustboroCityEast_EventScript_FlowerWoman::
+	msgbox RustboroCityEast_Text_FlowerWoman, MSGBOX_NPC
+	end
+	
+RustboroCityEast_Text_BerryIntro:
+	.string "I knew I'd find someone waiting here!$"
+	
+RustboroCityEast_Text_BerryDefeated:
+	.string "Just maybe not the person I wanted...$"
+	
+RustboroCityEast_Text_BerryPostBattle:
+	.string "It's always nice to meet new people.$"
+	
+RustboroCityEast_EventScript_Berry::
+	trainerbattle_single TRAINER_BERRY, RustboroCityEast_Text_BerryIntro, RustboroCityEast_Text_BerryDefeated
+	msgbox RustboroCityEast_Text_BerryPostBattle, MSGBOX_AUTOCLOSE
+	end
+	
+RustboroCityEast_Text_Fisherman:
+	.string "This is my favorite place to relax. Calm\n"
+	.string "open water, smell of flowers in the air...\p"
+	.string "AAACHHOOOOOO!!!\p"
+	.string "Worth every sneeze.$"
+	
+RustboroCityEast_EventScript_Fisherman::
+	msgbox RustboroCityEast_Text_Fisherman, MSGBOX_NPC
+	end
+	
+	

data/maps/SootopolisCity/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": [],
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
@@ -342,7 +342,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",

data/maps/map_groups.json

@@ -444,7 +444,8 @@
     "PetalburgWoodsext2",
     "GraniteCave_B3F",
     "GraniteCave_B4F",
-    "GraniteCave_B4FNorth"
+    "GraniteCave_B4FNorth",
+    "PetalburfForrestRiver"
   ],
   "gMapGroup_IndoorDynamic": [
     "SecretBase_RedCave1",

include/constants/layouts.h

@@ -459,5 +459,8 @@
 #define LAYOUT_GRANITE_CAVE_B3F 452
 #define LAYOUT_GRANITE_CAVE_B4F 453
 #define LAYOUT_GRANITE_CAVE_B4FNORTH 454
+#define LAYOUT_NEW_MAP2 455
+#define LAYOUT_RUSTBORO_CITY_EAST 456
+#define LAYOUT_PETALBURF_FORREST_RIVER 457
 
 #endif // GUARD_CONSTANTS_LAYOUTS_H

include/constants/map_groups.h

@@ -415,6 +415,7 @@
 #define MAP_GRANITE_CAVE_B3F                         (110 | (24 << 8))
 #define MAP_GRANITE_CAVE_B4F                         (111 | (24 << 8))
 #define MAP_GRANITE_CAVE_B4FNORTH                    (112 | (24 << 8))
+#define MAP_PETALBURF_FORREST_RIVER                  (113 | (24 << 8))
 
 // gMapGroup_IndoorDynamic
 #define MAP_SECRET_BASE_RED_CAVE1    (0 | (25 << 8))

include/constants/opponents.h

@@ -859,12 +859,15 @@
 #define TRAINER_BART						855
 #define TRAINER_LEWIS						856
 #define TRAINER_COLEMAN						867
+#define TRAINER_ANDY						868
+#define TRAINER_AMBER						869
+#define TRAINER_BERRY						870
 
 // 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                      868
+#define TRAINERS_COUNT                      890
 #define MAX_TRAINERS_COUNT                  900//864
 
 #endif  // GUARD_CONSTANTS_OPPONENTS_H

src/data/map_group_count.h

@@ -1 +1 @@
-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, 113, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};
+static const u8 MAP_GROUP_COUNT[] = {65, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 19, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 114, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};

src/data/trainer_parties.h

@@ -24,6 +24,40 @@ static const struct TrainerMonNoItemDefaultMoves sParty_lewis[] = {
 	}
 };
 
+static const struct TrainerMonNoItemDefaultMoves sParty_andy[] = {
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_SLAKOTH,
+    },
+	{
+	.iv = 0,
+	.lvl = 12,
+	.species = SPECIES_WHISMUR,
+	}
+};
+
+static const struct TrainerMonNoItemDefaultMoves sParty_berry[] = {
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_DUSTOX,
+    }
+};
+
+static const struct TrainerMonNoItemDefaultMoves sParty_amber[] = {
+    {
+    .iv = 0,
+    .lvl = 12,
+    .species = SPECIES_BEAUTIFLY,
+    },
+	{
+	.iv = 0,
+	.lvl = 8,
+	.species = SPECIES_ODDISH,
+	}
+};
+
 static const struct TrainerMonItemCustomMoves sParty_coleman[] = {
     {
     .iv = 255,

src/data/trainers.h

@@ -10297,4 +10297,40 @@ const struct Trainer gTrainers[] = {
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
         .party = ITEM_CUSTOM_MOVES(sParty_coleman),
 	},
+	
+	[TRAINER_ANDY] =
+	{
+		.trainerClass = TRAINER_CLASS_YOUNGSTER,
+        .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
+        .trainerPic = TRAINER_PIC_YOUNGSTER,
+        .trainerName = _("ANDY"),
+        .items = {},
+        .doubleBattle = FALSE,
+        .aiFlags = 0,
+        .party = NO_ITEM_DEFAULT_MOVES(sParty_andy),
+	},
+	
+	[TRAINER_AMBER] =
+	{
+		.trainerClass = TRAINER_CLASS_LASS,
+        .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
+        .trainerPic = TRAINER_PIC_LASS,
+        .trainerName = _("AMBER"),
+        .items = {ITEM_SUPER_POTION},
+        .doubleBattle = FALSE,
+        .aiFlags = 0,
+        .party = NO_ITEM_DEFAULT_MOVES(sParty_amber),
+	},
+	
+	[TRAINER_BERRY] =
+	{
+		.trainerClass = TRAINER_CLASS_RICH_BOY,
+        .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
+        .trainerPic = TRAINER_PIC_RICH_BOY,
+        .trainerName = _("BERRY"),
+        .items = {},
+        .doubleBattle = FALSE,
+        .aiFlags = 0,
+        .party = NO_ITEM_DEFAULT_MOVES(sParty_berry),
+	},
 };