diff --git a/data/event_scripts.s b/data/event_scripts.s index 0d7e38a63..57d031846 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1068,3 +1068,5 @@ Common_EventScript_LegendaryFlewAway:: .include "data/maps/PetalburgCity_OldResearchBuilding/scripts.inc" .include "data/maps/PetalburgWoodsExt/scripts.inc" + + .include "data/maps/Route103ext/scripts.inc" diff --git a/data/layouts/PetalburgCity/map.bin b/data/layouts/PetalburgCity/map.bin index 3bb1a4f1b..f6fb70058 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*1000T0 1"101111111100 "010 "0UNMNMNMN \ No newline at end of file +EEF00000000 1"10LL110 1"10T L0 1"100 !"00L0 1!111111000L0 1!1)1)1)1)1*1000T0 1"101111111100 1"1010 1"10UNMNMNMN \ No newline at end of file diff --git a/data/layouts/PetalburgWoodsExt/map.bin b/data/layouts/PetalburgWoodsExt/map.bin index 12b916ce2..011b5f63a 100644 --- a/data/layouts/PetalburgWoodsExt/map.bin +++ b/data/layouts/PetalburgWoodsExt/map.bin @@ -1 +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 +00000 0 0 0 0000000000000 0 0 0 0 00000000000000001100000000 0 0 0 0 000000000000 0 0 00000000110000000 0 0 00000000000000000000000000000000000 0 0 0 0 0 0 0 0 0110022200000001000000000000000 0 0 0 0 0 0 0 0 0000000000000000000000000110 0 0 0 0 0 00000000000000000000000000 0 0 0 0 0000000001100000X2Z20000000000000000 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 000h2a2a20000000111111BB11111!1!1)1)1)1*100000000(1)1!1!111100000h2j2000000pqr00000 0 000 1!1100X2Y2Y2i2KK00000h2i22200111!1!1)1)1)1)1*BB()1)1)1)1)1)1*100000000011000(1)1)1!1!11100000000000000111100000 0 0 00(1!1!111h2i2i2i2SS00000000011!1!1)1)1*1000000 0000 0 0000000000001100(1)1!1!111110000000000110000000000(1)1!1!1111100000000011!1!1)1*10X2Y2Y2Y2Z2000000011220002220000000(1)1)1)1!1!11111001111110000 0000000(1)1)1)1!1!1111111111!1!1)1*1K0X2a2a2i2X2b20000000000000000 0000X2Y2Y2Z20000(1)1)1)1)1*111001100 00000000000(1)1)1)1)1)1)1)1)1)1)1)1*100S0h2i2j20h2j20000 000000 0 0 0 0000h2i20a2Z20000000001111000 000000 000000000000000000000000000000K 0 0 0 0 000000000000h2a2a2Y2Z2000001111220000000000000000000000 0 0 00X2Y2Z200000000S 0 00000000h2i20a2Z20000000 0X2Y2Z200000000 00000000000000011X2Y2a20110000000000000h2i2j201100000 0 0 0X2a2a2j2021100000000000 00000000h2i2i2j200000X2Z2000000000000000Y20000j2000000000000000 0 0 00000000000000h2j200000000 0000000000000000X2a2a2222200111111111011111111 0111110000111111111111000000000000000 000000000111111111100001111110X2Z2000000 0 000 0002220 000000022110`2b201111 0111111111100000011$0$00`2b20000000000000000110`2a2Z20000000000110`2a2b2002000000000000I1I10`2a2b2000000000000000000011 0 0 0 0 0 0 0 0 0 0 00X2a2i2j2001111100000X2Y2Y2Y2Z2000000000****00 0000 0 0 000000h2j20000 1 1 1 1 1000001111110 001111STST00 000000000000000000000000011111111111 0 0000000000000000000000000 000000000X2Y2Z20K000011KK00111111111111 0 0111111111111002200222200 00000000 0h2i2j22S0000SS001111111111 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 00222211112222111111111 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/map.bin b/data/layouts/Petalburgext/map.bin index bd40eb6ea..182c71def 100644 --- a/data/layouts/Petalburgext/map.bin +++ b/data/layouts/Petalburgext/map.bin @@ -1 +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 +115115115I 1"1IL 2B2C2 2B2C221511111111111 1"1LJKJK11111111111111 1"1L11111111111111q 1"1L,A-11111111111111I 1"1IT&4I25'111111111111110 1!1111111100111111111111110(1)1)1)1)1)1)1)1*100111111111111110000000000001111111111111100000000000000001111111111111100000000000011111111111111111100000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 \ No newline at end of file diff --git a/data/layouts/Route101ext/map.bin b/data/layouts/Route101ext/map.bin index 0b450693f..d5f779480 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 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 +00000000ppp0011110000ppp0  00000pp0 !"0000000000B00000111110000008IIJ0000011111100000@0000 000011011100&0'00@000 0 00000011100000@0000 000000001111000@110 0000000001111100@ 0 0000000000011110@ 00000000000001111@ 0 0 00000000000000111HIIII0III000000000111000000000000000110110001100000000000110000000000000011000000000000000111000 0 0 000000000011111000 00 01100000011111011000 0011001111000000000011100000000000001110000000000000000011100000000001111011111000 0 0 0 0 0001111111000 000 0 0 0 001111000000 0 00 001100011100110000 0 0000110000000000 0 000000000000011 000 000000000 0000 0 0 0 000000000 0 0 00000 0 0000 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/Route102ext/map.bin b/data/layouts/Route102ext/map.bin index 18ab03fd0..37bb391ee 100644 --- a/data/layouts/Route102ext/map.bin +++ b/data/layouts/Route102ext/map.bin @@ -1 +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 +011100000000011111100 00000111110 0 0 0000 0 00111 00 0 00 0 0 0011100 0 00 0 0 001100000 0 0 0 000000000 0 0 0 0 0 0 00000000 0 0 0 0 000000000000000 0 0 0 0 0000011000hij0000 0 00hiij0000xyz 0 0 0 0 011pqqr0000000 00 000pklqij0000000 00 0 00psqqquimij000 0 00 0000psqqququqr000 0 0 0 0000psqqququqr00 0 00 0 00 0 0psqt||}qr0 0 0 0 0 0 00hisqut0yyyz0 0 00 0 0iqqq{|}r20000 0 0 0111z11111111 \ No newline at end of file diff --git a/data/layouts/Route103/map.bin b/data/layouts/Route103/map.bin index 0778ee12b..5e5082ba5 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$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 +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}~pppppppppppp0000000000000000000000000 0 0 0 0 0 00000111110000pppppppppppppppppp00000000000000000001111 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}~ppppppppppppppx00000pppppppppppppppp5500000000pppppppppppppppp0000pppppppppppp1111 \ No newline at end of file diff --git a/data/layouts/Route103ext/border.bin b/data/layouts/Route103ext/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/Route103ext/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Route103ext/map.bin b/data/layouts/Route103ext/map.bin new file mode 100644 index 000000000..dd68365e2 --- /dev/null +++ b/data/layouts/Route103ext/map.bin @@ -0,0 +1 @@ +00&'110000 0 0000000 0 0 0 0 00000 00 00 0 00 0 0 0 0 0 000001111 0 0 0 0 0 000 0 0 0 0 0000 0 0 0 00 000 0 0 0 0 0 0 0 0 0 0 0 00 011 00 0 011 0 0 0 000 0 0 0 000 0 0 0 000111111 0 00 022 0 0 0 0$0$0 0 0 0 0 0 011 \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index c0079ef87..2a04b090d 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -4470,6 +4470,16 @@ "secondary_tileset": "gTileset_Fortree", "border_filepath": "data/layouts/PetalburgWoodsExt/border.bin", "blockdata_filepath": "data/layouts/PetalburgWoodsExt/map.bin" + }, + { + "id": "LAYOUT_ROUTE103EXT", + "name": "Route103ext_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/Route103ext/border.bin", + "blockdata_filepath": "data/layouts/Route103ext/map.bin" } ] } diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index ef10ea164..ddf4ff933 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -728,7 +728,7 @@ LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou: .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 "with your POKéMON.\p" .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}?$" diff --git a/data/maps/PetalburgWoodsExt/map.json b/data/maps/PetalburgWoodsExt/map.json index 76ce8f0c8..ed5456165 100644 --- a/data/maps/PetalburgWoodsExt/map.json +++ b/data/maps/PetalburgWoodsExt/map.json @@ -5,7 +5,7 @@ "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, - "weather": "WEATHER_FOG_DIAGONAL", + "weather": "WEATHER_RAIN", "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, @@ -49,18 +49,18 @@ ], "warp_events": [ { - "x": 89, - "y": 17, + "x": 88, + "y": 29, "elevation": 0, - "dest_map": "MAP_ROUTE103", - "dest_warp_id": "1" + "dest_map": "MAP_ROUTE103EXT", + "dest_warp_id": "0" }, { "x": 89, - "y": 18, + "y": 29, "elevation": 0, - "dest_map": "MAP_ROUTE103", - "dest_warp_id": "2" + "dest_map": "MAP_ROUTE103EXT", + "dest_warp_id": "1" } ], "coord_events": [ diff --git a/data/maps/Route101ext/map.json b/data/maps/Route101ext/map.json index 43b941a89..2d8ef0cbf 100644 --- a/data/maps/Route101ext/map.json +++ b/data/maps/Route101ext/map.json @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EventScript_CutTreeDown", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_11" }, { @@ -94,6 +94,19 @@ "trainer_sight_or_berry_tree_id": "0", "script": "Route101ext_EventScript_ItemPokeBall", "flag": "FLAG_ITEM_ROUTE_101ext_POTION" + }, + { + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", + "x": 7, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route101ext_EventScript_LonelyWoman", + "flag": "0" } ], "warp_events": [ diff --git a/data/maps/Route101ext/scripts.inc b/data/maps/Route101ext/scripts.inc index f78003411..bc819a04d 100644 --- a/data/maps/Route101ext/scripts.inc +++ b/data/maps/Route101ext/scripts.inc @@ -9,6 +9,18 @@ Route101ext_EventScript_FatMan:: msgbox Route101ext_Text_DailyWalk, MSGBOX_NPC end +Route101ext_EventScript_LonelyWoman:: + msgbox Route101ext_Text_MassiveWorld, MSGBOX_NPC + end + +Route101ext_EventScript_Sign:: + msgbox Route101ext_Text_Sign, MSGBOX_NPC + end + +Route101ext_Text_Sign: + .string "{LEFT_ARROW} OLDALE TOWN\n" + .string "{DOWN_ARROW} LITTLEROOT.$" + Route101ext_Text_DailyWalk: .string "Usually there are many paths\n" .string "between towns.\p" @@ -20,3 +32,9 @@ Route101ext_Text_StrangeHouse: .string "It has been empty for years.\p" .string "I wonder if there are any\n" .string "spooky Bug POKéMON in there.$" + +Route101ext_Text_MassiveWorld: + .string "The world just seems to get\n" + .string "larger and larger.\p" + .string "There must be a lot we have\n" + .string "yet to discover.$" diff --git a/data/maps/Route102ext/map.json b/data/maps/Route102ext/map.json index 460579ed9..44702c18d 100644 --- a/data/maps/Route102ext/map.json +++ b/data/maps/Route102ext/map.json @@ -45,6 +45,19 @@ "trainer_sight_or_berry_tree_id": "0", "script": "Route102ext_EventScript_ItemRareCandy", "flag": "FLAG_ITEM_ROUTE_102ext_RARECANDY" + }, + { + "graphics_id": "OBJ_EVENT_GFX_BOY_3", + "x": 1, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NORMAL", + "trainer_sight_or_berry_tree_id": "5", + "script": "Route102ext_EventScript_Bart", + "flag": "0" } ], "warp_events": [ diff --git a/data/maps/Route102ext/scripts.inc b/data/maps/Route102ext/scripts.inc index 635916fa2..61f3f5870 100644 --- a/data/maps/Route102ext/scripts.inc +++ b/data/maps/Route102ext/scripts.inc @@ -1,2 +1,19 @@ Route102ext_MapScripts:: .byte 0 + +Route102ext_EventScript_Bart:: + bufferleadmonspeciesname 0 + trainerbattle_single TRAINER_BART, Route102_Text_BartIntro, Route102_Text_BartDefeated + msgbox Route102ext_Text_BartPostBattle, MSGBOX_AUTOCLOSE + end + +Route102_Text_BartIntro: + .string "Woah! Where did you catch\n" + .string "that {STR_VAR_1}?!$" + +Route102_Text_BartDefeated: + .string "It's too strong for me...$" + +Route102ext_Text_BartPostBattle: + .string "Maybe I should focus on\n" + .string "training my own POKéMON.$" diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index db38e190b..a06749c08 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -27,6 +27,11 @@ "map": "MAP_ROUTE101EXT", "offset": 20, "direction": "down" + }, + { + "map": "MAP_ROUTE103EXT", + "offset": 0, + "direction": "left" } ], "object_events": [ @@ -292,29 +297,42 @@ }, { "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", - "x": 1, + "x": 0, "y": 8, "elevation": 0, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "null", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EventScript_CutTreeDown", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_16" }, { "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", - "x": 1, + "x": 0, "y": 9, "elevation": 0, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "null", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EventScript_CutTreeDown", - "flag": "FLAG_TEMP_16" + "script": "EventScript_CutTree", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", + "x": 1, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route103_EventScript_PicnickerTree", + "flag": "0" } ], "warp_events": [ @@ -324,20 +342,6 @@ "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/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 557db64e2..ce560e90f 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -352,4 +352,15 @@ Route103_Text_ShortcutToOldale: Route103_Text_RouteSign: .string "ROUTE 103\n" .string "{DOWN_ARROW} OLDALE TOWN$" + +Route103_EventScript_PicnickerTree:: + msgbox Route103_Text_PicnickerTree, MSGBOX_NPC + end + +Route103_Text_PicnickerTree: + .string "These small trees have been growing\n" + .string "rapidly in this area recently.\p" + .string "I heard there is a man in RUSTBORO\n" + .string "that can teach your POKéMON how to\l" + .string "remove them.$" diff --git a/data/maps/Route103ext/map.json b/data/maps/Route103ext/map.json new file mode 100644 index 000000000..4378c51c4 --- /dev/null +++ b/data/maps/Route103ext/map.json @@ -0,0 +1,47 @@ +{ + "id": "MAP_ROUTE103EXT", + "name": "Route103ext", + "layout": "LAYOUT_ROUTE103EXT", + "music": "MUS_ROUTE101", + "region_map_section": "MAPSEC_ROUTE_103", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "map": "MAP_ROUTE103", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + + ], + "warp_events": [ + { + "x": 0, + "y": 17, + "elevation": 0, + "dest_map": "MAP_PETALBURG_WOODS_EXT", + "dest_warp_id": "0" + }, + { + "x": 1, + "y": 17, + "elevation": 0, + "dest_map": "MAP_PETALBURG_WOODS_EXT", + "dest_warp_id": "1" + } + ], + "coord_events": [ + + ], + "bg_events": [ + + ] +} diff --git a/data/maps/Route103ext/scripts.inc b/data/maps/Route103ext/scripts.inc new file mode 100644 index 000000000..9f3c3b961 --- /dev/null +++ b/data/maps/Route103ext/scripts.inc @@ -0,0 +1,2 @@ +Route103ext_MapScripts:: + .byte 0 diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 0e1f1c593..b45e54cc7 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -97,7 +97,8 @@ "Route102ext", "NewMap1", "Petalburgext", - "PetalburgCity_OldResearchBuilding" + "PetalburgCity_OldResearchBuilding", + "Route103ext" ], "gMapGroup_IndoorLittleroot": [ "LittlerootTown_BrendansHouse_1F", diff --git a/include/constants/flags.h b/include/constants/flags.h index ca4ee5641..193bb03dd 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1220,7 +1220,7 @@ #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_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 e477d16fc..32aee8a00 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -452,5 +452,6 @@ #define LAYOUT_PETALBURGEXT 445 #define LAYOUT_PETALBURG_CITY_OLD_RESEARCH_BUILDING 446 #define LAYOUT_PETALBURG_WOODS_EXT 447 +#define LAYOUT_ROUTE103EXT 448 #endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 6b7dbe2eb..a1f85f448 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -68,6 +68,7 @@ #define MAP_NEW_MAP1 (59 | (0 << 8)) #define MAP_PETALBURGEXT (60 | (0 << 8)) #define MAP_PETALBURG_CITY_OLD_RESEARCH_BUILDING (61 | (0 << 8)) +#define MAP_ROUTE103EXT (62 | (0 << 8)) // gMapGroup_IndoorLittleroot #define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8)) diff --git a/include/constants/opponents.h b/include/constants/opponents.h index c9cf9239d..bce8d1c28 100644 --- a/include/constants/opponents.h +++ b/include/constants/opponents.h @@ -856,12 +856,13 @@ #define TRAINER_LEAF 852 #define TRAINER_BRENDAN_PLACEHOLDER 853 #define TRAINER_MAY_PLACEHOLDER 854 +#define TRAINER_BART 855 // NOTE: Because each Trainer uses a flag to determine when they are defeated, there is only space for 9 additional trainers before trainer flag space overflows // More space can be made by shifting flags around in constants/flags.h or changing how trainer flags are handled // MAX_TRAINERS_COUNT can be increased but will take up additional saveblock space -#define TRAINERS_COUNT 855 -#define MAX_TRAINERS_COUNT 864 +#define TRAINERS_COUNT 856 +#define MAX_TRAINERS_COUNT 1000//864 #endif // GUARD_CONSTANTS_OPPONENTS_H diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index 824a49dc3..05a8ff7dd 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -1,3 +1,16 @@ +static const struct TrainerMonNoItemDefaultMoves sParty_bart[] = { + { + .iv = 0, + .lvl = 4, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 3, + .species = SPECIES_RALTS, + }, +}; + static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer1[] = { { .iv = 0, diff --git a/src/data/trainers.h b/src/data/trainers.h index b4c1b0575..5a255c34e 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -1,4 +1,5 @@ const struct Trainer gTrainers[] = { + [TRAINER_NONE] = { .partyFlags = 0, @@ -10260,4 +10261,16 @@ const struct Trainer gTrainers[] = { .aiFlags = 0, .party = NO_ITEM_DEFAULT_MOVES(sParty_MayLinkPlaceholder), }, + + [TRAINER_BART] = + { + .trainerClass = TRAINER_CLASS_COOLTRAINER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, + .trainerName = _("BART"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, + .party = NO_ITEM_DEFAULT_MOVES(sParty_bart), + }, }; diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index bb95a67cf..783f8387a 100755 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -11496,67 +11496,67 @@ "map": "MAP_ROUTE101EXT", "base_label": "gRoute101ext0", "land_mons": { - "encounter_rate": 0, + "encounter_rate": 20, "mons": [ { "min_level": 2, + "max_level": 2, + "species": "SPECIES_WURMPLE" + }, + { + "min_level": 2, + "max_level": 2, + "species": "SPECIES_POOCHYENA" + }, + { + "min_level": 2, + "max_level": 2, + "species": "SPECIES_WURMPLE" + }, + { + "min_level": 3, "max_level": 3, "species": "SPECIES_WURMPLE" }, { - "min_level": 2, - "max_level": 5, - "species": "SPECIES_ZIGZAGOON" - }, - { - "min_level": 2, - "max_level": 5, - "species": "SPECIES_TAILLOW" - }, - { - "min_level": 2, - "max_level": 5, + "min_level": 3, + "max_level": 3, "species": "SPECIES_POOCHYENA" }, { - "min_level": 4, - "max_level": 5, + "min_level": 3, + "max_level": 3, + "species": "SPECIES_POOCHYENA" + }, + { + "min_level": 3, + "max_level": 3, "species": "SPECIES_WURMPLE" }, { - "min_level": 5, - "max_level": 5, + "min_level": 3, + "max_level": 3, + "species": "SPECIES_POOCHYENA" + }, + { + "min_level": 2, + "max_level": 2, "species": "SPECIES_ZIGZAGOON" }, { - "min_level": 5, - "max_level": 5, - "species": "SPECIES_RALTS" + "min_level": 2, + "max_level": 2, + "species": "SPECIES_ZIGZAGOON" }, { - "min_level": 5, - "max_level": 5, - "species": "SPECIES_WURMPLE" + "min_level": 3, + "max_level": 3, + "species": "SPECIES_ZIGZAGOON" }, { - "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" + "min_level": 3, + "max_level": 3, + "species": "SPECIES_ZIGZAGOON" } ] }, @@ -11689,7 +11689,7 @@ "map": "MAP_PETALBURG_WOODS_EXT", "base_label": "gPetalburgWoodsExt0", "land_mons": { - "encounter_rate": 0, + "encounter_rate": 20, "mons": [ { "min_level": 3,