diff options
Diffstat (limited to 'data/scripts/maps/Route111.inc')
| -rw-r--r-- | data/scripts/maps/Route111.inc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 0a7e6befc..5336bd510 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -21,16 +21,16 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 end Route111_EventScript_14FFCD:: @ 814FFCD - getplayerxy 0x4000, 0x4001 - compare 0x4001, 34 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 34 goto_if 0, Route111_EventScript_15000C - compare 0x4001, 107 + compare VAR_TEMP_1, 107 goto_if 2, Route111_EventScript_15000C - compare 0x4001, 72 + compare VAR_TEMP_1, 72 goto_if 2, Route111_EventScript_150009 - compare 0x4000, 2000 + compare VAR_TEMP_0, 2000 goto_if 2, Route111_EventScript_15000C - compare 0x4000, 8 + compare VAR_TEMP_0, 8 goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 @@ -140,25 +140,25 @@ Route111_EventScript_150100:: @ 8150100 @ 815010A lockall - setvar 0x8004, 0 + setvar VAR_SPECIAL_4, 0 goto Route111_EventScript_15013A end Route111_EventScript_150116:: @ 8150116 lockall - setvar 0x8004, 1 + setvar VAR_SPECIAL_4, 1 goto Route111_EventScript_15013A end Route111_EventScript_150122:: @ 8150122 lockall - setvar 0x8004, 2 + setvar VAR_SPECIAL_4, 2 goto Route111_EventScript_15013A end @ 815012E lockall - setvar 0x8004, 3 + setvar VAR_SPECIAL_4, 3 goto Route111_EventScript_15013A end @@ -166,20 +166,20 @@ Route111_EventScript_15013A:: @ 815013A checkitem ITEM_GO_GOGGLES, 1 compare RESULT, 0 goto_if_eq Route111_EventScript_150151 - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 releaseall end Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closemessage - compare 0x8004, 0 + compare VAR_SPECIAL_4, 0 call_if 1, Route111_EventScript_150188 - compare 0x8004, 1 + compare VAR_SPECIAL_4, 1 call_if 1, Route111_EventScript_150193 - compare 0x8004, 2 + compare VAR_SPECIAL_4, 2 call_if 1, Route111_EventScript_15019E - compare 0x8004, 3 + compare VAR_SPECIAL_4, 3 call_if 1, Route111_EventScript_1501A9 releaseall end @@ -224,7 +224,7 @@ Route111_EventScript_1501BC:: @ 81501BC setweather 2 fadenewbgm 360 doweather - setvar 0x4003, 0 + setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 @@ -392,7 +392,7 @@ Route111_EventScript_1503EC:: @ 81503EC Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 @@ -420,7 +420,7 @@ Route111_EventScript_15046F:: @ 815046F Route111_EventScript_150486:: @ 8150486 trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 @@ -433,7 +433,7 @@ Route111_EventScript_1504AD:: @ 81504AD Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 |