diff options
Diffstat (limited to 'data/maps/Route18')
| -rw-r--r-- | data/maps/Route18/map.json | 34 | ||||
| -rw-r--r-- | data/maps/Route18/scripts.inc | 18 | ||||
| -rw-r--r-- | data/maps/Route18/text.inc | 22 |
3 files changed, 39 insertions, 35 deletions
diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 5e89b3f8c..427e6347b 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE17", @@ -25,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 46, "y": 14, "elevation": 3, @@ -34,11 +36,11 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route18_EventScript_1AB3D3", + "script": "Route18_EventScript_Jacob", "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 41, "y": 15, "elevation": 3, @@ -47,11 +49,11 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route18_EventScript_1AB395", + "script": "Route18_EventScript_Ramiro", "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCKER", + "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 39, "y": 12, "elevation": 3, @@ -60,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route18_EventScript_1AB357", + "script": "Route18_EventScript_Wilton", "flag": "0" } ], @@ -83,18 +85,20 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 37, "y": 7, "elevation": 0, - "script": "Route18_EventScript_168228" + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route18_EventScript_CyclingRoadSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 52, "y": 7, "elevation": 0, - "script": "Route18_EventScript_16821F" + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route18_EventScript_RouteSign" } ] } diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index 25fda03c2..385d60134 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -5,25 +5,25 @@ Route18_MapScripts:: @ 81681F6 Route18_OnTransition:: @ 8168201 compare VAR_MAP_SCENE_ROUTE16, 1 - call_if_eq EventScript_16820D + call_if_eq Route18_OnTransitionCyclingRoad end -EventScript_16820D:: @ 816820D +Route18_OnTransitionCyclingRoad:: @ 816820D setflag FLAG_SYS_ON_CYCLING_ROAD return Route18_OnWarp:: @ 8168211 - map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16821B + map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route18_OnWarpCyclingRoad .2byte 0 -EventScript_16821B:: @ 816821B - special Special_ForcePlayerOntoBike +Route18_OnWarpCyclingRoad:: @ 816821B + special ForcePlayerOntoBike end -Route18_EventScript_16821F:: @ 816821F - msgbox gUnknown_8187757, MSGBOX_SIGN +Route18_EventScript_RouteSign:: @ 816821F + msgbox Route18_Text_RouteSign, MSGBOX_SIGN end -Route18_EventScript_168228:: @ 8168228 - msgbox gUnknown_818777C, MSGBOX_SIGN +Route18_EventScript_CyclingRoadSign:: @ 8168228 + msgbox Route18_Text_CyclingRoadSign, MSGBOX_SIGN end diff --git a/data/maps/Route18/text.inc b/data/maps/Route18/text.inc index c22a6360a..107804cfb 100644 --- a/data/maps/Route18/text.inc +++ b/data/maps/Route18/text.inc @@ -1,40 +1,40 @@ -Text_187640:: @ 8187640 +Route18_Text_WiltonIntro:: @ 8187640 .string "I always check every grassy area\n" .string "for new POKéMON.$" -Text_187672:: @ 8187672 +Route18_Text_WiltonDefeat:: @ 8187672 .string "Tch!$" -Text_187677:: @ 8187677 +Route18_Text_WiltonPostBattle:: @ 8187677 .string "I wish I had a BIKE!$" -Text_18768C:: @ 818768C +Route18_Text_RamiroIntro:: @ 818768C .string "Kurukkoo!\n" .string "How do you like my birdcall?$" -Text_1876B3:: @ 81876B3 +Route18_Text_RamiroDefeat:: @ 81876B3 .string "I had to bug you!$" -Text_1876C5:: @ 81876C5 +Route18_Text_RamiroPostBattle:: @ 81876C5 .string "I collect sea POKéMON on weekends\n" .string "because the sea is so close.$" -Text_187704:: @ 8187704 +Route18_Text_JacobIntro:: @ 8187704 .string "This is my turf!\n" .string "Get out of here!$" -Text_187726:: @ 8187726 +Route18_Text_JacobDefeat:: @ 8187726 .string "Darn!$" -Text_18772C:: @ 818772C +Route18_Text_JacobPostBattle:: @ 818772C .string "This is my fave area for catching\n" .string "POKéMON.$" -gUnknown_8187757:: @ 8187757 +Route18_Text_RouteSign:: @ 8187757 .string "ROUTE 18\n" .string "CELADON CITY - FUCHSIA CITY$" -gUnknown_818777C:: @ 818777C +Route18_Text_CyclingRoadSign:: @ 818777C .string "CYCLING ROAD\n" .string "No pedestrians permitted!$" |