diff options
Diffstat (limited to 'data/maps/Route118/scripts.inc')
| -rw-r--r-- | data/maps/Route118/scripts.inc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 45b8665b0..9c1ec46ca 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -1,28 +1,28 @@ Route118_MapScripts:: @ 81F3DBC - map_script 3, Route118_MapScript1_1F3DCC - map_script 1, Route118_MapScript1_1F3DF3 - map_script 2, Route118_MapScript2_1F3E0A + map_script MAP_SCRIPT_ON_TRANSITION, Route118_MapScript1_1F3DCC + map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A .byte 0 Route118_MapScript1_1F3DCC: @ 81F3DCC call Route118_EventScript_28CCC7 - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route118_EventScript_273D13 - compare VAR_0x4037, 7 - call_if_eq Route118_EventScript_273D1B - compare VAR_0x4037, 8 - call_if_eq Route118_EventScript_273D1B + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST + call_if_eq UnusualWeather_StartGroudonWeather + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST + call_if_eq UnusualWeather_StartGroudonWeather end Route118_MapScript1_1F3DF3: @ 81F3DF3 - compare VAR_0x4037, 7 - call_if_eq Route118_EventScript_273985 - compare VAR_0x4037, 8 - call_if_eq Route118_EventScript_273998 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West end Route118_MapScript2_1F3E0A: @ 81F3E0A - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route118_EventScript_1F3E14:: @ 81F3E14 @@ -69,7 +69,7 @@ Route118_EventScript_1F3E85:: @ 81F3E85 Route118_EventScript_1F3E8E:: @ 81F3E8E lockall setvar VAR_0x8008, 0 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F61 waitmovement 0 @@ -79,7 +79,7 @@ Route118_EventScript_1F3E8E:: @ 81F3E8E Route118_EventScript_1F3EAE:: @ 81F3EAE lockall setvar VAR_0x8008, 1 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 goto Route118_EventScript_1F3EE4 end @@ -87,7 +87,7 @@ Route118_EventScript_1F3EAE:: @ 81F3EAE Route118_EventScript_1F3EC4:: @ 81F3EC4 lockall setvar VAR_0x8008, 2 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F63 waitmovement 0 @@ -107,7 +107,7 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 call_if_eq Route118_EventScript_1F3F3A compare VAR_0x8008, 2 call_if_eq Route118_EventScript_1F3F4C - setvar VAR_0x4071, 1 + setvar VAR_ROUTE118_STATE, 1 removeobject 19 releaseall end |