summaryrefslogtreecommitdiff
path: root/data/maps/Route129/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route129/scripts.inc')
-rw-r--r--data/maps/Route129/scripts.inc66
1 files changed, 33 insertions, 33 deletions
diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc
index d57a27cf9..ea53c3bf2 100644
--- a/data/maps/Route129/scripts.inc
+++ b/data/maps/Route129/scripts.inc
@@ -1,57 +1,57 @@
Route129_MapScripts:: @ 81F7284
map_script MAP_SCRIPT_ON_TRANSITION, Route129_OnTransition
- map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294
- map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2
+ map_script MAP_SCRIPT_ON_LOAD, Route129_OnLoad
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_OnFrame
.byte 0
-Route129_MapScript1_1F7294: @ 81F7294
- 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
+Route129_OnLoad: @ 81F7294
+ compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_WEST
+ call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute129West
+ compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_EAST
+ call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute129East
end
Route129_OnTransition: @ 81F72AB
- compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
- call_if_eq Route129_EventScript_273D13
+ compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
+ call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
compare VAR_SOOTOPOLIS_CITY_STATE, 4
- call_if_ge Route129_EventScript_1F72D8
- 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
+ call_if_ge Route129_EventScript_CheckSetAbnormalWeather
+ compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_WEST
+ call_if_eq AbnormalWeather_StartKyogreWeather
+ compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_EAST
+ call_if_eq AbnormalWeather_StartKyogreWeather
end
-Route129_EventScript_1F72D8:: @ 81F72D8
- call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+Route129_EventScript_CheckSetAbnormalWeather:: @ 81F72D8
+ call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
return
-Route129_MapScript2_1F72E2: @ 81F72E2
- map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+Route129_OnFrame: @ 81F72E2
+ map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
.2byte 0
-Route129_EventScript_1F72EC:: @ 81F72EC
- trainerbattle_single TRAINER_CHASE, Route129_Text_2A2F66, Route129_Text_2A2F9D
- msgbox Route129_Text_2A2FB9, MSGBOX_AUTOCLOSE
+Route129_EventScript_Chase:: @ 81F72EC
+ trainerbattle_single TRAINER_CHASE, Route129_Text_ChaseIntro, Route129_Text_ChaseDefeat
+ msgbox Route129_Text_ChasePostBattle, MSGBOX_AUTOCLOSE
end
-Route129_EventScript_1F7303:: @ 81F7303
- trainerbattle_single TRAINER_ALLISON, Route129_Text_2A2FF2, Route129_Text_2A3034
- msgbox Route129_Text_2A3048, MSGBOX_AUTOCLOSE
+Route129_EventScript_Allison:: @ 81F7303
+ trainerbattle_single TRAINER_ALLISON, Route129_Text_AllisonIntro, Route129_Text_AllisonDefeat
+ msgbox Route129_Text_AllisonPostBattle, MSGBOX_AUTOCLOSE
end
-Route129_EventScript_1F731A:: @ 81F731A
- trainerbattle_single TRAINER_REED, Route129_Text_2A30CD, Route129_Text_2A30F1
- msgbox Route129_Text_2A3114, MSGBOX_AUTOCLOSE
+Route129_EventScript_Reed:: @ 81F731A
+ trainerbattle_single TRAINER_REED, Route129_Text_ReedIntro, Route129_Text_ReedDefeat
+ msgbox Route129_Text_ReedPostBattle, MSGBOX_AUTOCLOSE
end
-Route129_EventScript_1F7331:: @ 81F7331
- trainerbattle_single TRAINER_TISHA, Route129_Text_2A314E, Route129_Text_2A317D
- msgbox Route129_Text_2A31A6, MSGBOX_AUTOCLOSE
+Route129_EventScript_Tisha:: @ 81F7331
+ trainerbattle_single TRAINER_TISHA, Route129_Text_TishaIntro, Route129_Text_TishaDefeat
+ msgbox Route129_Text_TishaPostBattle, MSGBOX_AUTOCLOSE
end
-Route129_EventScript_1F7348:: @ 81F7348
- trainerbattle_single TRAINER_CLARENCE, Route129_Text_2A3204, Route129_Text_2A3239
- msgbox Route129_Text_2A3252, MSGBOX_AUTOCLOSE
+Route129_EventScript_Clarence:: @ 81F7348
+ trainerbattle_single TRAINER_CLARENCE, Route129_Text_ClarenceIntro, Route129_Text_ClarenceDefeat
+ msgbox Route129_Text_ClarencePostBattle, MSGBOX_AUTOCLOSE
end