diff --git a/data/event_scripts.s b/data/event_scripts.s index 74525a2f2..b2d5eca2e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1090,3 +1090,5 @@ Common_EventScript_LegendaryFlewAway:: .include "data/maps/NewMap2/scripts.inc" .include "data/maps/RustboroCityEast/scripts.inc" + + .include "data/maps/PetalburfForrestRiver/scripts.inc" diff --git a/data/layouts/LittlerootTown/map.bin b/data/layouts/LittlerootTown/map.bin index 7278d2cab..60c12a052 100644 --- a/data/layouts/LittlerootTown/map.bin +++ b/data/layouts/LittlerootTown/map.bin @@ -1,3 +1,3 @@ -0000 @10000000000000000(H9000000000000000000002 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/PetalburfForrestRiver/border.bin b/data/layouts/PetalburfForrestRiver/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/PetalburfForrestRiver/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/PetalburfForrestRiver/map.bin b/data/layouts/PetalburfForrestRiver/map.bin new file mode 100644 index 000000000..64e3b7399 --- /dev/null +++ b/data/layouts/PetalburfForrestRiver/map.bin @@ -0,0 +1 @@ +p0s0s0s0i0i0i0i0i0i0i0i0i0i0i0i000000i0i0i0i0i0i0i0u0u0u0j0p0s0s0s0q0q0q0q0q0q0q0q0q0q0q0q000000q0q0q0q0q0q0q0u0u0u0r0p0s0s0s0q0q0q0q0q0q0q0q0q0q0q0q000000q0q0q0q0q0q0q0u0u0u0r0p0s0s0s0q0q0q0q0q0q0q0q0q0q0q0000000q0q0q0q0q00q0u0u0u0r0p0s0s0s0q0q0q0q0q0q0q0q00q0q00000000q0q0q0q0q00u0u0u0r0p0s0s0s0q0q0q0t0|0|0|0|0|0|0|0|000000|0|0|0|0|0|0|0}0u0u0r0p0s0s0s0q0q0q0u0t0|0|0|0|0|0|0|000000|0|0|0|00|0|0|0}0u0r0p0s0s0s0q0q0q0u0u0t0|0|0|0|0|0|000000|0|0|010y0|0|00u0r0p0s0s0s0q0q0q0u0u0u0t0y0y0y0y0y000000y0y00X2Z20t00s0u0r0p0s0s0s0q0q0q0u0u0u0u00000000000000j2j2h2u0p0s0u0r0p0s0s0s0q0q0q0u0u0u0u00000000000000X2Z2X2u0p0s0u0r0p0s0s0s0q0q0q0u0u0u00000000000000x0y00y0z0p0s0u0r0p0s0s0s0q0q0q0u0u0u0q0q0q0q001000000000000p0s0u0r0p0s0s0s0q0q0q0u0u0u0q0q0q0q001000000000000p0s0u0r0p0s0s0s0q0q0q0u0u0u0q0q0q0q001000000000000p0{0}0r0p0s0s0s0q0q0q0u0u0u0q0q00t001000000000000x0y0y0z0p0s0s0s0q0q0q0u0u0u0q0q0t00100000000011110000p0s0s0s0q0q00u0u0u0q0q001000000000011111100p0s0s0{0|0|0|0}0u0u0q0t001000000000111111110p0s0{0|0|0|0|0|0}0u00010000000001111111110p0{0|0|0|0|0|0|0|0}0t0010000000001111111110p0q0q0q0q0q0q0q0q0t00100000000000011111110p0q0q0q0q0q00q0t001000-0-00 0 00000011000110p00q0q0q0q0q0q0u000000000 0 0 0 000011000000p0q0q0q0q0q0q0q0000000 0 0 00 0 0 000000000011p0q0q0q0q0q0q0q0q00u0000 0 0 00 0 0 000000000011p0q0q0q0q0q0q0q0t0|0}00000 00 0 0 0000000000011p0q0q00q0q0t0y0z0000000 0 000 0 0 00000001100p0q0q0q0q0t0z0 0 0000000 0 0 0 00 000000001100p0k0l0l0m0r0 0 0 000000000000000000001100p0s0q0q0u0r0 0 0 000000000000000000000000p0s0q0q0u0q0l0l0l0l0l0000000000000000000000p0s00q00l0l0l0l0l000000-0-0000000000000000p0s0q0k0l0l0l0l0l0m00l0l0m0r000000000000000000p0{00s0q0q0q00q0u0q0q0q0u00i0j0000-0-00000000011p0q0s0s0q0q0q0q0q0u0q00q00m0q0r0 000000000000011x00s0s0q0q0q0q0q00l0m0q0q0u0q00i0j0 0 000000000a211 0p0s0s00q0q0q0q0q0q00l0l0l0l0m0m0r0 0 000000002a2a2a2 0p0s0s0q0q0q0q0q0q0q0q0q0q000u0u0r0 0 0 0000000110a2 0p0s0{0|0|0|0|0|0|0|0|0|0|0|0|0}0u0r0 0 000000001100 0p0{0|000q0q0q0t0|0|0|0|0|0|0|0}0r0 0 000000001100 0p0q0q0{0|0|0|0|0}00q0q0q0q0q0t0y0z0 0 000000000000 0x00q0q0q0q0q0q0q0q0t0y0y0y0y0z0 0 0 0 000000000000 0 0p0q0t0y0y0y0y0y0y0z0 0 0 0 0 0 000 000000000000 0h0q0t0z0 0 0 0 0 0 0 0000 0 0 00 0 000000000002 0x0y0z0 0 0000000000 0 0 0 0 00000-0-0000020 0 0 0 0 00000000000000 0 00000000Y200Y2Z2 00 0000000000000000 0 0 00000h2a2a2000b2 0 000000000000000000 0 0000 00h2a20000000000-0-00-0-0-0000000000000 00K2h2i2a200000000000000000000000000 00S2K2K2h2j2a2000000000000000000000000 00000K2a20000000000022000000000000 000000j2a2000000000 0 0 000000000000000000000000000000000 00000000000000000000110000000000 00000000000000000011110000000000 00000000000000000011111111000000 022001111111111111111111110000000000 011111111111111 01111110000000000111111111111111 011111100-0-000000011111111111111 0 01111110000000000111111111111111 011111122 0 0000000 011111111111111 011111111110000021111111111111111 \ No newline at end of file diff --git a/data/layouts/PetalburgWoodsExt/map.bin b/data/layouts/PetalburgWoodsExt/map.bin index 011b5f63a..e455fdf3f 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 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 +00000000 0 0 0 0000000000000 0 0 0 0 000000000000000011000000000 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 0000000000000000`2a2a2a2a20a2a2a2Y2Y2Z200020000000000000000000000000&'`2a2a2a2a2a2i2a2a2a2b200000000000000000000000000110000000000000000h2i2i2i2i2a2b20h2a2a2a2Z2000220000000000000000000000K0 0 0 0 0000000000000000000h2j200h2a2a2a2b200000000002000 0 0000000000000000000S00 0 0 0 001111111111110000000110h2a2a2b20000020000000 0 0000000000000200X2Y2Z2000000000000000000 0 01111111111111111110000000h2a2b20000002222000 0 0110022222222 000h2a2a20000000Y2Y2Y2111BB1111111111100000000111111100000h2j2000000pqr00000 0 011100X2Y2Y2i2KK00000h2i2220011111Y2111BB111111100000000011000111111100000000000000111100000 0 0 0011111h2i2i2i2SS0000000001111111Y2Y20000 0000 0 0000000000001100111111110000000000110000011 00 0111111110000000 001111110X2Y2Y2Y2Z20000000112200022200000001111111111001111110000  0 0 000111111111111 0111111K0X2a2a2i2X2b20000000000000000 0000X2Y2Y2Z2000011111111001100 11000000011111111 0111100S0h2i2j20h2j20000 000000 0 0 0 0000h2i20a2Z2000000000111100000 000000000000000000000000000000K 0 0 0 0 000000000000h2a2a2Y2Z200000111122000000000000000000 0 0 00X2Y2Z200000000S 0 00000000h2i20a2Z20000000 0X2Y2Z20000 00000000000000011X2Y2a20110000000000000h2i2j201100000 0 0 0X2a2a2j202000000000 00000000h2i2i2j200000X2Z2000000000000000Y20000j20000000000000 0 0 00000000000000h2j200000000 0000000000000000X2a2a22222001111110000111111 0111110000111111111111000000000000000 000000000111111111100001111110 0110X2Z2000000 0 000 0002220 000000022110 00`2b201111 0111111111100000011$0$0 0 00`2b200000000000000001111110`2a2Z20000000000110`2a2b2002000000000000I1I10`2a2b2000000000000000000011 0 0 0 0 0 0 0 0 0 0 00X2a2i2j200K1L5L5L5M100000X2Y2Y2Y2Z2000000000****00 0000 0 0 000000h2j2000011111000001111110 001111STST00 000000000000000000000000011100000111 0 0000000000000000000000000 000000000X2Y2Z20K000011KK00111111111111 0 0111111111111002200222200 00000000 0h2i2j22S0000SS001111111111 0 0 0 0020 000 0 0 0 0001110001111110X2Y2Z200011111111111 0 0 0 0000000 0 000000`2a2j2 0 022011111111 0 0 0 0 0 0 000 0 0000000222222 00222211111111111111111 0 0 01111000 0222&'000111111111111011111 0 0 0 022 0 0 00 000222001111111111111111111111 \ No newline at end of file diff --git a/data/layouts/Route104/map.bin b/data/layouts/Route104/map.bin index 5379a0256..dc2dd0117 100644 Binary files a/data/layouts/Route104/map.bin and b/data/layouts/Route104/map.bin differ diff --git a/data/layouts/Route116/map.bin b/data/layouts/Route116/map.bin index 8621a9edd..3a414f369 100644 Binary files a/data/layouts/Route116/map.bin and b/data/layouts/Route116/map.bin differ diff --git a/data/layouts/RustboroCity/map.bin b/data/layouts/RustboroCity/map.bin index d55b06843..5eb18812d 100644 Binary files a/data/layouts/RustboroCity/map.bin and b/data/layouts/RustboroCity/map.bin differ diff --git a/data/layouts/RustboroCityEast/map.bin b/data/layouts/RustboroCityEast/map.bin index f176180fe..846295294 100644 --- a/data/layouts/RustboroCityEast/map.bin +++ b/data/layouts/RustboroCityEast/map.bin @@ -1,6 +1,5 @@ - 0 00 0 00 01110 0111 0 0 000111110 0 0 0 0 0 000011111110 0 011110011111 0 00 0 0001101 0 011001101 0 0000000 0 0100011011 0 0 0 0 0000000 0 0 00000000 0 0 0011 0 00111000 0 00 00 00011100 0 00 0 00000110000000 000000 011000000000000111100000000000011001110000000000001111111110000000000000111111111000000000000000000000000000000000001108IIIIII11IIIIII:0@00000 1"1000000B00111@00000 1"100000B0000@000000 1"1000000B0000@00000 1"100000B0 0 0@000000 1"1000000B00000 0 00@00000 1"100000B0000 0 0 0@000000 1"1000000B000000 0 0@00000 1"100000B0 0 0@000000 1"1000000B000110 0 0@00000 1"100000B0011 0 0 0@000000 1"1000000B00011 0 0 0HIIIIII 1"1IIIIIIJ 0 00 1"1000001100000000 1"100000000000000000000 1"100000000000010000000 1"1000000011000000000 1"1000&'0000000111111!1"100000000011100 1!1)1)1)1)1)1*1000000000000 1"10000=>>>>>>?00 1"10000E0000000000GF00 0 0 00 1!1110000000000000G11 0 000 1!1!1"10000000000000G 0 0 00 1!1)1*10000000000000G11 00 1"10000E0000000000GF00 00 1"1000MNNNNNNOF0010 1!111100000000000110 000(1)1)1!1"1000000011001100000 1"10000000010 1"10000000 0 0 - 0 1"10000000 0 0 - 0 1"1000001111 0 0 - 0 1"100000 0 0 - 0 1"10000011 - 0 1"100000D3D3D3D3D3 1"100011L3L3L3L3L30 1"1000V3W3(1*101144400000001111111111 \ No newline at end of file + 0 00 0 00 01110 0111 0 0 000111110 0 0 0 0 0 000011111110 0 011110011111 0 00 0 0001101 0 011001101 0 0000000 0 0100011011 0 0 0 0 0000000 0 0 00000000 0 0 0011 0 00111000 0 00 00 00011100 0 00 0 00000110000000 000000 011000000000000111100000000000011001110000000000001111111110000000000000111111111000000000000000000000000000000000001108IIIIII11IIIIII:0@00000 1"1000000B00111@00000 1"100000B0000@000000 1"1000000B0000@00000 1"100000B0 0 0@000000 1"1000000B00000 0 00@00000 1"100000B0000 0 0 0@000000 1"1000000B000000 0 0@00000 1"100000B0 0 0@000000 1"1000000B000110 0 0@00000 1"100000B0011 0 0 0@000000 1"1000000B00011 0 0 0HIIIIII 1"1IIIIIIJ 0 00 1"1000001100000000 1"100000000000000000000 1"100000000000010000000 1"1000000011000000000 1"1000&'0000000111111!1"100000000011100 1!1)1)1)1)1)1*1000000000000 1"10000=>>>>>>?00 1"10000E0000000000GF00 0 0 00 1!1110000000000000GF00 0 000 1!1!1"10000000000000GF00 0 0 00 1!1)1*10000000000000GF0 011 00 1"10000E0000000000GF0 0 00 1"1000MNNNNNNOF0 010 1!111100000000000110 000(1)1)1!1"1000000011001100000 1"10000000010 1"10000000 0 0   + 0 1"10000000 0 0    + 0 1"1000001111 0 0    +0 1"100000 0 0   0 1"10000011  0 1"100000D3D3D3D3D3 1"100011L3L3L3L3L30 1"1000  + V3W3(1*101144400000001111111111 \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 04841cf89..2556cc979 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -4560,6 +4560,16 @@ "secondary_tileset": "gTileset_Rustboro", "border_filepath": "data/layouts/RustboroCityEast/border.bin", "blockdata_filepath": "data/layouts/RustboroCityEast/map.bin" + }, + { + "id": "LAYOUT_PETALBURF_FORREST_RIVER", + "name": "PetalburfForrestRiver_Layout", + "width": 32, + "height": 64, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/PetalburfForrestRiver/border.bin", + "blockdata_filepath": "data/layouts/PetalburfForrestRiver/map.bin" } ] } diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index b81fbdee8..62858ff55 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -164,8 +164,8 @@ "x": 17, "y": 2, "elevation": 0, - "dest_map": "MAP_GRANITE_CAVE_1F", - "dest_warp_id": "3" + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/PetalburfForrestRiver/map.json b/data/maps/PetalburfForrestRiver/map.json new file mode 100644 index 000000000..6d7b175a7 --- /dev/null +++ b/data/maps/PetalburfForrestRiver/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_PETALBURF_FORREST_RIVER", + "name": "PetalburfForrestRiver", + "layout": "LAYOUT_PETALBURF_FORREST_RIVER", + "music": "MUS_PETALBURG_WOODS", + "region_map_section": "MAPSEC_PETALBURG_WOODS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "map": "MAP_PETALBURG_WOODS_EXT", + "offset": -18, + "direction": "down" + } + ], + "object_events": [ + + ], + "warp_events": [ + + ], + "coord_events": [ + + ], + "bg_events": [ + + ] +} diff --git a/data/maps/PetalburfForrestRiver/scripts.inc b/data/maps/PetalburfForrestRiver/scripts.inc new file mode 100644 index 000000000..1e556d05d --- /dev/null +++ b/data/maps/PetalburfForrestRiver/scripts.inc @@ -0,0 +1,2 @@ +PetalburfForrestRiver_MapScripts:: + .byte 0 diff --git a/data/maps/PetalburgWoodsExt/map.json b/data/maps/PetalburgWoodsExt/map.json index d17514e7f..e0dcf68e0 100644 --- a/data/maps/PetalburgWoodsExt/map.json +++ b/data/maps/PetalburgWoodsExt/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_WOODS_EXT", "name": "PetalburgWoodsExt", "layout": "LAYOUT_PETALBURG_WOODS_EXT", - "music": "MUS_PETALBURG", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_PETALBURG_WOODS", "requires_flash": false, "weather": "WEATHER_RAIN", @@ -17,6 +17,11 @@ "map": "MAP_PETALBURG_WOODS", "offset": 0, "direction": "left" + }, + { + "map": "MAP_PETALBURF_FORREST_RIVER", + "offset": 18, + "direction": "up" } ], "object_events": [ @@ -45,6 +50,32 @@ "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", + "x": 32, + "y": 35, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", + "x": 33, + "y": 34, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" } ], "warp_events": [ @@ -67,6 +98,40 @@ ], "bg_events": [ - + { + "type": "secret_base", + "x": 58, + "y": 11, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE2_1" + }, + { + "type": "secret_base", + "x": 59, + "y": 11, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE4_3" + }, + { + "type": "secret_base", + "x": 81, + "y": 16, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB2_1" + }, + { + "type": "secret_base", + "x": 73, + "y": 41, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE4_2" + }, + { + "type": "secret_base", + "x": 74, + "y": 41, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE1_1" + } ] } diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 0fcdbba72..c33786a09 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -97,8 +97,8 @@ }, { "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", - "x": 13, - "y": 17, + "x": 7, + "y": 15, "elevation": 3, "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, @@ -123,8 +123,8 @@ }, { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", - "x": 10, - "y": 17, + "x": 5, + "y": 15, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, @@ -241,7 +241,7 @@ { "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 22, - "y": 16, + "y": 14, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index 272618769..bb65bf268 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -242,6 +242,19 @@ "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_Boy1", "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", + "x": 34, + "y": 32, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_NONE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "Eventscript_GiveTestngPokemon", + "flag": "0" } ], "warp_events": [ diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 28fd38921..41ea36305 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -5,6 +5,11 @@ .set LOCALID_RIVAL, 14 .set LOCALID_SCIENTIST, 15 +Eventscript_GiveTestngPokemon:: + givemon SPECIES_DRATINI, 15 + givemon SPECIES_TOTODILE, 15 + end + RustboroCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_OnFrame diff --git a/data/maps/RustboroCityEast/map.json b/data/maps/RustboroCityEast/map.json index 44309dd97..0a1b0a74f 100644 --- a/data/maps/RustboroCityEast/map.json +++ b/data/maps/RustboroCityEast/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "NULL", + "script": "RustboroCityEast_EventScript_FlowerWoman", "flag": "0" }, { @@ -48,12 +48,12 @@ "x": 18, "y": 40, "elevation": 0, - "movement_type": "MOVEMENT_TYPE_NONE", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "NULL", + "script": "RustboroCityEast_EventScript_Father", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "NULL", + "script": "RustboroCityEast_EventScript_Daughter", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 2, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "NULL", + "script": "RustboroCityEast_EventScript_Plusle", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 4, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "NULL", + "script": "RustboroCityEast_EventScript_Beautifly", "flag": "0" }, { @@ -105,7 +105,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "NULL", + "script": "RustboroCityEast_EventScript_Fisherman", "flag": "0" }, { @@ -116,9 +116,9 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "NULL", + "trainer_type": "TRAINER_TYPE_NORMAL", + "trainer_sight_or_berry_tree_id": "4", + "script": "RustboroCityEast_EventScript_Amber", "flag": "0" }, { @@ -129,9 +129,9 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "NULL", + "trainer_type": "TRAINER_TYPE_NORMAL", + "trainer_sight_or_berry_tree_id": "3", + "script": "RustboroCityEast_EventScript_Andy", "flag": "0" }, { @@ -142,9 +142,9 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "NULL", + "trainer_type": "TRAINER_TYPE_NORMAL", + "trainer_sight_or_berry_tree_id": "4", + "script": "RustboroCityEast_EventScript_Berry", "flag": "0" } ], diff --git a/data/maps/RustboroCityEast/scripts.inc b/data/maps/RustboroCityEast/scripts.inc index 2e9917b28..ee63706ae 100644 --- a/data/maps/RustboroCityEast/scripts.inc +++ b/data/maps/RustboroCityEast/scripts.inc @@ -1,2 +1,109 @@ RustboroCityEast_MapScripts:: .byte 0 + +RustboroCityEast_EventScript_Father:: + msgbox RustboroCityEast_Text_Father, MSGBOX_NPC + end + +RustboroCityEast_Text_Father: + .string "I take my daughter to this park every day\n" + .string "after school.\p" + .string "Recently she's made friends with that\n" + .string "PLUSLE. It doesn't seem to have a trainer\l" + .string "but it's always here waiting for us.$" + +RustboroCityEast_EventScript_Daughter:: + msgbox RustboroCityEast_Text_Daughter, MSGBOX_NPC + end + +RustboroCityEast_Text_Daughter: + .string "PLUSLE is my best friend!$" + +RustboroCityEast_EventScript_Plusle:: + playmoncry SPECIES_PLUSLE, 0 + waitmoncry + msgbox RustboroCityEast_Text_Plusle, MSGBOX_NPC + end + +RustboroCityEast_Text_Plusle: + .string "It seems very close to the small child.$" + +RustboroCityEast_Text_AmberIntro: + .string "I'm the top of my class at battling.$" + +RustboroCityEast_Text_AmberDefeated: + .string "No fair!$" + +RustboroCityEast_Text_AmberPostBattle: + .string "I won't be making the same mistake the\n" + .string "next time we battle!$" + +RustboroCityEast_EventScript_Amber:: + trainerbattle_single TRAINER_AMBER, RustboroCityEast_Text_AmberIntro, RustboroCityEast_Text_AmberDefeated + msgbox RustboroCityEast_Text_AmberPostBattle, MSGBOX_AUTOCLOSE + end + +RustboroCityEast_Text_AndyIntro: + .string "My Mom says I need to get out and see the\n" + .string "world more.\p" + .string "Well, here I am.$" + +RustboroCityEast_Text_AndyDefeated: + .string "Aww man, I knew this was going to happen..$" + +RustboroCityEast_Text_AndyPostBattle: + .string "I guess I can't give up that easily. I'll\n" + .string "try again tomorrow!$" + +RustboroCityEast_EventScript_Andy:: + trainerbattle_single TRAINER_ANDY, RustboroCityEast_Text_AndyIntro, RustboroCityEast_Text_AndyDefeated + msgbox RustboroCityEast_Text_AndyPostBattle, MSGBOX_AUTOCLOSE + end + +RustboroCityEast_Text_Beautifly: + .string "BEAUTIFLY is peacfully bouncing from\n" + .string "flower to flower.$" + +RustboroCityEast_EventScript_Beautifly:: + playmoncry SPECIES_BEAUTIFLY, 0 + msgbox RustboroCityEast_Text_Beautifly, MSGBOX_NPC + waitmoncry + end + +RustboroCityEast_Text_FlowerWoman: + .string "My sister works at the flower shop over\n" + .string "on ROUTE 104. She supplies me with all the\p" + .string "seeds that I need to keep this community\n" + .string "area perfectly beautiful.\p" + .string "You should go visit her if you have the\n" + .string "chance!$" + +RustboroCityEast_EventScript_FlowerWoman:: + msgbox RustboroCityEast_Text_FlowerWoman, MSGBOX_NPC + end + +RustboroCityEast_Text_BerryIntro: + .string "I knew I'd find someone waiting here!$" + +RustboroCityEast_Text_BerryDefeated: + .string "Just maybe not the person I wanted...$" + +RustboroCityEast_Text_BerryPostBattle: + .string "It's always nice to meet new people.$" + +RustboroCityEast_EventScript_Berry:: + trainerbattle_single TRAINER_BERRY, RustboroCityEast_Text_BerryIntro, RustboroCityEast_Text_BerryDefeated + msgbox RustboroCityEast_Text_BerryPostBattle, MSGBOX_AUTOCLOSE + end + +RustboroCityEast_Text_Fisherman: + .string "This is my favorite place to relax. Calm\n" + .string "open water, smell of flowers in the air...\p" + .string "AAACHHOOOOOO!!!\p" + .string "Worth every sneeze.$" + +RustboroCityEast_EventScript_Fisherman:: + msgbox RustboroCityEast_Text_Fisherman, MSGBOX_NPC + end + + \ No newline at end of file diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index c6a6757d2..bc7655b14 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -12,7 +12,7 @@ "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": [], + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", @@ -342,7 +342,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index e1efcc578..34b38fb99 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -444,7 +444,8 @@ "PetalburgWoodsext2", "GraniteCave_B3F", "GraniteCave_B4F", - "GraniteCave_B4FNorth" + "GraniteCave_B4FNorth", + "PetalburfForrestRiver" ], "gMapGroup_IndoorDynamic": [ "SecretBase_RedCave1", diff --git a/include/constants/layouts.h b/include/constants/layouts.h index d8e3c397a..0388cc43f 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -459,5 +459,8 @@ #define LAYOUT_GRANITE_CAVE_B3F 452 #define LAYOUT_GRANITE_CAVE_B4F 453 #define LAYOUT_GRANITE_CAVE_B4FNORTH 454 +#define LAYOUT_NEW_MAP2 455 +#define LAYOUT_RUSTBORO_CITY_EAST 456 +#define LAYOUT_PETALBURF_FORREST_RIVER 457 #endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index bc4372c2d..4e7f546e0 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -415,6 +415,7 @@ #define MAP_GRANITE_CAVE_B3F (110 | (24 << 8)) #define MAP_GRANITE_CAVE_B4F (111 | (24 << 8)) #define MAP_GRANITE_CAVE_B4FNORTH (112 | (24 << 8)) +#define MAP_PETALBURF_FORREST_RIVER (113 | (24 << 8)) // gMapGroup_IndoorDynamic #define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8)) diff --git a/include/constants/opponents.h b/include/constants/opponents.h index 4e333590a..73e78b5e9 100644 --- a/include/constants/opponents.h +++ b/include/constants/opponents.h @@ -859,12 +859,15 @@ #define TRAINER_BART 855 #define TRAINER_LEWIS 856 #define TRAINER_COLEMAN 867 +#define TRAINER_ANDY 868 +#define TRAINER_AMBER 869 +#define TRAINER_BERRY 870 // NOTE: Because each Trainer uses a flag to determine when they are defeated, there is only space for 9 additional trainers before trainer flag space overflows // More space can be made by shifting flags around in constants/flags.h or changing how trainer flags are handled // MAX_TRAINERS_COUNT can be increased but will take up additional saveblock space -#define TRAINERS_COUNT 868 +#define TRAINERS_COUNT 890 #define MAX_TRAINERS_COUNT 900//864 #endif // GUARD_CONSTANTS_OPPONENTS_H diff --git a/src/data/map_group_count.h b/src/data/map_group_count.h index 0f8e8c4d0..28d6cb5e0 100644 --- a/src/data/map_group_count.h +++ b/src/data/map_group_count.h @@ -1 +1 @@ -static const u8 MAP_GROUP_COUNT[] = {63, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 19, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 113, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0}; +static const u8 MAP_GROUP_COUNT[] = {65, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 19, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 114, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0}; diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index ed302f3bf..9ba26718c 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -24,6 +24,40 @@ static const struct TrainerMonNoItemDefaultMoves sParty_lewis[] = { } }; +static const struct TrainerMonNoItemDefaultMoves sParty_andy[] = { + { + .iv = 0, + .lvl = 11, + .species = SPECIES_SLAKOTH, + }, + { + .iv = 0, + .lvl = 12, + .species = SPECIES_WHISMUR, + } +}; + +static const struct TrainerMonNoItemDefaultMoves sParty_berry[] = { + { + .iv = 0, + .lvl = 11, + .species = SPECIES_DUSTOX, + } +}; + +static const struct TrainerMonNoItemDefaultMoves sParty_amber[] = { + { + .iv = 0, + .lvl = 12, + .species = SPECIES_BEAUTIFLY, + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_ODDISH, + } +}; + static const struct TrainerMonItemCustomMoves sParty_coleman[] = { { .iv = 255, diff --git a/src/data/trainers.h b/src/data/trainers.h index a8696497a..37db27c28 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -10297,4 +10297,40 @@ const struct Trainer gTrainers[] = { .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .party = ITEM_CUSTOM_MOVES(sParty_coleman), }, + + [TRAINER_ANDY] = + { + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("ANDY"), + .items = {}, + .doubleBattle = FALSE, + .aiFlags = 0, + .party = NO_ITEM_DEFAULT_MOVES(sParty_andy), + }, + + [TRAINER_AMBER] = + { + .trainerClass = TRAINER_CLASS_LASS, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LASS, + .trainerName = _("AMBER"), + .items = {ITEM_SUPER_POTION}, + .doubleBattle = FALSE, + .aiFlags = 0, + .party = NO_ITEM_DEFAULT_MOVES(sParty_amber), + }, + + [TRAINER_BERRY] = + { + .trainerClass = TRAINER_CLASS_RICH_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_RICH_BOY, + .trainerName = _("BERRY"), + .items = {}, + .doubleBattle = FALSE, + .aiFlags = 0, + .party = NO_ITEM_DEFAULT_MOVES(sParty_berry), + }, };