diff --git a/constants/map_constants.asm b/constants/map_constants.asm index f1571e5..f217628 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -462,7 +462,7 @@ ENDM map_const ROUTE_47, 10, 10 ; 17 map_const CLIFF_CAVE, 19, 16 ; 18 map_const CLIFF_EDGE_GATE, 10, 10 ; 19 - map_const ROUTE_48, 10, 10 ; 20 + map_const ROUTE_48, 13, 17 ; 20 map_const EMBEDDED_TOWER, 10, 10 ; 21 map_const JOHTO_SAFARI_ZONE_GATE, 10, 10 ; 22 map_const JOHTO_SAFARI_ZONE, 10, 10 ; 23 diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index a08ce70..ebd6507 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -1782,4 +1782,32 @@ JohtoGrassWildMons: dbw 35, STEELIX end_grass_wildmons + def_grass_wildmons ROUTE_48 + db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite + ; morn + dbw 20, GIRAFARIG + dbw 21, FEAROW + dbw 20, FARFETCH_D + dbw 21, GIRAFARIG + dbw 22, SKIPLOOM + dbw 23, MILTANK + dbw 25, TAUROS + ; day + dbw 20, GIRAFARIG + dbw 21, FEAROW + dbw 20, FARFETCH_D + dbw 21, GIRAFARIG + dbw 22, SKIPLOOM + dbw 23, MILTANK + dbw 25, TAUROS + ; nite + dbw 20, GIRAFARIG + dbw 21, GROWLITHE + dbw 20, VULPIX + dbw 21, GIRAFARIG + dbw 22, GLOOM + dbw 23, NOCTOWL + dbw 25, MURKROW + end_grass_wildmons + db -1 ; end diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 7813663..b0247d0 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -200,7 +200,7 @@ DebugRoom_MapEvents: warp_event 19, 34, BLUE_FOREST, 1 ; southern warp warp_event 33, 33, BLUE_FOREST, 1 ; southeast warp warp_event 5, 3, AZALEA_TOWN, 1 - warp_event 34, 11, CLIFF_CAVE, 1 + warp_event 34, 11, ROUTE_48, 1 def_coord_events diff --git a/maps/Route48.ablk b/maps/Route48.ablk index eeb5760..b2f96d7 100644 Binary files a/maps/Route48.ablk and b/maps/Route48.ablk differ diff --git a/maps/Route48.asm b/maps/Route48.asm index 6fe1c90..38d6bf5 100644 --- a/maps/Route48.asm +++ b/maps/Route48.asm @@ -5,14 +5,34 @@ Route48_MapScripts: def_callbacks +Route48Sign1: + jumptext Route48Sign1Text + +Route48Sign1Text: + text "ROUTE 48" + line "NORTH: JOHTO" + cont "SAFARI ZONE" + done + +Route48Sign2: + jumptext Route48Sign2Text + +Route48Sign2Text: + text "JOHTO SAFARI" + line "ZONE" + para "#MON-u-Catch!" + done + Route48_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 3, 22, DEBUG_ROOM, 1 + warp_event 10, 3, DEBUG_ROOM, 1 ; Will be the Johto Safari Zone. def_coord_events def_bg_events - + bg_event 21, 25, BGEVENT_READ, Route48Sign1 + bg_event 13, 5, BGEVENT_READ, Route48Sign2 + def_object_events \ No newline at end of file