diff options
Diffstat (limited to 'data/maps/Route129')
| -rw-r--r-- | data/maps/Route129/map.json | 2 | ||||
| -rw-r--r-- | data/maps/Route129/scripts.inc | 30 |
2 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index b3e45b227..3183f9821 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_129", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 177dc626a..25aa675a6 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -1,33 +1,33 @@ Route129_MapScripts:: @ 81F7284 - map_script 3, Route129_MapScript1_1F72AB - map_script 1, Route129_MapScript1_1F7294 - map_script 2, Route129_MapScript2_1F72E2 + map_script MAP_SCRIPT_ON_TRANSITION, Route129_MapScript1_1F72AB + map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2 .byte 0 Route129_MapScript1_1F7294: @ 81F7294 - compare VAR_0x4037, 15 - call_if_eq Route129_EventScript_273C39 - compare VAR_0x4037, 16 - call_if_eq Route129_EventScript_273CA6 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129West + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129East end Route129_MapScript1_1F72AB: @ 81F72AB - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route129_EventScript_273D13 - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 call_if_ge Route129_EventScript_1F72D8 - compare VAR_0x4037, 15 - call_if_eq Route129_EventScript_273D17 - compare VAR_0x4037, 16 - call_if_eq Route129_EventScript_273D17 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST + call_if_eq UnusualWeather_StartKyogreWeather + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST + call_if_eq UnusualWeather_StartKyogreWeather end Route129_EventScript_1F72D8:: @ 81F72D8 - call_if_set FLAG_SYS_WEATHER_CTRL, Route129_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return Route129_MapScript2_1F72E2: @ 81F72E2 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route129_EventScript_1F72EC:: @ 81F72EC |