diff options
Diffstat (limited to 'data/scripts/maps/Route113.inc')
| -rw-r--r-- | data/scripts/maps/Route113.inc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 1fc5a9345..41b289db0 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -4,7 +4,7 @@ Route113_MapScripts:: @ 81505CC .byte 0 Route113_MapScript1_1505D7:: @ 81505D7 - tileeffect 1 + setstepcallback 1 end Route113_MapScript1_1505DA:: @ 81505DA @@ -13,12 +13,12 @@ Route113_MapScript1_1505DA:: @ 81505DA end Route113_EventScript_1505E5:: @ 81505E5 - getplayerxy 0x4000, 0x4001 - compare 0x4000, 19 - jumpif 0, Route113_EventScript_150604 - compare 0x4000, 84 - jumpif 2, Route113_EventScript_150604 - setweather 7 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 19 + goto_if_lt Route113_EventScript_150604 + compare VAR_TEMP_0, 84 + goto_if_gt Route113_EventScript_150604 + setweather WEATHER_ASH return Route113_EventScript_150604:: @ 8150604 @@ -60,9 +60,9 @@ Route113_EventScript_150652:: @ 8150652 Route113_EventScript_150669:: @ 8150669 trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A - specialval RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 - jumpeq Route113_EventScript_150690 + goto_if_eq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 end @@ -73,9 +73,9 @@ Route113_EventScript_150690:: @ 8150690 Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 - specialval RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 - jumpeq Route113_EventScript_1506CE + goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 end |