diff --git a/data/event_scripts.s b/data/event_scripts.s index d2192e2b9..0d7e38a63 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1058,3 +1058,13 @@ Common_EventScript_LegendaryFlewAway:: .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" diff --git a/data/layouts/LittlerootTown/map.bin b/data/layouts/LittlerootTown/map.bin index 2b49652fd..3d836fded 100644 --- a/data/layouts/LittlerootTown/map.bin +++ b/data/layouts/LittlerootTown/map.bin @@ -1,3 +1,3 @@ -000000000000000000000000000000000000000000000000000000000000002 2 2 2 +0000000000000000000000000000000000000000002 2 2 2 20000002 2 2 2 2000000000000000000000000"20@!000000 @12#0000*:8H)400004(H9:+000000020000000020000000000000000000000000000000000000000000000 2B2C2 2 2 220000000000000JK0000000000000000000000000,A-0000000011000&4I5'00000000110000200000000110000000000000011111111111111 \ 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 @@ +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/data/layouts/PetalburgCity/map.bin b/data/layouts/PetalburgCity/map.bin index 35f0172ca..3bb1a4f1b 100644 --- a/data/layouts/PetalburgCity/map.bin +++ b/data/layouts/PetalburgCity/map.bin @@ -1,4 +1,4 @@ UNMNMNVD    F000LL55T  L??0 !"LLL001100LLL00 1"100LLL00 1"10<2fL111L5500 1"1deT0011101T00000P2Q2XY0000 1"1000000 1!1"110000000123550000 1"1000000 1!1"1000000089:;001111!1!1111111!1!1"10000000`ABC11(1)1)1)1)1R2S2)1)1)1)1)1)1!1"100H0I0J0K000110000000 1"100PQRS00 1"10000000 1"100XYZ[00 1"1050 0 0 -000 1"10`abc00 1"100000 1!111111111!1!1100 00 1!1)1)1)1)1)1)1)1)1)1)1*10055 !"00 1"1000000000111100020000 1"10<2=2=2=2=2=2=2>200000000 1"10D   -EEF00000000 1"10LL110 1"10T L0 1"100 !"00L0 1!111111000L0(1)1)1)1)1)1*1000T11111111111100001111 \ No newline at end of file +000 1"10`abc00 1"100000 1!111111111!1!1100 00 1!1)1)1)1)1)1)1)1)1)1)1*10055 !"00 1"1000000000111100020000 1"10<2=2=2=2=2=2=2>200000000 1"10D   +EEF00000000 1"10LL110 1"10T L0 1"100 !"00L0 1!111111000L0 1!1)1)1)1)1*1000T0 1"101111111100 "010 "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..9a8acd8e8 100644 --- a/data/layouts/PetalburgWoods/map.bin +++ b/data/layouts/PetalburgWoods/map.bin @@ -1 +1 @@ -000000 0 0 0 0 0 0IIII000001111 0 0 000000000000005555 0 0 0000000000000000 0 0000000 0 0 0 04000000 0 0000000 0 0 0000 0 0 0 0 0 00000000 0 0 00111111 0 0000000 0 0 0 0 0 0 00000000000 0 0 0 0 0 0 0555555 0 0 000000000 0 0 0 0 0111111000011111111111111110000 0 00 0 0 05555550000555555555555555000 0 0 000000000100 0 0 00000500 0 0 0000 00000010 0 0 00 0 0 0 0 0 00000000000000000050 0 0 0 0 0 0 0 0 0 0000000 0 0 0 0000000000 0 0 0 0 0 0 0 0 000000 0 0 0 0 0 0 0 0 0000000 011111111000011111111110000005555555500005555555555000000000000 000000 000000 0 000000000 000000 0 0 00000000000000 0 0 0 0 0 0 0 000 0 0000000 0 0 0 0 00 0 0 00000000000 0 0 0 0 0 0000 0 0 00110 0 0 0 0 0 0 00 0 0 0 0 0 0 0 0000000000000000 0 0 0 0550 0 0 0 0 0 0 0 0 0 0 0 0 0111111000000111111 0 0 0 011 0 0 0 011 0 0 0 0 0 0555000000555555 0 0 0 05 0 0 0 05 0 0 0 0 0 00000000 0 0 01111 0 0 0 0 0 0000 0 0 0 0 0 0 000000000000 0 0 0 0 0 0 0 0 040000000 0 0 0 0110 0 0 0 0 0 000000000 0 0 0 0 000005000000000000000 0 0 0 0 0 0 000000000 0 0 0 0 0 01111111100000011111111111111000 0 00 0 0500000055000 0 0 0 0 00000000000 0 011IIIIIIII5 \ No newline at end of file +000000 0 0 0 0 0 0IIII000001111 0 0 000000000000005555 0 0 0000000000000000 0 0000000 0 0 0 04000000 0 0000000 0 0 0000 0 0 0 0 0 00000000 0 0 00111111 0 0000000 0 0 0 0 0 0 00000000000 0 0 0 0 0 0 0555555 0 0 000000000 0 0 0 0 0111111000011111111111111110000 0 00 0 0 05555550000555555555555555000 0 0 0 0 000000000100 0 0 0 0 00000500 0 0 0 0 0000 00000010 0 0 0110 0 0 0 0 0 00000000000000000050 0 0 0 0 0 0 0 0 0 0000000 0 0 0 0000000000 0 0 0 0 0 0 0 0 000000 0 0 0 0 0 0 0 0 0000000 011111111000011111111110000005555555500005555555555000000000000 000000 000000 0 000000000 000000 0 0 00000000000000 0 0 0 0 0 0 0 000 0 0000000 0 0 0 0 00 0 0 00000000000 0 0 0 0 0 0000 0 0 00110 0 0 0 0 0 0 00 0 0 0 0 0 0 0 0000000000000000 0 0 0 0550 0 0 0 0 0 0 0 0 0 0 0 0 0111111000000111111 0 0 0 011 0 0 0 011 0 0 0 0 0 0555000000555555 0 0 0 05 0 0 0 05 0 0 0 0 0 00000000 0 0 01111 0 0 0 0 0 0000 0 0 0 0 0 0 000000000000 0 0 0 0 0 0 0 0 040000000 0 0 0 0110 0 0 0 0 0 000000000 0 0 0 0 000005000000000000000 0 0 0 0 0 0 000000000 0 0 0 0 0 01111111100000011111111111111000 0 00 0 0500000055000 0 0 0 0 00000000000 0 011IIIIIIII5 \ 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..12b916ce2 --- /dev/null +++ b/data/layouts/PetalburgWoodsExt/map.bin @@ -0,0 +1 @@ +00000 0 0 0 0000000000000 0 0 0 0 00000000000000001100000000 0 0 0 0 000000000000 0 0 00000000110000000 0 0 000000000000000000000000000000000000 0 0 0 0 0 0 0 0 0110022200000001000000000000000 0 0 0 0 0 0 0 0 0000000000000000000000000110 0 0 0 0 0 0000000000000000000000000110 0 0 0 0 0000000001100000X2Z2000000000000000011 0 0 0 0 00110000000000`2a2Y2Y2Y2Y2Y2Y2Y2Z200000000 0 00000000000000000000`2a2a2a2a20a2a2a2Y2Y2Z20002000000000 0 0000000000000000000&'`2a2a2a2a2a2i2a2a2a2b2000000000000000 0 00000000000000110000000000000000h2i2i2i2i2a2b20h2a2a2a2Z200022000000000 0 0000000000000000K0 0 0 0 0000000000000000000h2j200h2a2a2a2b200000000002000 0 000000000000000000000S00 0 0 0 001111111111110000000110h2a2a2b20000020000000 0 000000000000000200X2Y2Z2000000000000000000 0 01111!1!1)1)1)1)1)1)1)1)1!1!1110000000h2a2b20000002222000 0 000110022222222 000h2a2a200000001111111111111!1!1)1)1)1*100000000(1)1!1!111100000h2j2000000pqr00000 0 000 1!1100X2Y2Y2i2KK00000h2i22200111!1!1)1)1)1)1*1(1)1)1)1)1)1)1*100000000011000(1)1)1!1!1110000000000000000001111$0 0 0 00(1!1!111h2i2i2i2SS00000000011!1!1)1)1*1000000 0000 0 000000000011001100(1)1!1!1111100000000000011!1!1)1*1$000000(1)1!1!1111100000000011!1!1)1*10X2Y2Y2Y2Z20000000112200022201100110000(1)1)1)1!1!1111111100111!1!1)1*100 0000000(1)1)1)1!1!1111111111!1!1)1*1K0X2a2a2i2X2b2000000011000000000 000011X2Y2Y2Z20000(1)1)1)1)1)1)1!1!111!1!1)1)1*10000 00000000000(1)1)1)1)1)1)1)1)1)1)1)1*100S0h2i2j20h2j20000 00011000 0 0 0 0000h2i20a2Z20000000000(1)1)1)1)1*100000000 000000 000000000000000000000000000000K 0 0 0 0 000000000000h2a2a2Y2Z200000000000000000220000000000000000000000 0 0 00X2Y2Z200000000S 0 00000000h2i20a2Z20000000000000 0X2Y2Z200000000 00000000000000011X2Y2a20110000000000000h2i2j2011000000000 0 0 0X2a2a2j2020000000000000 00000000h2i2i2j200000X2Z200000000000000000 0X2Y20000j200000000000000000 0 0 00000000000000h2j200000000 00000000000000000 0X2a2a222220000 01111 011101111 011 0 0111110000111111111111000000000000000 00000000011111111111111111111010X2Z2000000 0 000 0002220 0000000000000`2b2011110 011111111110000000000000`2b20000000000000000000`2a2Z2000000000000000000`2a2b200200000000000000000000000`2a2b2000000000000000000000000000000 0 0 0 0 0 0 0 0 0 0 00X2a2i2j2001111100000X2Y2Y2Y2Z200000000000000000*2*2*2*200 0000 0 0 000000h2j20000 1 1 1 1 1000001111110000000000 001111S2T2S2T200 000000000000000000000000011111111111 0 0000000000000000000000000 000000000X2Y2Z20K2000011KK00111111111111 0 0111111111111002200222200 00000000 0h2i2j22S20000SS001111111111 0 0 0 0020 000 0 0 0 0001110001111110X2Y2Z200011111111111 0 0 0 0000000 0 000000`2a2j20000011111111 0 0 0 0 0 0 000 0 0000000222222 0022221h2j212222111111111 0 0 01111000 0222&'000111111111111011111 0 0 0 022 0 0 00 000222001111111111111111111111 \ 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..bd40eb6ea --- /dev/null +++ b/data/layouts/Petalburgext/map.bin @@ -0,0 +1 @@ +11511511500000000115I1 1"1I1L2 2B2C2 2B2C221151111111111110000000011110 1"10L2JKJK11111111111111110000000011110 1"10L21111111111111111000q0000011110 1"10L2,A-1111111111111111000000001111I1 1"1I1T2&4I5'11111111111111110000000011110 1!1110011111111111111110000000011110(1)1)1)1)1)1)1)1*100111111111111111100000000550000000000001111111111111111000000000000000000000000111111111111111100000000000000000000111111111111111111110000000000000000000011111111111111111111000000000000000000001111111111111111111100000000000000000000111111111111111111110000000000000000000011111111111111111111000000000000000000001111111111111111111100111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 \ No newline at end of file diff --git a/data/layouts/Route101/map.bin b/data/layouts/Route101/map.bin index fefc96cff..eecbbe745 100644 --- a/data/layouts/Route101/map.bin +++ b/data/layouts/Route101/map.bin @@ -1 +1 @@ -11101110 0 0 000000000 0 0 05 0 0 0 0000000 0 0 0 0 0 0 0 0 0 0000000 0 0 0 0 0 011 0 0 000000011 0 0 0 0 0 0 000n11 0 000000000011011000000001110001110 0 0011110111110 0 0 0 0 001110111110 0 0 0 0 0 00110011100 0 0 0 0 0 0000 0 0000011 0 0 0011 0 0 0 0 00000000 0 00011 0 0 0 00000001111 0 0 0 0000000 0 0 00000000000000000000000000000000 \ No newline at end of file +11101110 0 0 000000000 0 0 05 0 0 0 0000000 0 0 0 0 0 0 0 0 0 0000000 0 0 0 0 0 011 0 0 000000011 0 0 0 0 0 0 000n11 0 000000000011011000000001110001110 0 0011110111110 0 0 0 0 001110111110 0 0 0 0 0 00110011100 0 0 0 0 0 0000 0 0000011 0 0 0011 0 0 0 0 00000000 0 00011 0 0 0 00000001111 0 0 0 000000011111111000000 \ No newline at end of file diff --git a/data/layouts/Route101ext/map.bin b/data/layouts/Route101ext/map.bin index ea32bd624..0b450693f 100644 --- a/data/layouts/Route101ext/map.bin +++ b/data/layouts/Route101ext/map.bin @@ -1,2 +1,2 @@ pPQPQppppppppp%%pppXYXYpppppppppppppppppppppppppppppppppppppp    -00000000ppp0011110000ppp0  00000pp0 !"0000000000B00000111110000008IIJ0000011111100000@0000 000011011100000@000 0 00000011100000@0000 000000001111000@110 0000000001111100@ 0 0000000000011110@ 00000000000001111@ 0 0 00000000000000111HIIII0III0000000001110000000000000000001100011000000000000011000000000000000011000000000000000111000 0 0 000000000011111000 00 01100000011111000000 0011001111000000000000111000000000000000111000000000000000001110000000000111101111100000000001111111000000000001111000000000001100011100000000000001100000000000000000000000000000000000000000000000000000000000000000000000000 0 0 0 00 0 0 0 0 0 0 00 0 0 0 011 0 0 0 00 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 00 00 0 0 0 00 0 0 001111111111111111111 \ No newline at end of file +00000000ppp0011110000ppp0  00000pp0 !"0000000000B00000111110000008IIJ0000011111100000@0000 000011011100000@000 0 00000011100000@0000 000000001111000@110 0000000001111100@ 0 0000000000011110@ 00000000000001111@ 0 0 00000000000000111HIIII0III0000000001110000000000000000001100011000000000000011000000000000000011000000000000000111000 0 0 000000000011111000 00 01100000011111011000 0011001111000000000011100000000000001110000000000000000011100000000001111011111000000000011111110000000000011110000000000011000111001100000000011000000000000000000000000110000000000000000000000000000000000000000 0 0 0 00 0 0 0 0 0 0 00 0 0 0 011 0 0 0 00 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 00 00 0 0 0 00 0 0 001111111111111111111 \ 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 00000000000026620 0 0 0 0 0 0 000011110000011110 0 0 0 0 0 0 0 0 0 0 0 0 0011111111000000000000000 0 0 0 0 0 0 0 0 0 0 0 00111q2y211110000000000110000 0 0 0000 0 0 0 0 0 0 0011100111100000 0 00000 0 0 0 00001r210000 0 0 0 0 00110000000000000000000000000 0 0 0 0 0 0 00{00000000000001111111100000 0 0 0 0 0 0 00011000000000000011 0 0 0 0 0 000000000011110000000 0 0 0 000000000111111100011 0 000 0 0 00011000 0 0111111111000 0 01100011000 0 0 0 0111111101111 0 0 0000000000 0 0 0 0 000111111000 0 0 001100 0 0 00000 0 0 0000111001111 0 0 0 00 0 0 0 0 0 0 0000000000000001111111111 0 0 00000011111111 0 0 0 0000011111111 \ No newline at end of file + 0 0 00000000000026620 0 0 0 0 0 0 000011110000011110 0 0 0 0 0 0 0 0 0 0 0 0 0011111111000000000000000 0 0 0 0 0 0 0 0 0 0 0 00111q2y211110000000000110000 0 0 0000 0 0 0 0 0 0 0011100111100000 0 00000 0 0 0 00001r210000 0 0 0 0 00110000000000000000000000000 0 0 0 0 0 0 00{00000000000001111111100000 0 0 0 0 0 0 00011000000000000011 0 0 0 0 0 000000000011110000000 0 0 0 000000000111111100011 0 000 0 0 00011000 0 0111111111000 0 01100011000 0 0 0 0111111101111 0 0 0000000000 0 0 0 0 000111111000 0 0 001100 0 0 00000 0 0 0000111001111 0 0 0 00 0 0 0 0 0 0 00000000000000011 0 0111111 0 0 00000011111111 0 0 0 0 0 00000 0 0 0 0 0 01111 \ 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..18ab03fd0 --- /dev/null +++ b/data/layouts/Route102ext/map.bin @@ -0,0 +1 @@ +01110000000001111110000000111110000000 0 0011100000 0 0 0011100000 0 0 001100000 0 0 0 00000000000 0 0 0 0 0 0 0000000000 0 0 0 0 0000000000000000 0 0 0 0 00000011000h0i0j00000 0 00h0i0i0j00000x0y0z0 0 0 0 0 011p0q0q0r00000000 00 000p0k0l0q0i0j00000000 00 0 00p0s0q0q0q0u0i0m0i0j0000 0 00 0000p0s0q0q0q0u0q0u0q0r0000 0 0 0 0000p0s0q0q0q0u0q0u0q0r000 0 00 0 00 0 0p0s0q0t0|00|0}0q0r00 0 0 0 0 0 00hi0s0q0u0t00y0yyz00 0 00 0 00i0q0q0q0{0|0}0r020000 0 0 011101111111z011111111 \ No newline at end of file diff --git a/data/layouts/Route103/map.bin b/data/layouts/Route103/map.bin index 0c56bb12e..0778ee12b 100644 --- a/data/layouts/Route103/map.bin +++ b/data/layouts/Route103/map.bin @@ -1 +1 @@ -ppppppppppsq{sqqqt}qsqqqqqqqqqqqqqqqqqqqqqqqt|}qqquuvpppppppp{|s{qquqq{qqqqt|||||||qqqqqqqqt}qqqqqu000000 0 0 0 0 0 0}~pppppppps{sqquqt{||||}qtq{||||||||}qqqqqqu0001111 0 0 0 0 0ppppppuvPQpp{s{ququ{|||||}qqq{|||||||} 0 0000111100 0 0 0 0 0puvppp}~XYpps{{|}t}tyyy 0 0 0 04444444o4 0 0 0 0dQpp}~uvPQpppuvPesq{|||}qr0000000K1L5L5L5M10000 0 0 0 0 0 0 000004444444lYuvpp}~XYppp}~Xm{|yz011111000000 0 0 0 0 0 0 000000000000p}~pppppppppppp0000000000000000000000 0 0 0 0 0 0 00000111110000pppppppppppppppppp000000000000000000011 0 0 0 0 00040111111000ppppppppppppppppppppppppp000000000000000111 0 0 0 000000001111000ppppppppppppppppppppppppp011110000000000011!1!1)1 0 0 0 0000000 0 0 0 00000ppppppppppppppppppppppppp0(1)1!1!1111100000011!1!1)1*104444444444 0 0 0 0 000000yppppppppppppppppppppppp000(1)1)1)1!1!1111111111111111!1!1)1*1000000000 0 0 0 0 0 0 0111111dQPQppppppppppuvppppp0000000(1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1*100000000000 0 0 0 0 0 0 05555lYXYuvppppPQPQ}~puvpx00000000000000000000000001100000011111122yp}~uvPQXYXYpPQ}~Pe0000000000000005ppp}~XYpppppXYppXm000000000110000uvppppppppppppppp000000000550000}~ppppppppppppppx00000pppppppppppppppp5500000000pppppppppppppppp0000pppppppppppp0011 \ No newline at end of file +ppppppppppsq{sqqqt}qsqqqqqqqqqqqqqqqqqqqqqqqt|}qqquuvpppppppp{|s{qquqq{qqqqt|||||||qqqqqqqqt}qqqqqu000000 0 0 0 0 0 0}~pppppppps{sqquqt{||||}qtq{||||||||}qqqqqqu0001111 0 0 0 0 0ppppppuvPQpp{s{ququ{|||||}qqq{|||||||} 0 0000111100 0 0 0 0 0puvppp}~XYpps{{|}t}tyyy 0 0 0 04444444o4 0 0 0 0dQpp}~uvPQpppuvPesq{|||}qr0000000K1L5L5L5M10000 0 0 0 0 0 0 000004444444lYuvpp}~XYppp}~Xm{|yz011111000000 0 0 0 0 0 0 000000000000p}~pppppppppppp0000000000000000000000$00 0 0 0 0 0 0 00000111110000pppppppppppppppppp0000000000000000000$0111 0 0 0 0 00040111111000ppppppppppppppppppppppppp000000000000000111 0 0 0 000000001111000ppppppppppppppppppppppppp011110000000000011!1!1)1 0 0 0 0000000 0 0 0 00000ppppppppppppppppppppppppp0(1)1!1!1111100000011!1!1)1*104444444444 0 0 0 0 000000yppppppppppppppppppppppp000(1)1)1)1!1!1111111111111111!1!1)1*1000000000 0 0 0 0 0 0 0111111dQPQppppppppppuvppppp0000000(1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1*100000000000 0 0 0 0 0 0 05555lYXYuvppppPQPQ}~puvpx00000000000000000000000001100000011111122yp}~uvPQXYXYpPQ}~Pe0000000000000005ppp}~XYpppppXYppXm000000000110000uvppppppppppppppp000000000550000}~ppppppppppppppx00000pppppppppppppppp5500000000pppppppppppppppp0000pppppppppppp0011 \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 57a0da130..c0079ef87 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -4420,6 +4420,56 @@ "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" } ] } 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 e808250f4..4489fedbb 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/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/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..3ecde2034 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -123,6 +123,19 @@ "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" } ], "warp_events": [ 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..ef10ea164 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.\n" + .string "They will follow you on your\n" + .string "adverntures 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/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 e8c63172c..b5a1963e8 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -37,8 +37,8 @@ "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..7e85e3dcf 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -12,7 +12,13 @@ "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" + } + ], "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", diff --git a/data/maps/PetalburgWoodsExt/map.json b/data/maps/PetalburgWoodsExt/map.json new file mode 100644 index 000000000..76ce8f0c8 --- /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_CITY", + "requires_flash": false, + "weather": "WEATHER_FOG_DIAGONAL", + "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": 89, + "y": 17, + "elevation": 0, + "dest_map": "MAP_ROUTE103", + "dest_warp_id": "1" + }, + { + "x": 89, + "y": 18, + "elevation": 0, + "dest_map": "MAP_ROUTE103", + "dest_warp_id": "2" + } + ], + "coord_events": [ + + ], + "bg_events": [ + + ] +} diff --git a/data/maps/PetalburgWoodsExt/scripts.inc b/data/maps/PetalburgWoodsExt/scripts.inc new file mode 100644 index 000000000..5a2bb5838 --- /dev/null +++ b/data/maps/PetalburgWoodsExt/scripts.inc @@ -0,0 +1,2 @@ +PetalburgWoodsExt_MapScripts:: + .byte 0 diff --git a/data/maps/Petalburgext/map.json b/data/maps/Petalburgext/map.json new file mode 100644 index 000000000..573f2e811 --- /dev/null +++ b/data/maps/Petalburgext/map.json @@ -0,0 +1,34 @@ +{ + "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": [ + + ], + "warp_events": [ + + ], + "coord_events": [ + + ], + "bg_events": [ + + ] +} diff --git a/data/maps/Petalburgext/scripts.inc b/data/maps/Petalburgext/scripts.inc new file mode 100644 index 000000000..0f253cb56 --- /dev/null +++ b/data/maps/Petalburgext/scripts.inc @@ -0,0 +1,2 @@ +Petalburgext_MapScripts:: + .byte 0 diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 6e3623a87..3705785ac 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -32,8 +32,8 @@ "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, diff --git a/data/maps/Route101ext/map.json b/data/maps/Route101ext/map.json index 3f10f201c..43b941a89 100644 --- a/data/maps/Route101ext/map.json +++ b/data/maps/Route101ext/map.json @@ -10,7 +10,7 @@ "allow_cycling": true, "allow_escaping": false, "allow_running": true, - "show_map_name": true, + "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { @@ -42,6 +42,58 @@ "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_CutTreeDown", + "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" } ], "warp_events": [ diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 8c8771b5e..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": [ diff --git a/data/maps/Route102ext/map.json b/data/maps/Route102ext/map.json new file mode 100644 index 000000000..460579ed9 --- /dev/null +++ b/data/maps/Route102ext/map.json @@ -0,0 +1,59 @@ +{ + "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" + } + ], + "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..635916fa2 --- /dev/null +++ b/data/maps/Route102ext/scripts.inc @@ -0,0 +1,2 @@ +Route102ext_MapScripts:: + .byte 0 diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index b980b84cb..db38e190b 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -35,7 +35,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", @@ -289,6 +289,32 @@ "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": 1, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "null", + "trainer_sight_or_berry_tree_id": "0", + "script": "EventScript_CutTreeDown", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", + "x": 1, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "null", + "trainer_sight_or_berry_tree_id": "0", + "script": "EventScript_CutTreeDown", + "flag": "FLAG_TEMP_16" } ], "warp_events": [ @@ -298,6 +324,20 @@ "elevation": 0, "dest_map": "MAP_ALTERING_CAVE", "dest_warp_id": "0" + }, + { + "x": 0, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PETALBURGEXT", + "dest_warp_id": "0" + }, + { + "x": 0, + "y": 9, + "elevation": 0, + "dest_map": "MAP_PETALBURGEXT", + "dest_warp_id": "1" } ], "coord_events": [ 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/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/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 6bfedaf5f..0e1f1c593 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -93,7 +93,11 @@ "Underwater_Route129", "Underwater_Route105", "Underwater_Route125", - "Route101ext" + "Route101ext", + "Route102ext", + "NewMap1", + "Petalburgext", + "PetalburgCity_OldResearchBuilding" ], "gMapGroup_IndoorLittleroot": [ "LittlerootTown_BrendansHouse_1F", @@ -430,7 +434,8 @@ "TerraCave_Entrance", "TerraCave_End", "AlteringCave", - "MeteorFalls_StevensCave" + "MeteorFalls_StevensCave", + "PetalburgWoodsExt" ], "gMapGroup_IndoorDynamic": [ "SecretBase_RedCave1", diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc index 683c383df..af3528cad 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 diff --git a/include/constants/flags.h b/include/constants/flags.h index 36a38a6e2..ca4ee5641 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1218,9 +1218,9 @@ #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_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_UNUSED_0x496 0x496 // Unused Flag #define FLAG_UNUSED_0x497 0x497 // Unused Flag #define FLAG_UNUSED_0x498 0x498 // Unused Flag diff --git a/include/constants/layouts.h b/include/constants/layouts.h index ee80c01be..e477d16fc 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -447,5 +447,10 @@ #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 #endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index f60397531..6b7dbe2eb 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -6,64 +6,68 @@ // // 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_ROUTE101EXT (57 | (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)) // gMapGroup_IndoorLittleroot #define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8)) @@ -401,6 +405,7 @@ #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)) // gMapGroup_IndoorDynamic #define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8)) diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index 053c4c095..bb95a67cf 100755 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -7,28 +7,28 @@ { "type": "land_mons", "encounter_rates": [ - 20, - 20, + 10, + 10, 10, 10, 10, 10, 5, 5, - 4, - 4, - 1, - 1 + 10, + 10, + 6, + 4 ] }, { "type": "water_mons", "encounter_rates": [ - 60, - 30, - 5, - 4, - 1 + 10, + 10, + 6, + 10, + 10 ] }, { @@ -49,8 +49,8 @@ 60, 20, 20, - 40, - 40, + 20, + 20, 15, 4, 1 @@ -11491,6 +11491,353 @@ } ] } + }, + { + "map": "MAP_ROUTE101EXT", + "base_label": "gRoute101ext0", + "land_mons": { + "encounter_rate": 0, + "mons": [ + { + "min_level": 2, + "max_level": 3, + "species": "SPECIES_WURMPLE" + }, + { + "min_level": 2, + "max_level": 5, + "species": "SPECIES_ZIGZAGOON" + }, + { + "min_level": 2, + "max_level": 5, + "species": "SPECIES_TAILLOW" + }, + { + "min_level": 2, + "max_level": 5, + "species": "SPECIES_POOCHYENA" + }, + { + "min_level": 4, + "max_level": 5, + "species": "SPECIES_WURMPLE" + }, + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_ZIGZAGOON" + }, + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_RALTS" + }, + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_WURMPLE" + }, + { + "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_NONE" + }, + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_NONE" + } + ] + }, + "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": 0, + "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": 0, + "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": 0, + "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" + } + ] + } } ] },