summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route120.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/Route120.inc')
-rw-r--r--data/scripts/maps/Route120.inc20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
index d2866cceb..bacdcd7dd 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/scripts/maps/Route120.inc
@@ -90,11 +90,11 @@ Route120_EventScript_1516EA:: @ 81516EA
return
Route120_EventScript_151711:: @ 8151711
- setweather 1
+ setweather WEATHER_CLOUDS
return
Route120_EventScript_151715:: @ 8151715
- setweather 2
+ setweather WEATHER_SUNNY
return
Route120_EventScript_151719:: @ 8151719
@@ -106,7 +106,7 @@ Route120_EventScript_151719:: @ 8151719
end
Route120_EventScript_151735:: @ 8151735
- setweather 3
+ setweather WEATHER_RAIN_LIGHT
return
Route120_EventScript_151739:: @ 8151739
@@ -115,10 +115,10 @@ Route120_EventScript_151739:: @ 8151739
dodailyevents
checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120
goto_if_eq Route120_EventScript_151837
- msgbox Route120_Text_1C58F1, 5
- compare RESULT, 1
+ msgbox Route120_Text_1C58F1, MSGBOX_YESNO
+ compare RESULT, YES
call_if 1, Route120_EventScript_151841
- compare RESULT, 0
+ compare RESULT, NO
call_if 1, Route120_EventScript_15184A
specialvar RESULT, GetPlayerTrainerIdOnesDigit
switch RESULT
@@ -186,8 +186,8 @@ Route120_EventScript_151853:: @ 8151853
faceplayer
checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120
goto_if_eq Route120_EventScript_151884
- msgbox Route120_Text_171827, 5
- compare RESULT, 0
+ msgbox Route120_Text_171827, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq Route120_EventScript_151877
goto Route120_EventScript_15189D
end
@@ -199,8 +199,8 @@ Route120_EventScript_151877:: @ 8151877
end
Route120_EventScript_151884:: @ 8151884
- msgbox Route120_Text_17196F, 5
- compare RESULT, 0
+ msgbox Route120_Text_17196F, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq Route120_EventScript_151877
goto Route120_EventScript_15189D
end