diff options
Diffstat (limited to 'data/scripts/maps/Route111.inc')
| -rw-r--r-- | data/scripts/maps/Route111.inc | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 5336bd510..99fa29efb 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -4,8 +4,7 @@ Route111_MapScripts:: @ 814FF91 .byte 0 Route111_MapScript1_14FF9C:: @ 814FF9C - checkflag FLAG_REGI_DOORS_OPENED - call_if 0, Route111_EventScript_14FFA6 + call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_14FFA6 end Route111_EventScript_14FFA6:: @ 814FFA6 @@ -16,25 +15,24 @@ Route111_EventScript_14FFA6:: @ 814FFA6 Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 - checktrainerflag OPPONENT_VICKY - goto_if 0, Route111_EventScript_15000D + goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 34 - goto_if 0, Route111_EventScript_15000C + goto_if_lt Route111_EventScript_15000C compare VAR_TEMP_1, 107 - goto_if 2, Route111_EventScript_15000C + goto_if_gt Route111_EventScript_15000C compare VAR_TEMP_1, 72 - goto_if 2, Route111_EventScript_150009 + goto_if_gt Route111_EventScript_150009 compare VAR_TEMP_0, 2000 - goto_if 2, Route111_EventScript_15000C + goto_if_gt Route111_EventScript_15000C compare VAR_TEMP_0, 8 - goto_if 0, Route111_EventScript_15000C + goto_if_lt Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 - setweather 8 + setweather WEATHER_SANDSTORM Route111_EventScript_15000C:: @ 815000C return @@ -51,8 +49,8 @@ Route111_EventScript_15000D:: @ 815000D Route111_EventScript_150023:: @ 8150023 lockall - msgbox Route111_Text_16FA54, 5 - compare RESULT, 0 + msgbox Route111_Text_16FA54, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route111_EventScript_15005F giveitem_std ITEM_ROOT_FOSSIL closemessage @@ -73,8 +71,8 @@ Route111_EventScript_15005F:: @ 815005F Route111_EventScript_150069:: @ 8150069 lockall - msgbox Route111_Text_16FAED, 5 - compare RESULT, 0 + msgbox Route111_Text_16FAED, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route111_EventScript_1500A5 giveitem_std ITEM_CLAW_FOSSIL closemessage @@ -121,8 +119,7 @@ Route111_EventScript_1500C5:: @ 81500C5 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 - goto_if_eq Route111_EventScript_150100 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem_std ITEM_RAZZ_BERRY compare RESULT, 0 @@ -174,13 +171,13 @@ Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closemessage compare VAR_SPECIAL_4, 0 - call_if 1, Route111_EventScript_150188 + call_if_eq Route111_EventScript_150188 compare VAR_SPECIAL_4, 1 - call_if 1, Route111_EventScript_150193 + call_if_eq Route111_EventScript_150193 compare VAR_SPECIAL_4, 2 - call_if 1, Route111_EventScript_15019E + call_if_eq Route111_EventScript_15019E compare VAR_SPECIAL_4, 3 - call_if 1, Route111_EventScript_1501A9 + call_if_eq Route111_EventScript_1501A9 releaseall end @@ -221,15 +218,15 @@ Route111_Movement_1501BA:: @ 81501BA step_end Route111_EventScript_1501BC:: @ 81501BC - setweather 2 - fadenewbgm 360 + setweather WEATHER_SUNNY + fadenewbgm BGM_DOORO_X1 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 - setweather 8 - fadenewbgm 409 + setweather WEATHER_SANDSTORM + fadenewbgm BGM_ASHROAD doweather end @@ -237,8 +234,8 @@ Route111_EventScript_1501D1:: @ 81501D1 lock faceplayer setflag FLAG_LANDMARK_WINSTRATE_FAMILY - msgbox Route111_Text_16F705, 5 - compare RESULT, 1 + msgbox Route111_Text_16F705, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route111_EventScript_1501F3 msgbox Route111_Text_16F785, 4 release |