diff options
Diffstat (limited to 'data/scripts/maps')
85 files changed, 617 insertions, 617 deletions
diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 0535af6f3..534e91341 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -9,14 +9,14 @@ AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7 AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 playse 21 - applymovement 0x8008, AquaHideout_B2F_Movement_1A0833 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0833 waitmovement 0 .ifdef SAPPHIRE - applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 .else - applymovement 0x8008, AquaHideout_B2F_Movement_1A0841 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0841 .endif waitmovement 0 setvar VAR_TEMP_1, 1 @@ -31,37 +31,37 @@ MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 end AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 .ifdef SAPPHIRE - setvar 0x8009, 4 + setvar SPECIALVAR_9, 4 .else - setvar 0x8009, 3 + setvar SPECIALVAR_9, 3 .endif .ifdef SAPPHIRE - applymovement 0x8008, Movement_1A083F + applymovement SPECIALVAR_8, Movement_1A083F .else - applymovement 0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843 .endif waitmovement 0 delay 20 - applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_197162, 4 closemessage .ifdef SAPPHIRE - applymovement 0x8008, Movement_1A083F + applymovement SPECIALVAR_8, Movement_1A083F .else - applymovement 0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843 .endif .ifdef SAPPHIRE - applymovement 0x8009, AquaHideout_B2F_Movement_15D958 + applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D958 .else - applymovement 0x8009, AquaHideout_B2F_Movement_15D95D + applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D95D .endif waitmovement 0 - removeobject 0x8009 + removeobject SPECIALVAR_9 delay 20 - applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 7259e8305..42e0a8821 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -21,25 +21,25 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA waitmessage closemessage special ScrSpecial_HealPlayerParty - setvar 0x8004, 0 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 0 special sub_813556C waitstate switch RESULT case 1, BattleTower_BattleRoom_EventScript_160961 special LoadPlayerParty - setvar 0x8004, 0 - setvar 0x8005, 5 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 5 special sub_8135668 - setvar 0x8004, 14 + setvar SPECIALVAR_4, 14 special sub_8135668 - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160961:: @ 8160961 - setvar 0x8004, 6 + setvar SPECIALVAR_4, 6 special sub_8135668 switch RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 @@ -89,23 +89,23 @@ BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special LoadPlayerParty - setvar 0x8004, 0 - setvar 0x8005, 4 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 4 special sub_8135668 - setvar 0x8004, 2 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 1 special sub_8135668 - setvar 0x8004, 7 + setvar SPECIALVAR_4, 7 special sub_8135668 - setvar 0x8004, 14 + setvar SPECIALVAR_4, 14 special sub_8135668 - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 special sub_8135BA0 message BattleTower_BattleRoom_Text_1C6CE1 delay 60 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index b0e957e6b..4261f8457 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -4,7 +4,7 @@ BattleTower_Corridor_MapScripts:: @ 8160845 .byte 0 BattleTower_Corridor_MapScript1_160850:: @ 8160850 - compare 0x8006, 1 + compare SPECIALVAR_6, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E setmetatile 12, 0, 519, 0 setmetatile 12, 1, 527, 0 @@ -21,7 +21,7 @@ BattleTower_Corridor_MapScript2_160881:: @ 8160881 BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar VAR_TEMP_0, 1 - compare 0x8006, 1 + compare SPECIALVAR_6, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 applymovement 1, BattleTower_Corridor_Movement_1608D5 applymovement 255, BattleTower_Corridor_Movement_1608D4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 902ffd4ba..684bdc6bb 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -11,22 +11,22 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293 end BattleTower_Lobby_EventScript_16029C:: @ 816029C - setvar 0x8004, 10 + setvar SPECIALVAR_4, 10 special sub_8135668 checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602CD - specialvar 0x8007, sub_810F404 - compare 0x8007, 50 + specialvar SPECIALVAR_7, sub_810F404 + compare SPECIALVAR_7, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD - specialvar 0x8007, sub_810F404 - compare 0x8007, 100 + specialvar SPECIALVAR_7, sub_810F404 + compare SPECIALVAR_7, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC @@ -75,7 +75,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 faceplayer message BattleTower_Lobby_Text_19A487 waitmessage - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_81358A4 compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D @@ -89,23 +89,23 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 msgbox BattleTower_Lobby_Text_19A719, 4 BattleTower_Lobby_EventScript_16037D:: @ 816037D - setvar 0x8004, 8 + setvar SPECIALVAR_4, 8 special sub_81358A4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waitmessage - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 special sub_8135668 special DetermineBattleTowerPrize - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 special sub_8135BA0 playse 55 waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD - setvar 0x8004, 0 - setvar 0x8005, 3 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 3 special sub_8135668 message BattleTower_Lobby_Text_19A4BB waitmessage @@ -116,7 +116,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD waitmessage playfanfare 370 waitfanfare - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 special sub_81358A4 compare RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 @@ -144,9 +144,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 waitmessage message BattleTower_Lobby_Text_19A589 waitmessage - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 special sub_8135668 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_8135BA0 playse 55 waitse @@ -164,12 +164,12 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B waitmessage message BattleTower_Lobby_Text_19A5CE waitmessage - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 special sub_8135BA0 playse 55 waitse - setvar 0x8004, 8 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 8 + setvar SPECIALVAR_5, 0 special sub_8135668 setvar VAR_TEMP_0, 5 special SavePlayerParty @@ -184,7 +184,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B BattleTower_Lobby_EventScript_16049E:: @ 816049E lock faceplayer - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_81358A4 compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 @@ -209,11 +209,11 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 2, BattleTower_Lobby_EventScript_160652 case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist - compare 0x8004, 1 + compare SPECIALVAR_4, 1 goto_if_eq BattleTower_Lobby_EventScript_16060D - setvar 0x8004, 1 - copyvar 0x8005, RESULT - copyvar 0x8006, RESULT + setvar SPECIALVAR_4, 1 + copyvar SPECIALVAR_5, RESULT + copyvar SPECIALVAR_6, RESULT special sub_8135668 msgbox BattleTower_Lobby_Text_19A07B, 4 fadescreen 1 @@ -228,16 +228,16 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 127, BattleTower_Lobby_EventScript_16064F BattleTower_Lobby_EventScript_160587:: @ 8160587 - setvar 0x8004, 5 + setvar SPECIALVAR_4, 5 special sub_8135668 setvar VAR_TEMP_0, 0 - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 special sub_8135668 - setvar 0x8004, 0 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 1 special sub_8135668 - setvar 0x8004, 8 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 8 + setvar SPECIALVAR_5, 0 special sub_8135668 special LoadPlayerParty closemessage @@ -276,7 +276,7 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635 goto BattleTower_Lobby_EventScript_160662 BattleTower_Lobby_EventScript_160642:: @ 8160642 - setvar 0x8004, 12 + setvar SPECIALVAR_4, 12 special sub_8135668 goto BattleTower_Lobby_EventScript_160652 @@ -285,7 +285,7 @@ BattleTower_Lobby_EventScript_16064F:: @ 816064F BattleTower_Lobby_EventScript_160652:: @ 8160652 msgbox BattleTower_Lobby_Text_199FA9, 4 - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 special sub_8135668 BattleTower_Lobby_EventScript_160662:: @ 8160662 @@ -343,7 +343,7 @@ BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 BattleTower_Lobby_EventScript_1606CC:: @ 81606CC msgbox BattleTower_Lobby_Text_19A7C3, 4 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer @@ -392,7 +392,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 - setvar 0x8008, DECOR_SILVER_SHIELD + setvar SPECIALVAR_8, DECOR_SILVER_SHIELD givedecoration_std DECOR_SILVER_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF @@ -406,7 +406,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 - setvar 0x8008, DECOR_GOLD_SHIELD + setvar SPECIALVAR_8, DECOR_GOLD_SHIELD givedecoration_std DECOR_GOLD_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF @@ -416,7 +416,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 end BattleTower_Lobby_EventScript_1607AF:: @ 81607AF - bufferdecorationname 1, 0x8008 + bufferdecorationname 1, SPECIALVAR_8 msgbox BattleTower_Lobby_Text_1A0CEF, 4 msgbox BattleTower_Lobby_Text_19ABED, 4 release diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 69c160562..c766eed38 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -68,7 +68,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 waitmovement 0 delay 30 hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE - setvar 0x8004, 4 + setvar SPECIALVAR_4, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index c2e03bc38..9bc51f7d1 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -143,7 +143,7 @@ DewfordTown_EventScript_14E151:: @ 814E151 setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 resetobjectpriority 255, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 - copyvar VAR_BRINEY_LOCATION, 0x8008 + copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 waitstate release end @@ -181,7 +181,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage - copyvar VAR_BRINEY_LOCATION, 0x8008 + copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 resetobjectpriority 255, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 @@ -612,7 +612,7 @@ DewfordTown_EventScript_14E439:: @ 814E439 DewfordTown_EventScript_14E443:: @ 814E443 msgbox DewfordTown_Text_16BADC, 4 - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 call DewfordTown_EventScript_1A00F3 lock faceplayer @@ -624,7 +624,7 @@ DewfordTown_EventScript_14E443:: @ 814E443 DewfordTown_EventScript_14E46E:: @ 814E46E incrementgamestat GAME_STAT_STARTED_TRENDS - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 release diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 42f1fccb1..797a79af0 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -10,12 +10,12 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 checktrainerflag OPPONENT_BRAWLY goto_if_eq DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 - copyvar 0x8001, 0x8000 - compare 0x8000, 0 + copyvar SPECIALVAR_1, SPECIALVAR_0 + compare SPECIALVAR_0, 0 goto_if_eq DewfordTown_Gym_EventScript_1530BA - compare 0x8000, 1 + compare SPECIALVAR_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530B6 - compare 0x8000, 2 + compare SPECIALVAR_0, 2 goto_if_eq DewfordTown_Gym_EventScript_1530B2 goto DewfordTown_Gym_EventScript_1530AE @@ -42,14 +42,14 @@ DewfordTown_Gym_EventScript_1530BA:: @ 81530BA DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 nop1 - compare 0x8000, 0x8001 + compare SPECIALVAR_0, SPECIALVAR_1 goto_if_eq DewfordTown_Gym_EventScript_1530F5 - copyvar 0x8001, 0x8000 - compare 0x8000, 1 + copyvar SPECIALVAR_1, SPECIALVAR_0 + compare SPECIALVAR_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530F6 - compare 0x8000, 2 + compare SPECIALVAR_0, 2 goto_if_eq DewfordTown_Gym_EventScript_153101 - compare 0x8000, 3 + compare SPECIALVAR_0, 3 goto_if_eq DewfordTown_Gym_EventScript_15310C DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 @@ -80,20 +80,20 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 return DewfordTown_Gym_EventScript_153122:: @ 8153122 - setvar 0x8000, 0 + setvar SPECIALVAR_0, 0 checktrainerflag OPPONENT_HIDEKI goto_if 0, DewfordTown_Gym_EventScript_153135 - addvar 0x8000, 1 + addvar SPECIALVAR_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 checktrainerflag OPPONENT_TESSA goto_if 0, DewfordTown_Gym_EventScript_153143 - addvar 0x8000, 1 + addvar SPECIALVAR_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 checktrainerflag OPPONENT_LAURA goto_if 0, DewfordTown_Gym_EventScript_153151 - addvar 0x8000, 1 + addvar SPECIALVAR_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 return @@ -117,7 +117,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 call DewfordTown_Gym_EventScript_1A01C0 goto DewfordTown_Gym_EventScript_1531B5 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index a3830ebb8..e2521f5e8 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -121,13 +121,13 @@ DewfordTown_Hall_EventScript_1533E8:: @ 81533E8 DewfordTown_Hall_EventScript_1533F2:: @ 81533F2 lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_1533FE:: @ 81533FE lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto DewfordTown_Hall_EventScript_15340A end @@ -191,9 +191,9 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC DewfordTown_Hall_EventScript_1534FD:: @ 81534FD applymovement 8, DewfordTown_Hall_Movement_153599 waitmovement 0 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E - compare 0x8008, 1 + compare SPECIALVAR_8, 1 goto_if_eq DewfordTown_Hall_EventScript_153534 end @@ -210,9 +210,9 @@ DewfordTown_Hall_EventScript_153534:: @ 8153534 DewfordTown_Hall_EventScript_153535:: @ 8153535 applymovement 7, DewfordTown_Hall_Movement_15359B waitmovement 0 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 goto_if_eq DewfordTown_Hall_EventScript_153583 end diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc index c1288078f..1bbcda5db 100644 --- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A end DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call DewfordTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index ec18ff9b5..2f0e2ea5f 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -55,7 +55,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B end EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_810FF60 setflag FLAG_DEFEATED_ELITE_4_DRAKE call EverGrandeCity_DrakesRoom_EventScript_1A0693 diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index 018658416..a9a13246b 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 63bb4cac3..6e029a91f 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -15,7 +15,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B return EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call EverGrandeCity_PokemonLeague_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 0e47f9859..c88471656 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -7,7 +7,7 @@ FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7 end FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD - setvar 0x800b, 6 + setvar SPECIALVAR_B, 6 setvar CONTEST_RANK, 1 call FallarborTown_ContestLobby_EventScript_1A4E92 call FallarborTown_ContestLobby_EventScript_1539F8 diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 17267f926..7f3b750a9 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -28,7 +28,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA giveitem_std ITEM_TM27 compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B - setvar 0x8004, 280 + setvar SPECIALVAR_4, 280 call FallarborTown_House1_EventScript_1A067F setflag FLAG_RECEIVED_TM27 msgbox FallarborTown_House1_Text_177910, 4 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 001863d5c..7b222e671 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -26,12 +26,12 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 special sub_80F9A4C waitstate - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 special sub_80FA148 compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 - compare 0x8005, 0 + compare SPECIALVAR_5, 0 goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end @@ -40,7 +40,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 special sub_8132670 waitstate - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 takeitem ITEM_HEART_SCALE, 1 diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index dd6e83be3..cf8f778fb 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 end FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 5cacc8bf3..4e300e66c 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 msgbox FortreeCity_Gym_Text_185E73, 4 setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET - setvar 0x8008, 6 + setvar SPECIALVAR_8, 6 call FortreeCity_Gym_EventScript_1A01C0 goto FortreeCity_Gym_EventScript_157F3E end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 14b9b2c31..71a8f6378 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -6,29 +6,29 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 faceplayer checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED goto_if_eq FortreeCity_House1_EventScript_157EAD - setvar 0x8008, 1 - copyvar 0x8004, 0x8008 + setvar SPECIALVAR_8, 1 + copyvar SPECIALVAR_4, SPECIALVAR_8 specialvar RESULT, sub_804D89C - copyvar 0x8009, RESULT + copyvar SPECIALVAR_9, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 special sub_80F9A0C waitstate - copyvar 0x800a, 0x8004 - compare 0x8004, 255 + copyvar SPECIALVAR_A, SPECIALVAR_4 + compare SPECIALVAR_4, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_5, SPECIALVAR_A specialvar RESULT, sub_804DB2C - copyvar 0x800b, RESULT - compare RESULT, 0x8009 + copyvar SPECIALVAR_B, RESULT + compare RESULT, SPECIALVAR_9 goto_if 5, FortreeCity_House1_EventScript_157E9F - copyvar 0x8004, 0x8008 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_4, SPECIALVAR_8 + copyvar SPECIALVAR_5, SPECIALVAR_A special sub_804DB68 special sub_804E174 waitstate - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox FortreeCity_House1_Text_1856F7, 4 setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95 end FortreeCity_House1_EventScript_157E9F:: @ 8157E9F - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox FortreeCity_House1_Text_185737, 4 release end diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc index b82927be1..22c3f0248 100644 --- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 end FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call FortreeCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 344ccd479..b19ac6635 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -5,7 +5,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA lock faceplayer msgbox GraniteCave_StevensRoom_Text_194AE5, 4 - setvar 0x8004, ITEM_LETTER + setvar SPECIALVAR_4, ITEM_LETTER call GraniteCave_StevensRoom_EventScript_1A067F setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 4ef3ae82c..cfcf29ecc 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -28,7 +28,7 @@ LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 LavaridgeTown_EventScript_14E4ED:: @ 814E4ED lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 opendoor 12, 15 waitdooranim addobject 8 @@ -48,7 +48,7 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED call_if 1, LavaridgeTown_EventScript_14E56B compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LavaridgeTown_EventScript_14E68F checkplayergender compare RESULT, 0 @@ -68,7 +68,7 @@ LavaridgeTown_EventScript_14E570:: @ 814E570 LavaridgeTown_EventScript_14E575:: @ 814E575 lock faceplayer - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 checkplayergender compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B @@ -99,22 +99,22 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closemessage - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LavaridgeTown_EventScript_14E646 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LavaridgeTown_EventScript_14E64E removeobject 8 addobject 7 delay 30 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LavaridgeTown_EventScript_14E69A - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 removeobject 7 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 fadedefaultbgm - compare 0x8008, 0 + compare SPECIALVAR_8, 0 goto_if_eq LavaridgeTown_EventScript_14E644 releaseall end diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 044f72d11..3a5bbf20b 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -86,7 +86,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB - setvar 0x8008, 4 + setvar SPECIALVAR_8, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE setvar VAR_LAVARIDGE_RIVAL_STATE, 1 diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc index 0efda9c1e..b395ce744 100644 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 end LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 33c81b108..4e27e0240 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -172,8 +172,8 @@ LilycoveCity_EventScript_14CC79:: @ 814CC79 LilycoveCity_EventScript_14CC82:: @ 814CC82 lockall - specialvar 0x8004, sub_80C4D50 - switch 0x8004 + specialvar SPECIALVAR_4, sub_80C4D50 + switch SPECIALVAR_4 case 0, LilycoveCity_EventScript_14CCA2 msgbox LilycoveCity_Text_168EA4, 4 releaseall diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index bc61c5ecd..976e0c89e 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -87,8 +87,8 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 return LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 - specialvar 0x8004, sub_80C4D50 - switch 0x8004 + specialvar SPECIALVAR_4, sub_80C4D50 + switch SPECIALVAR_4 case 1, LilycoveCity_ContestLobby_EventScript_1589D6 case 2, LilycoveCity_ContestLobby_EventScript_1589DA case 3, LilycoveCity_ContestLobby_EventScript_1589DE @@ -361,7 +361,7 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 choosecontestmon - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 compare RESULT, 0 @@ -392,7 +392,7 @@ LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2 end LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 - copyvar 0x8008, 0x8004 + copyvar SPECIALVAR_8, SPECIALVAR_4 message LilycoveCity_ContestLobby_Text_1A67A3 waitmessage yesnobox 20, 8 @@ -417,7 +417,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 message LilycoveCity_ContestLobby_Text_1887C7 waitmessage - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT special sub_808363C waitstate compare RESULT, 3 @@ -429,7 +429,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 messageautoscroll LilycoveCity_ContestLobby_Text_18872A waitmessage contestlinktransfer - switch 0x8004 + switch SPECIALVAR_4 case 0, LilycoveCity_ContestLobby_EventScript_158DD1 case 1, LilycoveCity_ContestLobby_EventScript_158D82 case 2, LilycoveCity_ContestLobby_EventScript_158DC3 @@ -471,11 +471,11 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C - addvar 0x8004, 1 + addvar SPECIALVAR_4, 1 buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage - addvar 0x8004, 65535 + addvar SPECIALVAR_4, 65535 goto LilycoveCity_ContestLobby_EventScript_158DEE end @@ -571,7 +571,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialvar RESULT, sub_80C5044 compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 - setvar 0x800b, 8 + setvar SPECIALVAR_B, 8 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_1A4E92 call LilycoveCity_ContestLobby_EventScript_158F86 @@ -586,7 +586,7 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 giveitem ITEM_CONTEST_PASS, 1 - setvar 0x800b, 8 + setvar SPECIALVAR_B, 8 setvar CONTEST_RANK, 3 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 setflag FLAG_SYS_RIBBON_GET diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index c25a014f3..c58f484e2 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -6,7 +6,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C faceplayer checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF - copyvar 0x8005, VAR_DEPT_STORE_FLOOR + copyvar SPECIALVAR_5, VAR_DEPT_STORE_FLOOR special sub_810E944 message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 6cdb3367e..08f99f04e 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -20,7 +20,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 waitmessage special RetrieveLotteryNumber - copyvar 0x8008, RESULT + copyvar SPECIALVAR_8, RESULT special sub_810F9AC msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 @@ -33,23 +33,23 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmovement 0 - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY - compare 0x8006, 0 + compare SPECIALVAR_6, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A - compare 0x8006, 1 + compare SPECIALVAR_6, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - bufferitemname 0, 0x8005 - compare 0x8004, 1 + bufferitemname 0, SPECIALVAR_5 + compare SPECIALVAR_4, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 - compare 0x8004, 2 + compare SPECIALVAR_4, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 - compare 0x8004, 3 + compare SPECIALVAR_4, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A - compare 0x8004, 4 + compare SPECIALVAR_4, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 - giveitem_std 0x8005 + giveitem_std SPECIALVAR_5 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E @@ -100,7 +100,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93 return LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C - copyvar VAR_LOTTERY_PRIZE, 0x8005 + copyvar VAR_LOTTERY_PRIZE, SPECIALVAR_5 goto LilycoveCity_DepartmentStore_1F_EventScript_159EA7 end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index d1ac96d93..9805da6e7 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -86,7 +86,7 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 call LilycoveCity_Harbor_EventScript_1A040E return @@ -136,7 +136,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE delay 30 hideobjectat 255, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 call LilycoveCity_Harbor_EventScript_1A040E warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 74c53591d..f7a5dafad 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -98,8 +98,8 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall checkflag FLAG_RECEIVED_GLASS_ORNAMENT goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 - specialvar 0x8004, sub_80C4D50 - switch 0x8004 + specialvar SPECIALVAR_4, sub_80C4D50 + switch SPECIALVAR_4 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 02558e9d3..a6b500c15 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -16,7 +16,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 special sub_80F9A0C waitstate - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B special sub_80FA148 compare RESULT, 1 @@ -28,7 +28,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE fadescreen 1 special sub_80F9EEC fadescreen 0 - compare 0x8005, 4 + compare SPECIALVAR_5, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 38428311b..c86fb3dbc 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D end LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 31f849b9f..3b63b2cd2 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -69,35 +69,35 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 special sub_810FCE8 - setvar 0x8004, 8 + setvar SPECIALVAR_4, 8 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD - setvar 0x8004, 10 + setvar SPECIALVAR_4, 10 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED - setvar 0x8004, 12 + setvar SPECIALVAR_4, 12 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD - setvar 0x8004, 14 + setvar SPECIALVAR_4, 14 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 - setvar 0x8004, 15 + setvar SPECIALVAR_4, 15 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D @@ -146,7 +146,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515 LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F lock faceplayer - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C @@ -186,7 +186,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15959C:: @ 815959C LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 lock faceplayer - setvar 0x8004, 8 + setvar SPECIALVAR_4, 8 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 @@ -226,7 +226,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159613:: @ 8159613 LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D lock faceplayer - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A @@ -266,7 +266,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15968A:: @ 815968A LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 lock faceplayer - setvar 0x8004, 10 + setvar SPECIALVAR_4, 10 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 @@ -306,7 +306,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159701:: @ 8159701 LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B lock faceplayer - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -339,7 +339,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159763:: @ 8159763 LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D lock faceplayer - setvar 0x8004, 12 + setvar SPECIALVAR_4, 12 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -372,7 +372,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5:: @ 81597C5 LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF lock faceplayer - setvar 0x8004, 14 + setvar SPECIALVAR_4, 14 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -405,7 +405,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159827:: @ 8159827 LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 lock faceplayer - setvar 0x8004, 15 + setvar SPECIALVAR_4, 15 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index cd0a61fef..8dcb712dd 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -77,8 +77,8 @@ LittlerootTown_MapScript2_14D5D5:: @ 814D5D5 LittlerootTown_EventScript_14D5EF:: @ 814D5EF lockall - setvar 0x8004, 5 - setvar 0x8005, 8 + setvar SPECIALVAR_4, 5 + setvar SPECIALVAR_5, 8 call LittlerootTown_EventScript_14D62B setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 @@ -88,8 +88,8 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF LittlerootTown_EventScript_14D60D:: @ 814D60D lockall - setvar 0x8004, 14 - setvar 0x8005, 8 + setvar SPECIALVAR_4, 14 + setvar SPECIALVAR_5, 8 call LittlerootTown_EventScript_14D62B setflag FLAG_HIDE_MOVING_TRUCK_MAY warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 @@ -102,12 +102,12 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B playse 10 applymovement 255, LittlerootTown_Movement_14D6C0 waitmovement 0 - opendoor 0x8004, 0x8005 + opendoor SPECIALVAR_4, SPECIALVAR_5 waitdooranim addobject 4 applymovement 4, LittlerootTown_Movement_14D6AC waitmovement 0 - closedoor 0x8004, 0x8005 + closedoor SPECIALVAR_4, SPECIALVAR_5 waitdooranim delay 10 applymovement 4, LittlerootTown_Movement_14D6AE @@ -117,7 +117,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6B1 applymovement 255, LittlerootTown_Movement_14D6B8 waitmovement 0 - opendoor 0x8004, 0x8005 + opendoor SPECIALVAR_4, SPECIALVAR_5 waitdooranim applymovement 4, LittlerootTown_Movement_14D6B5 applymovement 255, LittlerootTown_Movement_14D6BD @@ -125,7 +125,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B setflag FLAG_HIDE_MOM_LITTLEROOT setvar VAR_LITTLEROOT_INTRO_STATE, 3 hideobjectat 255, MAP_PETALBURG_CITY - closedoor 0x8004, 0x8005 + closedoor SPECIALVAR_4, SPECIALVAR_5 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT clearflag FLAG_SPECIAL_FLAG_0 @@ -369,39 +369,39 @@ LittlerootTown_EventScript_14D857:: @ 814D857 LittlerootTown_EventScript_14D860:: @ 814D860 lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 setobjectxy 4, 10, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D873:: @ 814D873 lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 setobjectxy 4, 11, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D886:: @ 814D886 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D892:: @ 814D892 lockall - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D89E:: @ 814D89E lockall - setvar 0x8008, 4 + setvar SPECIALVAR_8, 4 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D8AA:: @ 814D8AA lockall - setvar 0x8008, 5 + setvar SPECIALVAR_8, 5 goto LittlerootTown_EventScript_14D8B6 end @@ -433,13 +433,13 @@ LittlerootTown_EventScript_14D8B6:: @ 814D8B6 end LittlerootTown_EventScript_14D926:: @ 814D926 - setvar 0x8009, 5 - setvar 0x800a, 8 + setvar SPECIALVAR_9, 5 + setvar SPECIALVAR_A, 8 return LittlerootTown_EventScript_14D931:: @ 814D931 - setvar 0x8009, 14 - setvar 0x800a, 8 + setvar SPECIALVAR_9, 14 + setvar SPECIALVAR_A, 8 return LittlerootTown_EventScript_14D93C:: @ 814D93C @@ -453,32 +453,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 return LittlerootTown_EventScript_14D952:: @ 814D952 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, LittlerootTown_EventScript_14DA02 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, LittlerootTown_EventScript_14DA17 - compare 0x8008, 4 + compare SPECIALVAR_8, 4 call_if 1, LittlerootTown_EventScript_14DA2C - compare 0x8008, 5 + compare SPECIALVAR_8, 5 call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, LittlerootTown_EventScript_14DA56 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, LittlerootTown_EventScript_14DA6B - compare 0x8008, 4 + compare SPECIALVAR_8, 4 call_if 1, LittlerootTown_EventScript_14DA80 - compare 0x8008, 5 + compare SPECIALVAR_8, 5 call_if 1, LittlerootTown_EventScript_14DA95 return @@ -553,32 +553,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, LittlerootTown_EventScript_14DB46 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, LittlerootTown_EventScript_14DB6C - compare 0x8008, 4 + compare SPECIALVAR_8, 4 call_if 1, LittlerootTown_EventScript_14DB92 - compare 0x8008, 5 + compare SPECIALVAR_8, 5 call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, LittlerootTown_EventScript_14DBDE - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, LittlerootTown_EventScript_14DC04 - compare 0x8008, 4 + compare SPECIALVAR_8, 4 call_if 1, LittlerootTown_EventScript_14DC2A - compare 0x8008, 5 + compare SPECIALVAR_8, 5 call_if 1, LittlerootTown_EventScript_14DC50 return @@ -595,96 +595,96 @@ LittlerootTown_EventScript_14DB3B:: @ 814DB3B LittlerootTown_EventScript_14DB46:: @ 814DB46 applymovement 4, LittlerootTown_Movement_14DCB4 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DB6C:: @ 814DB6C applymovement 4, LittlerootTown_Movement_14DCBA waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DB92:: @ 814DB92 applymovement 4, LittlerootTown_Movement_14DCC1 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DBB8:: @ 814DBB8 applymovement 4, LittlerootTown_Movement_14DCC5 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DBDE:: @ 814DBDE applymovement 4, LittlerootTown_Movement_14DCCA waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DC04:: @ 814DC04 applymovement 4, LittlerootTown_Movement_14DCCF waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DC2A:: @ 814DC2A applymovement 4, LittlerootTown_Movement_14DCD3 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DC50:: @ 814DC50 applymovement 4, LittlerootTown_Movement_14DCDA waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return @@ -849,12 +849,12 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim goto LittlerootTown_EventScript_14DD2B end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index ba530cefc..b017f0254 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -76,15 +76,15 @@ LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720 LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 lockall - setvar 0x8004, 1 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6956 end LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 lockall - setvar 0x8004, 0 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 1 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF end @@ -116,9 +116,9 @@ LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall - setvar 0x8004, 1 - setvar 0x8005, 0 - applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 0 + applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A083F waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index e7f3b6b62..db1261736 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -58,7 +58,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E end LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 special DoPCTurnOnEffect playse SE_PC_ON msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4 @@ -68,7 +68,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 end gBrendanHouse_TurnPCOff:: @ 8152850 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 playse SE_PC_OFF special DoPCTurnOffEffect releaseall diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index e3255b289..f48e84252 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -76,15 +76,15 @@ LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 lockall - setvar 0x8004, 1 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6956 end LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 lockall - setvar 0x8004, 1 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6B2E end @@ -163,9 +163,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_152A2B:: @ 8152A2B LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 lockall - setvar 0x8004, 1 - setvar 0x8005, 1 - applymovement 0x8004, LittlerootTown_MaysHouse_1F_Movement_1A0843 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 1 + applymovement SPECIALVAR_4, LittlerootTown_MaysHouse_1F_Movement_1A0843 waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index ee449d263..778ce6846 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -206,7 +206,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 end LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 special DoPCTurnOnEffect playse SE_PC_ON msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4 @@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C end gMayHouse_TurnPCOff:: @ 8152C75 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 playse SE_PC_OFF special DoPCTurnOffEffect releaseall diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 35478a445..51fb1614d 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -37,7 +37,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE end LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678 goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 7dc063149..7c071477d 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -524,7 +524,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -535,7 +535,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -546,7 +546,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -557,7 +557,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -568,7 +568,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 4 + setvar SPECIALVAR_4, 4 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -579,7 +579,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 5 + setvar SPECIALVAR_4, 5 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -590,7 +590,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 6 + setvar SPECIALVAR_4, 6 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -601,7 +601,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 7 + setvar SPECIALVAR_4, 7 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -612,7 +612,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 8 + setvar SPECIALVAR_4, 8 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -623,7 +623,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -634,7 +634,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 10 + setvar SPECIALVAR_4, 10 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -645,7 +645,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 4e4d5cf31..b8be1d0ac 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -46,19 +46,19 @@ MauvilleCity_Gym_EventScript_15649B:: @ 815649B end MauvilleCity_Gym_EventScript_15657D:: @ 815657D - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_15658B:: @ 815658B - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_156599:: @ 8156599 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end @@ -87,7 +87,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 special DrawWholeMapView @@ -116,7 +116,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 1 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 goto MauvilleCity_Gym_EventScript_1566BA end @@ -127,7 +127,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 2 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 goto MauvilleCity_Gym_EventScript_1566BA end @@ -138,7 +138,7 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 3 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 goto MauvilleCity_Gym_EventScript_1566BA end diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index de30e21cd..c16b66482 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -13,7 +13,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 end MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 9d4f26cfa..6d8aeee21 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -18,8 +18,8 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E special PrintEReaderTrainerGreeting msgbox gStringVar4, 4 closemessage - setvar 0x8004, 2 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 0 special sub_813556C waitstate compare RESULT, 3 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index b1550a4c1..a1afd4e82 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -65,7 +65,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 setflag FLAG_BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_UNKNOWN_393 - setvar 0x8008, 7 + setvar SPECIALVAR_8, 7 call MossdeepCity_Gym_EventScript_1A01C0 clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR goto MossdeepCity_Gym_EventScript_15A5C6 diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc index c26238102..7f6220aa9 100644 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 end MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index a11b12fcc..5f26583c9 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -77,7 +77,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C getpartysize compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT removeobject 2 playfanfare 370 message MossdeepCity_StevensHouse_Text_18DD61 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 7b71ebd76..eac29a855 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -44,7 +44,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C applymovement 1, MtChimney_CableCarStation_Movement_15C1A5 applymovement 255, MtChimney_CableCarStation_Movement_15C1AF waitmovement 0 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 34828f415..2cf8b7b8e 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -8,19 +8,19 @@ MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7 MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9 lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto MtPyre_Summit_EventScript_15D4E1 end @@ -30,11 +30,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, MtPyre_Summit_EventScript_15D593 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, MtPyre_Summit_EventScript_15D59E - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 @@ -52,11 +52,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 fadescreen 0 delay 20 call MtPyre_Summit_EventScript_15D57A - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, MtPyre_Summit_EventScript_15D5BF - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 @@ -196,7 +196,7 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A end MtPyre_Summit_EventScript_15D669:: @ 815D669 - setvar 0x8004, ITEM_RED_OR_BLUE_ORB + setvar SPECIALVAR_4, ITEM_RED_OR_BLUE_ORB call MtPyre_Summit_EventScript_1A067F closemessage applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841 @@ -246,19 +246,19 @@ MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4 MtPyre_Summit_EventScript_15D6CE:: @ 815D6CE lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto MtPyre_Summit_EventScript_15D6F2 end @@ -268,11 +268,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, MtPyre_Summit_EventScript_15D75E - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, MtPyre_Summit_EventScript_15D769 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 @@ -280,11 +280,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 msgbox MtPyre_Summit_Text_1B6848, 4 .endif closemessage - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, MtPyre_Summit_EventScript_15D77F - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, MtPyre_Summit_EventScript_15D78A - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, MtPyre_Summit_EventScript_15D795 removeobject 2 setvar VAR_MT_PYRE_STATE, 3 diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index cbf3acd27..da913f4bd 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E end OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call OldaleTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 624a221d5..2717be669 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -6,29 +6,29 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E faceplayer checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED goto_if_eq PacifidlogTown_House3_EventScript_154338 - setvar 0x8008, 2 - copyvar 0x8004, 0x8008 + setvar SPECIALVAR_8, 2 + copyvar SPECIALVAR_4, SPECIALVAR_8 specialvar RESULT, sub_804D89C - copyvar 0x8009, RESULT + copyvar SPECIALVAR_9, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 special sub_80F9A0C waitstate - copyvar 0x800a, 0x8004 - compare 0x8004, 255 + copyvar SPECIALVAR_A, SPECIALVAR_4 + compare SPECIALVAR_4, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_5, SPECIALVAR_A specialvar RESULT, sub_804DB2C - copyvar 0x800b, RESULT - compare RESULT, 0x8009 + copyvar SPECIALVAR_B, RESULT + compare RESULT, SPECIALVAR_9 goto_if 5, PacifidlogTown_House3_EventScript_15432A - copyvar 0x8004, 0x8008 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_4, SPECIALVAR_8 + copyvar SPECIALVAR_5, SPECIALVAR_A special sub_804DB68 special sub_804E174 waitstate - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox PacifidlogTown_House3_Text_1794C4, 4 setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320 end PacifidlogTown_House3_EventScript_15432A:: @ 815432A - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox PacifidlogTown_House3_Text_1794DF, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc index 95d5448e8..fa19f9d76 100644 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 end @ 8154109 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index caec9b4a2..31e01f8ab 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -156,25 +156,25 @@ PetalburgCity_EventScript_14B82D:: @ 814B82D PetalburgCity_EventScript_14B836:: @ 814B836 lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B842:: @ 814B842 lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B84E:: @ 814B84E lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B85A:: @ 814B85A lockall - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto PetalburgCity_EventScript_14B866 end @@ -187,23 +187,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 waitmovement 0 applymovement 9, PetalburgCity_Movement_1A0835 waitmovement 0 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_EventScript_14B91B - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_EventScript_14B930 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_EventScript_14B93B - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closemessage - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_EventScript_14B965 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_EventScript_14B977 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_EventScript_14B989 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 applymovement 9, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 727818f34..2d95958a2 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -13,7 +13,7 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C end PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 - setvar 0x8005, 1 + setvar SPECIALVAR_5, 1 call PetalburgCity_Gym_EventScript_154F9A checktrainerflag OPPONENT_RANDALL call_if 1, PetalburgCity_Gym_EventScript_154FBB @@ -32,7 +32,7 @@ PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED - setvar 0x8005, 1 + setvar SPECIALVAR_5, 1 call PetalburgCity_Gym_EventScript_154F9A call PetalburgCity_Gym_EventScript_154FBB call PetalburgCity_Gym_EventScript_154FDC @@ -122,87 +122,87 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 end PetalburgCity_Gym_EventScript_15463D:: @ 815463D - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154648:: @ 8154648 - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154653:: @ 8154653 - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_15465E:: @ 815465E - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 playse 8 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154800 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15481C - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154884 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15488F - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548A1 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548C5 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548D0 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548DB - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_15492F - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154930 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15493B - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_15493C - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548FC - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage setflag FLAG_SPECIAL_FLAG_1 playbgm 420, 0 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15484E - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_154860 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 removeobject 10 setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 @@ -403,7 +403,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 call PetalburgCity_Gym_EventScript_1A0424 setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM clearflag FLAG_HIDE_WATTSON_MAUVILLE - setvar 0x8008, 5 + setvar SPECIALVAR_8, 5 call PetalburgCity_Gym_EventScript_1A01C0 clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL call PetalburgCity_Gym_EventScript_1544ED @@ -594,8 +594,8 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 85 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 85 msgbox PetalburgCity_Gym_Text_17B870, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -624,8 +624,8 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 98 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 98 msgbox PetalburgCity_Gym_Text_17B8D4, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -637,8 +637,8 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall checktrainerflag OPPONENT_RANDALL goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 46 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -650,8 +650,8 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall checktrainerflag OPPONENT_RANDALL goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 59 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -663,8 +663,8 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall checktrainerflag OPPONENT_MARY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 59 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -676,8 +676,8 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall checktrainerflag OPPONENT_MARY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 72 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -689,8 +689,8 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall checktrainerflag OPPONENT_PARKER goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 20 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -702,8 +702,8 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall checktrainerflag OPPONENT_LORI goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 20 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -715,8 +715,8 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall checktrainerflag OPPONENT_LORI goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 33 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -728,8 +728,8 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall checktrainerflag OPPONENT_GEORGE goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 33 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -741,8 +741,8 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall checktrainerflag OPPONENT_JODY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 7 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -754,8 +754,8 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall checktrainerflag OPPONENT_BERKE goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 7 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -771,7 +771,7 @@ PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 end PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_154FBB special DrawWholeMapView release @@ -789,7 +789,7 @@ PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 end PetalburgCity_Gym_EventScript_154E56:: @ 8154E56 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_154FFD special DrawWholeMapView release @@ -807,7 +807,7 @@ PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E end PetalburgCity_Gym_EventScript_154E92:: @ 8154E92 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_15503F special DrawWholeMapView release @@ -825,7 +825,7 @@ PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA end PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_155081 special DrawWholeMapView release @@ -843,7 +843,7 @@ PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 end PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_154FDC special DrawWholeMapView release @@ -861,7 +861,7 @@ PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 end PetalburgCity_Gym_EventScript_154F46:: @ 8154F46 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_15501E special DrawWholeMapView release @@ -879,7 +879,7 @@ PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E end PetalburgCity_Gym_EventScript_154F82:: @ 8154F82 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_155060 special DrawWholeMapView release @@ -890,73 +890,73 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 end PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A - setvar 0x8004, 1 - compare 0x8005, 0 + setvar SPECIALVAR_4, 1 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB - setvar 0x8004, 2 - compare 0x8005, 0 + setvar SPECIALVAR_4, 2 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC - setvar 0x8004, 3 - compare 0x8005, 0 + setvar SPECIALVAR_4, 3 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD - setvar 0x8004, 4 - compare 0x8005, 0 + setvar SPECIALVAR_4, 4 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E - setvar 0x8004, 5 - compare 0x8005, 0 + setvar SPECIALVAR_4, 5 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F - setvar 0x8004, 6 - compare 0x8005, 0 + setvar SPECIALVAR_4, 6 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 - setvar 0x8004, 7 - compare 0x8005, 0 + setvar SPECIALVAR_4, 7 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 - setvar 0x8004, 8 - compare 0x8005, 0 + setvar SPECIALVAR_4, 8 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 25af3e1cb..cb79bdf86 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A end PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 1bf579d77..4d3f03cd1 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -153,7 +153,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 - copyvar VAR_BRINEY_LOCATION, 0x8008 + copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 61ad2bddd..35e59cdff 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -54,7 +54,7 @@ Route109_EventScript_14F548:: @ 814F548 hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_16B4B5, 4 closemessage - copyvar VAR_BRINEY_LOCATION, 0x8008 + copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 resetobjectpriority 255, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 9d6cc22d3..e409a3cd6 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -309,17 +309,17 @@ Route110_EventScript_14FD09:: @ 814FD09 return Route110_EventScript_14FD13:: @ 814FD13 - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD1E:: @ 814FD1E - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD29:: @ 814FD29 - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto Route110_EventScript_14FD34 end @@ -337,11 +337,11 @@ Route110_EventScript_14FD34:: @ 814FD34 applymovement 28, Route110_Movement_1A0835 waitmovement 0 delay 30 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, Route110_EventScript_14FF14 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, Route110_EventScript_14FF1F - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, Route110_EventScript_14FF2A checkplayergender compare RESULT, 0 @@ -425,22 +425,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closemessage - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, Route110_EventScript_14FF56 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, Route110_EventScript_14FF5E - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, Route110_EventScript_14FF66 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, Route110_EventScript_14FF35 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, Route110_EventScript_14FF40 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, Route110_EventScript_14FF4B removeobject 29 setvar VAR_ROUTE110_STATE, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 05b570482..5dad15672 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -736,23 +736,23 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 end Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1 - setvar 0x8004, 6 - setvar 0x8005, 3 - setvar 0x8006, 0 + setvar SPECIALVAR_4, 6 + setvar SPECIALVAR_5, 3 + setvar SPECIALVAR_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_1618F6:: @ 81618F6 - setvar 0x8004, 11 - setvar 0x8005, 5 - setvar 0x8006, 0 + setvar SPECIALVAR_4, 11 + setvar SPECIALVAR_5, 5 + setvar SPECIALVAR_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B - setvar 0x8004, 9 - setvar 0x8005, 2 - setvar 0x8006, 0 + setvar SPECIALVAR_4, 9 + setvar SPECIALVAR_5, 2 + setvar SPECIALVAR_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 17d4f91c6..2463feb9c 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -140,25 +140,25 @@ Route111_EventScript_150100:: @ 8150100 @ 815010A lockall - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 goto Route111_EventScript_15013A end Route111_EventScript_150116:: @ 8150116 lockall - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 goto Route111_EventScript_15013A end Route111_EventScript_150122:: @ 8150122 lockall - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 goto Route111_EventScript_15013A end @ 815012E lockall - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 goto Route111_EventScript_15013A end @@ -173,13 +173,13 @@ Route111_EventScript_15013A:: @ 815013A Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closemessage - compare 0x8004, 0 + compare SPECIALVAR_4, 0 call_if 1, Route111_EventScript_150188 - compare 0x8004, 1 + compare SPECIALVAR_4, 1 call_if 1, Route111_EventScript_150193 - compare 0x8004, 2 + compare SPECIALVAR_4, 2 call_if 1, Route111_EventScript_15019E - compare 0x8004, 3 + compare SPECIALVAR_4, 3 call_if 1, Route111_EventScript_1501A9 releaseall end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 981971e41..32f8e41a3 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -4,7 +4,7 @@ Route111_WinstrateFamilysHouse_MapScripts:: @ 815BF24 Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 lock faceplayer - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 msgbox Route111_WinstrateFamilysHouse_Text_191FCE, 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -12,7 +12,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A lock faceplayer - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 checkflag FLAG_RECEIVED_MACHO_BRACE goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 @@ -31,7 +31,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF72:: @ 815BF72 Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 lock faceplayer - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 msgbox Route111_WinstrateFamilysHouse_Text_192190, 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -39,7 +39,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 lock faceplayer - setvar 0x8008, 4 + setvar SPECIALVAR_8, 4 checkflag FLAG_TEMP_4 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 @@ -54,7 +54,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 closemessage - applymovement 0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D + applymovement SPECIALVAR_8, Route111_WinstrateFamilysHouse_Movement_1A083D waitmovement 0 release end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 9c572c0ca..fcdd565bc 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -45,7 +45,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD applymovement 1, Route112_CableCarStation_Movement_15C0E6 applymovement 255, Route112_CableCarStation_Movement_15C0F0 waitmovement 0 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 3424fbb6f..887f019f3 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -51,7 +51,7 @@ Route113_GlassWorkshop_EventScript_1635E4:: @ 81635E4 end Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE - setvar 0x8009, 0 + setvar SPECIALVAR_9, 0 special ShowGlassWorkshopMenu waitstate switch RESULT @@ -67,9 +67,9 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE end Route113_GlassWorkshop_EventScript_163660:: @ 8163660 - setvar 0x8008, 39 - bufferitemname 0, 0x8008 - setvar 0x800a, 250 + setvar SPECIALVAR_8, 39 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 250 compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -81,9 +81,9 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 end Route113_GlassWorkshop_EventScript_16369C:: @ 816369C - setvar 0x8008, 40 - bufferitemname 0, 0x8008 - setvar 0x800a, 500 + setvar SPECIALVAR_8, 40 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -95,9 +95,9 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C end Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 - setvar 0x8008, 41 - bufferitemname 0, 0x8008 - setvar 0x800a, 500 + setvar SPECIALVAR_8, 41 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -109,9 +109,9 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 end Route113_GlassWorkshop_EventScript_163714:: @ 8163714 - setvar 0x8008, 43 - bufferitemname 0, 0x8008 - setvar 0x800a, 1000 + setvar SPECIALVAR_8, 43 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -123,9 +123,9 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 end Route113_GlassWorkshop_EventScript_163750:: @ 8163750 - setvar 0x8008, 42 - bufferitemname 0, 0x8008 - setvar 0x800a, 1000 + setvar SPECIALVAR_8, 42 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -137,10 +137,10 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 end Route113_GlassWorkshop_EventScript_16378C:: @ 816378C - setvar 0x8009, 1 - setvar 0x8008, 13 - bufferdecorationname 0, 0x8008 - setvar 0x800a, 6000 + setvar SPECIALVAR_9, 1 + setvar SPECIALVAR_8, 13 + bufferdecorationname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -152,10 +152,10 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C end Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD - setvar 0x8009, 1 - setvar 0x8008, 6 - bufferdecorationname 0, 0x8008 - setvar 0x800a, 8000 + setvar SPECIALVAR_9, 1 + setvar SPECIALVAR_8, 6 + bufferdecorationname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -172,15 +172,15 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E end Route113_GlassWorkshop_EventScript_163818:: @ 8163818 - setvar 0x800a, 250 - subvar 0x800a, 16456 + setvar SPECIALVAR_A, 250 + subvar SPECIALVAR_A, 16456 buffernumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 - subvar 0x800a, 16456 + subvar SPECIALVAR_A, 16456 buffernumberstring 1, 32778 message Route113_GlassWorkshop_Text_19E890 waitmessage @@ -201,22 +201,22 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare 0x8009, 0 + compare SPECIALVAR_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare 0x8009, 1 + compare SPECIALVAR_9, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release end Route113_GlassWorkshop_EventScript_163889:: @ 8163889 - giveitem_std 0x8008 + giveitem_std SPECIALVAR_8 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 - givedecoration_std 0x8008 + givedecoration_std SPECIALVAR_8 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -245,59 +245,59 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 end Route113_GlassWorkshop_EventScript_163925:: @ 8163925 - setvar 0x8009, 0 - setvar 0x8008, 39 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 39 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 - setvar 0x8009, 0 - setvar 0x8008, 40 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 40 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D - setvar 0x8009, 0 - setvar 0x8008, 41 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 41 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 - setvar 0x8009, 0 - setvar 0x8008, 43 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 43 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 - setvar 0x8009, 0 - setvar 0x8008, 42 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 42 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 - setvar 0x8009, 1 - setvar 0x8008, 13 + setvar SPECIALVAR_9, 1 + setvar SPECIALVAR_8, 13 bufferdecorationname 0, 13 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D - setvar 0x8009, 1 - setvar 0x8008, 6 + setvar SPECIALVAR_9, 1 + setvar SPECIALVAR_8, 6 bufferdecorationname 0, 6 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare 0x8009, 0 + compare SPECIALVAR_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare 0x8009, 1 + compare SPECIALVAR_9, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index bc2ab0a51..051b30d54 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -50,7 +50,7 @@ Route118_EventScript_150FA5:: @ 8150FA5 Route118_EventScript_150FAE:: @ 8150FAE lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 applymovement 255, Route118_Movement_1A0841 waitmovement 0 applymovement 19, Route118_Movement_151069 @@ -60,7 +60,7 @@ Route118_EventScript_150FAE:: @ 8150FAE Route118_EventScript_150FCE:: @ 8150FCE lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 applymovement 255, Route118_Movement_1A0841 waitmovement 0 goto Route118_EventScript_151004 @@ -68,7 +68,7 @@ Route118_EventScript_150FCE:: @ 8150FCE Route118_EventScript_150FE4:: @ 8150FE4 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 applymovement 255, Route118_Movement_1A0841 waitmovement 0 applymovement 19, Route118_Movement_15106B @@ -83,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004 delay 30 msgbox Route118_Text_170D66, 4 closemessage - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, Route118_EventScript_151048 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, Route118_EventScript_151053 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, Route118_EventScript_15105E setvar VAR_ROUTE118_STATE, 1 removeobject 19 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index ca9acd2d5..85938be18 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -9,9 +9,9 @@ Route119_MapScript1_151172:: @ 8151172 end Route119_EventScript_15117C:: @ 815117C - compare 0x8004, 6 + compare SPECIALVAR_4, 6 call_if 1, Route119_EventScript_151193 - compare 0x8004, 7 + compare SPECIALVAR_4, 7 call_if 1, Route119_EventScript_151197 return diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 98c0cf20d..da0a65af1 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,17 +10,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare 0x8004, 0 + compare SPECIALVAR_4, 0 call_if 1, Route120_EventScript_15166B - compare 0x8004, 1 + compare SPECIALVAR_4, 1 call_if 1, Route120_EventScript_151672 - compare 0x8004, 2 + compare SPECIALVAR_4, 2 call_if 1, Route120_EventScript_151676 - compare 0x8004, 3 + compare SPECIALVAR_4, 3 call_if 1, Route120_EventScript_15167A - compare 0x8004, 4 + compare SPECIALVAR_4, 4 call_if 1, Route120_EventScript_15167E - compare 0x8004, 5 + compare SPECIALVAR_4, 5 call_if 1, Route120_EventScript_151682 return @@ -135,32 +135,32 @@ Route120_EventScript_151739:: @ 8151739 end Route120_EventScript_1517DC:: @ 81517DC - setvar 0x8004, ITEM_FIGY_BERRY + setvar SPECIALVAR_4, ITEM_FIGY_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 - setvar 0x8004, ITEM_WIKI_BERRY + setvar SPECIALVAR_4, ITEM_WIKI_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 - setvar 0x8004, ITEM_MAGO_BERRY + setvar SPECIALVAR_4, ITEM_MAGO_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD - setvar 0x8004, ITEM_AGUAV_BERRY + setvar SPECIALVAR_4, ITEM_AGUAV_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 - setvar 0x8004, ITEM_IAPAPA_BERRY + setvar SPECIALVAR_4, ITEM_IAPAPA_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151813:: @ 8151813 - giveitem_std 0x8004 + giveitem_std SPECIALVAR_4 compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 @@ -226,7 +226,7 @@ Route120_EventScript_15189D:: @ 815189D delay 40 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 6948bff87..0dbf1d345 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -43,7 +43,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 call Route123_BerryMastersHouse_EventScript_1A00F3 lock faceplayer @@ -60,17 +60,17 @@ Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B end Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 - compare 0x8004, 1 + compare SPECIALVAR_4, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E - compare 0x8004, 2 + compare SPECIALVAR_4, 2 goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F - compare 0x8004, 3 + compare SPECIALVAR_4, 3 goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 - compare 0x8004, 4 + compare SPECIALVAR_4, 4 goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 - compare 0x8004, 5 + compare SPECIALVAR_4, 5 goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 04da2d9c7..6d0bcc2c6 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -224,43 +224,43 @@ Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F end Route124_DivingTreasureHuntersHouse_EventScript_164256:: @ 8164256 - setvar 0x8008, 48 - setvar 0x8009, 95 + setvar SPECIALVAR_8, 48 + setvar SPECIALVAR_9, 95 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 - setvar 0x8008, 50 - setvar 0x8009, 96 + setvar SPECIALVAR_8, 50 + setvar SPECIALVAR_9, 96 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 - setvar 0x8008, 49 - setvar 0x8009, 97 + setvar SPECIALVAR_8, 49 + setvar SPECIALVAR_9, 97 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 - setvar 0x8008, 51 - setvar 0x8009, 98 + setvar SPECIALVAR_8, 51 + setvar SPECIALVAR_9, 98 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - bufferitemname 0, 0x8008 - bufferitemname 1, 0x8009 + bufferitemname 0, SPECIALVAR_8 + bufferitemname 1, SPECIALVAR_9 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F - checkitemspace 0x8009, 1 + checkitemspace SPECIALVAR_9, 1 compare RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 - checkitem 0x8008, 2 + checkitem SPECIALVAR_8, 2 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 - takeitem 0x8008, 1 - giveitem_std 0x8009 + takeitem SPECIALVAR_8, 1 + giveitem_std SPECIALVAR_9 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare VAR_TEMP_1, 0 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index efe390f8a..e4cef9fa4 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -126,7 +126,7 @@ RustboroCity_EventScript_14C481:: @ 814C481 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 goto RustboroCity_EventScript_14C4F4 end @@ -134,7 +134,7 @@ RustboroCity_EventScript_14C498:: @ 814C498 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 goto RustboroCity_EventScript_14C4F4 end @@ -142,7 +142,7 @@ RustboroCity_EventScript_14C4AF:: @ 814C4AF lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 goto RustboroCity_EventScript_14C4F4 end @@ -150,7 +150,7 @@ RustboroCity_EventScript_14C4C6:: @ 814C4C6 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 goto RustboroCity_EventScript_14C4F4 end @@ -158,7 +158,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 4 + setvar SPECIALVAR_4, 4 goto RustboroCity_EventScript_14C4F4 end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 71fc9731d..2e18bc55e 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -137,7 +137,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 @@ -157,7 +157,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 7ed47d35c..ef4d6fad1 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -18,7 +18,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE setflag FLAG_BADGE01_GET setvar VAR_RUSTBORO_STATE, 1 addvar VAR_PETALBURG_GYM_STATE, 1 - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 call RustboroCity_Gym_EventScript_1A01C0 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, RustboroCity_Gym_EventScript_1A00FB diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 0cad33204..8761d3898 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -6,25 +6,25 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D faceplayer checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED goto_if_eq RustboroCity_House1_EventScript_157D13 - setvar 0x8008, 0 - copyvar 0x8004, 0x8008 + setvar SPECIALVAR_8, 0 + copyvar SPECIALVAR_4, SPECIALVAR_8 specialvar RESULT, sub_804D89C - copyvar 0x8009, RESULT + copyvar SPECIALVAR_9, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB special sub_80F9A0C waitstate - copyvar 0x800a, 0x8004 - compare 0x8004, 255 + copyvar SPECIALVAR_A, SPECIALVAR_4 + compare SPECIALVAR_4, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_5, SPECIALVAR_A specialvar RESULT, sub_804DB2C - copyvar 0x800b, RESULT - compare RESULT, 0x8009 + copyvar SPECIALVAR_B, RESULT + compare RESULT, SPECIALVAR_9 goto_if 5, RustboroCity_House1_EventScript_157D05 - copyvar 0x8004, 0x8008 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_4, SPECIALVAR_8 + copyvar SPECIALVAR_5, SPECIALVAR_A special sub_804DB68 special sub_804E174 waitstate @@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox RustboroCity_House1_Text_184F8F, 4 release end diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index a1c0ac31b..c9a2a48a4 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F end RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index f9bf888e2..fb332fbff 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -14,10 +14,10 @@ SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA lockall - setvar 0x8004, 2 - setvar 0x8005, 3 - setvar 0x8006, 4 - setvar 0x8007, 5 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 3 + setvar SPECIALVAR_6, 4 + setvar SPECIALVAR_7, 5 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 applymovement 255, SeafloorCavern_Room9_Movement_15DD68 @@ -28,24 +28,24 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4850, 4 .endif closemessage - addobject 0x8004 + addobject SPECIALVAR_4 applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 - applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD36 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD36 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B41D5, 4 .else msgbox SeafloorCavern_Room9_Text_1B486C, 4 .endif - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0841 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4201, 4 .else msgbox SeafloorCavern_Room9_Text_1B4897, 4 .endif - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0839 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0839 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4289, 4 @@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA playfanfare 388 playse 107 special sub_80818A4 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0841 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 delay 150 @@ -104,23 +104,23 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA waitmovement 0 special sub_80818FC waitstate - setvar 0x8004, 1 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 1 special sub_810F758 waitstate applymovement 1, SeafloorCavern_Room9_Movement_15DD57 waitmovement 0 removeobject 1 delay 4 - setvar 0x8004, 2 - setvar 0x8005, 2 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 2 special sub_810F758 waitstate delay 30 - setvar 0x8004, 2 - setvar 0x8005, 3 - setvar 0x8006, 4 - setvar 0x8007, 5 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 3 + setvar SPECIALVAR_6, 4 + setvar SPECIALVAR_7, 5 .ifdef SAPPHIRE msgbox UnknownString_81B43F2, 4 .else @@ -135,7 +135,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4ADB, 4 .endif closemessage - applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD41 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD41 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B447A, 4 @@ -145,7 +145,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA closemessage playse 3 delay 20 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0845 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0845 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B45C6, 4 @@ -153,14 +153,14 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4C79, 4 .endif closemessage - addobject 0x8005 - addobject 0x8006 - addobject 0x8007 - applymovement 0x8007, SeafloorCavern_Room9_Movement_15DD63 - applymovement 0x8006, SeafloorCavern_Room9_Movement_15DD63 - applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD5A + addobject SPECIALVAR_5 + addobject SPECIALVAR_6 + addobject SPECIALVAR_7 + applymovement SPECIALVAR_7, SeafloorCavern_Room9_Movement_15DD63 + applymovement SPECIALVAR_6, SeafloorCavern_Room9_Movement_15DD63 + applymovement SPECIALVAR_5, SeafloorCavern_Room9_Movement_15DD5A waitmovement 0 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A083F + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B464D, 4 @@ -168,9 +168,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4D02, 4 .endif playse 21 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0833 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0833 waitmovement 0 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0835 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0835 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4723, 4 @@ -183,8 +183,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4E37, 4 .endif closemessage - applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD60 - applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD46 + applymovement SPECIALVAR_5, SeafloorCavern_Room9_Movement_15DD60 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD46 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4818, 4 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 0e64282e4..c481a0461 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -7,7 +7,7 @@ SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417 end SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D - setvar 0x800b, 7 + setvar SPECIALVAR_B, 7 setvar CONTEST_RANK, 2 call SlateportCity_ContestLobby_EventScript_1A4E92 call SlateportCity_ContestLobby_EventScript_155448 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index c13dbaf9c..b8547fda9 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -24,25 +24,25 @@ SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7 lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF lockall - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 applymovement 255, SlateportCity_Harbor_Movement_1560C2 waitmovement 0 goto SlateportCity_Harbor_EventScript_155FD5 @@ -63,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 removeobject 7 removeobject 8 setvar VAR_SLATEPORT_HARBOR_STATE, 2 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, SlateportCity_Harbor_EventScript_156071 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, SlateportCity_Harbor_EventScript_156086 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage @@ -229,7 +229,7 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar 0x8004, 5 + setvar SPECIALVAR_4, 5 call SlateportCity_Harbor_EventScript_1A040E return diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index c72aa229a..80522f4c1 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -15,9 +15,9 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 special sub_80F9A0C waitstate - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 7fcd0fff1..c261f3e83 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -78,7 +78,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 - setvar 0x8004, 269 + setvar SPECIALVAR_4, 269 call SlateportCity_OceanicMuseum_2F_EventScript_1A067F msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4 closemessage diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc index ac4e8f240..f9b7c7fb3 100644 --- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 end SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call SlateportCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 90748bbf5..b7f0f996b 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -102,7 +102,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET - setvar 0x8008, 8 + setvar SPECIALVAR_8, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 goto SootopolisCity_Gym_1F_EventScript_15B056 end diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index bdff79375..a9810ed16 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -8,7 +8,7 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 msgbox SootopolisCity_House8_Text_1900F7, 4 special sub_80F9A0C waitstate - copyvar RESULT, 0x8004 + copyvar RESULT, SPECIALVAR_4 compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize @@ -57,7 +57,7 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 msgbox SootopolisCity_House8_Text_190431, 4 special sub_80F9A0C waitstate - copyvar RESULT, 0x8004 + copyvar RESULT, SPECIALVAR_4 compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B4D9 special CompareBarboachSize diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 7b87bc7fc..1bbd30364 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 end @ 815B19A - setvar 0x800B, 1 + setvar SPECIALVAR_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index f62becf08..7624b3da3 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -18,7 +18,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 call SouthernIsland_Exterior_EventScript_1A047C warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 6386c3b82..63fd57a20 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -39,7 +39,7 @@ SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B lockall - setvar 0x8008, 12 + setvar SPECIALVAR_8, 12 goto SouthernIsland_Interior_EventScript_160BA7 end diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index cb5c713ee..54a614576 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -3,10 +3,10 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 .byte 0 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 - getplayerxy 0x8004, 0x8005 - compare 0x8004, 12 + getplayerxy SPECIALVAR_4, SPECIALVAR_5 + compare SPECIALVAR_4, 12 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 - compare 0x8005, 44 + compare SPECIALVAR_5, 44 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 11568ad22..83298dba6 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -7,7 +7,7 @@ VerdanturfTown_ContestLobby_MapScript1_153D70:: @ 8153D70 end VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 - setvar 0x800b, 5 + setvar SPECIALVAR_B, 5 setvar CONTEST_RANK, 0 call VerdanturfTown_ContestLobby_EventScript_1A4E92 call VerdanturfTown_ContestLobby_EventScript_153DA1 diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc index 598c3f60b..2323c139a 100644 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F PacifidlogTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress |