diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-24 14:00:44 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-24 14:00:44 -0600 |
| commit | 2c4d972f7c5a79ca94dca599b6e7b9e2c769cf70 (patch) | |
| tree | 473525953b1ac35be06b26cd2e6926fb7b0278cb | |
| parent | 7581e5de933b1b5829ff65c60e512d8c57b1fee9 (diff) | |
'VAR_SPECIAL_X' instead of 'SPECIALVAR_X'
99 files changed, 1178 insertions, 1178 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 5727c7383..5176beff3 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1366,11 +1366,11 @@ .endm .macro switch var - copyvar SPECIALVAR_0, \var + copyvar VAR_SPECIAL_0, \var .endm .macro case condition, dest - compare_var_to_value SPECIALVAR_0, \condition + compare_var_to_value VAR_SPECIAL_0, \condition goto_if_eq \dest .endm @@ -1386,12 +1386,12 @@ NO = 0 .macro giveitem_std item, amount=1, function=0 - setorcopyvar SPECIALVAR_0, \item - setorcopyvar SPECIALVAR_1, \amount + setorcopyvar VAR_SPECIAL_0, \item + setorcopyvar VAR_SPECIAL_1, \amount callstd \function .endm .macro givedecoration_std decoration - setorcopyvar SPECIALVAR_0, \decoration + setorcopyvar VAR_SPECIAL_0, \decoration callstd 7 .endm diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index fa0b1b5a7..64b211199 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1459,11 +1459,11 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C incrementgamestat GAME_STAT_USED_POKECENTER message gText_NurseJoy_OkayIllTakeYourPokemon waitmessage - applymovement SPECIALVAR_B, OldaleTown_PokemonCenter_1F_Movement_1A083F + applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A083F waitmovement 0 dofieldeffect 25 waitfieldeffect 25 - applymovement SPECIALVAR_B, OldaleTown_PokemonCenter_1F_Movement_1A0845 + applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmovement 0 special ScrSpecial_HealPlayerParty checkflag FLAG_POKERUS_EXPLAINED @@ -1474,7 +1474,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0 message gText_NurseJoy_ThankYouForWaiting waitmessage - applymovement SPECIALVAR_B, OldaleTown_PokemonCenter_1F_Movement_19FDF4 + applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_19FDF4 waitmovement 0 message gText_NurseJoy_WeHopeToSeeYouAgain waitmessage @@ -1505,18 +1505,18 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 step_end Std_ObtainItem: @ 819FDF7 - giveitem SPECIALVAR_0, SPECIALVAR_1 - copyvar SPECIALVAR_7, RESULT + giveitem VAR_SPECIAL_0, VAR_SPECIAL_1 + copyvar VAR_SPECIAL_7, RESULT call Std_ObtainItem_ return Std_ObtainItem_: @ 819FE07 - bufferitemname 1, SPECIALVAR_0 - checkitemtype SPECIALVAR_0 + bufferitemname 1, VAR_SPECIAL_0 + checkitemtype VAR_SPECIAL_0 call GetItem_HandlePocket - compare SPECIALVAR_7, 0x1 + compare VAR_SPECIAL_7, 0x1 call_if 1, Std_ObtainItem_Success - compare SPECIALVAR_7, 0x0 + compare VAR_SPECIAL_7, 0x0 call_if 1, Std_ObtainItem_Fail return @@ -1531,31 +1531,31 @@ GetItem_HandlePocket: GetItem_HandlePocket_Items: bufferstdstring 2, 0xE - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: bufferstdstring 2, 0xF - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: bufferstdstring 2, 0x10 - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: bufferstdstring 2, 0x11 - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: bufferstdstring 2, 0x12 - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetItemFanfare return @@ -1580,16 +1580,16 @@ PlayGetTMHMFanfare: return Std_ObtainDecoration: @ 819FEDA - givedecoration SPECIALVAR_0 - copyvar SPECIALVAR_7, RESULT + givedecoration VAR_SPECIAL_0 + copyvar VAR_SPECIAL_7, RESULT call Std_ObtainDecoration_ return Std_ObtainDecoration_: @ 819FEE8 - bufferdecorationname 1, SPECIALVAR_0 - compare SPECIALVAR_7, 1 + bufferdecorationname 1, VAR_SPECIAL_0 + compare VAR_SPECIAL_7, 1 call_if 1, Std_ObtainDecoration_Success - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 call_if 1, Std_ObtainDecoration_Fail return @@ -1610,14 +1610,14 @@ Std_FindItem: @ 819FF21 lock faceplayer waitse - giveitem SPECIALVAR_0, SPECIALVAR_1 - copyvar SPECIALVAR_7, RESULT - bufferitemname 1, SPECIALVAR_0 - checkitemtype SPECIALVAR_0 + giveitem VAR_SPECIAL_0, VAR_SPECIAL_1 + copyvar VAR_SPECIAL_7, RESULT + bufferitemname 1, VAR_SPECIAL_0 + checkitemtype VAR_SPECIAL_0 call GetItem_HandlePocket - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, Std_FindItem_Success - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 call_if 1, Std_FindItem_Fail release return @@ -1639,14 +1639,14 @@ Std_FindItem_Fail: @ 819FF65 HiddenItemScript:: @ 819FF7B lockall waitse - giveitem SPECIALVAR_5, 1 - copyvar SPECIALVAR_7, RESULT - bufferitemname 0x1, SPECIALVAR_5 - checkitemtype SPECIALVAR_5 + giveitem VAR_SPECIAL_5, 1 + copyvar VAR_SPECIAL_7, RESULT + bufferitemname 0x1, VAR_SPECIAL_5 + checkitemtype VAR_SPECIAL_5 call GetItem_HandlePocket - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 goto_if_eq HiddenItemScript_Success - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 goto_if_eq HiddenItemScript_Fail end @@ -1689,7 +1689,7 @@ UnusedMixRecordsScript_Done: @ 81A0000 gUnknown_081A0009:: @ 81A0009 lockall - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special DoPCTurnOnEffect playse 4 msgbox UnknownString_81A09EC, 4 @@ -1742,7 +1742,7 @@ EventScript_1A00B5: return EventScript_1A00BE: - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 playse 3 special DoPCTurnOffEffect releaseall @@ -1814,14 +1814,14 @@ RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 dodailyevents - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special sub_80FA5BC return DewfordTown_EventScript_1A010C:: @ 81A010C Route104_MrBrineysHouse_EventScript_1A010C:: @ 81A010C Route109_EventScript_1A010C:: @ 81A010C - copyvar SPECIALVAR_8, VAR_BRINEY_LOCATION + copyvar VAR_SPECIAL_8, VAR_BRINEY_LOCATION setvar VAR_BRINEY_LOCATION, 0 return @@ -1943,7 +1943,7 @@ MossdeepCity_Gym_EventScript_1A01C0:: @ 81A01C0 PetalburgCity_Gym_EventScript_1A01C0:: @ 81A01C0 RustboroCity_Gym_EventScript_1A01C0:: @ 81A01C0 SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0 - switch SPECIALVAR_8 + switch VAR_SPECIAL_8 case 1, DewfordTown_Gym_EventScript_1A021E case 2, DewfordTown_Gym_EventScript_1A0225 case 3, DewfordTown_Gym_EventScript_1A022F @@ -2211,7 +2211,7 @@ Route101_EventScript_1A039B:: @ 81A039B end Route101_EventScript_1A03A5:: @ 81A03A5 - copyvar SPECIALVAR_4, SPECIALVAR_9 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_9 special ShowPokedexRatingMessage waitmessage waitbuttonpress @@ -2219,23 +2219,23 @@ Route101_EventScript_1A03A5:: @ 81A03A5 EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0 Route101_EventScript_1A03B0:: @ 81A03B0 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 specialvar RESULT, ScriptGetPokedexInfo - copyvar SPECIALVAR_8, SPECIALVAR_5 - copyvar SPECIALVAR_9, SPECIALVAR_6 - copyvar SPECIALVAR_A, RESULT - buffernumberstring 0, SPECIALVAR_8 - buffernumberstring 1, SPECIALVAR_9 + copyvar VAR_SPECIAL_8, VAR_SPECIAL_5 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 + copyvar VAR_SPECIAL_A, RESULT + buffernumberstring 0, VAR_SPECIAL_8 + buffernumberstring 1, VAR_SPECIAL_9 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 - compare SPECIALVAR_A, 0 + compare VAR_SPECIAL_A, 0 goto_if_eq Route101_EventScript_1A14DC - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 specialvar RESULT, ScriptGetPokedexInfo - copyvar SPECIALVAR_8, SPECIALVAR_5 - copyvar SPECIALVAR_9, SPECIALVAR_6 - buffernumberstring 0, SPECIALVAR_8 - buffernumberstring 1, SPECIALVAR_9 + copyvar VAR_SPECIAL_8, VAR_SPECIAL_5 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 + buffernumberstring 0, VAR_SPECIAL_8 + buffernumberstring 1, VAR_SPECIAL_9 msgbox Route101_Text_1C4B05, 4 return @@ -2243,7 +2243,7 @@ BattleTower_Outside_EventScript_1A040E:: @ 81A040E LilycoveCity_Harbor_EventScript_1A040E:: @ 81A040E SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E delay 60 - applymovement SPECIALVAR_4, SlateportCity_Harbor_Movement_1A041C + applymovement VAR_SPECIAL_4, SlateportCity_Harbor_Movement_1A041C waitmovement 0 return @@ -2337,8 +2337,8 @@ CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3 CaveOfOrigin_B2F_EventScript_1A04D3:: @ 81A04D3 - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 special sub_810F758 waitstate releaseall @@ -2391,49 +2391,49 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B Route120_EventScript_1A0539:: @ 81A0539 lock faceplayer - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto Route120_EventScript_1A0594 end Route120_EventScript_1A0546:: @ 81A0546 lock faceplayer - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 goto Route120_EventScript_1A0594 end Route120_EventScript_1A0553:: @ 81A0553 lock faceplayer - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 goto Route120_EventScript_1A0594 end Route120_EventScript_1A0560:: @ 81A0560 lock faceplayer - setvar SPECIALVAR_4, 4 + setvar VAR_SPECIAL_4, 4 goto Route120_EventScript_1A0594 end Route120_EventScript_1A056D:: @ 81A056D lock faceplayer - setvar SPECIALVAR_4, 5 + setvar VAR_SPECIAL_4, 5 goto Route120_EventScript_1A0594 end Route119_EventScript_1A057A:: @ 81A057A lock faceplayer - setvar SPECIALVAR_4, 6 + setvar VAR_SPECIAL_4, 6 goto Route119_EventScript_1A0594 end Route119_EventScript_1A0587:: @ 81A0587 lock faceplayer - setvar SPECIALVAR_4, 7 + setvar VAR_SPECIAL_4, 7 goto Route119_EventScript_1A0594 end @@ -2465,19 +2465,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3 delay 40 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 call_if 1, Route119_EventScript_1A0646 - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 call_if 1, Route119_EventScript_1A064A - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 call_if 1, Route119_EventScript_1A064E - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 call_if 1, Route119_EventScript_1A0652 - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_4, 5 call_if 1, Route119_EventScript_1A0656 - compare SPECIALVAR_4, 6 + compare VAR_SPECIAL_4, 6 call_if 1, Route119_EventScript_1A065A - compare SPECIALVAR_4, 7 + compare VAR_SPECIAL_4, 7 call_if 1, Route119_EventScript_1A065E setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -2552,12 +2552,12 @@ FallarborTown_House1_EventScript_1A067F:: @ 81A067F GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F MtPyre_Summit_EventScript_1A067F:: @ 81A067F SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F - bufferitemname 0, SPECIALVAR_4 + bufferitemname 0, VAR_SPECIAL_4 playfanfare 372 message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare - takeitem SPECIALVAR_4, 1 + takeitem VAR_SPECIAL_4, 1 return EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 @@ -3633,17 +3633,17 @@ gUnknown_081A2C51:: @ 81A2C51 checkpartymove MOVE_SECRET_POWER setfieldeffectargument 0, RESULT buffermovename 1, MOVE_SECRET_POWER - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 goto_if_eq EventScript_1A2CB0 - compare SPECIALVAR_7, 2 + compare VAR_SPECIAL_7, 2 goto_if_eq EventScript_1A2CB0 - compare SPECIALVAR_7, 3 + compare VAR_SPECIAL_7, 3 goto_if_eq EventScript_1A2CB0 - compare SPECIALVAR_7, 4 + compare VAR_SPECIAL_7, 4 goto_if_eq EventScript_1A2CB0 - compare SPECIALVAR_7, 5 + compare VAR_SPECIAL_7, 5 goto_if_eq EventScript_1A2D08 - compare SPECIALVAR_7, 6 + compare VAR_SPECIAL_7, 6 goto_if_eq EventScript_1A2D60 end @@ -3747,8 +3747,8 @@ EventScript_1A2DB8: setflag FLAG_DECORATION_1 special sub_80BB8CC special sub_80BBAF0 - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 0 special sub_80BBDD0 setvar VAR_0x4089, 1 waitstate @@ -3803,7 +3803,7 @@ EventScript_1A2E45: compare RESULT, 6 goto_if_eq EventScript_1A2EF7 setfieldeffectargument 0, RESULT - setorcopyvar SPECIALVAR_4, RESULT + setorcopyvar VAR_SPECIAL_4, RESULT lockall special GetSecretBaseNearbyMapName msgbox UnknownString_81A3C71, 5 @@ -3819,38 +3819,38 @@ EventScript_1A2E45: msgbox UnknownString_81A3CC9, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A - bufferpartymonnick 0, SPECIALVAR_4 + bufferpartymonnick 0, VAR_SPECIAL_4 buffermovename 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closemessage closemessage - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 goto_if_eq gUnknown_081A2CE6 - compare SPECIALVAR_7, 2 + compare VAR_SPECIAL_7, 2 goto_if_eq gUnknown_081A2CE6 - compare SPECIALVAR_7, 3 + compare VAR_SPECIAL_7, 3 goto_if_eq gUnknown_081A2CE6 - compare SPECIALVAR_7, 4 + compare VAR_SPECIAL_7, 4 goto_if_eq gUnknown_081A2CE6 - compare SPECIALVAR_7, 5 + compare VAR_SPECIAL_7, 5 goto_if_eq gUnknown_081A2D3E - compare SPECIALVAR_7, 6 + compare VAR_SPECIAL_7, 6 goto_if_eq gUnknown_081A2D96 releaseall end EventScript_1A2EF7:: - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 goto_if_eq EventScript_1A2CF1 - compare SPECIALVAR_7, 2 + compare VAR_SPECIAL_7, 2 goto_if_eq EventScript_1A2CF1 - compare SPECIALVAR_7, 3 + compare VAR_SPECIAL_7, 3 goto_if_eq EventScript_1A2CF1 - compare SPECIALVAR_7, 4 + compare VAR_SPECIAL_7, 4 goto_if_eq EventScript_1A2CF1 - compare SPECIALVAR_7, 5 + compare VAR_SPECIAL_7, 5 goto_if_eq EventScript_1A2D49 - compare SPECIALVAR_7, 6 + compare VAR_SPECIAL_7, 6 goto_if_eq EventScript_1A2DA1 end @@ -3881,14 +3881,14 @@ SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68 LittlerootTown_MaysHouse_2F_EventScript_1A2F68:: @ 81A2F68 SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68 - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 0 special sub_80BBDD0 setvar VAR_0x4089, 1 end gUnknown_081A2F7B:: @ 81A2F7B - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 goto EventScript_1A2F86 end @@ -3897,7 +3897,7 @@ EventScript_1A2F86: end gUnknown_081A2F8A:: @ 81A2F8A - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto EventScript_1A2F95 end @@ -3905,11 +3905,11 @@ EventScript_1A2F95: special sub_8100A7C compare RESULT, 1 goto_if_eq EventScript_1A2FBF - addvar SPECIALVAR_4, 1 - compare SPECIALVAR_5, 0 + addvar VAR_SPECIAL_4, 1 + compare VAR_SPECIAL_5, 0 goto_if_eq EventScript_1A2F95 - removeobject SPECIALVAR_6 - setflag SPECIALVAR_5 + removeobject VAR_SPECIAL_6 + setflag VAR_SPECIAL_5 goto EventScript_1A2F95 end @@ -3941,25 +3941,25 @@ SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 special sub_80BCE90 - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3032 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30AE - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 goto_if_eq SecretBase_RedCave1_EventScript_1A312A - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 goto_if_eq SecretBase_RedCave1_EventScript_1A31A6 - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 goto_if_eq SecretBase_RedCave1_EventScript_1A3222 - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_4, 5 goto_if_eq SecretBase_RedCave1_EventScript_1A329E - compare SPECIALVAR_4, 6 + compare VAR_SPECIAL_4, 6 goto_if_eq SecretBase_RedCave1_EventScript_1A331A - compare SPECIALVAR_4, 7 + compare VAR_SPECIAL_4, 7 goto_if_eq SecretBase_RedCave1_EventScript_1A3396 - compare SPECIALVAR_4, 8 + compare VAR_SPECIAL_4, 8 goto_if_eq SecretBase_RedCave1_EventScript_1A3412 - compare SPECIALVAR_4, 9 + compare VAR_SPECIAL_4, 9 goto_if_eq SecretBase_RedCave1_EventScript_1A348E end @@ -4315,8 +4315,8 @@ SecretBase_RedCave1_EventScript_1A3501:: @ 81A3501 SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A special sub_80BCE1C - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 0 special sub_813556C waitstate special ScrSpecial_HealPlayerParty @@ -4421,11 +4421,11 @@ SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 end SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 special sub_80BF2C4 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84 @@ -4435,9 +4435,9 @@ SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84 msgbox SlateportCity_PokemonFanClub_Text_1A87CA, 4 - setvar SPECIALVAR_4, 5 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 1 + setvar VAR_SPECIAL_4, 5 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 1 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer @@ -4454,7 +4454,7 @@ SlateportCity_PokemonFanClub_EventScript_1ADEB9:: @ 81ADEB9 SlateportCity_PokemonFanClub_EventScript_1ADEC3:: @ 81ADEC3 msgbox SlateportCity_PokemonFanClub_Text_1A8818, 4 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 goto SlateportCity_PokemonFanClub_EventScript_1ADE46 end @@ -4466,11 +4466,11 @@ SlateportCity_PokemonFanClub_EventScript_1ADED6:: @ 81ADED6 SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 lock faceplayer - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_5, 2 special sub_80BF2C4 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER @@ -4491,9 +4491,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25 SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44 msgbox SlateportCity_OceanicMuseum_1F_Text_1A93D1, 4 - setvar SPECIALVAR_4, 5 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 5 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 0 call SlateportCity_OceanicMuseum_1F_EventScript_1A00F3 lock faceplayer @@ -4510,7 +4510,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF79:: @ 81ADF79 SlateportCity_OceanicMuseum_1F_EventScript_1ADF83:: @ 81ADF83 msgbox SlateportCity_OceanicMuseum_1F_Text_1A949A, 4 - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_5, 2 goto SlateportCity_OceanicMuseum_1F_EventScript_1ADE46 end @@ -4525,11 +4525,11 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 specialvar RESULT, sub_80BF544 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D - setvar SPECIALVAR_5, 3 + setvar VAR_SPECIAL_5, 3 special sub_80BF2C4 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9 @@ -4540,7 +4540,7 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 SlateportCity_PokemonFanClub_EventScript_1ADFE9:: @ 81ADFE9 msgbox SlateportCity_PokemonFanClub_Text_1A83D0, 4 random 3 - copyvar SPECIALVAR_A, RESULT + copyvar VAR_SPECIAL_A, RESULT switch RESULT case 0, SlateportCity_PokemonFanClub_EventScript_1AE020 case 1, SlateportCity_PokemonFanClub_EventScript_1AE02E @@ -4563,24 +4563,24 @@ SlateportCity_PokemonFanClub_EventScript_1AE03C:: @ 81AE03C end SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A - setvar SPECIALVAR_4, 7 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 7 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 0 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A852D, 4 - setvar SPECIALVAR_6, 1 + setvar VAR_SPECIAL_6, 1 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A85A6, 4 - copyvar SPECIALVAR_7, SPECIALVAR_A - setvar SPECIALVAR_5, 3 + copyvar VAR_SPECIAL_7, VAR_SPECIAL_A + setvar VAR_SPECIAL_5, 3 goto SlateportCity_PokemonFanClub_EventScript_1ADE46 end @@ -4602,11 +4602,11 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 faceplayer checkflag FLAG_TEMP_2 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E - setvar SPECIALVAR_5, 6 + setvar VAR_SPECIAL_5, 6 special sub_80BF2C4 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8 @@ -4616,9 +4616,9 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8 msgbox FallarborTown_ContestLobby_Text_1A704E, 4 - setvar SPECIALVAR_4, 11 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 11 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 0 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer @@ -4634,12 +4634,12 @@ FallarborTown_ContestLobby_EventScript_1AE12D:: @ 81AE12D end FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 - setvar SPECIALVAR_4, 24 + setvar VAR_SPECIAL_4, 24 special SetContestCategoryStringVarForInterview msgbox FallarborTown_ContestLobby_Text_1A70A5, 4 - setvar SPECIALVAR_4, 11 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 1 + setvar VAR_SPECIAL_4, 11 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 1 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer @@ -4647,7 +4647,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D msgbox FallarborTown_ContestLobby_Text_1A7153, 4 setflag FLAG_TEMP_2 - setvar SPECIALVAR_5, 6 + setvar VAR_SPECIAL_5, 6 goto FallarborTown_ContestLobby_EventScript_1ADE46 end @@ -4662,7 +4662,7 @@ SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE - setvar SPECIALVAR_5, 6 + setvar VAR_SPECIAL_5, 6 special sub_80BF2C4 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE @@ -4699,11 +4699,11 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF faceplayer checkflag FLAG_TEMP_2 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 - setvar SPECIALVAR_5, 7 + setvar VAR_SPECIAL_5, 7 special sub_80BF2C4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 msgbox BattleTower_Lobby_Text_1A776D, 5 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE241 @@ -4715,14 +4715,14 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 message BattleTower_Lobby_Text_1A7823 waitmessage multichoice 19, 8, 45, 1 - copyvar SPECIALVAR_8, RESULT + copyvar VAR_SPECIAL_8, RESULT compare RESULT, 0 call_if 1, BattleTower_Lobby_EventScript_1AE2A1 compare RESULT, 1 call_if 1, BattleTower_Lobby_EventScript_1AE2AA msgbox BattleTower_Lobby_Text_1A79EB, 4 - setvar SPECIALVAR_4, 12 - copyvar SPECIALVAR_5, SPECIALVAR_9 + setvar VAR_SPECIAL_4, 12 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer @@ -4750,8 +4750,8 @@ BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 msgbox BattleTower_Lobby_Text_1A7A6E, 4 setflag FLAG_TEMP_2 - copyvar SPECIALVAR_4, SPECIALVAR_8 - setvar SPECIALVAR_5, 7 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + setvar VAR_SPECIAL_5, 7 goto BattleTower_Lobby_EventScript_1ADE46 end @@ -4768,7 +4768,7 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3 BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F - setvar SPECIALVAR_5, 7 + setvar VAR_SPECIAL_5, 7 special sub_80BF2C4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F @@ -4834,11 +4834,11 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 getpricereduction 2 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA - addvar SPECIALVAR_4, 128 + addvar VAR_SPECIAL_4, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA end @@ -4846,11 +4846,11 @@ MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 getpricereduction 2 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA - addvar SPECIALVAR_4, 128 + addvar VAR_SPECIAL_4, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA end diff --git a/data/event_scripts.s b/data/event_scripts.s index 5170a0707..7b69ac338 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1453,11 +1453,11 @@ do_heal_party:: @ 819FD7C incrementgamestat GAME_STAT_USED_POKECENTER message gText_NurseJoy_OkayIllTakeYourPokemon waitmessage - applymovement SPECIALVAR_B, OldaleTown_PokemonCenter_1F_Movement_1A083F + applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A083F waitmovement 0 dofieldeffect 25 waitfieldeffect 25 - applymovement SPECIALVAR_B, OldaleTown_PokemonCenter_1F_Movement_1A0845 + applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmovement 0 special ScrSpecial_HealPlayerParty checkflag FLAG_POKERUS_EXPLAINED @@ -1468,7 +1468,7 @@ do_heal_party:: @ 819FD7C OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0 message gText_NurseJoy_ThankYouForWaiting waitmessage - applymovement SPECIALVAR_B, OldaleTown_PokemonCenter_1F_Movement_19FDF4 + applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_19FDF4 waitmovement 0 message gText_NurseJoy_WeHopeToSeeYouAgain waitmessage @@ -1499,18 +1499,18 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 step_end Std_ObtainItem: @ 819FDF7 - giveitem SPECIALVAR_0, SPECIALVAR_1 - copyvar SPECIALVAR_7, RESULT + giveitem VAR_SPECIAL_0, VAR_SPECIAL_1 + copyvar VAR_SPECIAL_7, RESULT call Std_ObtainItem_ return Std_ObtainItem_: @ 819FE07 - bufferitemname 1, SPECIALVAR_0 - checkitemtype SPECIALVAR_0 + bufferitemname 1, VAR_SPECIAL_0 + checkitemtype VAR_SPECIAL_0 call GetItem_HandlePocket - compare SPECIALVAR_7, 0x1 + compare VAR_SPECIAL_7, 0x1 call_if 1, Std_ObtainItem_Success - compare SPECIALVAR_7, 0x0 + compare VAR_SPECIAL_7, 0x0 call_if 1, Std_ObtainItem_Fail return @@ -1525,31 +1525,31 @@ GetItem_HandlePocket: GetItem_HandlePocket_Items: bufferstdstring 2, 0xE - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: bufferstdstring 2, 0xF - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: bufferstdstring 2, 0x10 - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: bufferstdstring 2, 0x11 - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: bufferstdstring 2, 0x12 - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetItemFanfare return @@ -1574,16 +1574,16 @@ PlayGetTMHMFanfare: return Std_ObtainDecoration: @ 819FEDA - givedecoration SPECIALVAR_0 - copyvar SPECIALVAR_7, RESULT + givedecoration VAR_SPECIAL_0 + copyvar VAR_SPECIAL_7, RESULT call Std_ObtainDecoration_ return Std_ObtainDecoration_: @ 819FEE8 - bufferdecorationname 1, SPECIALVAR_0 - compare SPECIALVAR_7, 1 + bufferdecorationname 1, VAR_SPECIAL_0 + compare VAR_SPECIAL_7, 1 call_if 1, Std_ObtainDecoration_Success - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 call_if 1, Std_ObtainDecoration_Fail return @@ -1604,14 +1604,14 @@ Std_FindItem: @ 819FF21 lock faceplayer waitse - giveitem SPECIALVAR_0, SPECIALVAR_1 - copyvar SPECIALVAR_7, RESULT - bufferitemname 1, SPECIALVAR_0 - checkitemtype SPECIALVAR_0 + giveitem VAR_SPECIAL_0, VAR_SPECIAL_1 + copyvar VAR_SPECIAL_7, RESULT + bufferitemname 1, VAR_SPECIAL_0 + checkitemtype VAR_SPECIAL_0 call GetItem_HandlePocket - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, Std_FindItem_Success - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 call_if 1, Std_FindItem_Fail release return @@ -1633,14 +1633,14 @@ Std_FindItem_Fail: @ 819FF65 HiddenItemScript:: @ 819FF7B lockall waitse - giveitem SPECIALVAR_5, 1 - copyvar SPECIALVAR_7, RESULT - bufferitemname 0x1, SPECIALVAR_5 - checkitemtype SPECIALVAR_5 + giveitem VAR_SPECIAL_5, 1 + copyvar VAR_SPECIAL_7, RESULT + bufferitemname 0x1, VAR_SPECIAL_5 + checkitemtype VAR_SPECIAL_5 call GetItem_HandlePocket - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 goto_if_eq HiddenItemScript_Success - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 goto_if_eq HiddenItemScript_Fail end @@ -1683,7 +1683,7 @@ UnusedMixRecordsScript_Done: @ 81A0000 gUnknown_081A0009:: @ 81A0009 lockall - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special DoPCTurnOnEffect playse 4 msgbox UnknownString_81A09EC, 4 @@ -1736,7 +1736,7 @@ EventScript_1A00B5: return EventScript_1A00BE: - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 playse 3 special DoPCTurnOffEffect releaseall @@ -1808,14 +1808,14 @@ RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 dodailyevents - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special sub_80FA5BC return DewfordTown_EventScript_1A010C:: @ 81A010C Route104_MrBrineysHouse_EventScript_1A010C:: @ 81A010C Route109_EventScript_1A010C:: @ 81A010C - copyvar SPECIALVAR_8, VAR_BRINEY_LOCATION + copyvar VAR_SPECIAL_8, VAR_BRINEY_LOCATION setvar VAR_BRINEY_LOCATION, 0 return @@ -1937,7 +1937,7 @@ MossdeepCity_Gym_EventScript_1A01C0:: @ 81A01C0 PetalburgCity_Gym_EventScript_1A01C0:: @ 81A01C0 RustboroCity_Gym_EventScript_1A01C0:: @ 81A01C0 SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0 - switch SPECIALVAR_8 + switch VAR_SPECIAL_8 case 1, DewfordTown_Gym_EventScript_1A021E case 2, DewfordTown_Gym_EventScript_1A0225 case 3, DewfordTown_Gym_EventScript_1A022F @@ -2205,7 +2205,7 @@ Route101_EventScript_1A039B:: @ 81A039B end Route101_EventScript_1A03A5:: @ 81A03A5 - copyvar SPECIALVAR_4, SPECIALVAR_9 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_9 special ShowPokedexRatingMessage waitmessage waitbuttonpress @@ -2213,23 +2213,23 @@ Route101_EventScript_1A03A5:: @ 81A03A5 EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0 Route101_EventScript_1A03B0:: @ 81A03B0 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 specialvar RESULT, ScriptGetPokedexInfo - copyvar SPECIALVAR_8, SPECIALVAR_5 - copyvar SPECIALVAR_9, SPECIALVAR_6 - copyvar SPECIALVAR_A, RESULT - buffernumberstring 0, SPECIALVAR_8 - buffernumberstring 1, SPECIALVAR_9 + copyvar VAR_SPECIAL_8, VAR_SPECIAL_5 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 + copyvar VAR_SPECIAL_A, RESULT + buffernumberstring 0, VAR_SPECIAL_8 + buffernumberstring 1, VAR_SPECIAL_9 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 - compare SPECIALVAR_A, 0 + compare VAR_SPECIAL_A, 0 goto_if_eq Route101_EventScript_1A14DC - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 specialvar RESULT, ScriptGetPokedexInfo - copyvar SPECIALVAR_8, SPECIALVAR_5 - copyvar SPECIALVAR_9, SPECIALVAR_6 - buffernumberstring 0, SPECIALVAR_8 - buffernumberstring 1, SPECIALVAR_9 + copyvar VAR_SPECIAL_8, VAR_SPECIAL_5 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 + buffernumberstring 0, VAR_SPECIAL_8 + buffernumberstring 1, VAR_SPECIAL_9 msgbox Route101_Text_1C4B05, 4 return @@ -2237,7 +2237,7 @@ BattleTower_Outside_EventScript_1A040E:: @ 81A040E LilycoveCity_Harbor_EventScript_1A040E:: @ 81A040E SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E delay 60 - applymovement SPECIALVAR_4, SlateportCity_Harbor_Movement_1A041C + applymovement VAR_SPECIAL_4, SlateportCity_Harbor_Movement_1A041C waitmovement 0 return @@ -2331,8 +2331,8 @@ CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3 CaveOfOrigin_B2F_EventScript_1A04D3:: @ 81A04D3 - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 special sub_810F758 waitstate releaseall @@ -2385,49 +2385,49 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B Route120_EventScript_1A0539:: @ 81A0539 lock faceplayer - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto Route120_EventScript_1A0594 end Route120_EventScript_1A0546:: @ 81A0546 lock faceplayer - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 goto Route120_EventScript_1A0594 end Route120_EventScript_1A0553:: @ 81A0553 lock faceplayer - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 goto Route120_EventScript_1A0594 end Route120_EventScript_1A0560:: @ 81A0560 lock faceplayer - setvar SPECIALVAR_4, 4 + setvar VAR_SPECIAL_4, 4 goto Route120_EventScript_1A0594 end Route120_EventScript_1A056D:: @ 81A056D lock faceplayer - setvar SPECIALVAR_4, 5 + setvar VAR_SPECIAL_4, 5 goto Route120_EventScript_1A0594 end Route119_EventScript_1A057A:: @ 81A057A lock faceplayer - setvar SPECIALVAR_4, 6 + setvar VAR_SPECIAL_4, 6 goto Route119_EventScript_1A0594 end Route119_EventScript_1A0587:: @ 81A0587 lock faceplayer - setvar SPECIALVAR_4, 7 + setvar VAR_SPECIAL_4, 7 goto Route119_EventScript_1A0594 end @@ -2459,19 +2459,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3 delay 40 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 call_if 1, Route119_EventScript_1A0646 - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 call_if 1, Route119_EventScript_1A064A - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 call_if 1, Route119_EventScript_1A064E - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 call_if 1, Route119_EventScript_1A0652 - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_4, 5 call_if 1, Route119_EventScript_1A0656 - compare SPECIALVAR_4, 6 + compare VAR_SPECIAL_4, 6 call_if 1, Route119_EventScript_1A065A - compare SPECIALVAR_4, 7 + compare VAR_SPECIAL_4, 7 call_if 1, Route119_EventScript_1A065E setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -2546,12 +2546,12 @@ FallarborTown_House1_EventScript_1A067F:: @ 81A067F GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F MtPyre_Summit_EventScript_1A067F:: @ 81A067F SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F - bufferitemname 0, SPECIALVAR_4 + bufferitemname 0, VAR_SPECIAL_4 playfanfare 372 message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare - takeitem SPECIALVAR_4, 1 + takeitem VAR_SPECIAL_4, 1 return EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 @@ -3612,17 +3612,17 @@ gUnknown_081A2C51:: @ 81A2C51 checkpartymove MOVE_SECRET_POWER setfieldeffectargument 0, RESULT buffermovename 1, MOVE_SECRET_POWER - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 goto_if_eq EventScript_1A2CB0 - compare SPECIALVAR_7, 2 + compare VAR_SPECIAL_7, 2 goto_if_eq EventScript_1A2CB0 - compare SPECIALVAR_7, 3 + compare VAR_SPECIAL_7, 3 goto_if_eq EventScript_1A2CB0 - compare SPECIALVAR_7, 4 + compare VAR_SPECIAL_7, 4 goto_if_eq EventScript_1A2CB0 - compare SPECIALVAR_7, 5 + compare VAR_SPECIAL_7, 5 goto_if_eq EventScript_1A2D08 - compare SPECIALVAR_7, 6 + compare VAR_SPECIAL_7, 6 goto_if_eq EventScript_1A2D60 end @@ -3726,8 +3726,8 @@ EventScript_1A2DB8: setflag FLAG_DECORATION_1 special sub_80BB8CC special sub_80BBAF0 - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 0 special sub_80BBDD0 setvar VAR_0x4089, 1 waitstate @@ -3782,7 +3782,7 @@ EventScript_1A2E45: compare RESULT, 6 goto_if_eq EventScript_1A2EF7 setfieldeffectargument 0, RESULT - setorcopyvar SPECIALVAR_4, RESULT + setorcopyvar VAR_SPECIAL_4, RESULT lockall special GetSecretBaseNearbyMapName msgbox UnknownString_81A3C71, 5 @@ -3798,38 +3798,38 @@ EventScript_1A2E45: msgbox UnknownString_81A3CC9, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A - bufferpartymonnick 0, SPECIALVAR_4 + bufferpartymonnick 0, VAR_SPECIAL_4 buffermovename 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closemessage closemessage - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 goto_if_eq gUnknown_081A2CE6 - compare SPECIALVAR_7, 2 + compare VAR_SPECIAL_7, 2 goto_if_eq gUnknown_081A2CE6 - compare SPECIALVAR_7, 3 + compare VAR_SPECIAL_7, 3 goto_if_eq gUnknown_081A2CE6 - compare SPECIALVAR_7, 4 + compare VAR_SPECIAL_7, 4 goto_if_eq gUnknown_081A2CE6 - compare SPECIALVAR_7, 5 + compare VAR_SPECIAL_7, 5 goto_if_eq gUnknown_081A2D3E - compare SPECIALVAR_7, 6 + compare VAR_SPECIAL_7, 6 goto_if_eq gUnknown_081A2D96 releaseall end EventScript_1A2EF7:: - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 goto_if_eq EventScript_1A2CF1 - compare SPECIALVAR_7, 2 + compare VAR_SPECIAL_7, 2 goto_if_eq EventScript_1A2CF1 - compare SPECIALVAR_7, 3 + compare VAR_SPECIAL_7, 3 goto_if_eq EventScript_1A2CF1 - compare SPECIALVAR_7, 4 + compare VAR_SPECIAL_7, 4 goto_if_eq EventScript_1A2CF1 - compare SPECIALVAR_7, 5 + compare VAR_SPECIAL_7, 5 goto_if_eq EventScript_1A2D49 - compare SPECIALVAR_7, 6 + compare VAR_SPECIAL_7, 6 goto_if_eq EventScript_1A2DA1 end @@ -3860,14 +3860,14 @@ SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68 LittlerootTown_MaysHouse_2F_EventScript_1A2F68:: @ 81A2F68 SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68 - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 0 special sub_80BBDD0 setvar VAR_0x4089, 1 end gUnknown_081A2F7B:: @ 81A2F7B - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 goto EventScript_1A2F86 end @@ -3876,7 +3876,7 @@ EventScript_1A2F86: end gUnknown_081A2F8A:: @ 81A2F8A - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto EventScript_1A2F95 end @@ -3884,11 +3884,11 @@ EventScript_1A2F95: special sub_8100A7C compare RESULT, 1 goto_if_eq EventScript_1A2FBF - addvar SPECIALVAR_4, 1 - compare SPECIALVAR_5, 0 + addvar VAR_SPECIAL_4, 1 + compare VAR_SPECIAL_5, 0 goto_if_eq EventScript_1A2F95 - removeobject SPECIALVAR_6 - setflag SPECIALVAR_5 + removeobject VAR_SPECIAL_6 + setflag VAR_SPECIAL_5 goto EventScript_1A2F95 end @@ -3920,25 +3920,25 @@ SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 special sub_80BCE90 - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3032 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30AE - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 goto_if_eq SecretBase_RedCave1_EventScript_1A312A - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 goto_if_eq SecretBase_RedCave1_EventScript_1A31A6 - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 goto_if_eq SecretBase_RedCave1_EventScript_1A3222 - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_4, 5 goto_if_eq SecretBase_RedCave1_EventScript_1A329E - compare SPECIALVAR_4, 6 + compare VAR_SPECIAL_4, 6 goto_if_eq SecretBase_RedCave1_EventScript_1A331A - compare SPECIALVAR_4, 7 + compare VAR_SPECIAL_4, 7 goto_if_eq SecretBase_RedCave1_EventScript_1A3396 - compare SPECIALVAR_4, 8 + compare VAR_SPECIAL_4, 8 goto_if_eq SecretBase_RedCave1_EventScript_1A3412 - compare SPECIALVAR_4, 9 + compare VAR_SPECIAL_4, 9 goto_if_eq SecretBase_RedCave1_EventScript_1A348E end @@ -4294,8 +4294,8 @@ SecretBase_RedCave1_EventScript_1A3501:: @ 81A3501 SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A special sub_80BCE1C - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 0 special sub_813556C waitstate special ScrSpecial_HealPlayerParty @@ -4389,11 +4389,11 @@ SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 end SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 special sub_80BF2C4 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84 @@ -4403,9 +4403,9 @@ SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84 msgbox SlateportCity_PokemonFanClub_Text_1A87CA, 4 - setvar SPECIALVAR_4, 5 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 1 + setvar VAR_SPECIAL_4, 5 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 1 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer @@ -4422,7 +4422,7 @@ SlateportCity_PokemonFanClub_EventScript_1ADEB9:: @ 81ADEB9 SlateportCity_PokemonFanClub_EventScript_1ADEC3:: @ 81ADEC3 msgbox SlateportCity_PokemonFanClub_Text_1A8818, 4 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 goto SlateportCity_PokemonFanClub_EventScript_1ADE46 end @@ -4434,11 +4434,11 @@ SlateportCity_PokemonFanClub_EventScript_1ADED6:: @ 81ADED6 SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 lock faceplayer - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_5, 2 special sub_80BF2C4 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER @@ -4459,9 +4459,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25 SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44 msgbox SlateportCity_OceanicMuseum_1F_Text_1A93D1, 4 - setvar SPECIALVAR_4, 5 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 5 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 0 call SlateportCity_OceanicMuseum_1F_EventScript_1A00F3 lock faceplayer @@ -4478,7 +4478,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF79:: @ 81ADF79 SlateportCity_OceanicMuseum_1F_EventScript_1ADF83:: @ 81ADF83 msgbox SlateportCity_OceanicMuseum_1F_Text_1A949A, 4 - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_5, 2 goto SlateportCity_OceanicMuseum_1F_EventScript_1ADE46 end @@ -4493,11 +4493,11 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 specialvar RESULT, sub_80BF544 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D - setvar SPECIALVAR_5, 3 + setvar VAR_SPECIAL_5, 3 special sub_80BF2C4 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9 @@ -4508,7 +4508,7 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 SlateportCity_PokemonFanClub_EventScript_1ADFE9:: @ 81ADFE9 msgbox SlateportCity_PokemonFanClub_Text_1A83D0, 4 random 3 - copyvar SPECIALVAR_A, RESULT + copyvar VAR_SPECIAL_A, RESULT switch RESULT case 0, SlateportCity_PokemonFanClub_EventScript_1AE020 case 1, SlateportCity_PokemonFanClub_EventScript_1AE02E @@ -4531,24 +4531,24 @@ SlateportCity_PokemonFanClub_EventScript_1AE03C:: @ 81AE03C end SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A - setvar SPECIALVAR_4, 7 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 7 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 0 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A852D, 4 - setvar SPECIALVAR_6, 1 + setvar VAR_SPECIAL_6, 1 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A85A6, 4 - copyvar SPECIALVAR_7, SPECIALVAR_A - setvar SPECIALVAR_5, 3 + copyvar VAR_SPECIAL_7, VAR_SPECIAL_A + setvar VAR_SPECIAL_5, 3 goto SlateportCity_PokemonFanClub_EventScript_1ADE46 end @@ -4570,11 +4570,11 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 faceplayer checkflag FLAG_TEMP_2 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E - setvar SPECIALVAR_5, 6 + setvar VAR_SPECIAL_5, 6 special sub_80BF2C4 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8 @@ -4584,9 +4584,9 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8 msgbox FallarborTown_ContestLobby_Text_1A704E, 4 - setvar SPECIALVAR_4, 11 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 11 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 0 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer @@ -4602,12 +4602,12 @@ FallarborTown_ContestLobby_EventScript_1AE12D:: @ 81AE12D end FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 - setvar SPECIALVAR_4, 24 + setvar VAR_SPECIAL_4, 24 special SetContestCategoryStringVarForInterview msgbox FallarborTown_ContestLobby_Text_1A70A5, 4 - setvar SPECIALVAR_4, 11 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 1 + setvar VAR_SPECIAL_4, 11 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 1 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer @@ -4615,7 +4615,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D msgbox FallarborTown_ContestLobby_Text_1A7153, 4 setflag FLAG_TEMP_2 - setvar SPECIALVAR_5, 6 + setvar VAR_SPECIAL_5, 6 goto FallarborTown_ContestLobby_EventScript_1ADE46 end @@ -4630,7 +4630,7 @@ SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE - setvar SPECIALVAR_5, 6 + setvar VAR_SPECIAL_5, 6 special sub_80BF2C4 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE @@ -4667,11 +4667,11 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF faceplayer checkflag FLAG_TEMP_2 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 - setvar SPECIALVAR_5, 7 + setvar VAR_SPECIAL_5, 7 special sub_80BF2C4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 msgbox BattleTower_Lobby_Text_1A776D, 5 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE241 @@ -4683,14 +4683,14 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 message BattleTower_Lobby_Text_1A7823 waitmessage multichoice 19, 8, 45, 1 - copyvar SPECIALVAR_8, RESULT + copyvar VAR_SPECIAL_8, RESULT compare RESULT, 0 call_if 1, BattleTower_Lobby_EventScript_1AE2A1 compare RESULT, 1 call_if 1, BattleTower_Lobby_EventScript_1AE2AA msgbox BattleTower_Lobby_Text_1A79EB, 4 - setvar SPECIALVAR_4, 12 - copyvar SPECIALVAR_5, SPECIALVAR_9 + setvar VAR_SPECIAL_4, 12 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer @@ -4718,8 +4718,8 @@ BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 msgbox BattleTower_Lobby_Text_1A7A6E, 4 setflag FLAG_TEMP_2 - copyvar SPECIALVAR_4, SPECIALVAR_8 - setvar SPECIALVAR_5, 7 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + setvar VAR_SPECIAL_5, 7 goto BattleTower_Lobby_EventScript_1ADE46 end @@ -4736,7 +4736,7 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3 BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F - setvar SPECIALVAR_5, 7 + setvar VAR_SPECIAL_5, 7 special sub_80BF2C4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F @@ -4802,11 +4802,11 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 getpricereduction 2 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA - addvar SPECIALVAR_4, 128 + addvar VAR_SPECIAL_4, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA end @@ -4814,11 +4814,11 @@ MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 getpricereduction 2 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA - addvar SPECIALVAR_4, 128 + addvar VAR_SPECIAL_4, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA end diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 94a52b66c..55b8e2439 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,6 +1,6 @@ S_BerryTree:: @ 81A14DD special FieldObjectInteractionGetBerryTreeData - switch SPECIALVAR_4 + switch VAR_SPECIAL_4 case 255, Route102_EventScript_1A1533 case 0, Route102_EventScript_1A153D case 1, Route102_EventScript_1A1595 @@ -82,9 +82,9 @@ Route102_EventScript_1A15BC:: @ 81A15BC goto Route102_EventScript_1A165F Route102_EventScript_1A15CE:: @ 81A15CE - compare SPECIALVAR_5, 0 + compare VAR_SPECIAL_5, 0 goto_if_eq Route102_EventScript_1A15F2 - compare SPECIALVAR_5, 4 + compare VAR_SPECIAL_5, 4 goto_if_eq Route102_EventScript_1A15EB bufferstring 1, Route102_Text_1A17B7 return @@ -98,7 +98,7 @@ Route102_EventScript_1A15F2:: @ 81A15F2 return Route102_EventScript_1A15F9:: @ 81A15F9 - buffernumberstring 1, SPECIALVAR_6 + buffernumberstring 1, VAR_SPECIAL_6 lock faceplayer msgbox Route102_Text_1A17C0, 5 @@ -109,7 +109,7 @@ Route102_EventScript_1A15F9:: @ 81A15F9 Route102_EventScript_1A161D:: @ 81A161D special FieldObjectInteractionPickBerryTree - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq Route102_EventScript_1A1642 special FieldObjectInteractionRemoveBerryTree message Route102_Text_1A17FD diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 46ef01ed0..b3926af65 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -21,7 +21,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D03:: @ 81A3D03 .2byte 0 OldaleTown_PokemonCenter_2F_EventScript_1A3D2D:: @ 81A3D2D - turnobject SPECIALVAR_7, 4 + turnobject VAR_SPECIAL_7, 4 end DewfordTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 @@ -90,9 +90,9 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2 setvar VAR_CABLE_CLUB_STATE, 0 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9 - applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 @@ -101,13 +101,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C - applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4356 + applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 - applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 return @@ -128,11 +128,11 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 waitmovement 0 - applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4356 + applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 message OldaleTown_PokemonCenter_2F_Text_1A4E50 waitmessage @@ -141,7 +141,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 waitmessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 - applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 return @@ -176,7 +176,7 @@ SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342 - copyvar SPECIALVAR_7, LAST_TALKED + copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer message OldaleTown_PokemonCenter_2F_Text_1A4510 @@ -195,7 +195,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waitmessage @@ -218,7 +218,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E special ScrSpecial_HealPlayerParty special SavePlayerParty special LoadPlayerBag - copyvar VAR_CABLE_CLUB_STATE, SPECIALVAR_4 + copyvar VAR_CABLE_CLUB_STATE, VAR_SPECIAL_4 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 5, 3, 514, 0 @@ -237,7 +237,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E closedoor 5, 1 waitdooranim release - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_4, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD special SetCableClubWarp warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 @@ -272,18 +272,18 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3FEF:: @ 81A3FEF case 127, OldaleTown_PokemonCenter_2F_EventScript_1A4036 OldaleTown_PokemonCenter_2F_EventScript_1A4036:: @ 81A4036 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 return OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C - setvar SPECIALVAR_4, 5 + setvar VAR_SPECIAL_4, 5 return OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 special CheckForAlivePartyMons compare RESULT, 0 goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 return OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056 @@ -293,11 +293,11 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056 goto OldaleTown_PokemonCenter_2F_EventScript_1A3FEF OldaleTown_PokemonCenter_2F_EventScript_1A4062:: @ 81A4062 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 return OldaleTown_PokemonCenter_2F_EventScript_1A4068:: @ 81A4068 - switch SPECIALVAR_4 + switch VAR_SPECIAL_4 case 1, OldaleTown_PokemonCenter_2F_EventScript_1A40B1 case 2, OldaleTown_PokemonCenter_2F_EventScript_1A40A2 case 5, OldaleTown_PokemonCenter_2F_EventScript_1A4093 @@ -348,7 +348,7 @@ SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339 - copyvar SPECIALVAR_7, LAST_TALKED + copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A457E, 5 @@ -382,8 +382,8 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 - setvar SPECIALVAR_4, 3 - copyvar VAR_CABLE_CLUB_STATE, SPECIALVAR_4 + setvar VAR_SPECIAL_4, 3 + copyvar VAR_CABLE_CLUB_STATE, VAR_SPECIAL_4 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 8, 3, 514, 0 @@ -445,7 +445,7 @@ SootopolisCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB checkflag FLAG_VISITED_MAUVILLE_CITY goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A434B - copyvar SPECIALVAR_7, LAST_TALKED + copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A45FE, 5 @@ -480,8 +480,8 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42E9 OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 - setvar SPECIALVAR_4, 4 - copyvar VAR_CABLE_CLUB_STATE, SPECIALVAR_4 + setvar VAR_SPECIAL_4, 4 + copyvar VAR_CABLE_CLUB_STATE, VAR_SPECIAL_4 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 11, 3, 514, 0 @@ -604,13 +604,13 @@ gUnknown_081A4363:: @ 81A4363 end SingleBattleColosseum_EventScript_1A436F:: @ 81A436F - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 special sub_8083B90 waitstate end SingleBattleColosseum_EventScript_1A4379:: @ 81A4379 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 special sub_8083B90 waitstate end @@ -621,7 +621,7 @@ DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383 waitstate compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 special sub_8083B90 waitstate end @@ -632,7 +632,7 @@ DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E waitstate compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 special sub_8083B90 waitstate end @@ -643,7 +643,7 @@ DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9 waitstate compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_5, 2 special sub_8083B90 waitstate end @@ -654,7 +654,7 @@ DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4 waitstate compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar SPECIALVAR_5, 3 + setvar VAR_SPECIAL_5, 3 special sub_8083B90 waitstate end @@ -663,31 +663,31 @@ DoubleBattleColosseum_EventScript_1A43EF:: @ 81A43EF end TradeCenter_EventScript_1A43F0:: @ 81A43F0 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 special sub_8083B5C waitstate end TradeCenter_EventScript_1A43FA:: @ 81A43FA - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 special sub_8083B5C waitstate end @ 81A4404 - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_5, 2 special sub_8083B5C waitstate end @ 81A440E - setvar SPECIALVAR_5, 3 + setvar VAR_SPECIAL_5, 3 special sub_8083B5C waitstate end RecordCorner_EventScript_1A4418:: @ 81A4418 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 special sub_80B929C waitstate compare VAR_TEMP_1, 0 @@ -695,7 +695,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 end RecordCorner_EventScript_1A442D:: @ 81A442D - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 special sub_80B929C waitstate compare VAR_TEMP_1, 0 @@ -703,7 +703,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D end RecordCorner_EventScript_1A4442:: @ 81A4442 - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_5, 2 special sub_80B929C waitstate compare VAR_TEMP_1, 0 @@ -711,7 +711,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 end RecordCorner_EventScript_1A4457:: @ 81A4457 - setvar SPECIALVAR_5, 3 + setvar VAR_SPECIAL_5, 3 special sub_80B929C waitstate compare VAR_TEMP_1, 0 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index ad478b3c7..9c5c246e2 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -11,7 +11,7 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E checkflag FLAG_TEMP_1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F - bufferstdstring 0, SPECIALVAR_B + bufferstdstring 0, VAR_SPECIAL_B msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 @@ -120,7 +120,7 @@ FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 msgbox FallarborTown_ContestLobby_Text_1A6319, 4 choosecontestmon - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 special sub_80C43F4 compare RESULT, 0 @@ -186,7 +186,7 @@ FallarborTown_ContestLobby_EventScript_1A513D:: @ 81A513D return LinkContestRoom1_EventScript_1A514D:: @ 81A514D - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_6, 0 lockall applymovement 14, LinkContestRoom1_Movement_1A5DBF waitmovement 0 @@ -215,19 +215,19 @@ LinkContestRoom1_EventScript_1A51A0:: @ 81A51A0 return LinkContestRoom1_EventScript_1A51D2:: @ 81A51D2 - setvar SPECIALVAR_9, 5 + setvar VAR_SPECIAL_9, 5 return LinkContestRoom1_EventScript_1A51D8:: @ 81A51D8 - setvar SPECIALVAR_9, 6 + setvar VAR_SPECIAL_9, 6 return LinkContestRoom1_EventScript_1A51DE:: @ 81A51DE - setvar SPECIALVAR_9, 7 + setvar VAR_SPECIAL_9, 7 return LinkContestRoom1_EventScript_1A51E4:: @ 81A51E4 - setvar SPECIALVAR_9, 8 + setvar VAR_SPECIAL_9, 8 return LinkContestRoom1_EventScript_1A51EA:: @ 81A51EA @@ -240,28 +240,28 @@ LinkContestRoom1_EventScript_1A51EA:: @ 81A51EA return LinkContestRoom1_EventScript_1A5227:: @ 81A5227 - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 return LinkContestRoom1_EventScript_1A522D:: @ 81A522D - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 return LinkContestRoom1_EventScript_1A5233:: @ 81A5233 - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 return LinkContestRoom1_EventScript_1A5239:: @ 81A5239 - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 return LinkContestRoom1_EventScript_1A523F:: @ 81A523F - setvar SPECIALVAR_8, 4 + setvar VAR_SPECIAL_8, 4 return LinkContestRoom1_EventScript_1A5245:: @ 81A5245 - bufferstdstring 1, SPECIALVAR_8 - bufferstdstring 2, SPECIALVAR_9 + bufferstdstring 1, VAR_SPECIAL_8 + bufferstdstring 2, VAR_SPECIAL_9 call LinkContestRoom1_EventScript_1A525F lockall applymovement 1, LinkContestRoom1_Movement_1A5D87 @@ -286,21 +286,21 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A call LinkContestRoom1_EventScript_1A5455 call LinkContestRoom1_EventScript_1A53E5 call LinkContestRoom1_EventScript_1A5880 - addvar SPECIALVAR_6, 1 - compare SPECIALVAR_6, 4 + addvar VAR_SPECIAL_6, 1 + compare VAR_SPECIAL_6, 4 goto_if 5, LinkContestRoom1_EventScript_1A527A call LinkContestRoom1_EventScript_1A5377 setvar VAR_TEMP_1, 6 return LinkContestRoom1_EventScript_1A52AE:: @ 81A52AE - compare SPECIALVAR_6, 0 + compare VAR_SPECIAL_6, 0 goto_if_eq LinkContestRoom1_EventScript_1A52DB - compare SPECIALVAR_6, 1 + compare VAR_SPECIAL_6, 1 goto_if_eq LinkContestRoom1_EventScript_1A52ED - compare SPECIALVAR_6, 2 + compare VAR_SPECIAL_6, 2 goto_if_eq LinkContestRoom1_EventScript_1A52FF - compare SPECIALVAR_6, 3 + compare VAR_SPECIAL_6, 3 goto_if_eq LinkContestRoom1_EventScript_1A5311 return @@ -309,7 +309,7 @@ LinkContestRoom1_EventScript_1A52DB:: @ 81A52DB applymovement 3, LinkContestRoom1_Movement_1A5DCE waitmovement 0 releaseall - setvar SPECIALVAR_B, 3 + setvar VAR_SPECIAL_B, 3 return LinkContestRoom1_EventScript_1A52ED:: @ 81A52ED @@ -317,7 +317,7 @@ LinkContestRoom1_EventScript_1A52ED:: @ 81A52ED applymovement 4, LinkContestRoom1_Movement_1A5DDA waitmovement 0 releaseall - setvar SPECIALVAR_B, 4 + setvar VAR_SPECIAL_B, 4 return LinkContestRoom1_EventScript_1A52FF:: @ 81A52FF @@ -325,7 +325,7 @@ LinkContestRoom1_EventScript_1A52FF:: @ 81A52FF applymovement 5, LinkContestRoom1_Movement_1A5DE2 waitmovement 0 releaseall - setvar SPECIALVAR_B, 5 + setvar VAR_SPECIAL_B, 5 return LinkContestRoom1_EventScript_1A5311:: @ 81A5311 @@ -333,24 +333,24 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311 applymovement 14, LinkContestRoom1_Movement_1A5DEA waitmovement 0 releaseall - setvar SPECIALVAR_B, 14 + setvar VAR_SPECIAL_B, 14 return LinkContestRoom1_EventScript_1A5323:: @ 81A5323 special sub_80C4C64 - addvar SPECIALVAR_6, 1 - buffernumberstring 1, SPECIALVAR_6 + addvar VAR_SPECIAL_6, 1 + buffernumberstring 1, VAR_SPECIAL_6 lockall - applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5D9C + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall addobject 13 playse 10 lockall - applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5D9C + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall - addvar SPECIALVAR_6, -1 + addvar VAR_SPECIAL_6, -1 playse 15 special ShowContestEntryMonPic call LinkContestRoom1_EventScript_1A535E @@ -486,101 +486,101 @@ LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB return LinkContestRoom1_EventScript_1A555A:: @ 81A555A - compare SPECIALVAR_4, 80 + compare VAR_SPECIAL_4, 80 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare SPECIALVAR_4, 70 + compare VAR_SPECIAL_4, 70 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare SPECIALVAR_4, 60 + compare VAR_SPECIAL_4, 60 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare SPECIALVAR_4, 50 + compare VAR_SPECIAL_4, 50 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare SPECIALVAR_4, 40 + compare VAR_SPECIAL_4, 40 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare SPECIALVAR_4, 30 + compare VAR_SPECIAL_4, 30 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare SPECIALVAR_4, 20 + compare VAR_SPECIAL_4, 20 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare SPECIALVAR_4, 10 + compare VAR_SPECIAL_4, 10 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 - compare SPECIALVAR_4, 230 + compare VAR_SPECIAL_4, 230 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare SPECIALVAR_4, 210 + compare VAR_SPECIAL_4, 210 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare SPECIALVAR_4, 190 + compare VAR_SPECIAL_4, 190 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare SPECIALVAR_4, 170 + compare VAR_SPECIAL_4, 170 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare SPECIALVAR_4, 150 + compare VAR_SPECIAL_4, 150 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare SPECIALVAR_4, 130 + compare VAR_SPECIAL_4, 130 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare SPECIALVAR_4, 110 + compare VAR_SPECIAL_4, 110 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare SPECIALVAR_4, 90 + compare VAR_SPECIAL_4, 90 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5616:: @ 81A5616 - compare SPECIALVAR_4, 380 + compare VAR_SPECIAL_4, 380 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare SPECIALVAR_4, 350 + compare VAR_SPECIAL_4, 350 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare SPECIALVAR_4, 320 + compare VAR_SPECIAL_4, 320 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare SPECIALVAR_4, 290 + compare VAR_SPECIAL_4, 290 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare SPECIALVAR_4, 260 + compare VAR_SPECIAL_4, 260 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare SPECIALVAR_4, 230 + compare VAR_SPECIAL_4, 230 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare SPECIALVAR_4, 200 + compare VAR_SPECIAL_4, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare SPECIALVAR_4, 170 + compare VAR_SPECIAL_4, 170 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5674:: @ 81A5674 - compare SPECIALVAR_4, 600 + compare VAR_SPECIAL_4, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare SPECIALVAR_4, 560 + compare VAR_SPECIAL_4, 560 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare SPECIALVAR_4, 520 + compare VAR_SPECIAL_4, 520 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare SPECIALVAR_4, 480 + compare VAR_SPECIAL_4, 480 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare SPECIALVAR_4, 440 + compare VAR_SPECIAL_4, 440 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare SPECIALVAR_4, 400 + compare VAR_SPECIAL_4, 400 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare SPECIALVAR_4, 360 + compare VAR_SPECIAL_4, 360 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare SPECIALVAR_4, 320 + compare VAR_SPECIAL_4, 320 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 - compare SPECIALVAR_4, 600 + compare VAR_SPECIAL_4, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare SPECIALVAR_4, 550 + compare VAR_SPECIAL_4, 550 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare SPECIALVAR_4, 500 + compare VAR_SPECIAL_4, 500 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare SPECIALVAR_4, 450 + compare VAR_SPECIAL_4, 450 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare SPECIALVAR_4, 400 + compare VAR_SPECIAL_4, 400 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare SPECIALVAR_4, 300 + compare VAR_SPECIAL_4, 300 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare SPECIALVAR_4, 200 + compare VAR_SPECIAL_4, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare SPECIALVAR_4, 100 + compare VAR_SPECIAL_4, 100 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return @@ -726,7 +726,7 @@ LinkContestRoom1_EventScript_1A5880:: @ 81A5880 release removeobject 13 special sub_80C5164 - switch SPECIALVAR_6 + switch VAR_SPECIAL_6 case 0, LinkContestRoom1_EventScript_1A58BA case 1, LinkContestRoom1_EventScript_1A58C7 case 2, LinkContestRoom1_EventScript_1A58D4 @@ -735,28 +735,28 @@ LinkContestRoom1_EventScript_1A5880:: @ 81A5880 LinkContestRoom1_EventScript_1A58BA:: @ 81A58BA lockall - applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5DD4 + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DD4 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58C7:: @ 81A58C7 lockall - applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5DDE + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DDE waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58D4:: @ 81A58D4 lockall - applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5DE6 + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DE6 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58E1:: @ 81A58E1 lockall - applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5DF0 + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DF0 waitmovement 0 releaseall return @@ -858,7 +858,7 @@ LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2 LinkContestRoom1_EventScript_1A59FC:: @ 81A59FC special sub_80C47C0 - switch SPECIALVAR_5 + switch VAR_SPECIAL_5 case 0, LinkContestRoom1_EventScript_1A5A31 case 1, LinkContestRoom1_EventScript_1A5A37 case 2, LinkContestRoom1_EventScript_1A5A3D @@ -884,9 +884,9 @@ LinkContestRoom1_EventScript_1A5A43:: @ 81A5A43 LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 special sub_80C47F0 special sub_80C4858 - addvar SPECIALVAR_5, 1 - buffernumberstring 1, SPECIALVAR_5 - addvar SPECIALVAR_5, -1 + addvar VAR_SPECIAL_5, 1 + buffernumberstring 1, VAR_SPECIAL_5 + addvar VAR_SPECIAL_5, -1 call LinkContestRoom1_EventScript_1A5A75 applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5D99 waitmovement 0 @@ -1007,7 +1007,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB call LinkContestRoom1_EventScript_1A5A90 delay 30 special sub_80C4CF8 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return @@ -1016,7 +1016,7 @@ LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 msgbox LinkContestRoom1_Text_1A6DF1, 3 delay 90 special sub_80C4CF8 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return @@ -1028,7 +1028,7 @@ LinkContestRoom1_EventScript_1A5C12:: @ 81A5C12 LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23 special sub_80C47C0 - compare SPECIALVAR_5, 3 + compare VAR_SPECIAL_5, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C32 return @@ -1053,7 +1053,7 @@ LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C delay 60 call LinkContestRoom1_EventScript_1A5C6A special sub_80C4CF8 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C64 closemessage return @@ -1065,7 +1065,7 @@ LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64 LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A special sub_80C496C special sub_80C47C0 - compare SPECIALVAR_4, SPECIALVAR_5 + compare VAR_SPECIAL_4, VAR_SPECIAL_5 goto_if_eq LinkContestRoom1_EventScript_1A5C7C return @@ -1074,7 +1074,7 @@ LinkContestRoom1_EventScript_1A5C7C:: @ 81A5C7C return LinkContestRoom1_EventScript_1A5C7F:: @ 81A5C7F - switch SPECIALVAR_5 + switch VAR_SPECIAL_5 case 0, LinkContestRoom1_EventScript_1A5CB1 case 1, LinkContestRoom1_EventScript_1A5CBE case 2, LinkContestRoom1_EventScript_1A5CCB @@ -1111,7 +1111,7 @@ LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 special sub_80C47C0 - compare SPECIALVAR_5, 3 + compare VAR_SPECIAL_5, 3 goto_if_eq LinkContestRoom1_EventScript_1A5CFC msgbox LinkContestRoom1_Text_1A6DF1, 3 return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 5868fec76..7664a14ca 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -59,7 +59,7 @@ Route117_EventScript_1B22DE:: @ 81B22DE Route117_EventScript_1B22E7:: @ 81B22E7 special GetDaycareMonNicknames msgbox Route117_Text_1B2710, 4 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call Route117_EventScript_1B22CD release end @@ -71,9 +71,9 @@ Route117_EventScript_1B22FE:: @ 81B22FE special ShowFieldMessageStringVar4 waitmessage waitbuttonpress - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call Route117_EventScript_1B22CD - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 call Route117_EventScript_1B22CD release end @@ -103,14 +103,14 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C fadescreen 1 special ChooseSendDaycareMon waitstate - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 specialvar RESULT, sub_8095C10 compare RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD - specialvar SPECIALVAR_5, GetSelectedDaycareMonNickname + specialvar VAR_SPECIAL_5, GetSelectedDaycareMonNickname waitse - playmoncry SPECIALVAR_5, 0 + playmoncry VAR_SPECIAL_5, 0 msgbox Route117_PokemonDayCare_Text_1B296E, 4 waitmoncry special StoreSelectedPokemonInDaycare @@ -160,7 +160,7 @@ Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B msgbox Route117_PokemonDayCare_Text_1B2A88, 4 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B29AD, 5 compare RESULT, 1 @@ -176,12 +176,12 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 compare RESULT, 6 goto_if_eq Route117_PokemonDayCare_EventScript_1B2539 specialvar RESULT, GetDaycareState - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8 special ShowDaycareLevelMenu waitstate - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 goto Route117_PokemonDayCare_EventScript_1B24A8 @@ -259,9 +259,9 @@ Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543 Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 msgbox Route117_PokemonDayCare_Text_1B2A88, 4 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call Route117_PokemonDayCare_EventScript_1B241A - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 compare RESULT, 1 @@ -275,7 +275,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 waitstate compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT specialvar RESULT, TakePokemonFromDaycare msgbox Route117_PokemonDayCare_Text_1B2B75, 4 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 0c81be439..ff45d2cff 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -215,19 +215,19 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 end Route111_EventScript_1AE5E0:: @ 81AE5E0 - applymovement SPECIALVAR_4, Route111_Movement_1AE699 + applymovement VAR_SPECIAL_4, Route111_Movement_1AE699 waitmovement 0 return Route111_EventScript_1AE5EB:: @ 81AE5EB - applymovement SPECIALVAR_4, Route111_Movement_1AE69B - applymovement SPECIALVAR_5, Route111_Movement_1A0841 + applymovement VAR_SPECIAL_4, Route111_Movement_1AE69B + applymovement VAR_SPECIAL_5, Route111_Movement_1A0841 waitmovement 0 return Route111_EventScript_1AE5FD:: @ 81AE5FD - applymovement SPECIALVAR_4, Route111_Movement_1AE69D - applymovement SPECIALVAR_5, Route111_Movement_1A083F + applymovement VAR_SPECIAL_4, Route111_Movement_1AE69D + applymovement VAR_SPECIAL_5, Route111_Movement_1A083F waitmovement 0 return @@ -303,7 +303,7 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3 compare RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, 4 - setvar SPECIALVAR_4, 10 + setvar VAR_SPECIAL_4, 10 call Route111_EventScript_1A00F3 lock faceplayer diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 534e91341..5ec8197f9 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 SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 playse 21 - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0833 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0833 waitmovement 0 .ifdef SAPPHIRE - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 .else - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0841 + applymovement VAR_SPECIAL_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 SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 .ifdef SAPPHIRE - setvar SPECIALVAR_9, 4 + setvar VAR_SPECIAL_9, 4 .else - setvar SPECIALVAR_9, 3 + setvar VAR_SPECIAL_9, 3 .endif .ifdef SAPPHIRE - applymovement SPECIALVAR_8, Movement_1A083F + applymovement VAR_SPECIAL_8, Movement_1A083F .else - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843 .endif waitmovement 0 delay 20 - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_197162, 4 closemessage .ifdef SAPPHIRE - applymovement SPECIALVAR_8, Movement_1A083F + applymovement VAR_SPECIAL_8, Movement_1A083F .else - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843 .endif .ifdef SAPPHIRE - applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D958 + applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D958 .else - applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D95D + applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D95D .endif waitmovement 0 - removeobject SPECIALVAR_9 + removeobject VAR_SPECIAL_9 delay 20 - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_SPECIAL_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 42e0a8821..87ba8c01a 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 SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 0 special sub_813556C waitstate switch RESULT case 1, BattleTower_BattleRoom_EventScript_160961 special LoadPlayerParty - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 5 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 5 special sub_8135668 - setvar SPECIALVAR_4, 14 + setvar VAR_SPECIAL_4, 14 special sub_8135668 - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160961:: @ 8160961 - setvar SPECIALVAR_4, 6 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 4 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 4 special sub_8135668 - setvar SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 1 special sub_8135668 - setvar SPECIALVAR_4, 7 + setvar VAR_SPECIAL_4, 7 special sub_8135668 - setvar SPECIALVAR_4, 14 + setvar VAR_SPECIAL_4, 14 special sub_8135668 - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_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 4261f8457..965da8d9c 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 SPECIALVAR_6, 1 + compare VAR_SPECIAL_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 SPECIALVAR_6, 1 + compare VAR_SPECIAL_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 684bdc6bb..527bae389 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 SPECIALVAR_4, 10 + setvar VAR_SPECIAL_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 SPECIALVAR_7, sub_810F404 - compare SPECIALVAR_7, 50 + specialvar VAR_SPECIAL_7, sub_810F404 + compare VAR_SPECIAL_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 SPECIALVAR_7, sub_810F404 - compare SPECIALVAR_7, 100 + specialvar VAR_SPECIAL_7, sub_810F404 + compare VAR_SPECIAL_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 SPECIALVAR_4, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 8 + setvar VAR_SPECIAL_4, 8 special sub_81358A4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waitmessage - setvar SPECIALVAR_4, 13 + setvar VAR_SPECIAL_4, 13 special sub_8135668 special DetermineBattleTowerPrize - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 special sub_8135BA0 playse 55 waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 3 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 9 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 13 + setvar VAR_SPECIAL_4, 13 special sub_8135668 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 special sub_8135BA0 playse 55 waitse - setvar SPECIALVAR_4, 8 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 8 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq BattleTower_Lobby_EventScript_16060D - setvar SPECIALVAR_4, 1 - copyvar SPECIALVAR_5, RESULT - copyvar SPECIALVAR_6, RESULT + setvar VAR_SPECIAL_4, 1 + copyvar VAR_SPECIAL_5, RESULT + copyvar VAR_SPECIAL_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 SPECIALVAR_4, 5 + setvar VAR_SPECIAL_4, 5 special sub_8135668 setvar VAR_TEMP_0, 0 - setvar SPECIALVAR_4, 11 + setvar VAR_SPECIAL_4, 11 special sub_8135668 - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 1 special sub_8135668 - setvar SPECIALVAR_4, 8 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 8 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 12 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 11 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_8, DECOR_SILVER_SHIELD + setvar VAR_SPECIAL_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 SPECIALVAR_8, DECOR_GOLD_SHIELD + setvar VAR_SPECIAL_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, SPECIALVAR_8 + bufferdecorationname 1, VAR_SPECIAL_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 c766eed38..3992ffd2c 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 SPECIALVAR_4, 4 + setvar VAR_SPECIAL_4, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 9bc51f7d1..dc733071f 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, SPECIALVAR_8 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_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, SPECIALVAR_8 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_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 SPECIALVAR_4, 9 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 0 + compare VAR_SPECIAL_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 797a79af0..ee7d77d6b 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 SPECIALVAR_1, SPECIALVAR_0 - compare SPECIALVAR_0, 0 + copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 + compare VAR_SPECIAL_0, 0 goto_if_eq DewfordTown_Gym_EventScript_1530BA - compare SPECIALVAR_0, 1 + compare VAR_SPECIAL_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530B6 - compare SPECIALVAR_0, 2 + compare VAR_SPECIAL_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 SPECIALVAR_0, SPECIALVAR_1 + compare VAR_SPECIAL_0, VAR_SPECIAL_1 goto_if_eq DewfordTown_Gym_EventScript_1530F5 - copyvar SPECIALVAR_1, SPECIALVAR_0 - compare SPECIALVAR_0, 1 + copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 + compare VAR_SPECIAL_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530F6 - compare SPECIALVAR_0, 2 + compare VAR_SPECIAL_0, 2 goto_if_eq DewfordTown_Gym_EventScript_153101 - compare SPECIALVAR_0, 3 + compare VAR_SPECIAL_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 SPECIALVAR_0, 0 + setvar VAR_SPECIAL_0, 0 checktrainerflag OPPONENT_HIDEKI goto_if 0, DewfordTown_Gym_EventScript_153135 - addvar SPECIALVAR_0, 1 + addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 checktrainerflag OPPONENT_TESSA goto_if 0, DewfordTown_Gym_EventScript_153143 - addvar SPECIALVAR_0, 1 + addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 checktrainerflag OPPONENT_LAURA goto_if 0, DewfordTown_Gym_EventScript_153151 - addvar SPECIALVAR_0, 1 + addvar VAR_SPECIAL_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 SPECIALVAR_8, 2 + setvar VAR_SPECIAL_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 e2521f5e8..e54ef8e50 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 SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_1533FE:: @ 81533FE lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_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 SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_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 1bbcda5db..33d14e770 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 2f0e2ea5f..d83745593 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 SPECIALVAR_4, 0 + setvar VAR_SPECIAL_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 a9a13246b..374ef9472 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 6e029a91f..5957508ae 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 c88471656..a0fd0ac3d 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 SPECIALVAR_B, 6 + setvar VAR_SPECIAL_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 7f3b750a9..3c5345f8f 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 SPECIALVAR_4, 280 + setvar VAR_SPECIAL_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 7b222e671..081850326 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 SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 special sub_80FA148 compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 - compare SPECIALVAR_5, 0 + compare VAR_SPECIAL_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 SPECIALVAR_4, 0 + compare VAR_SPECIAL_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 cf8f778fb..0c9880137 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 4e300e66c..9217ba8f4 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 SPECIALVAR_8, 6 + setvar VAR_SPECIAL_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 71a8f6378..aee4141a8 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 SPECIALVAR_8, 1 - copyvar SPECIALVAR_4, SPECIALVAR_8 + setvar VAR_SPECIAL_8, 1 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, sub_804D89C - copyvar SPECIALVAR_9, RESULT + copyvar VAR_SPECIAL_9, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 special sub_80F9A0C waitstate - copyvar SPECIALVAR_A, SPECIALVAR_4 - compare SPECIALVAR_4, 255 + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A specialvar RESULT, sub_804DB2C - copyvar SPECIALVAR_B, RESULT - compare RESULT, SPECIALVAR_9 + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 goto_if 5, FortreeCity_House1_EventScript_157E9F - copyvar SPECIALVAR_4, SPECIALVAR_8 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special sub_804DB68 special sub_804E174 waitstate - bufferspeciesname 0, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_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, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_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 22c3f0248..6d847d7cc 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 b19ac6635..3d4a57c13 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 SPECIALVAR_4, ITEM_LETTER + setvar VAR_SPECIAL_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 cfcf29ecc..43a8ed7cd 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 SPECIALVAR_8, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 1 + compare VAR_SPECIAL_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 SPECIALVAR_8, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LavaridgeTown_EventScript_14E646 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LavaridgeTown_EventScript_14E64E removeobject 8 addobject 7 delay 30 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LavaridgeTown_EventScript_14E69A - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 removeobject 7 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 fadedefaultbgm - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_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 3a5bbf20b..1bbad53bf 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 SPECIALVAR_8, 4 + setvar VAR_SPECIAL_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 b395ce744..4e9c51380 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 4e27e0240..5c05639fd 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 SPECIALVAR_4, sub_80C4D50 - switch SPECIALVAR_4 + specialvar VAR_SPECIAL_4, sub_80C4D50 + switch VAR_SPECIAL_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 976e0c89e..7a13b1c48 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 SPECIALVAR_4, sub_80C4D50 - switch SPECIALVAR_4 + specialvar VAR_SPECIAL_4, sub_80C4D50 + switch VAR_SPECIAL_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 SPECIALVAR_4, 255 + compare VAR_SPECIAL_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 SPECIALVAR_8, SPECIALVAR_4 + copyvar VAR_SPECIAL_8, VAR_SPECIAL_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 SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_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 SPECIALVAR_4 + switch VAR_SPECIAL_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 SPECIALVAR_4, 1 + addvar VAR_SPECIAL_4, 1 buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage - addvar SPECIALVAR_4, 65535 + addvar VAR_SPECIAL_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 SPECIALVAR_B, 8 + setvar VAR_SPECIAL_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 SPECIALVAR_B, 8 + setvar VAR_SPECIAL_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 c58f484e2..8233504dd 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 SPECIALVAR_5, VAR_DEPT_STORE_FLOOR + copyvar VAR_SPECIAL_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 08f99f04e..a9680e3a5 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 SPECIALVAR_8, RESULT + copyvar VAR_SPECIAL_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 SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY - compare SPECIALVAR_6, 0 + compare VAR_SPECIAL_6, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A - compare SPECIALVAR_6, 1 + compare VAR_SPECIAL_6, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - bufferitemname 0, SPECIALVAR_5 - compare SPECIALVAR_4, 1 + bufferitemname 0, VAR_SPECIAL_5 + compare VAR_SPECIAL_4, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 - giveitem_std SPECIALVAR_5 + giveitem_std VAR_SPECIAL_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, SPECIALVAR_5 + copyvar VAR_LOTTERY_PRIZE, VAR_SPECIAL_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 9805da6e7..9554b8fa4 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 SPECIALVAR_4, 2 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 2 + setvar VAR_SPECIAL_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 f7a5dafad..120054e91 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 SPECIALVAR_4, sub_80C4D50 - switch SPECIALVAR_4 + specialvar VAR_SPECIAL_4, sub_80C4D50 + switch VAR_SPECIAL_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 a6b500c15..1024d30e9 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 SPECIALVAR_4, 255 + compare VAR_SPECIAL_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 SPECIALVAR_5, 4 + compare VAR_SPECIAL_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 c86fb3dbc..f6eb35c98 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 3b63b2cd2..2db702ffc 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 SPECIALVAR_4, 8 + setvar VAR_SPECIAL_4, 8 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 - setvar SPECIALVAR_4, 9 + setvar VAR_SPECIAL_4, 9 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD - setvar SPECIALVAR_4, 10 + setvar VAR_SPECIAL_4, 10 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 - setvar SPECIALVAR_4, 11 + setvar VAR_SPECIAL_4, 11 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED - setvar SPECIALVAR_4, 12 + setvar VAR_SPECIAL_4, 12 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 - setvar SPECIALVAR_4, 13 + setvar VAR_SPECIAL_4, 13 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD - setvar SPECIALVAR_4, 14 + setvar VAR_SPECIAL_4, 14 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 - setvar SPECIALVAR_4, 15 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 13 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 8 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 9 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 10 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 11 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 12 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 14 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 15 + setvar VAR_SPECIAL_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 8dcb712dd..c11546bb5 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 SPECIALVAR_4, 5 - setvar SPECIALVAR_5, 8 + setvar VAR_SPECIAL_4, 5 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 14 - setvar SPECIALVAR_5, 8 + setvar VAR_SPECIAL_4, 14 + setvar VAR_SPECIAL_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 SPECIALVAR_4, SPECIALVAR_5 + opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 waitdooranim addobject 4 applymovement 4, LittlerootTown_Movement_14D6AC waitmovement 0 - closedoor SPECIALVAR_4, SPECIALVAR_5 + closedoor VAR_SPECIAL_4, VAR_SPECIAL_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 SPECIALVAR_4, SPECIALVAR_5 + opendoor VAR_SPECIAL_4, VAR_SPECIAL_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 SPECIALVAR_4, SPECIALVAR_5 + closedoor VAR_SPECIAL_4, VAR_SPECIAL_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 SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 setobjectxy 4, 10, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D873:: @ 814D873 lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 setobjectxy 4, 11, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D886:: @ 814D886 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D892:: @ 814D892 lockall - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D89E:: @ 814D89E lockall - setvar SPECIALVAR_8, 4 + setvar VAR_SPECIAL_8, 4 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D8AA:: @ 814D8AA lockall - setvar SPECIALVAR_8, 5 + setvar VAR_SPECIAL_8, 5 goto LittlerootTown_EventScript_14D8B6 end @@ -433,13 +433,13 @@ LittlerootTown_EventScript_14D8B6:: @ 814D8B6 end LittlerootTown_EventScript_14D926:: @ 814D926 - setvar SPECIALVAR_9, 5 - setvar SPECIALVAR_A, 8 + setvar VAR_SPECIAL_9, 5 + setvar VAR_SPECIAL_A, 8 return LittlerootTown_EventScript_14D931:: @ 814D931 - setvar SPECIALVAR_9, 14 - setvar SPECIALVAR_A, 8 + setvar VAR_SPECIAL_9, 14 + setvar VAR_SPECIAL_A, 8 return LittlerootTown_EventScript_14D93C:: @ 814D93C @@ -453,32 +453,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 return LittlerootTown_EventScript_14D952:: @ 814D952 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DA02 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DA17 - compare SPECIALVAR_8, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DA2C - compare SPECIALVAR_8, 5 + compare VAR_SPECIAL_8, 5 call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DA56 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DA6B - compare SPECIALVAR_8, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DA80 - compare SPECIALVAR_8, 5 + compare VAR_SPECIAL_8, 5 call_if 1, LittlerootTown_EventScript_14DA95 return @@ -553,32 +553,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DB46 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DB6C - compare SPECIALVAR_8, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DB92 - compare SPECIALVAR_8, 5 + compare VAR_SPECIAL_8, 5 call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DBDE - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DC04 - compare SPECIALVAR_8, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DC2A - compare SPECIALVAR_8, 5 + compare VAR_SPECIAL_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 SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DB6C:: @ 814DB6C applymovement 4, LittlerootTown_Movement_14DCBA waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DB92:: @ 814DB92 applymovement 4, LittlerootTown_Movement_14DCC1 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DBB8:: @ 814DBB8 applymovement 4, LittlerootTown_Movement_14DCC5 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DBDE:: @ 814DBDE applymovement 4, LittlerootTown_Movement_14DCCA waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DC04:: @ 814DC04 applymovement 4, LittlerootTown_Movement_14DCCF waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DC2A:: @ 814DC2A applymovement 4, LittlerootTown_Movement_14DCD3 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DC50:: @ 814DC50 applymovement 4, LittlerootTown_Movement_14DCDA waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return @@ -849,12 +849,12 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_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 b017f0254..4ce1e277a 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 SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6956 end LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 lockall - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 0 - applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A083F + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 0 + applymovement VAR_SPECIAL_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 db1261736..e0e1a1086 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 SPECIALVAR_4, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 1 + setvar VAR_SPECIAL_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 f48e84252..af7a2976b 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 SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6956 end LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 lockall - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 - applymovement SPECIALVAR_4, LittlerootTown_MaysHouse_1F_Movement_1A0843 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 + applymovement VAR_SPECIAL_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 778ce6846..8bd9a01d2 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 SPECIALVAR_4, 2 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 2 + setvar VAR_SPECIAL_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 51fb1614d..44adab6f1 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 SPECIALVAR_4, 0 + setvar VAR_SPECIAL_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 7c071477d..6befb5fb9 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 SPECIALVAR_4, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 2 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 3 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 4 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 5 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 6 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 7 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 8 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 9 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 10 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 11 + setvar VAR_SPECIAL_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 b8be1d0ac..05287c7de 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 SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_15658B:: @ 815658B - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_156599:: @ 8156599 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 3 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 2 + setvar VAR_SPECIAL_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 c16b66482..85590f9c2 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 6d8aeee21..9395633e7 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 SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_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 a1afd4e82..54a9546c4 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 SPECIALVAR_8, 7 + setvar VAR_SPECIAL_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 7f6220aa9..a722e666b 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 5f26583c9..eababfa6c 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 SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_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 eac29a855..6b919f2ca 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 SPECIALVAR_4, 1 + setvar VAR_SPECIAL_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 2cf8b7b8e..9cd4eecd1 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 SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9 lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D593 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D59E - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_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 SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D5BF - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_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 SPECIALVAR_4, ITEM_RED_OR_BLUE_ORB + setvar VAR_SPECIAL_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 SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D75E - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D769 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_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 SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D77F - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D78A - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_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 da913f4bd..d94e02227 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 2717be669..b65c2e67d 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 SPECIALVAR_8, 2 - copyvar SPECIALVAR_4, SPECIALVAR_8 + setvar VAR_SPECIAL_8, 2 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, sub_804D89C - copyvar SPECIALVAR_9, RESULT + copyvar VAR_SPECIAL_9, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 special sub_80F9A0C waitstate - copyvar SPECIALVAR_A, SPECIALVAR_4 - compare SPECIALVAR_4, 255 + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A specialvar RESULT, sub_804DB2C - copyvar SPECIALVAR_B, RESULT - compare RESULT, SPECIALVAR_9 + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 goto_if 5, PacifidlogTown_House3_EventScript_15432A - copyvar SPECIALVAR_4, SPECIALVAR_8 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special sub_804DB68 special sub_804E174 waitstate - bufferspeciesname 0, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_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, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_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 fa19f9d76..557b6497e 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 31e01f8ab..2ac3f35f9 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 SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B842:: @ 814B842 lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B84E:: @ 814B84E lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B85A:: @ 814B85A lockall - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_EventScript_14B91B - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_EventScript_14B930 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_EventScript_14B93B - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closemessage - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_EventScript_14B965 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_EventScript_14B977 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_EventScript_14B989 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_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 2d95958a2..1bd1649cf 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 SPECIALVAR_5, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_5, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154648:: @ 8154648 - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154653:: @ 8154653 - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_15465E:: @ 815465E - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 playse 8 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154800 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15481C - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_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 SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154884 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15488F - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548A1 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548C5 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548D0 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548DB - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_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 SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_15492F - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154930 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15493B - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_15493C - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548FC - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_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 SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15484E - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_154860 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_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 SPECIALVAR_8, 5 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 85 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 98 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 46 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 59 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 59 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 72 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 20 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 20 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 33 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 33 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 7 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 7 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_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 SPECIALVAR_5, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_5, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_5, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_5, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_5, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_5, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_5, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 1 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 1 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB - setvar SPECIALVAR_4, 2 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 2 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC - setvar SPECIALVAR_4, 3 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 3 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD - setvar SPECIALVAR_4, 4 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 4 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E - setvar SPECIALVAR_4, 5 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 5 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F - setvar SPECIALVAR_4, 6 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 6 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 - setvar SPECIALVAR_4, 7 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 7 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 - setvar SPECIALVAR_4, 8 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 8 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_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 cb79bdf86..8dda62ea1 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 4d3f03cd1..b97d92c7d 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, SPECIALVAR_8 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_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 35e59cdff..f56081097 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, SPECIALVAR_8 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_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 e409a3cd6..2b4293ed4 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 SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD1E:: @ 814FD1E - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD29:: @ 814FD29 - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route110_EventScript_14FF14 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route110_EventScript_14FF1F - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_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 SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route110_EventScript_14FF56 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route110_EventScript_14FF5E - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, Route110_EventScript_14FF66 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route110_EventScript_14FF35 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route110_EventScript_14FF40 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_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 5dad15672..8a8dd2763 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 SPECIALVAR_4, 6 - setvar SPECIALVAR_5, 3 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 6 + setvar VAR_SPECIAL_5, 3 + setvar VAR_SPECIAL_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_1618F6:: @ 81618F6 - setvar SPECIALVAR_4, 11 - setvar SPECIALVAR_5, 5 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 11 + setvar VAR_SPECIAL_5, 5 + setvar VAR_SPECIAL_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B - setvar SPECIALVAR_4, 9 - setvar SPECIALVAR_5, 2 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 9 + setvar VAR_SPECIAL_5, 2 + setvar VAR_SPECIAL_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 2463feb9c..aa136559b 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -140,25 +140,25 @@ Route111_EventScript_150100:: @ 8150100 @ 815010A lockall - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto Route111_EventScript_15013A end Route111_EventScript_150116:: @ 8150116 lockall - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto Route111_EventScript_15013A end Route111_EventScript_150122:: @ 8150122 lockall - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 goto Route111_EventScript_15013A end @ 815012E lockall - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 call_if 1, Route111_EventScript_150188 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 call_if 1, Route111_EventScript_150193 - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 call_if 1, Route111_EventScript_15019E - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_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 32f8e41a3..8352db786 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 SPECIALVAR_8, 2 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 3 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 4 + setvar VAR_SPECIAL_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 SPECIALVAR_8, Route111_WinstrateFamilysHouse_Movement_1A083D + applymovement VAR_SPECIAL_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 fcdd565bc..cba6c33e8 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 SPECIALVAR_4, 0 + setvar VAR_SPECIAL_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 887f019f3..bc32449cd 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 SPECIALVAR_9, 0 + setvar VAR_SPECIAL_9, 0 special ShowGlassWorkshopMenu waitstate switch RESULT @@ -67,9 +67,9 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE end Route113_GlassWorkshop_EventScript_163660:: @ 8163660 - setvar SPECIALVAR_8, 39 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 250 + setvar VAR_SPECIAL_8, 39 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 40 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 500 + setvar VAR_SPECIAL_8, 40 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 41 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 500 + setvar VAR_SPECIAL_8, 41 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 43 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 1000 + setvar VAR_SPECIAL_8, 43 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 42 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 1000 + setvar VAR_SPECIAL_8, 42 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_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 SPECIALVAR_9, 1 - setvar SPECIALVAR_8, 13 - bufferdecorationname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 6000 + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, 13 + bufferdecorationname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_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 SPECIALVAR_9, 1 - setvar SPECIALVAR_8, 6 - bufferdecorationname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 8000 + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, 6 + bufferdecorationname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_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 SPECIALVAR_A, 250 - subvar SPECIALVAR_A, 16456 + setvar VAR_SPECIAL_A, 250 + subvar VAR_SPECIAL_A, 16456 buffernumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 - subvar SPECIALVAR_A, 16456 + subvar VAR_SPECIAL_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 SPECIALVAR_9, 0 + compare VAR_SPECIAL_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare SPECIALVAR_9, 1 + compare VAR_SPECIAL_9, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release end Route113_GlassWorkshop_EventScript_163889:: @ 8163889 - giveitem_std SPECIALVAR_8 + giveitem_std VAR_SPECIAL_8 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 - givedecoration_std SPECIALVAR_8 + givedecoration_std VAR_SPECIAL_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 SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 39 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 39 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 40 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 40 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 41 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 41 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 43 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 43 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 42 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 42 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 - setvar SPECIALVAR_9, 1 - setvar SPECIALVAR_8, 13 + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, 13 bufferdecorationname 0, 13 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D - setvar SPECIALVAR_9, 1 - setvar SPECIALVAR_8, 6 + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, 6 bufferdecorationname 0, 6 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare SPECIALVAR_9, 0 + compare VAR_SPECIAL_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare SPECIALVAR_9, 1 + compare VAR_SPECIAL_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 051b30d54..b34c22a50 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 SPECIALVAR_8, 0 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 1 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 2 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, Route118_EventScript_151048 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route118_EventScript_151053 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_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 85938be18..95edf346c 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 SPECIALVAR_4, 6 + compare VAR_SPECIAL_4, 6 call_if 1, Route119_EventScript_151193 - compare SPECIALVAR_4, 7 + compare VAR_SPECIAL_4, 7 call_if 1, Route119_EventScript_151197 return diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index da0a65af1..9e5ff95be 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 SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 call_if 1, Route120_EventScript_15166B - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 call_if 1, Route120_EventScript_151672 - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 call_if 1, Route120_EventScript_151676 - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 call_if 1, Route120_EventScript_15167A - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 call_if 1, Route120_EventScript_15167E - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_4, 5 call_if 1, Route120_EventScript_151682 return @@ -135,32 +135,32 @@ Route120_EventScript_151739:: @ 8151739 end Route120_EventScript_1517DC:: @ 81517DC - setvar SPECIALVAR_4, ITEM_FIGY_BERRY + setvar VAR_SPECIAL_4, ITEM_FIGY_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 - setvar SPECIALVAR_4, ITEM_WIKI_BERRY + setvar VAR_SPECIAL_4, ITEM_WIKI_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 - setvar SPECIALVAR_4, ITEM_MAGO_BERRY + setvar VAR_SPECIAL_4, ITEM_MAGO_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD - setvar SPECIALVAR_4, ITEM_AGUAV_BERRY + setvar VAR_SPECIAL_4, ITEM_AGUAV_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 - setvar SPECIALVAR_4, ITEM_IAPAPA_BERRY + setvar VAR_SPECIAL_4, ITEM_IAPAPA_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151813:: @ 8151813 - giveitem_std SPECIALVAR_4 + giveitem_std VAR_SPECIAL_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 SPECIALVAR_4, 0 + setvar VAR_SPECIAL_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 0dbf1d345..26edb6fbb 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 SPECIALVAR_4, 13 + setvar VAR_SPECIAL_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 SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_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 6d0bcc2c6..4061dcd7e 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 SPECIALVAR_8, 48 - setvar SPECIALVAR_9, 95 + setvar VAR_SPECIAL_8, 48 + setvar VAR_SPECIAL_9, 95 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 - setvar SPECIALVAR_8, 50 - setvar SPECIALVAR_9, 96 + setvar VAR_SPECIAL_8, 50 + setvar VAR_SPECIAL_9, 96 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 - setvar SPECIALVAR_8, 49 - setvar SPECIALVAR_9, 97 + setvar VAR_SPECIAL_8, 49 + setvar VAR_SPECIAL_9, 97 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 - setvar SPECIALVAR_8, 51 - setvar SPECIALVAR_9, 98 + setvar VAR_SPECIAL_8, 51 + setvar VAR_SPECIAL_9, 98 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - bufferitemname 0, SPECIALVAR_8 - bufferitemname 1, SPECIALVAR_9 + bufferitemname 0, VAR_SPECIAL_8 + bufferitemname 1, VAR_SPECIAL_9 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F - checkitemspace SPECIALVAR_9, 1 + checkitemspace VAR_SPECIAL_9, 1 compare RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 - checkitem SPECIALVAR_8, 2 + checkitem VAR_SPECIAL_8, 2 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 - takeitem SPECIALVAR_8, 1 - giveitem_std SPECIALVAR_9 + takeitem VAR_SPECIAL_8, 1 + giveitem_std VAR_SPECIAL_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 e4cef9fa4..47d216d9f 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 SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto RustboroCity_EventScript_14C4F4 end @@ -134,7 +134,7 @@ RustboroCity_EventScript_14C498:: @ 814C498 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto RustboroCity_EventScript_14C4F4 end @@ -142,7 +142,7 @@ RustboroCity_EventScript_14C4AF:: @ 814C4AF lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 goto RustboroCity_EventScript_14C4F4 end @@ -150,7 +150,7 @@ RustboroCity_EventScript_14C4C6:: @ 814C4C6 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 goto RustboroCity_EventScript_14C4F4 end @@ -158,7 +158,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 4 + setvar VAR_SPECIAL_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 2e18bc55e..c997935cc 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 SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_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 SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_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 ef4d6fad1..1e2256b47 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 SPECIALVAR_8, 1 + setvar VAR_SPECIAL_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 8761d3898..cf91c31bd 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 SPECIALVAR_8, 0 - copyvar SPECIALVAR_4, SPECIALVAR_8 + setvar VAR_SPECIAL_8, 0 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, sub_804D89C - copyvar SPECIALVAR_9, RESULT + copyvar VAR_SPECIAL_9, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB special sub_80F9A0C waitstate - copyvar SPECIALVAR_A, SPECIALVAR_4 - compare SPECIALVAR_4, 255 + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A specialvar RESULT, sub_804DB2C - copyvar SPECIALVAR_B, RESULT - compare RESULT, SPECIALVAR_9 + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 goto_if 5, RustboroCity_House1_EventScript_157D05 - copyvar SPECIALVAR_4, SPECIALVAR_8 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_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, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_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 c9a2a48a4..653cceb25 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 fb332fbff..574c7412e 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 SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 3 - setvar SPECIALVAR_6, 4 - setvar SPECIALVAR_7, 5 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 3 + setvar VAR_SPECIAL_6, 4 + setvar VAR_SPECIAL_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 SPECIALVAR_4 + addobject VAR_SPECIAL_4 applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD36 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD36 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B41D5, 4 .else msgbox SeafloorCavern_Room9_Text_1B486C, 4 .endif - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4201, 4 .else msgbox SeafloorCavern_Room9_Text_1B4897, 4 .endif - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0839 + applymovement VAR_SPECIAL_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 SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841 + applymovement VAR_SPECIAL_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 SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 special sub_810F758 waitstate applymovement 1, SeafloorCavern_Room9_Movement_15DD57 waitmovement 0 removeobject 1 delay 4 - setvar SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 2 special sub_810F758 waitstate delay 30 - setvar SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 3 - setvar SPECIALVAR_6, 4 - setvar SPECIALVAR_7, 5 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 3 + setvar VAR_SPECIAL_6, 4 + setvar VAR_SPECIAL_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 SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD41 + applymovement VAR_SPECIAL_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 SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0845 + applymovement VAR_SPECIAL_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 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 + addobject VAR_SPECIAL_5 + addobject VAR_SPECIAL_6 + addobject VAR_SPECIAL_7 + applymovement VAR_SPECIAL_7, SeafloorCavern_Room9_Movement_15DD63 + applymovement VAR_SPECIAL_6, SeafloorCavern_Room9_Movement_15DD63 + applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD5A waitmovement 0 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A083F + applymovement VAR_SPECIAL_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 SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0833 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0833 waitmovement 0 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0835 + applymovement VAR_SPECIAL_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 SPECIALVAR_5, SeafloorCavern_Room9_Movement_15DD60 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD46 + applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD60 + applymovement VAR_SPECIAL_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 c481a0461..72528a929 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 SPECIALVAR_B, 7 + setvar VAR_SPECIAL_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 b8547fda9..72f2d0382 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 SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7 lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF lockall - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_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 SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, SlateportCity_Harbor_EventScript_156071 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, SlateportCity_Harbor_EventScript_156086 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_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 SPECIALVAR_4, 5 + setvar VAR_SPECIAL_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 80522f4c1..e760beab5 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 SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_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 c261f3e83..007e42f90 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 SPECIALVAR_4, 269 + setvar VAR_SPECIAL_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 f9b7c7fb3..37b2b95ab 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 b7f0f996b..9f2d6c35b 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 SPECIALVAR_8, 8 + setvar VAR_SPECIAL_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 a9810ed16..6a72ec1da 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, SPECIALVAR_4 + copyvar RESULT, VAR_SPECIAL_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, SPECIALVAR_4 + copyvar RESULT, VAR_SPECIAL_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 1bbd30364..9eb5b4a57 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_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 7624b3da3..ab2a73460 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 SPECIALVAR_4, 2 + setvar VAR_SPECIAL_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 63fd57a20..cbc451a18 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 SPECIALVAR_8, 12 + setvar VAR_SPECIAL_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 54a614576..8d3e8e723 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 SPECIALVAR_4, SPECIALVAR_5 - compare SPECIALVAR_4, 12 + getplayerxy VAR_SPECIAL_4, VAR_SPECIAL_5 + compare VAR_SPECIAL_4, 12 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 - compare SPECIALVAR_5, 44 + compare VAR_SPECIAL_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 83298dba6..568d9b207 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 SPECIALVAR_B, 5 + setvar VAR_SPECIAL_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 2323c139a..956a28ac5 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 SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 690e7c94e..58dacb2f3 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -26,7 +26,7 @@ SpeakToBard: end yes_hear_song: - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 @ Give the player ear rape special ScrSpecial_PlayBardSong delay 60 @@ -52,14 +52,14 @@ prompt_write_lyrics: end write_lyrics: - setvar SPECIALVAR_4, 6 + setvar VAR_SPECIAL_4, 6 call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer compare RESULT, NO goto_if_eq dont_write_lyrics msgbox gTextBard_ThankYouKindly, 4 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 @ Give the player ear rape again special ScrSpecial_PlayBardSong delay 60 @@ -139,9 +139,9 @@ already_traded: do_trader_menu_get: special ScrSpecial_TraderMenuGetDecoration waitstate - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq cancelled_get_menu - compare SPECIALVAR_4, 65535 + compare VAR_SPECIAL_4, 65535 goto_if_eq rare_item_cant_trade_away msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO compare RESULT, NO @@ -176,9 +176,9 @@ do_trader_menu_give: msgbox gTextTrader_PickDecorationYoullTrade, 4 special ScrSpecial_TraderMenuGiveDecoration waitstate - compare SPECIALVAR_6, 0 + compare VAR_SPECIAL_6, 0 goto_if_eq cancelled_give_menu - compare SPECIALVAR_6, 65535 + compare VAR_SPECIAL_6, 65535 goto_if_eq decoration_is_in_use special ScrSpecial_IsDecorationFull compare RESULT, 1 @@ -211,10 +211,10 @@ decorations_full: .include "data/text/storyteller.inc" SpeakToStoryteller: - setvar SPECIALVAR_8, 0 - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_A, 0 - setvar SPECIALVAR_B, 0 + setvar VAR_SPECIAL_8, 0 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_A, 0 + setvar VAR_SPECIAL_B, 0 lock faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO @@ -230,7 +230,7 @@ choose_story: waitstate compare RESULT, FALSE goto_if_eq cancel_story_menu - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 special ScrSpecial_StorytellerDisplayStory waitmessage waitbuttonpress @@ -239,7 +239,7 @@ choose_story: goto_if_eq no_stat_update goto stat_update cancel_story_menu: - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 goto_if_eq dont_hear_story goto yes_hear_story no_stat_update: diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 74f8987d2..b02ab4faa 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -25,11 +25,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B6C:: @ 81B1B6C PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A msgbox PetalburgCity_PokemonCenter_1F_Text_1B1F7B, 4 closemessage - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 @@ -43,7 +43,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1:: @ 81B1BB1 end PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB:: @ 81B1BBB - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special sub_80EB7C4 waitmessage delay 80 @@ -79,11 +79,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C28:: @ 81B1C28 PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 msgbox PetalburgCity_PokemonCenter_1F_Text_1B207F, 4 closemessage - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 504454dcf..d93ff7660 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -6,17 +6,17 @@ LittlerootTown_MaysHouse_2F_EventScript_1B6950:: @ 81B6950 LittlerootTown_BrendansHouse_1F_EventScript_1B6956:: @ 81B6956 LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 - applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 - compare SPECIALVAR_5, 0 + compare VAR_SPECIAL_5, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 - applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A0841 waitmovement 0 releaseall end @@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 msgbox LittlerootTown_BrendansHouse_1F_Text_172531, 4 closemessage - applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A0841 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC waitmovement 0 releaseall @@ -47,13 +47,13 @@ LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_BrendansHouse_2F_EventScript_1B69D3:: @ 81B69D3 lockall - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto LittlerootTown_BrendansHouse_2F_EventScript_1B69EB end LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF lockall - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto LittlerootTown_MaysHouse_2F_EventScript_1B69EB end @@ -74,33 +74,33 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 playse 9 - removeobject SPECIALVAR_8 + removeobject VAR_SPECIAL_8 releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 - setvar SPECIALVAR_8, 14 - addobject SPECIALVAR_8 - applymovement SPECIALVAR_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 + setvar VAR_SPECIAL_8, 14 + addobject VAR_SPECIAL_8 + applymovement VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A0843 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4 closemessage - applymovement SPECIALVAR_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 + applymovement VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 - setvar SPECIALVAR_8, 14 - addobject SPECIALVAR_8 - applymovement SPECIALVAR_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD + setvar VAR_SPECIAL_8, 14 + addobject VAR_SPECIAL_8 + applymovement VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A083F waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4 closemessage - applymovement SPECIALVAR_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 + applymovement VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 waitmovement 0 return @@ -155,7 +155,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 end LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF - applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1A0843 + applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0843 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC @@ -163,7 +163,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF playbgm 453, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4 closemessage - applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB + applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2 waitmovement 0 @@ -174,13 +174,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF msgbox LittlerootTown_BrendansHouse_1F_Text_172644, 4 closemessage setvar VAR_TEMP_1, 1 - applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 + applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8 end LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E - applymovement SPECIALVAR_5, LittlerootTown_MaysHouse_1F_Movement_1A083F + applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1A083F waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 @@ -188,7 +188,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E playbgm 453, 0 msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4 closemessage - applymovement SPECIALVAR_5, LittlerootTown_MaysHouse_1F_Movement_1B6BDE + applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1B6BDE waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CDA waitmovement 0 @@ -199,7 +199,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E msgbox LittlerootTown_MaysHouse_1F_Text_172644, 4 closemessage setvar VAR_TEMP_1, 1 - applymovement SPECIALVAR_5, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 + applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B6AB8 end @@ -207,9 +207,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D:: @ 81B6B9D LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D playse 21 - applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 - applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, 4 closemessage @@ -366,38 +366,38 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 playse 21 - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 delay 20 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 giveitem_std ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 closemessage - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4 closemessage - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playse 8 - removeobject SPECIALVAR_9 + removeobject VAR_SPECIAL_9 setflag FLAG_RECEIVED_SS_TICKET setvar VAR_LITTLEROOT_HOUSES_STATE, 4 setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 @@ -405,46 +405,46 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE end LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD:: @ 81B6DAD - setvar SPECIALVAR_8, 0 - setvar SPECIALVAR_9, 5 - setvar SPECIALVAR_A, 1 + setvar VAR_SPECIAL_8, 0 + setvar VAR_SPECIAL_9, 5 + setvar VAR_SPECIAL_A, 1 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD:: @ 81B6DBD - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 5 - setvar SPECIALVAR_A, 1 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 5 + setvar VAR_SPECIAL_A, 1 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD:: @ 81B6DCD - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E33 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E33 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8:: @ 81B6DD8 - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E36 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E36 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3:: @ 81B6DE3 - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E39 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E39 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE:: @ 81B6DEE - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E3B + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E3B waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9:: @ 81B6DF9 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B:: @ 81B6E0B applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E43 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E43 waitmovement 0 return diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 12ee04d3c..4a659f469 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -1,34 +1,34 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 - setvar SPECIALVAR_8, 4 - setvar SPECIALVAR_9, 1 - applymovement SPECIALVAR_8, FallarborTown_ContestLobby_Movement_1B7821 + setvar VAR_SPECIAL_8, 4 + setvar VAR_SPECIAL_9, 1 + applymovement VAR_SPECIAL_8, FallarborTown_ContestLobby_Movement_1B7821 waitmovement 0 goto FallarborTown_ContestLobby_EventScript_1B7681 end SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E - setvar SPECIALVAR_8, 2 - setvar SPECIALVAR_9, 2 + setvar VAR_SPECIAL_8, 2 + setvar VAR_SPECIAL_9, 2 applymovement 6, SlateportCity_ContestLobby_Movement_1A083D - applymovement SPECIALVAR_8, SlateportCity_ContestLobby_Movement_1B7821 + applymovement VAR_SPECIAL_8, SlateportCity_ContestLobby_Movement_1B7821 waitmovement 0 goto SlateportCity_ContestLobby_EventScript_1B7681 end VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F - setvar SPECIALVAR_8, 2 - setvar SPECIALVAR_9, 1 - applymovement SPECIALVAR_8, VerdanturfTown_ContestLobby_Movement_1B7821 + setvar VAR_SPECIAL_8, 2 + setvar VAR_SPECIAL_9, 1 + applymovement VAR_SPECIAL_8, VerdanturfTown_ContestLobby_Movement_1B7821 waitmovement 0 goto VerdanturfTown_ContestLobby_EventScript_1B7681 end LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 - setvar SPECIALVAR_8, 3 - setvar SPECIALVAR_9, 3 + setvar VAR_SPECIAL_8, 3 + setvar VAR_SPECIAL_9, 3 applymovement 9, LilycoveCity_ContestLobby_Movement_1A083D applymovement 10, LilycoveCity_ContestLobby_Movement_1A083D - applymovement SPECIALVAR_8, LilycoveCity_ContestLobby_Movement_1B7821 + applymovement VAR_SPECIAL_8, LilycoveCity_ContestLobby_Movement_1B7821 waitmovement 0 goto LilycoveCity_ContestLobby_EventScript_1B7681 end @@ -92,7 +92,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 end FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 - copyvar SPECIALVAR_4, SPECIALVAR_9 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_9 fadescreen 1 special sub_804E538 waitstate @@ -122,22 +122,22 @@ FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780 end FallarborTown_ContestLobby_EventScript_1B778A:: @ 81B778A - setvar SPECIALVAR_8, 4 + setvar VAR_SPECIAL_8, 4 goto FallarborTown_ContestLobby_EventScript_1B77B6 end SlateportCity_ContestLobby_EventScript_1B7795:: @ 81B7795 - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto SlateportCity_ContestLobby_EventScript_1B77B6 end VerdanturfTown_ContestLobby_EventScript_1B77A0:: @ 81B77A0 - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto VerdanturfTown_ContestLobby_EventScript_1B77B6 end LilycoveCity_ContestLobby_EventScript_1B77AB:: @ 81B77AB - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 goto LilycoveCity_ContestLobby_EventScript_1B77B6 end @@ -270,7 +270,7 @@ FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F end FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 fadescreen 1 removeobject 240 removeobject 239 @@ -322,15 +322,15 @@ FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973 FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 fadescreen 1 specialvar RESULT, GetLinkPartnerNames - copyvar SPECIALVAR_8, RESULT - copyvar SPECIALVAR_4, SPECIALVAR_8 + copyvar VAR_SPECIAL_8, RESULT + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 special SpawnBerryBlenderLinkPlayerSprites goto FallarborTown_ContestLobby_EventScript_1B799A end FallarborTown_ContestLobby_EventScript_1B799A:: @ 81B799A fadescreen 0 - switch SPECIALVAR_8 + switch VAR_SPECIAL_8 case 2, FallarborTown_ContestLobby_EventScript_1B78F3 case 3, FallarborTown_ContestLobby_EventScript_1B7901 case 4, FallarborTown_ContestLobby_EventScript_1B790F diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 23ed463d9..4b55e505f 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -18,13 +18,13 @@ Event_TV:: @ 81A6E72 end EventScript_1A6EBB: - specialvar SPECIALVAR_4, special_0x44 - compare SPECIALVAR_4, 255 + specialvar VAR_SPECIAL_4, special_0x44 + compare VAR_SPECIAL_4, 255 goto_if_eq EventScript_1A6F3F specialvar RESULT, special_0x4a compare RESULT, 255 goto_if_eq EventScript_1A6F3F - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT specialvar RESULT, sub_80BDA0C compare RESULT, 0 goto_if 5, EventScript_1A6F21 diff --git a/include/constants/vars.h b/include/constants/vars.h index 352034d7a..13114e09b 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -171,18 +171,18 @@ // special vars // They are commonly used as parameters to commands, or return values from commands. -#define SPECIALVAR_0 0x8000 -#define SPECIALVAR_1 0x8001 -#define SPECIALVAR_2 0x8002 -#define SPECIALVAR_3 0x8003 -#define SPECIALVAR_4 0x8004 -#define SPECIALVAR_5 0x8005 -#define SPECIALVAR_6 0x8006 -#define SPECIALVAR_7 0x8007 -#define SPECIALVAR_8 0x8008 -#define SPECIALVAR_9 0x8009 -#define SPECIALVAR_A 0x800A -#define SPECIALVAR_B 0x800B +#define VAR_SPECIAL_0 0x8000 +#define VAR_SPECIAL_1 0x8001 +#define VAR_SPECIAL_2 0x8002 +#define VAR_SPECIAL_3 0x8003 +#define VAR_SPECIAL_4 0x8004 +#define VAR_SPECIAL_5 0x8005 +#define VAR_SPECIAL_6 0x8006 +#define VAR_SPECIAL_7 0x8007 +#define VAR_SPECIAL_8 0x8008 +#define VAR_SPECIAL_9 0x8009 +#define VAR_SPECIAL_A 0x800A +#define VAR_SPECIAL_B 0x800B #define FACING 0x800C #define RESULT 0x800D #define ITEM_ID 0x800E |