diff --git a/data/event_scripts.s b/data/event_scripts.s index 66877b25c..d2192e2b9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1056,3 +1056,5 @@ Common_EventScript_LegendaryFlewAway:: .include "data/text/frontier_brain.inc" .include "data/text/save.inc" .include "data/text/birch_speech.inc" + + .include "data/maps/Route101ext/scripts.inc" diff --git a/data/layouts/LittlerootTown/map.bin b/data/layouts/LittlerootTown/map.bin index 9af76f90e..2b49652fd 100644 --- a/data/layouts/LittlerootTown/map.bin +++ b/data/layouts/LittlerootTown/map.bin @@ -1,3 +1,3 @@ -5000000000000000000000000000000000000002 2 2 2 +000000000000000000000000000000000000000000000000000000000000002 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/OldaleTown/map.bin b/data/layouts/OldaleTown/map.bin index 28b17c441..fc4e77f22 100644 --- a/data/layouts/OldaleTown/map.bin +++ b/data/layouts/OldaleTown/map.bin @@ -1 +1 @@ -01101110000011110000000011110(0)0)000l2m2m2n2111100123000tuuv1111189:;000|}~11111`ABC00011111111110001111000111111100111111001111111020111111100011111100211111111111111110110001111111111000000H0I02211111l2m2m2n2000PQRS11110tuuv110XYZ[11110|}~0`abc1111000011111000011000111110000111x211111111 \ No newline at end of file +01101110000011110000000011110(0)0)000l2m2m2n2111100123000tuuv1111189:;000|}~11111`ABC00011111111110001111000111111110111111001111111120111111100011111111211111111111111110110001111111111000000H0I02211111l2m2m2n2000PQRS11110tuuv110XYZ[11110|}~0`abc1111000011111000011000111110000111x211111111 \ No newline at end of file diff --git a/data/layouts/Route101/map.bin b/data/layouts/Route101/map.bin index fab3a1d69..fefc96cff 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 000000011111111000000 \ 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 0000000 0 0 00000000000000000000000000000000 \ No newline at end of file diff --git a/data/layouts/Route101ext/border.bin b/data/layouts/Route101ext/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/layouts/Route101ext/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/Route101ext/map.bin b/data/layouts/Route101ext/map.bin new file mode 100644 index 000000000..ea32bd624 --- /dev/null +++ b/data/layouts/Route101ext/map.bin @@ -0,0 +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 diff --git a/data/layouts/Route103/map.bin b/data/layouts/Route103/map.bin index 44518dc92..0c56bb12e 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}~ppppppppppppppx00000pppppppppppppppp550000pppppppppppppppp0000pppppppppppppppp \ 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 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 diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index b8d841f72..57a0da130 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -4410,6 +4410,16 @@ "secondary_tileset": "gTileset_MysteryEventsHouse", "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin", "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin" + }, + { + "id": "LAYOUT_ROUTE101EXT", + "name": "Route101ext_Layout", + "width": 20, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/Route101ext/border.bin", + "blockdata_filepath": "data/layouts/Route101ext/map.bin" } ] } diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index f073a7436..73aea8287 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -128,7 +128,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index f4da4222b..eda6ec7fe 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -230,7 +230,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 302ef5e9d..e8c63172c 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -27,6 +27,11 @@ "map": "MAP_ROUTE102", "offset": 0, "direction": "left" + }, + { + "map": "MAP_ROUTE101EXT", + "offset": 0, + "direction": "right" } ], "object_events": [ diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 1abb23030..6e3623a87 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -22,6 +22,11 @@ "map": "MAP_LITTLEROOT_TOWN", "offset": 0, "direction": "down" + }, + { + "map": "MAP_ROUTE101EXT", + "offset": -20, + "direction": "right" } ], "object_events": [ @@ -104,7 +109,9 @@ "flag": "FLAG_HIDE_ROUTE_101_BOY" } ], - "warp_events": [], + "warp_events": [ + + ], "coord_events": [ { "type": "trigger", diff --git a/data/maps/Route101ext/map.json b/data/maps/Route101ext/map.json new file mode 100644 index 000000000..3f10f201c --- /dev/null +++ b/data/maps/Route101ext/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_ROUTE101EXT", + "name": "Route101ext", + "layout": "LAYOUT_ROUTE101EXT", + "music": "MUS_ROUTE101", + "region_map_section": "MAPSEC_ROUTE_101", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "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_ROUTE101", + "offset": 20, + "direction": "left" + }, + { + "map": "MAP_OLDALE_TOWN", + "offset": 0, + "direction": "left" + }, + { + "map": "MAP_ROUTE103", + "offset": -20, + "direction": "up" + } + ], + "object_events": [ + { + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", + "x": 12, + "y": 17, + "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_BugCatcher", + "flag": "0" + } + ], + "warp_events": [ + + ], + "coord_events": [ + + ], + "bg_events": [ + + ] +} diff --git a/data/maps/Route101ext/scripts.inc b/data/maps/Route101ext/scripts.inc new file mode 100644 index 000000000..f78003411 --- /dev/null +++ b/data/maps/Route101ext/scripts.inc @@ -0,0 +1,22 @@ +Route101ext_MapScripts:: + .byte 0 + +Route101ext_EventScript_BugCatcher:: + msgbox Route101ext_Text_StrangeHouse, MSGBOX_NPC + end + +Route101ext_EventScript_FatMan:: + msgbox Route101ext_Text_DailyWalk, MSGBOX_NPC + end + +Route101ext_Text_DailyWalk: + .string "Usually there are many paths\n" + .string "between towns.\p" + .string "I like taking the long way\n" + .string "between OLDALE and LITTLEROOT.$" + +Route101ext_Text_StrangeHouse: + .string "See that house over there?\n" + .string "It has been empty for years.\p" + .string "I wonder if there are any\n" + .string "spooky Bug POKéMON in there.$" diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 68e3549db..8c8771b5e 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -143,8 +143,12 @@ "flag": "0" } ], - "warp_events": [], - "coord_events": [], + "warp_events": [ + + ], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 9bc6fed67..b980b84cb 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -22,6 +22,11 @@ "map": "MAP_ROUTE110", "offset": -60, "direction": "right" + }, + { + "map": "MAP_ROUTE101EXT", + "offset": 20, + "direction": "down" } ], "object_events": [ @@ -295,7 +300,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index ae9bb6a5a..88ca381a6 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -144,7 +144,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "hidden_item", diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 5a0a38dc9..8c99ac285 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -100,7 +100,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "hidden_item", diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index 106546ef5..37b6651c1 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -156,7 +156,13 @@ "flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE" } ], - "warp_events": [], - "coord_events": [], - "bg_events": [] + "warp_events": [ + + ], + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index f516f16de..a294aa2c4 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -169,7 +169,13 @@ "flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE" } ], - "warp_events": [], - "coord_events": [], - "bg_events": [] + "warp_events": [ + + ], + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index ebef431b3..6bfedaf5f 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -92,7 +92,8 @@ "Underwater_Route128", "Underwater_Route129", "Underwater_Route105", - "Underwater_Route125" + "Underwater_Route125", + "Route101ext" ], "gMapGroup_IndoorLittleroot": [ "LittlerootTown_BrendansHouse_1F", @@ -620,72 +621,5 @@ ], "gMapGroup_IndoorRoute124": [ "Route124_DivingTreasureHuntersHouse" - ], - "connections_include_order": [ - "LittlerootTown", - "OldaleTown", - "DewfordTown", - "LavaridgeTown", - "FallarborTown", - "VerdanturfTown", - "PacifidlogTown", - "PetalburgCity", - "SlateportCity", - "MauvilleCity", - "RustboroCity", - "FortreeCity", - "LilycoveCity", - "MossdeepCity", - "SootopolisCity", - "EverGrandeCity", - "Route101", - "Route102", - "Route103", - "Route104", - "Route105", - "Route106", - "Route107", - "Route108", - "Route109", - "Route110", - "Route111", - "Route112", - "Route113", - "Route114", - "Route115", - "Route116", - "Route117", - "Route118", - "Route119", - "Route120", - "Route121", - "Route122", - "Route123", - "Route124", - "Route125", - "Route126", - "Route127", - "Route128", - "Route129", - "Route130", - "Route131", - "Route132", - "Route133", - "Route134", - "Underwater_Route105", - "Underwater_Route124", - "Underwater_Route125", - "Underwater_Route126", - "Underwater_Route127", - "Underwater_Route128", - "Underwater_Route129", - "SafariZone_Northwest", - "SafariZone_North", - "SafariZone_Southwest", - "SafariZone_South", - "SafariZone_Northeast", - "SafariZone_Southeast", - "BattleFrontier_OutsideWest", - "BattleFrontier_OutsideEast" ] } diff --git a/include/constants/layouts.h b/include/constants/layouts.h index db92c9594..ee80c01be 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -446,5 +446,6 @@ #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F 439 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED 441 +#define LAYOUT_ROUTE101EXT 442 #endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index eaf40a525..f60397531 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -63,6 +63,7 @@ #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)) // gMapGroup_IndoorLittleroot #define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8)) diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index 0b30c0f65..053c4c095 100755 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -7,30 +7,71 @@ { "type": "land_mons", "encounter_rates": [ - 20, 20, 10, 10, 10, 10, 5, 5, 4, 4, 1, 1 + 20, + 20, + 10, + 10, + 10, + 10, + 5, + 5, + 4, + 4, + 1, + 1 ] }, { "type": "water_mons", "encounter_rates": [ - 60, 30, 5, 4, 1 + 60, + 30, + 5, + 4, + 1 ] }, { "type": "rock_smash_mons", "encounter_rates": [ - 60, 30, 5, 4, 1 + 60, + 30, + 5, + 4, + 1 ] }, { "type": "fishing_mons", "encounter_rates": [ - 70, 30, 60, 20, 20, 40, 40, 15, 4, 1 + 70, + 30, + 60, + 20, + 20, + 40, + 40, + 15, + 4, + 1 ], "groups": { - "old_rod": [0, 1], - "good_rod": [2, 3, 4], - "super_rod": [5, 6, 7, 8, 9] + "old_rod": [ + 0, + 1 + ], + "good_rod": [ + 2, + 3, + 4 + ], + "super_rod": [ + 5, + 6, + 7, + 8, + 9 + ] } } ],