diff options
Diffstat (limited to 'data/maps/Route120/scripts.inc')
| -rw-r--r-- | data/maps/Route120/scripts.inc | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 4d2eca797..4c7aefdea 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -9,17 +9,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare VAR_SPECIAL_4, 0 + compare VAR_0x8004, 0 call_if_eq Route120_EventScript_15166B - compare VAR_SPECIAL_4, 1 + compare VAR_0x8004, 1 call_if_eq Route120_EventScript_151672 - compare VAR_SPECIAL_4, 2 + compare VAR_0x8004, 2 call_if_eq Route120_EventScript_151676 - compare VAR_SPECIAL_4, 3 + compare VAR_0x8004, 3 call_if_eq Route120_EventScript_15167A - compare VAR_SPECIAL_4, 4 + compare VAR_0x8004, 4 call_if_eq Route120_EventScript_15167E - compare VAR_SPECIAL_4, 5 + compare VAR_0x8004, 5 call_if_eq Route120_EventScript_151682 return @@ -111,12 +111,12 @@ Route120_EventScript_151739:: @ 8151739 dodailyevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE120, Route120_EventScript_151837 msgbox Route120_Text_1C58F1, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES call_if_eq Route120_EventScript_151841 - compare RESULT, NO + compare VAR_RESULT, NO call_if_eq Route120_EventScript_15184A - specialvar RESULT, GetPlayerTrainerIdOnesDigit - switch RESULT + specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit + switch VAR_RESULT case 0, Route120_EventScript_1517DC case 5, Route120_EventScript_1517DC case 1, Route120_EventScript_1517E7 @@ -130,33 +130,33 @@ Route120_EventScript_151739:: @ 8151739 end Route120_EventScript_1517DC:: @ 81517DC - setvar VAR_SPECIAL_4, ITEM_FIGY_BERRY + setvar VAR_0x8004, ITEM_FIGY_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 - setvar VAR_SPECIAL_4, ITEM_WIKI_BERRY + setvar VAR_0x8004, ITEM_WIKI_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 - setvar VAR_SPECIAL_4, ITEM_MAGO_BERRY + setvar VAR_0x8004, ITEM_MAGO_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD - setvar VAR_SPECIAL_4, ITEM_AGUAV_BERRY + setvar VAR_0x8004, ITEM_AGUAV_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 - setvar VAR_SPECIAL_4, ITEM_IAPAPA_BERRY + setvar VAR_0x8004, ITEM_IAPAPA_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151813:: @ 8151813 - giveitem_std VAR_SPECIAL_4 - compare RESULT, 0 + giveitem_std VAR_0x8004 + compare VAR_RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 msgbox Route120_Text_1C5A0B, 4 @@ -181,7 +181,7 @@ Route120_EventScript_151853:: @ 8151853 faceplayer goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE120, Route120_EventScript_151884 msgbox Route120_Text_171827, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -194,7 +194,7 @@ Route120_EventScript_151877:: @ 8151877 Route120_EventScript_151884:: @ 8151884 msgbox Route120_Text_17196F, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -202,9 +202,9 @@ Route120_EventScript_151884:: @ 8151884 Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 closemessage - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq Route120_EventScript_15197F - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq Route120_EventScript_15198A applymovement 31, Route120_Movement_1A083F waitmovement 0 @@ -220,7 +220,7 @@ Route120_EventScript_15189D:: @ 815189D delay 40 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE @@ -286,8 +286,8 @@ Route120_EventScript_1519B3:: @ 81519B3 Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, TRAINER_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 end @@ -309,8 +309,8 @@ Route120_EventScript_151A1F:: @ 8151A1F Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, TRAINER_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 end |