diff options
Diffstat (limited to 'data/scripts')
-rw-r--r-- | data/scripts/berry_tree.inc | 32 | ||||
-rw-r--r-- | data/scripts/cable_club.inc | 166 | ||||
-rw-r--r-- | data/scripts/contest_hall.inc | 238 | ||||
-rw-r--r-- | data/scripts/day_care.inc | 108 | ||||
-rw-r--r-- | data/scripts/debug.inc | 28 | ||||
-rw-r--r-- | data/scripts/gabby_and_ty.inc | 40 | ||||
-rw-r--r-- | data/scripts/magma_chimney.inc | 8 | ||||
-rw-r--r-- | data/scripts/mauville_man.inc | 102 | ||||
-rw-r--r-- | data/scripts/mystery_event_club.inc | 22 | ||||
-rw-r--r-- | data/scripts/players_house.inc | 106 | ||||
-rw-r--r-- | data/scripts/pokeblocks.inc | 98 | ||||
-rw-r--r-- | data/scripts/safari_zone.inc | 8 | ||||
-rw-r--r-- | data/scripts/secret_power_tm.inc | 16 | ||||
-rw-r--r-- | data/scripts/tv.inc | 30 |
14 files changed, 501 insertions, 501 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 10734411f..17897223a 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,6 +1,6 @@ S_BerryTree:: @ 81A14DD special EventObjectInteractionGetBerryTreeData - switch VAR_SPECIAL_4 + switch VAR_0x8004 case 255, BerryTree_EventScript_1A1533 case 0, BerryTree_EventScript_1A153D case 1, BerryTree_EventScript_1A1595 @@ -21,8 +21,8 @@ BerryTree_EventScript_1A1533:: @ 81A1533 BerryTree_EventScript_1A153D:: @ 81A153D lock faceplayer - specialvar RESULT, PlayerHasBerries - compare RESULT, 1 + specialvar VAR_RESULT, PlayerHasBerries + compare VAR_RESULT, 1 goto_if_eq BerryTree_EventScript_1A1558 message Route102_Text_1A16B6 waitmessage @@ -32,9 +32,9 @@ BerryTree_EventScript_1A153D:: @ 81A153D BerryTree_EventScript_1A1558:: @ 81A1558 msgbox Route102_Text_1A16CD, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_1A1577 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq BerryTree_EventScript_1A1593 end @@ -43,9 +43,9 @@ BerryTree_EventScript_1A1577:: @ 81A1577 closemessage special Berry_FadeAndGoToBerryBagMenu waitstate - compare ITEM_ID, 0 + compare VAR_ITEM_ID, 0 goto_if_eq BerryTree_EventScript_1A1593 - takeitem ITEM_ID, 1 + takeitem VAR_ITEM_ID, 1 call S_PlantBerryTree BerryTree_EventScript_1A1593:: @ 81A1593 release @@ -81,9 +81,9 @@ BerryTree_EventScript_1A15BC:: @ 81A15BC goto BerryTree_EventScript_1A165F BerryTree_EventScript_1A15CE:: @ 81A15CE - compare VAR_SPECIAL_5, 0 + compare VAR_0x8005, 0 goto_if_eq BerryTree_EventScript_1A15F2 - compare VAR_SPECIAL_5, 4 + compare VAR_0x8005, 4 goto_if_eq BerryTree_EventScript_1A15EB bufferstring 1, Route102_Text_1A17B7 return @@ -97,18 +97,18 @@ BerryTree_EventScript_1A15F2:: @ 81A15F2 return BerryTree_EventScript_1A15F9:: @ 81A15F9 - buffernumberstring 1, VAR_SPECIAL_6 + buffernumberstring 1, VAR_0x8006 lock faceplayer msgbox Route102_Text_1A17C0, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_1A161D - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq BerryTree_EventScript_1A164B BerryTree_EventScript_1A161D:: @ 81A161D special EventObjectInteractionPickBerryTree - compare VAR_SPECIAL_4, 0 + compare VAR_0x8004, 0 goto_if_eq BerryTree_EventScript_1A1642 special EventObjectInteractionRemoveBerryTree message Route102_Text_1A17FD @@ -145,12 +145,12 @@ S_PlantBerryTreeFromBag:: @ 81A1654 BerryTree_EventScript_1A165F:: @ 81A165F checkitem ITEM_WAILMER_PAIL, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq BerryTree_EventScript_1A168D msgbox Route102_Text_1A18E6, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq S_WaterBerryTree - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq BerryTree_EventScript_1A168D BerryTree_EventScript_1A168D:: @ 81A168D releaseall diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 4e29db7c9..56a03f346 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 VAR_SPECIAL_7, 4 + turnobject VAR_0x8007, 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 VAR_SPECIAL_7, 0 + compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9 - applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement VAR_0x8007, 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 VAR_SPECIAL_7, 0 + compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C - applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4356 + applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 - applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement VAR_0x8007, 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 VAR_SPECIAL_7, 0 + compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 waitmovement 0 - applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4356 + applymovement VAR_0x8007, 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 VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 return @@ -175,7 +175,7 @@ SlateportCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_1A4342 - copyvar VAR_SPECIAL_7, LAST_TALKED + copyvar VAR_0x8007, VAR_LAST_TALKED lock faceplayer message OldaleTown_PokemonCenter_2F_Text_1A4510 @@ -183,7 +183,7 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC multichoice 17, 6, 17, 0 - switch RESULT + switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_1A3EF2 case 1, OldaleTown_PokemonCenter_2F_EventScript_1A4319 case 2, OldaleTown_PokemonCenter_2F_EventScript_1A3FDD @@ -191,39 +191,39 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 call S_DoSaveDialog - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF - compare VAR_SPECIAL_4, 0 + compare VAR_0x8004, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waitmessage special sub_808347C waitstate - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3F5E - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 - compare RESULT, 3 + compare VAR_RESULT, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D - compare RESULT, 4 + compare VAR_RESULT, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4068 - compare RESULT, 5 + compare VAR_RESULT, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E special ScrSpecial_HealPlayerParty special SavePlayerParty special LoadPlayerBag - copyvar VAR_CABLE_CLUB_STATE, VAR_SPECIAL_4 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 5, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 special DrawWholeMapView delay 60 - applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 + applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 closemessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B @@ -236,7 +236,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E closedoor 5, 1 waitdooranim release - compare VAR_SPECIAL_4, 5 + compare VAR_0x8004, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD special SetCableClubWarp warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 @@ -263,7 +263,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3FEF:: @ 81A3FEF message OldaleTown_PokemonCenter_2F_Text_1A4840 waitmessage multichoice 0, 0, 18, 0 - switch RESULT + switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_1A4062 case 1, OldaleTown_PokemonCenter_2F_EventScript_1A4042 case 2, OldaleTown_PokemonCenter_2F_EventScript_1A403C @@ -271,18 +271,18 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3FEF:: @ 81A3FEF case 127, OldaleTown_PokemonCenter_2F_EventScript_1A4036 OldaleTown_PokemonCenter_2F_EventScript_1A4036:: @ 81A4036 - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 return OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C - setvar VAR_SPECIAL_4, 5 + setvar VAR_0x8004, 5 return OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 special CheckForAlivePartyMons - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_1A4056 - setvar VAR_SPECIAL_4, 2 + setvar VAR_0x8004, 2 return OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056 @@ -292,11 +292,11 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056 goto OldaleTown_PokemonCenter_2F_EventScript_1A3FEF OldaleTown_PokemonCenter_2F_EventScript_1A4062:: @ 81A4062 - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 return OldaleTown_PokemonCenter_2F_EventScript_1A4068:: @ 81A4068 - switch VAR_SPECIAL_4 + switch VAR_0x8004 case 1, OldaleTown_PokemonCenter_2F_EventScript_1A40B1 case 2, OldaleTown_PokemonCenter_2F_EventScript_1A40A2 case 5, OldaleTown_PokemonCenter_2F_EventScript_1A4093 @@ -346,48 +346,48 @@ SlateportCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_1A4339 - copyvar VAR_SPECIAL_7, LAST_TALKED + copyvar VAR_0x8007, VAR_LAST_TALKED lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A457E, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A40FA OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA call OldaleTown_PokemonCenter_2F_EventScript_1A41BB - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call S_DoSaveDialog - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waitmessage special sub_80834E4 waitstate - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4166 - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 - compare RESULT, 3 + compare VAR_RESULT, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D - compare RESULT, 4 + compare VAR_RESULT, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A432D - compare RESULT, 5 + compare VAR_RESULT, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 - setvar VAR_SPECIAL_4, 3 - copyvar VAR_CABLE_CLUB_STATE, VAR_SPECIAL_4 + setvar VAR_0x8004, 3 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 8, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 special DrawWholeMapView delay 60 - applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 + applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 closemessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B @@ -403,27 +403,27 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 goto OldaleTown_PokemonCenter_2F_EventScript_1A4325 OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB - specialvar RESULT, CalculatePlayerPartyCount - compare RESULT, 2 + specialvar VAR_RESULT, CalculatePlayerPartyCount + compare VAR_RESULT, 2 goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_1A41E1 - specialvar RESULT, GetNameOfEnigmaBerryInPlayerParty - compare RESULT, 1 + specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty + compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A41EE - setvar RESULT, 1 + setvar VAR_RESULT, 1 return OldaleTown_PokemonCenter_2F_EventScript_1A41E1:: @ 81A41E1 message OldaleTown_PokemonCenter_2F_Text_1A48A3 waitmessage waitbuttonpress - setvar RESULT, 0 + setvar VAR_RESULT, 0 return OldaleTown_PokemonCenter_2F_EventScript_1A41EE:: @ 81A41EE message OldaleTown_PokemonCenter_2F_Text_1A48DD waitmessage waitbuttonpress - setvar RESULT, 0 + setvar VAR_RESULT, 0 return DewfordTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB @@ -442,18 +442,18 @@ SlateportCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB SootopolisCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB goto_if_unset FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_1A434B - copyvar VAR_SPECIAL_7, LAST_TALKED + copyvar VAR_0x8007, VAR_LAST_TALKED lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A45FE, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4229 OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 call S_DoSaveDialog - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waitmessage @@ -461,30 +461,30 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 waitstate special sub_80835D8 waitstate - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4294 - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 - compare RESULT, 3 + compare VAR_RESULT, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D - compare RESULT, 4 + compare VAR_RESULT, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A432D - compare RESULT, 5 + compare VAR_RESULT, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 - compare RESULT, 7 + compare VAR_RESULT, 7 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42E9 OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 - setvar VAR_SPECIAL_4, 4 - copyvar VAR_CABLE_CLUB_STATE, VAR_SPECIAL_4 + setvar VAR_0x8004, 4 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 11, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 special DrawWholeMapView delay 60 - applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 + applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 closemessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B @@ -601,13 +601,13 @@ gUnknown_081A4363:: @ 81A4363 end SingleBattleColosseum_EventScript_1A436F:: @ 81A436F - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8005, 0 special sub_8083B90 waitstate end SingleBattleColosseum_EventScript_1A4379:: @ 81A4379 - setvar VAR_SPECIAL_5, 1 + setvar VAR_0x8005, 1 special sub_8083B90 waitstate end @@ -616,9 +616,9 @@ DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383 fadescreen 1 special sub_80C5568 waitstate - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8005, 0 special sub_8083B90 waitstate end @@ -627,9 +627,9 @@ DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E fadescreen 1 special sub_80C5568 waitstate - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar VAR_SPECIAL_5, 1 + setvar VAR_0x8005, 1 special sub_8083B90 waitstate end @@ -638,9 +638,9 @@ DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9 fadescreen 1 special sub_80C5568 waitstate - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar VAR_SPECIAL_5, 2 + setvar VAR_0x8005, 2 special sub_8083B90 waitstate end @@ -649,9 +649,9 @@ DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4 fadescreen 1 special sub_80C5568 waitstate - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar VAR_SPECIAL_5, 3 + setvar VAR_0x8005, 3 special sub_8083B90 waitstate end @@ -660,31 +660,31 @@ DoubleBattleColosseum_EventScript_1A43EF:: @ 81A43EF end TradeCenter_EventScript_1A43F0:: @ 81A43F0 - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8005, 0 special sub_8083B5C waitstate end TradeCenter_EventScript_1A43FA:: @ 81A43FA - setvar VAR_SPECIAL_5, 1 + setvar VAR_0x8005, 1 special sub_8083B5C waitstate end @ 81A4404 - setvar VAR_SPECIAL_5, 2 + setvar VAR_0x8005, 2 special sub_8083B5C waitstate end @ 81A440E - setvar VAR_SPECIAL_5, 3 + setvar VAR_0x8005, 3 special sub_8083B5C waitstate end RecordCorner_EventScript_1A4418:: @ 81A4418 - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8005, 0 special sub_80B929C waitstate compare VAR_TEMP_1, 0 @@ -692,7 +692,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 end RecordCorner_EventScript_1A442D:: @ 81A442D - setvar VAR_SPECIAL_5, 1 + setvar VAR_0x8005, 1 special sub_80B929C waitstate compare VAR_TEMP_1, 0 @@ -700,7 +700,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D end RecordCorner_EventScript_1A4442:: @ 81A4442 - setvar VAR_SPECIAL_5, 2 + setvar VAR_0x8005, 2 special sub_80B929C waitstate compare VAR_TEMP_1, 0 @@ -708,7 +708,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 end RecordCorner_EventScript_1A4457:: @ 81A4457 - setvar VAR_SPECIAL_5, 3 + setvar VAR_0x8005, 3 special sub_80B929C waitstate compare VAR_TEMP_1, 0 @@ -788,7 +788,7 @@ RecordCorner_EventScript_1A44D6:: @ 81A44D6 TradeRoom_PromptToCancelLink:: @ 81A44E5 msgbox TradeRoom_WillLinkBeTerminated, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq TradeRoom_TerminateLink erasebox 0, 0, 29, 19 end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 165cc4409..2a63d97f8 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -5,15 +5,15 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 lock faceplayer checkitem ITEM_CONTEST_PASS, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq FallarborTown_ContestLobby_EventScript_1A4EDD compare VAR_CONTEST_PRIZE_PICKUP, 0 goto_if_ne FallarborTown_ContestLobby_EventScript_1A4F4E goto_if_set FLAG_TEMP_1, FallarborTown_ContestLobby_EventScript_1A4F8F - bufferstdstring 0, VAR_SPECIAL_B + bufferstdstring 0, VAR_0x800B msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EE1 setflag FLAG_TEMP_1 goto FallarborTown_ContestLobby_EventScript_1A4F8F @@ -24,7 +24,7 @@ FallarborTown_ContestLobby_EventScript_1A4EDD:: @ 81A4EDD return FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 - compare CONTEST_RANK, 0 + compare VAR_CONTEST_RANK, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EF6 msgbox FallarborTown_ContestLobby_Text_1A6340, 4 releaseall @@ -32,7 +32,7 @@ FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 msgbox FallarborTown_ContestLobby_Text_1A64F4, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F13 msgbox FallarborTown_ContestLobby_Text_1A65EA, 4 releaseall @@ -61,7 +61,7 @@ FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67 giveitem_std ITEM_LUXURY_BALL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86 setvar VAR_CONTEST_PRIZE_PICKUP, 0 closemessage @@ -76,7 +76,7 @@ FallarborTown_ContestLobby_EventScript_1A4F8F:: @ 81A4F8F message FallarborTown_ContestLobby_Text_1A5E46 waitmessage multichoice 0, 0, 2, 0 - switch RESULT + switch VAR_RESULT case 0, FallarborTown_ContestLobby_EventScript_1A5097 case 1, FallarborTown_ContestLobby_EventScript_1A4FCC case 2, FallarborTown_ContestLobby_EventScript_1A503E @@ -87,7 +87,7 @@ FallarborTown_ContestLobby_EventScript_1A4FCC:: @ 81A4FCC message FallarborTown_ContestLobby_Text_1A5E7C waitmessage multichoice 0, 0, 3, 0 - switch RESULT + switch VAR_RESULT case 0, FallarborTown_ContestLobby_EventScript_1A5014 case 1, FallarborTown_ContestLobby_EventScript_1A5022 case 2, FallarborTown_ContestLobby_EventScript_1A5030 @@ -118,18 +118,18 @@ FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 msgbox FallarborTown_ContestLobby_Text_1A6319, 4 choosecontestmon - compare VAR_SPECIAL_4, 255 + compare VAR_0x8004, 255 goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 special ScrSpecial_CheckSelectedMonAndInitContest - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A50C8 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A50D7 - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq FallarborTown_ContestLobby_EventScript_1A50FB - compare RESULT, 3 + compare VAR_RESULT, 3 goto_if_eq FallarborTown_ContestLobby_EventScript_1A511F - compare RESULT, 4 + compare VAR_RESULT, 4 goto_if_eq FallarborTown_ContestLobby_EventScript_1A512E end @@ -137,10 +137,10 @@ FallarborTown_ContestLobby_EventScript_1A5097:: @ 81A5097 message FallarborTown_ContestLobby_Text_1A6623 waitmessage multichoice 0, 0, 4, 0 - switch RESULT + switch VAR_RESULT case 5, FallarborTown_ContestLobby_EventScript_1A503E case 127, FallarborTown_ContestLobby_EventScript_1A503E - copyvar CONTEST_CATEGORY, RESULT + copyvar VAR_CONTEST_CATEGORY, VAR_RESULT goto FallarborTown_ContestLobby_EventScript_1A5048 end @@ -152,14 +152,14 @@ FallarborTown_ContestLobby_EventScript_1A50C8:: @ 81A50C8 FallarborTown_ContestLobby_EventScript_1A50D7:: @ 81A50D7 msgbox FallarborTown_ContestLobby_Text_1A67A3, MSGBOX_YESNO - switch RESULT + switch VAR_RESULT case NO, FallarborTown_ContestLobby_EventScript_1A5048 case YES, FallarborTown_ContestLobby_EventScript_1A513D end FallarborTown_ContestLobby_EventScript_1A50FB:: @ 81A50FB msgbox FallarborTown_ContestLobby_Text_1A6724, MSGBOX_YESNO - switch RESULT + switch VAR_RESULT case NO, FallarborTown_ContestLobby_EventScript_1A5048 case YES, FallarborTown_ContestLobby_EventScript_1A513D end @@ -184,7 +184,7 @@ FallarborTown_ContestLobby_EventScript_1A513D:: @ 81A513D return LinkContestRoom1_EventScript_1A514D:: @ 81A514D - setvar VAR_SPECIAL_6, 0 + setvar VAR_0x8006, 0 lockall applymovement 14, LinkContestRoom1_Movement_1A5DBF waitmovement 0 @@ -205,7 +205,7 @@ LinkContestRoom1_EventScript_1A514D:: @ 81A514D return LinkContestRoom1_EventScript_1A51A0:: @ 81A51A0 - switch CONTEST_RANK + switch VAR_CONTEST_RANK case 0, LinkContestRoom1_EventScript_1A51D2 case 1, LinkContestRoom1_EventScript_1A51D8 case 2, LinkContestRoom1_EventScript_1A51DE @@ -213,23 +213,23 @@ LinkContestRoom1_EventScript_1A51A0:: @ 81A51A0 return LinkContestRoom1_EventScript_1A51D2:: @ 81A51D2 - setvar VAR_SPECIAL_9, 5 + setvar VAR_0x8009, 5 return LinkContestRoom1_EventScript_1A51D8:: @ 81A51D8 - setvar VAR_SPECIAL_9, 6 + setvar VAR_0x8009, 6 return LinkContestRoom1_EventScript_1A51DE:: @ 81A51DE - setvar VAR_SPECIAL_9, 7 + setvar VAR_0x8009, 7 return LinkContestRoom1_EventScript_1A51E4:: @ 81A51E4 - setvar VAR_SPECIAL_9, 8 + setvar VAR_0x8009, 8 return LinkContestRoom1_EventScript_1A51EA:: @ 81A51EA - switch CONTEST_CATEGORY + switch VAR_CONTEST_CATEGORY case 0, LinkContestRoom1_EventScript_1A5227 case 1, LinkContestRoom1_EventScript_1A522D case 2, LinkContestRoom1_EventScript_1A5233 @@ -238,28 +238,28 @@ LinkContestRoom1_EventScript_1A51EA:: @ 81A51EA return LinkContestRoom1_EventScript_1A5227:: @ 81A5227 - setvar VAR_SPECIAL_8, 0 + setvar VAR_0x8008, 0 return LinkContestRoom1_EventScript_1A522D:: @ 81A522D - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 return LinkContestRoom1_EventScript_1A5233:: @ 81A5233 - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 return LinkContestRoom1_EventScript_1A5239:: @ 81A5239 - setvar VAR_SPECIAL_8, 3 + setvar VAR_0x8008, 3 return LinkContestRoom1_EventScript_1A523F:: @ 81A523F - setvar VAR_SPECIAL_8, 4 + setvar VAR_0x8008, 4 return LinkContestRoom1_EventScript_1A5245:: @ 81A5245 - bufferstdstring 1, VAR_SPECIAL_8 - bufferstdstring 2, VAR_SPECIAL_9 + bufferstdstring 1, VAR_0x8008 + bufferstdstring 2, VAR_0x8009 call LinkContestRoom1_EventScript_1A525F lockall applymovement 1, LinkContestRoom1_Movement_1A5D87 @@ -284,21 +284,21 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A call LinkContestRoom1_EventScript_1A5455 call LinkContestRoom1_EventScript_1A53E5 call LinkContestRoom1_EventScript_1A5880 - addvar VAR_SPECIAL_6, 1 - compare VAR_SPECIAL_6, 4 + addvar VAR_0x8006, 1 + compare VAR_0x8006, 4 goto_if_ne LinkContestRoom1_EventScript_1A527A call LinkContestRoom1_EventScript_1A5377 setvar VAR_TEMP_1, 6 return LinkContestRoom1_EventScript_1A52AE:: @ 81A52AE - compare VAR_SPECIAL_6, 0 + compare VAR_0x8006, 0 goto_if_eq LinkContestRoom1_EventScript_1A52DB - compare VAR_SPECIAL_6, 1 + compare VAR_0x8006, 1 goto_if_eq LinkContestRoom1_EventScript_1A52ED - compare VAR_SPECIAL_6, 2 + compare VAR_0x8006, 2 goto_if_eq LinkContestRoom1_EventScript_1A52FF - compare VAR_SPECIAL_6, 3 + compare VAR_0x8006, 3 goto_if_eq LinkContestRoom1_EventScript_1A5311 return @@ -307,7 +307,7 @@ LinkContestRoom1_EventScript_1A52DB:: @ 81A52DB applymovement 3, LinkContestRoom1_Movement_1A5DCE waitmovement 0 releaseall - setvar VAR_SPECIAL_B, 3 + setvar VAR_0x800B, 3 return LinkContestRoom1_EventScript_1A52ED:: @ 81A52ED @@ -315,7 +315,7 @@ LinkContestRoom1_EventScript_1A52ED:: @ 81A52ED applymovement 4, LinkContestRoom1_Movement_1A5DDA waitmovement 0 releaseall - setvar VAR_SPECIAL_B, 4 + setvar VAR_0x800B, 4 return LinkContestRoom1_EventScript_1A52FF:: @ 81A52FF @@ -323,7 +323,7 @@ LinkContestRoom1_EventScript_1A52FF:: @ 81A52FF applymovement 5, LinkContestRoom1_Movement_1A5DE2 waitmovement 0 releaseall - setvar VAR_SPECIAL_B, 5 + setvar VAR_0x800B, 5 return LinkContestRoom1_EventScript_1A5311:: @ 81A5311 @@ -331,24 +331,24 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311 applymovement 14, LinkContestRoom1_Movement_1A5DEA waitmovement 0 releaseall - setvar VAR_SPECIAL_B, 14 + setvar VAR_0x800B, 14 return LinkContestRoom1_EventScript_1A5323:: @ 81A5323 special sub_80C4C64 - addvar VAR_SPECIAL_6, 1 - buffernumberstring 1, VAR_SPECIAL_6 + addvar VAR_0x8006, 1 + buffernumberstring 1, VAR_0x8006 lockall - applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5D9C + applymovement VAR_0x800B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall addobject 13 playse SE_DANSA lockall - applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5D9C + applymovement VAR_0x800B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall - addvar VAR_SPECIAL_6, -1 + addvar VAR_0x8006, -1 playse SE_BOWA2 special ShowContestEntryMonPic call LinkContestRoom1_EventScript_1A535E @@ -460,23 +460,23 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455 return LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB - setvar RESULT, 8 + setvar VAR_RESULT, 8 special ScriptRandom - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LinkContestRoom1_EventScript_1A5760 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LinkContestRoom1_EventScript_1A5784 - compare RESULT, 2 + compare VAR_RESULT, 2 call_if_eq LinkContestRoom1_EventScript_1A57A8 - compare RESULT, 3 + compare VAR_RESULT, 3 call_if_eq LinkContestRoom1_EventScript_1A57CC - compare RESULT, 4 + compare VAR_RESULT, 4 call_if_eq LinkContestRoom1_EventScript_1A57F0 - compare RESULT, 5 + compare VAR_RESULT, 5 call_if_eq LinkContestRoom1_EventScript_1A5814 - compare RESULT, 6 + compare VAR_RESULT, 6 call_if_eq LinkContestRoom1_EventScript_1A5838 - compare RESULT, 7 + compare VAR_RESULT, 7 call_if_eq LinkContestRoom1_EventScript_1A585C compare VAR_TEMP_0, 0 goto_if_gt LinkContestRoom1_EventScript_1A54EB @@ -484,101 +484,101 @@ LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB return LinkContestRoom1_EventScript_1A555A:: @ 81A555A - compare VAR_SPECIAL_4, 80 + compare VAR_0x8004, 80 goto_if_gt LinkContestRoom1_EventScript_1A575A - compare VAR_SPECIAL_4, 70 + compare VAR_0x8004, 70 goto_if_gt LinkContestRoom1_EventScript_1A5754 - compare VAR_SPECIAL_4, 60 + compare VAR_0x8004, 60 goto_if_gt LinkContestRoom1_EventScript_1A574E - compare VAR_SPECIAL_4, 50 + compare VAR_0x8004, 50 goto_if_gt LinkContestRoom1_EventScript_1A5748 - compare VAR_SPECIAL_4, 40 + compare VAR_0x8004, 40 goto_if_gt LinkContestRoom1_EventScript_1A5742 - compare VAR_SPECIAL_4, 30 + compare VAR_0x8004, 30 goto_if_gt LinkContestRoom1_EventScript_1A573C - compare VAR_SPECIAL_4, 20 + compare VAR_0x8004, 20 goto_if_gt LinkContestRoom1_EventScript_1A5736 - compare VAR_SPECIAL_4, 10 + compare VAR_0x8004, 10 goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 - compare VAR_SPECIAL_4, 230 + compare VAR_0x8004, 230 goto_if_gt LinkContestRoom1_EventScript_1A575A - compare VAR_SPECIAL_4, 210 + compare VAR_0x8004, 210 goto_if_gt LinkContestRoom1_EventScript_1A5754 - compare VAR_SPECIAL_4, 190 + compare VAR_0x8004, 190 goto_if_gt LinkContestRoom1_EventScript_1A574E - compare VAR_SPECIAL_4, 170 + compare VAR_0x8004, 170 goto_if_gt LinkContestRoom1_EventScript_1A5748 - compare VAR_SPECIAL_4, 150 + compare VAR_0x8004, 150 goto_if_gt LinkContestRoom1_EventScript_1A5742 - compare VAR_SPECIAL_4, 130 + compare VAR_0x8004, 130 goto_if_gt LinkContestRoom1_EventScript_1A573C - compare VAR_SPECIAL_4, 110 + compare VAR_0x8004, 110 goto_if_gt LinkContestRoom1_EventScript_1A5736 - compare VAR_SPECIAL_4, 90 + compare VAR_0x8004, 90 goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5616:: @ 81A5616 - compare VAR_SPECIAL_4, 380 + compare VAR_0x8004, 380 goto_if_gt LinkContestRoom1_EventScript_1A575A - compare VAR_SPECIAL_4, 350 + compare VAR_0x8004, 350 goto_if_gt LinkContestRoom1_EventScript_1A5754 - compare VAR_SPECIAL_4, 320 + compare VAR_0x8004, 320 goto_if_gt LinkContestRoom1_EventScript_1A574E - compare VAR_SPECIAL_4, 290 + compare VAR_0x8004, 290 goto_if_gt LinkContestRoom1_EventScript_1A5748 - compare VAR_SPECIAL_4, 260 + compare VAR_0x8004, 260 goto_if_gt LinkContestRoom1_EventScript_1A5742 - compare VAR_SPECIAL_4, 230 + compare VAR_0x8004, 230 goto_if_gt LinkContestRoom1_EventScript_1A573C - compare VAR_SPECIAL_4, 200 + compare VAR_0x8004, 200 goto_if_gt LinkContestRoom1_EventScript_1A5736 - compare VAR_SPECIAL_4, 170 + compare VAR_0x8004, 170 goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5674:: @ 81A5674 - compare VAR_SPECIAL_4, 600 + compare VAR_0x8004, 600 goto_if_gt LinkContestRoom1_EventScript_1A575A - compare VAR_SPECIAL_4, 560 + compare VAR_0x8004, 560 goto_if_gt LinkContestRoom1_EventScript_1A5754 - compare VAR_SPECIAL_4, 520 + compare VAR_0x8004, 520 goto_if_gt LinkContestRoom1_EventScript_1A574E - compare VAR_SPECIAL_4, 480 + compare VAR_0x8004, 480 goto_if_gt LinkContestRoom1_EventScript_1A5748 - compare VAR_SPECIAL_4, 440 + compare VAR_0x8004, 440 goto_if_gt LinkContestRoom1_EventScript_1A5742 - compare VAR_SPECIAL_4, 400 + compare VAR_0x8004, 400 goto_if_gt LinkContestRoom1_EventScript_1A573C - compare VAR_SPECIAL_4, 360 + compare VAR_0x8004, 360 goto_if_gt LinkContestRoom1_EventScript_1A5736 - compare VAR_SPECIAL_4, 320 + compare VAR_0x8004, 320 goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 - compare VAR_SPECIAL_4, 600 + compare VAR_0x8004, 600 goto_if_gt LinkContestRoom1_EventScript_1A575A - compare VAR_SPECIAL_4, 550 + compare VAR_0x8004, 550 goto_if_gt LinkContestRoom1_EventScript_1A5754 - compare VAR_SPECIAL_4, 500 + compare VAR_0x8004, 500 goto_if_gt LinkContestRoom1_EventScript_1A574E - compare VAR_SPECIAL_4, 450 + compare VAR_0x8004, 450 goto_if_gt LinkContestRoom1_EventScript_1A5748 - compare VAR_SPECIAL_4, 400 + compare VAR_0x8004, 400 goto_if_gt LinkContestRoom1_EventScript_1A5742 - compare VAR_SPECIAL_4, 300 + compare VAR_0x8004, 300 goto_if_gt LinkContestRoom1_EventScript_1A573C - compare VAR_SPECIAL_4, 200 + compare VAR_0x8004, 200 goto_if_gt LinkContestRoom1_EventScript_1A5736 - compare VAR_SPECIAL_4, 100 + compare VAR_0x8004, 100 goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return @@ -724,7 +724,7 @@ LinkContestRoom1_EventScript_1A5880:: @ 81A5880 release removeobject 13 special sub_80C5164 - switch VAR_SPECIAL_6 + switch VAR_0x8006 case 0, LinkContestRoom1_EventScript_1A58BA case 1, LinkContestRoom1_EventScript_1A58C7 case 2, LinkContestRoom1_EventScript_1A58D4 @@ -733,28 +733,28 @@ LinkContestRoom1_EventScript_1A5880:: @ 81A5880 LinkContestRoom1_EventScript_1A58BA:: @ 81A58BA lockall - applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DD4 + applymovement VAR_0x800B, LinkContestRoom1_Movement_1A5DD4 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58C7:: @ 81A58C7 lockall - applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DDE + applymovement VAR_0x800B, LinkContestRoom1_Movement_1A5DDE waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58D4:: @ 81A58D4 lockall - applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DE6 + applymovement VAR_0x800B, LinkContestRoom1_Movement_1A5DE6 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58E1:: @ 81A58E1 lockall - applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DF0 + applymovement VAR_0x800B, LinkContestRoom1_Movement_1A5DF0 waitmovement 0 releaseall return @@ -856,7 +856,7 @@ LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2 LinkContestRoom1_EventScript_1A59FC:: @ 81A59FC special ScrSpecial_GetContestWinnerIdx - switch VAR_SPECIAL_5 + switch VAR_0x8005 case 0, LinkContestRoom1_EventScript_1A5A31 case 1, LinkContestRoom1_EventScript_1A5A37 case 2, LinkContestRoom1_EventScript_1A5A3D @@ -882,9 +882,9 @@ LinkContestRoom1_EventScript_1A5A43:: @ 81A5A43 LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 special ScrSpecial_GetContestWinnerTrainerName special ScrSpecial_GetContestWinnerNick - addvar VAR_SPECIAL_5, 1 - buffernumberstring 1, VAR_SPECIAL_5 - addvar VAR_SPECIAL_5, -1 + addvar VAR_0x8005, 1 + buffernumberstring 1, VAR_0x8005 + addvar VAR_0x8005, -1 call LinkContestRoom1_EventScript_1A5A75 applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5D99 waitmovement 0 @@ -1004,7 +1004,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB call LinkContestRoom1_EventScript_1A5A90 delay 30 special sub_80C4CF8 - compare VAR_SPECIAL_4, 1 + compare VAR_0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return @@ -1013,24 +1013,24 @@ LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 msgbox LinkContestRoom1_Text_1A6DF1, 3 delay 90 special sub_80C4CF8 - compare VAR_SPECIAL_4, 1 + compare VAR_0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return LinkContestRoom1_EventScript_1A5C12:: @ 81A5C12 - specialvar RESULT, ScrSpecial_CanMonParticipateInSelectedLinkContest - compare RESULT, 1 + specialvar VAR_RESULT, ScrSpecial_CanMonParticipateInSelectedLinkContest + compare VAR_RESULT, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C23 return LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23 special ScrSpecial_GetContestWinnerIdx - compare VAR_SPECIAL_5, 3 + compare VAR_0x8005, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C32 return LinkContestRoom1_EventScript_1A5C32:: @ 81A5C32 - compare CONTEST_RANK, 3 + compare VAR_CONTEST_RANK, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C41 setflag FLAG_TEMP_2 return @@ -1050,7 +1050,7 @@ LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C delay 60 call LinkContestRoom1_EventScript_1A5C6A special sub_80C4CF8 - compare VAR_SPECIAL_4, 1 + compare VAR_0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C64 closemessage return @@ -1062,7 +1062,7 @@ LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64 LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A special ScrSpecial_GetContestPlayerMonIdx special ScrSpecial_GetContestWinnerIdx - compare VAR_SPECIAL_4, VAR_SPECIAL_5 + compare VAR_0x8004, VAR_0x8005 goto_if_eq LinkContestRoom1_EventScript_1A5C7C return @@ -1071,7 +1071,7 @@ LinkContestRoom1_EventScript_1A5C7C:: @ 81A5C7C return LinkContestRoom1_EventScript_1A5C7F:: @ 81A5C7F - switch VAR_SPECIAL_5 + switch VAR_0x8005 case 0, LinkContestRoom1_EventScript_1A5CB1 case 1, LinkContestRoom1_EventScript_1A5CBE case 2, LinkContestRoom1_EventScript_1A5CCB @@ -1108,7 +1108,7 @@ LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 special ScrSpecial_GetContestWinnerIdx - compare VAR_SPECIAL_5, 3 + compare VAR_0x8005, 3 goto_if_eq LinkContestRoom1_EventScript_1A5CFC msgbox LinkContestRoom1_Text_1A6DF1, 3 return @@ -1117,10 +1117,10 @@ LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC compare VAR_CONTEST_LOCATION, 2 call_if_eq LinkContestRoom1_EventScript_1A5C42 incrementgamestat GAME_STAT_WON_CONTEST - specialvar RESULT, ScrSpecial_CanMonParticipateInSelectedLinkContest - compare RESULT, 0 + specialvar VAR_RESULT, ScrSpecial_CanMonParticipateInSelectedLinkContest + compare VAR_RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D5B - compare CONTEST_RANK, 3 + compare VAR_CONTEST_RANK, 3 goto_if_eq LinkContestRoom1_EventScript_1A5D3B msgbox LinkContestRoom1_Text_1A6DF1, 3 return @@ -1132,7 +1132,7 @@ LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B giveitem_std ITEM_LUXURY_BALL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D2D msgbox LinkContestRoom1_Text_1A6DF1, 3 return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 34ba18f08..1a7e56cfd 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -2,12 +2,12 @@ Route117_EventScript_1B222D:: @ 81B222D lock faceplayer special GetDaycareMonNicknames - specialvar RESULT, GetDaycareState - compare RESULT, 1 + specialvar VAR_RESULT, GetDaycareState + compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_1B2262 - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq Route117_EventScript_1B22E7 - compare RESULT, 3 + compare VAR_RESULT, 3 goto_if_eq Route117_EventScript_1B22FE msgbox Route117_Text_1B25CB, 4 release @@ -15,10 +15,10 @@ Route117_EventScript_1B222D:: @ 81B222D Route117_EventScript_1B2262:: @ 81B2262 msgbox Route117_Text_1B2659, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B28C4, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 clearflag FLAG_PENDING_DAYCARE_EGG @@ -27,8 +27,8 @@ Route117_EventScript_1B2262:: @ 81B2262 end Route117_EventScript_1B2298:: @ 81B2298 - specialvar RESULT, CalculatePlayerPartyCount - compare RESULT, 6 + specialvar VAR_RESULT, CalculatePlayerPartyCount + compare VAR_RESULT, 6 goto_if_ne Route117_EventScript_1B22B2 msgbox Route117_Text_1B2766, 4 release @@ -47,8 +47,8 @@ Route117_EventScript_1B22B2:: @ 81B22B2 end Route117_EventScript_1B22CD:: @ 81B22CD - specialvar RESULT, DaycareMonReceivedMail - compare RESULT, 1 + specialvar VAR_RESULT, DaycareMonReceivedMail + compare VAR_RESULT, 1 call_if_eq Route117_EventScript_1B22DE return @@ -59,7 +59,7 @@ Route117_EventScript_1B22DE:: @ 81B22DE Route117_EventScript_1B22E7:: @ 81B22E7 special GetDaycareMonNicknames msgbox Route117_Text_1B2710, 4 - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 call Route117_EventScript_1B22CD release end @@ -71,9 +71,9 @@ Route117_EventScript_1B22FE:: @ 81B22FE special ShowFieldMessageStringVar4 waitmessage waitbuttonpress - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 call Route117_EventScript_1B22CD - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 call Route117_EventScript_1B22CD release end @@ -81,42 +81,42 @@ Route117_EventScript_1B22FE:: @ 81B22FE Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 lock faceplayer - specialvar RESULT, GetDaycareState - compare RESULT, 1 + specialvar VAR_RESULT, GetDaycareState + compare VAR_RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2407 - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B242B - compare RESULT, 3 + compare VAR_RESULT, 3 goto_if_eq Route117_PokemonDayCare_EventScript_1B2558 msgbox Route117_PokemonDayCare_Text_1B28F2, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2A14, 4 release end Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C - specialvar RESULT, GetNumValidDaycarePartyMons - compare RESULT, 1 + specialvar VAR_RESULT, GetNumValidDaycarePartyMons + compare VAR_RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3 msgbox Route117_PokemonDayCare_Text_1B2947, 4 fadescreen 1 special ChooseSendDaycareMon waitstate - compare VAR_SPECIAL_4, 255 + compare VAR_0x8004, 255 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 - specialvar RESULT, CountAlivePartyMonsExceptSelectedOne - compare RESULT, 0 + specialvar VAR_RESULT, CountAlivePartyMonsExceptSelectedOne + compare VAR_RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD - specialvar VAR_SPECIAL_5, GetSelectedDaycareMonNickname + specialvar VAR_0x8005, GetSelectedDaycareMonNickname waitse - playmoncry VAR_SPECIAL_5, 0 + playmoncry VAR_0x8005, 0 msgbox Route117_PokemonDayCare_Text_1B296E, 4 waitmoncry special StoreSelectedPokemonInDaycare incrementgamestat GAME_STAT_USED_DAYCARE - specialvar RESULT, GetDaycareState - compare RESULT, 2 + specialvar VAR_RESULT, GetDaycareState + compare VAR_RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23DA release end @@ -128,7 +128,7 @@ Route117_PokemonDayCare_EventScript_1B23D0:: @ 81B23D0 Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA msgbox Route117_PokemonDayCare_Text_1B29AD, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B236C goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -153,36 +153,36 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 return Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A - specialvar RESULT, GetNumLevelsGainedFromDaycare - compare RESULT, 0 + specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare + compare VAR_RESULT, 0 call_if_ne Route117_PokemonDayCare_EventScript_1B2411 return Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B msgbox Route117_PokemonDayCare_Text_1B2A88, 4 - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B29AD, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2BF6, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 - specialvar RESULT, CalculatePlayerPartyCount - compare RESULT, 6 + specialvar VAR_RESULT, CalculatePlayerPartyCount + compare VAR_RESULT, 6 goto_if_eq Route117_PokemonDayCare_EventScript_1B2539 - specialvar RESULT, GetDaycareState - setvar VAR_SPECIAL_4, 0 - compare RESULT, 2 + specialvar VAR_RESULT, GetDaycareState + setvar VAR_0x8004, 0 + compare VAR_RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8 special ShowDaycareLevelMenu waitstate - copyvar VAR_SPECIAL_4, RESULT - compare RESULT, 2 + copyvar VAR_0x8004, VAR_RESULT + compare VAR_RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 goto Route117_PokemonDayCare_EventScript_1B24A8 end @@ -190,14 +190,14 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 special GetDaycareCost msgbox Route117_PokemonDayCare_Text_1B2B49, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B24C4 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 - specialvar RESULT, HasEnoughMoneyFor - compare RESULT, 1 + specialvar VAR_RESULT, HasEnoughMoneyFor + compare VAR_RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE msgbox Route117_PokemonDayCare_Text_1B2A30, 4 release @@ -206,23 +206,23 @@ Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE applymovement 1, Route117_PokemonDayCare_Movement_1B2543 waitmovement 0 - specialvar RESULT, TakePokemonFromDaycare + specialvar VAR_RESULT, TakePokemonFromDaycare special PayMoneyFor playse SE_REGI msgbox Route117_PokemonDayCare_Text_1B2B75, 4 waitse - playmoncry RESULT, 0 + playmoncry VAR_RESULT, 0 msgbox Route117_PokemonDayCare_Text_1B2B93, 4 waitmoncry - specialvar RESULT, GetDaycareState - compare RESULT, 2 + specialvar VAR_RESULT, GetDaycareState + compare VAR_RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B2520 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2520:: @ 81B2520 msgbox Route117_PokemonDayCare_Text_1B2A4F, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -259,12 +259,12 @@ Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543 Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 msgbox Route117_PokemonDayCare_Text_1B2A88, 4 - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 call Route117_PokemonDayCare_EventScript_1B241A - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B2BF6, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 release @@ -273,10 +273,10 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 @ 81B2591 special ShowDaycareLevelMenu waitstate - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 - copyvar VAR_SPECIAL_4, RESULT - specialvar RESULT, TakePokemonFromDaycare + copyvar VAR_0x8004, VAR_RESULT + specialvar VAR_RESULT, TakePokemonFromDaycare msgbox Route117_PokemonDayCare_Text_1B2B75, 4 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 release diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc index 5427ea6cd..c11e78a8d 100644 --- a/data/scripts/debug.inc +++ b/data/scripts/debug.inc @@ -7,7 +7,7 @@ DebugScript_081C1CFE:: @ 81C1CFE DebugScript_081C1D07:: @ 81C1D07 checkitem ITEM_COIN_CASE, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq DebugScript_081C1D1D giveitem ITEM_COIN_CASE, 1 end @@ -34,7 +34,7 @@ DebugScript_081C1D34:: @ 81C1D34 DebugScript_081C1D35:: @ 81C1D35 getpartysize - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq DebugScript_081C1D45 giveegg SPECIES_KYOGRE end @@ -463,15 +463,15 @@ DebugScript_081C23F6:: @ 81C23F6 DebugScript_081C23FD:: @ 81C23FD getpartysize - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq DebugScript_081C2436 - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq DebugScript_081C2445 - compare RESULT, 3 + compare VAR_RESULT, 3 goto_if_eq DebugScript_081C2454 - compare RESULT, 4 + compare VAR_RESULT, 4 goto_if_eq DebugScript_081C2463 - compare RESULT, 5 + compare VAR_RESULT, 5 goto_if_eq DebugScript_081C2472 end @@ -489,15 +489,15 @@ DebugScript_081C2472: DebugScript_081C2482:: @ 81C2482 getpartysize - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq DebugScript_081C24BB - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq DebugScript_081C24CA - compare RESULT, 3 + compare VAR_RESULT, 3 goto_if_eq DebugScript_081C24D9 - compare RESULT, 4 + compare VAR_RESULT, 4 goto_if_eq DebugScript_081C24E8 - compare RESULT, 5 + compare VAR_RESULT, 5 goto_if_eq DebugScript_081C24F7 end @@ -515,7 +515,7 @@ DebugScript_081C24F7: DebugScript_081C2507:: @ 81C2507 getpartysize - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq DebugScript_081C2517 giveegg SPECIES_BARBOACH end @@ -525,7 +525,7 @@ DebugScript_081C2517:: @ 81C2517 DebugScript_081C2518:: @ 81C2518 getpartysize - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq DebugScript_081C2528 giveegg SPECIES_SHROOMISH end diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index b1c47fa62..29e05c513 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -2,8 +2,8 @@ Route111_EventScript_1AE313:: @ 81AE313 Route118_EventScript_1AE313:: @ 81AE313 Route120_EventScript_1AE313:: @ 81AE313 cleartrainerflag TRAINER_GABBY_AND_TY_6 - specialvar RESULT, GabbyAndTyGetBattleNum - switch RESULT + specialvar VAR_RESULT, GabbyAndTyGetBattleNum + switch VAR_RESULT case 0, Route111_EventScript_1AE384 case 1, Route111_EventScript_1AE38A case 2, Route111_EventScript_1AE395 @@ -202,11 +202,11 @@ Route120_EventScript_1AE582:: @ 81AE582 Route111_EventScript_1AE5A2:: @ 81AE5A2 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq Route111_EventScript_1AE5E0 - compare FACING, 1 + compare VAR_FACING, 1 call_if_eq Route111_EventScript_1AE5EB - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq Route111_EventScript_1AE5FD goto_if_set FLAG_TEMP_1, Route111_EventScript_1AE73A msgbox Route111_Text_1AC015, MSGBOX_YESNO @@ -214,19 +214,19 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 end Route111_EventScript_1AE5E0:: @ 81AE5E0 - applymovement VAR_SPECIAL_4, Route111_Movement_1AE699 + applymovement VAR_0x8004, Route111_Movement_1AE699 waitmovement 0 return Route111_EventScript_1AE5EB:: @ 81AE5EB - applymovement VAR_SPECIAL_4, Route111_Movement_1AE69B - applymovement VAR_SPECIAL_5, Route111_Movement_1A0841 + applymovement VAR_0x8004, Route111_Movement_1AE69B + applymovement VAR_0x8005, Route111_Movement_1A0841 waitmovement 0 return Route111_EventScript_1AE5FD:: @ 81AE5FD - applymovement VAR_SPECIAL_4, Route111_Movement_1AE69D - applymovement VAR_SPECIAL_5, Route111_Movement_1A083F + applymovement VAR_0x8004, Route111_Movement_1AE69D + applymovement VAR_0x8005, Route111_Movement_1A083F waitmovement 0 return @@ -235,19 +235,19 @@ Route118_EventScript_1AE60F:: @ 81AE60F Route120_EventScript_1AE60F:: @ 81AE60F special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq Route111_EventScript_1AE5E0 - compare FACING, 1 + compare VAR_FACING, 1 call_if_eq Route111_EventScript_1AE5EB - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq Route111_EventScript_1AE5FD goto_if_set FLAG_TEMP_1, Route111_EventScript_1AE73A - specialvar RESULT, GabbyAndTyGetLastQuote - compare RESULT, 0 + specialvar VAR_RESULT, GabbyAndTyGetLastQuote + compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_1AE69F msgbox Route111_Text_1AC10A, 4 - specialvar RESULT, GabbyAndTyGetLastBattleTrivia - switch RESULT + specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia + switch VAR_RESULT case 0, Route111_EventScript_1AE6AD case 1, Route111_EventScript_1AE6BB case 2, Route111_EventScript_1AE6C9 @@ -298,14 +298,14 @@ Route111_EventScript_1AE6E5:: @ 81AE6E5 end Route111_EventScript_1AE6F3:: @ 81AE6F3 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, 4 - setvar VAR_SPECIAL_4, 10 + setvar VAR_0x8004, 10 call Route111_EventScript_1A00F3 lock faceplayer - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC487, 4 special GabbyAndTyAfterInterview diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 5f70c1295..ff31d8b97 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -65,9 +65,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB fadescreen 0 setobjectxyperm 1, 10, 12 addobject 1 - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq MtChimney_EventScript_1B2D7D - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq MtChimney_EventScript_1B2D88 applymovement 255, MtChimney_Movement_1A083F waitmovement 0 @@ -77,9 +77,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB msgbox MtChimney_Text_1B3FFE, 4 .endif closemessage - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq MtChimney_EventScript_1B2D93 - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq MtChimney_EventScript_1B2D9E removeobject 1 setflag FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 0e1835ae4..9e2db94a1 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -2,7 +2,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 special ScrSpecial_GetCurrentMauvilleMan - switch RESULT + switch VAR_RESULT case MAUVILLE_MAN_BARD, SpeakToBard case MAUVILLE_MAN_HIPSTER, SpeakToHipster case MAUVILLE_MAN_TRADER, SpeakToTrader @@ -19,19 +19,19 @@ SpeakToBard: lock faceplayer msgbox gTextBard_HiImTheBard, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq yes_hear_song - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq dont_hear_song end yes_hear_song: - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 @ Give the player ear rape special ScrSpecial_PlayBardSong delay 60 special ScrSpecial_HasBardSongBeenChanged - compare RESULT, FALSE + compare VAR_RESULT, FALSE @ Prompt new lyrics only if song hasn't been changed goto_if_eq prompt_write_lyrics msgbox gTextBard_OhWhatAMovingSong, 4 @@ -45,26 +45,26 @@ dont_hear_song: prompt_write_lyrics: msgbox gTextBard_SoHowDoYouLikeMySong, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq write_lyrics - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq dont_write_lyrics end write_lyrics: - setvar VAR_SPECIAL_4, 6 + setvar VAR_0x8004, 6 call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq dont_write_lyrics msgbox gTextBard_ThankYouKindly, 4 - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 @ Give the player ear rape again special ScrSpecial_PlayBardSong delay 60 msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq write_lyrics @ Keep looping until player responds YES special ScrSpecial_SaveBardSongLyrics msgbox gTextBard_OkayThatsIt, 4 @@ -87,7 +87,7 @@ SpeakToHipster: setflag FLAG_SYS_HIPSTER_MEET msgbox gTextHipster_TheyCallMeTheHipster, 4 special ScrSpecial_GetHipsterSpokenFlag - compare RESULT, FALSE + compare VAR_RESULT, FALSE goto_if_eq hipster_first_time msgbox gTextHipster_TaughtYouAlready, 4 release @@ -95,7 +95,7 @@ SpeakToHipster: hipster_first_time: special ScrSpecial_HipsterTeachWord - compare RESULT, TRUE @ TRUE if player learned a new word + compare VAR_RESULT, TRUE @ TRUE if player learned a new word goto_if_eq teach_new_word msgbox gTextHipster_YouAlreadyKnowALot, 4 release @@ -118,10 +118,10 @@ SpeakToTrader: lock faceplayer msgbox gTextTrader_Introduction, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq dont_want_to_trade special ScrSpecial_GetTraderTradedFlag - compare RESULT, TRUE + compare VAR_RESULT, TRUE goto_if_eq already_traded message gTextTrader_MenuPrompt waitmessage @@ -139,15 +139,15 @@ already_traded: do_trader_menu_get: special ScrSpecial_TraderMenuGetDecoration waitstate - compare VAR_SPECIAL_4, 0 + compare VAR_0x8004, 0 goto_if_eq cancelled_get_menu - compare VAR_SPECIAL_4, -1 + compare VAR_0x8004, -1 goto_if_eq rare_item_cant_trade_away msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq dont_want_item special ScrSpecial_DoesPlayerHaveNoDecorations - compare RESULT, TRUE + compare VAR_RESULT, TRUE goto_if_eq player_has_no_decorations goto do_trader_menu_give end @@ -176,15 +176,15 @@ do_trader_menu_give: msgbox gTextTrader_PickDecorationYoullTrade, 4 special ScrSpecial_TraderMenuGiveDecoration waitstate - compare VAR_SPECIAL_6, 0 + compare VAR_0x8006, 0 goto_if_eq cancelled_give_menu - compare VAR_SPECIAL_6, -1 + compare VAR_0x8006, -1 goto_if_eq decoration_is_in_use special ScrSpecial_IsDecorationFull - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq decorations_full msgbox gTextTrader_SoWellTrade, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq do_trader_menu_give special ScrSpecial_TraderDoDecorationTrade msgbox gTextTrader_ThenWellTrade, 2 @@ -211,58 +211,58 @@ decorations_full: .include "data/text/storyteller.inc" SpeakToStoryteller: - setvar VAR_SPECIAL_8, 0 - setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_A, 0 - setvar VAR_SPECIAL_B, 0 + setvar VAR_0x8008, 0 + setvar VAR_0x8009, 0 + setvar VAR_0x800A, 0 + setvar VAR_0x800B, 0 lock faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq dont_hear_story - specialvar RESULT, ScrSpecial_StorytellerGetFreeStorySlot - compare RESULT, 0 @ If slot is 0, then the list is empty + specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot + compare VAR_RESULT, 0 @ If slot is 0, then the list is empty goto_if_eq no_stories_recorded choose_story: message gTextStoryteller_WhichTale waitmessage special ScrSpecial_StorytellerStoryListMenu waitstate - compare RESULT, FALSE + compare VAR_RESULT, FALSE goto_if_eq cancel_story_menu - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 special ScrSpecial_StorytellerDisplayStory waitmessage waitbuttonpress - specialvar RESULT, ScrSpecial_StorytellerUpdateStat - compare RESULT, FALSE + specialvar VAR_RESULT, ScrSpecial_StorytellerUpdateStat + compare VAR_RESULT, FALSE goto_if_eq no_stat_update goto stat_update cancel_story_menu: - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 goto_if_eq dont_hear_story goto yes_hear_story no_stat_update: msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4 msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq choose_story yes_hear_story: - specialvar RESULT, ScrSpecial_HasStorytellerAlreadyRecorded - compare RESULT, TRUE + specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded + compare VAR_RESULT, TRUE goto_if_eq cant_record_story @ already recorded story - specialvar RESULT, ScrSpecial_StorytellerGetFreeStorySlot - compare RESULT, 4 + specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot + compare VAR_RESULT, 4 goto_if_eq cant_record_story @ story list is full goto prompt_record_story no_stories_recorded: msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4 prompt_record_story: msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq dont_hear_story - specialvar RESULT, ScrSpecial_StorytellerInitializeRandomStat - compare RESULT, TRUE + specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat + compare VAR_RESULT, TRUE goto_if_eq stat_update msgbox gTextStoryteller_ImNotSatisfied, 4 closemessage @@ -298,25 +298,25 @@ SpeakToGiddy: lock faceplayer msgbox gTextGiddy_Introduction, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq yes_hear_giddy - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq dont_hear_giddy end yes_hear_giddy: special ScrSpecial_GiddyShouldTellAnotherTale - compare RESULT, TRUE + compare VAR_RESULT, TRUE goto_if_eq tell_giddy_tale - compare RESULT, FALSE + compare VAR_RESULT, FALSE goto_if_eq bye_bye end tell_another_giddy_tale: special ScrSpecial_GiddyShouldTellAnotherTale - compare RESULT, TRUE + compare VAR_RESULT, TRUE goto_if_eq also_i_was_thinking - compare RESULT, FALSE + compare VAR_RESULT, FALSE goto_if_eq bye_bye end @@ -330,9 +330,9 @@ tell_giddy_tale: special ShowFieldMessageStringVar4 waitmessage yesnobox 20, 8 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq tell_another_giddy_tale - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq tell_another_giddy_tale end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 4813caa68..34c546a39 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -9,7 +9,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14 PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D:: @ 81B1B2D msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D10, 4 multichoice 17, 6, 20, 0 - switch RESULT + switch VAR_RESULT case 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A case 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1BD1 case 2, PetalburgCity_PokemonCenter_1F_EventScript_1B1B6C @@ -24,15 +24,15 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B6C:: @ 81B1B6C PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A msgbox PetalburgCity_PokemonCenter_1F_Text_1B1F7B, 4 closemessage - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare VAR_SPECIAL_4, 1 + compare VAR_0x8004, 1 call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB end @@ -42,7 +42,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1:: @ 81B1BB1 end PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB:: @ 81B1BBB - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 special sub_80EB7C4 waitmessage delay 80 @@ -63,7 +63,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB:: @ 81B1BDB PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9:: @ 81B1BE9 msgbox PetalburgCity_PokemonCenter_1F_Text_1B2063, 4 multichoice 17, 6, 20, 0 - switch RESULT + switch VAR_RESULT case 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C36 case 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D case 2, PetalburgCity_PokemonCenter_1F_EventScript_1B1C28 @@ -78,15 +78,15 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C28:: @ 81B1C28 PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 msgbox PetalburgCity_PokemonCenter_1F_Text_1B207F, 4 closemessage - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare VAR_SPECIAL_4, 1 + compare VAR_0x8004, 1 call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 9f0e67cb6..a4de5d113 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 VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 - compare VAR_SPECIAL_5, 0 + compare VAR_0x8005, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B699F - compare VAR_SPECIAL_5, 1 + compare VAR_0x8005, 1 call_if_eq 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 VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement VAR_0x8004, 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 VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement VAR_0x8004, 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 VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 goto LittlerootTown_BrendansHouse_2F_EventScript_1B69EB end LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF lockall - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 goto LittlerootTown_MaysHouse_2F_EventScript_1B69EB end @@ -68,38 +68,38 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB setflag FLAG_HIDE_MACHOKE_MOVER_1 setflag FLAG_HIDE_MACHOKE_MOVER_2 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 playse SE_KAIDAN - removeobject VAR_SPECIAL_8 + removeobject VAR_0x8008 releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 - setvar VAR_SPECIAL_8, 14 - addobject VAR_SPECIAL_8 - applymovement VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 + setvar VAR_0x8008, 14 + addobject VAR_0x8008 + applymovement VAR_0x8008, 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 VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 + applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 - setvar VAR_SPECIAL_8, 14 - addobject VAR_SPECIAL_8 - applymovement VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD + setvar VAR_0x8008, 14 + addobject VAR_0x8008 + applymovement VAR_0x8008, 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 VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 + applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 waitmovement 0 return @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 end LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF - applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0843 + applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0843 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC @@ -162,7 +162,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF playbgm MUS_INTER_V, FALSE msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4 closemessage - applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB + applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2 waitmovement 0 @@ -173,13 +173,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF msgbox LittlerootTown_BrendansHouse_1F_Text_172644, 4 closemessage setvar VAR_TEMP_1, 1 - applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 + applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8 end LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E - applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1A083F + applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1A083F waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 @@ -187,7 +187,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E playbgm MUS_INTER_V, FALSE msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4 closemessage - applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1B6BDE + applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CDA waitmovement 0 @@ -198,7 +198,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E msgbox LittlerootTown_MaysHouse_1F_Text_172644, 4 closemessage setvar VAR_TEMP_1, 1 - applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 + applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B6AB8 end @@ -206,9 +206,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D:: @ 81B6B9D LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D playse SE_PIN - applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 - applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, 4 closemessage @@ -274,7 +274,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D goto_if_set FLAG_RECEIVED_AMULET_COIN, LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 giveitem_std ITEM_AMULET_COIN - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4 setflag FLAG_RECEIVED_AMULET_COIN @@ -358,42 +358,42 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE lockall checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 - applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 playse SE_PIN - applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 - applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 delay 20 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq 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 VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4 closemessage - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playse SE_DOOR - removeobject VAR_SPECIAL_9 + removeobject VAR_0x8009 setflag FLAG_RECEIVED_SS_TICKET setvar VAR_LITTLEROOT_HOUSES_STATE, 4 setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 @@ -401,46 +401,46 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE end LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD:: @ 81B6DAD - setvar VAR_SPECIAL_8, 0 - setvar VAR_SPECIAL_9, 5 - setvar VAR_SPECIAL_A, 1 + setvar VAR_0x8008, 0 + setvar VAR_0x8009, 5 + setvar VAR_0x800A, 1 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD:: @ 81B6DBD - setvar VAR_SPECIAL_8, 1 - setvar VAR_SPECIAL_9, 5 - setvar VAR_SPECIAL_A, 1 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 5 + setvar VAR_0x800A, 1 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD:: @ 81B6DCD - applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E33 + applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E33 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8:: @ 81B6DD8 - applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E36 + applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E36 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3:: @ 81B6DE3 - applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E39 + applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E39 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE:: @ 81B6DEE - applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E3B + applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E3B waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9:: @ 81B6DF9 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F - applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D + applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B:: @ 81B6E0B applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F - applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E43 + applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E43 waitmovement 0 return diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 6f8cb1176..95525b4c9 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -1,34 +1,34 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 - setvar VAR_SPECIAL_8, 4 - setvar VAR_SPECIAL_9, 1 - applymovement VAR_SPECIAL_8, FallarborTown_ContestLobby_Movement_1B7821 + setvar VAR_0x8008, 4 + setvar VAR_0x8009, 1 + applymovement VAR_0x8008, FallarborTown_ContestLobby_Movement_1B7821 waitmovement 0 goto FallarborTown_ContestLobby_EventScript_1B7681 end SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E - setvar VAR_SPECIAL_8, 2 - setvar VAR_SPECIAL_9, 2 + setvar VAR_0x8008, 2 + setvar VAR_0x8009, 2 applymovement 6, SlateportCity_ContestLobby_Movement_1A083D - applymovement VAR_SPECIAL_8, SlateportCity_ContestLobby_Movement_1B7821 + applymovement VAR_0x8008, SlateportCity_ContestLobby_Movement_1B7821 waitmovement 0 goto SlateportCity_ContestLobby_EventScript_1B7681 end VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F - setvar VAR_SPECIAL_8, 2 - setvar VAR_SPECIAL_9, 1 - applymovement VAR_SPECIAL_8, VerdanturfTown_ContestLobby_Movement_1B7821 + setvar VAR_0x8008, 2 + setvar VAR_0x8009, 1 + applymovement VAR_0x8008, VerdanturfTown_ContestLobby_Movement_1B7821 waitmovement 0 goto VerdanturfTown_ContestLobby_EventScript_1B7681 end LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 - setvar VAR_SPECIAL_8, 3 - setvar VAR_SPECIAL_9, 3 + setvar VAR_0x8008, 3 + setvar VAR_0x8009, 3 applymovement 9, LilycoveCity_ContestLobby_Movement_1A083D applymovement 10, LilycoveCity_ContestLobby_Movement_1A083D - applymovement VAR_SPECIAL_8, LilycoveCity_ContestLobby_Movement_1B7821 + applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_1B7821 waitmovement 0 goto LilycoveCity_ContestLobby_EventScript_1B7681 end @@ -39,24 +39,24 @@ SlateportCity_ContestLobby_EventScript_1B7681:: @ 81B7681 VerdanturfTown_ContestLobby_EventScript_1B7681:: @ 81B7681 lockall msgbox FallarborTown_ContestLobby_Text_1B6E63, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1B76A1 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1B76E5 end FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 checkitem ITEM_POKEBLOCK_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7780 - specialvar RESULT, PlayerHasBerries - compare RESULT, 0 + specialvar VAR_RESULT, PlayerHasBerries + compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 - specialvar RESULT, GetFirstFreePokeblockSlot - compare RESULT, -1 + specialvar VAR_RESULT, GetFirstFreePokeblockSlot + compare VAR_RESULT, -1 goto_if_ne FallarborTown_ContestLobby_EventScript_1B76EF - compare RESULT, -1 + compare VAR_RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end @@ -67,9 +67,9 @@ FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF msgbox FallarborTown_ContestLobby_Text_1B6ED0, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1B7734 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1B7726 end @@ -91,7 +91,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 end FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 - copyvar VAR_SPECIAL_4, VAR_SPECIAL_9 + copyvar VAR_0x8004, VAR_0x8009 fadescreen 1 special DoBerryBlending waitstate @@ -121,22 +121,22 @@ FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780 end FallarborTown_ContestLobby_EventScript_1B778A:: @ 81B778A - setvar VAR_SPECIAL_8, 4 + setvar VAR_0x8008, 4 goto FallarborTown_ContestLobby_EventScript_1B77B6 end SlateportCity_ContestLobby_EventScript_1B7795:: @ 81B7795 - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 goto SlateportCity_ContestLobby_EventScript_1B77B6 end VerdanturfTown_ContestLobby_EventScript_1B77A0:: @ 81B77A0 - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 goto VerdanturfTown_ContestLobby_EventScript_1B77B6 end LilycoveCity_ContestLobby_EventScript_1B77AB:: @ 81B77AB - setvar VAR_SPECIAL_8, 3 + setvar VAR_0x8008, 3 goto LilycoveCity_ContestLobby_EventScript_1B77B6 end @@ -147,10 +147,10 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 lock faceplayer msgbox FallarborTown_ContestLobby_Text_1B742F, 4 - specialvar RESULT, PlayerHasBerries - compare RESULT, 1 + specialvar VAR_RESULT, PlayerHasBerries + compare VAR_RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77DC - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77E6 end @@ -206,24 +206,24 @@ LilycoveCity_ContestLobby_EventScript_1B783B:: @ 81B783B SlateportCity_ContestLobby_EventScript_1B783B:: @ 81B783B VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B lockall - specialvar RESULT, PlayerHasBerries - compare RESULT, 0 + specialvar VAR_RESULT, PlayerHasBerries + compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7897 checkitem ITEM_POKEBLOCK_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 - specialvar RESULT, GetFirstFreePokeblockSlot - compare RESULT, -1 + specialvar VAR_RESULT, GetFirstFreePokeblockSlot + compare VAR_RESULT, -1 goto_if_ne FallarborTown_ContestLobby_EventScript_1B7878 - compare RESULT, -1 + compare VAR_RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878 msgbox FallarborTown_ContestLobby_Text_1B727C, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1B78A1 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 end @@ -234,21 +234,21 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 call S_DoSaveDialog - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 waitmessage special sub_8083614 waitstate - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7980 - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq FallarborTown_ContestLobby_EventScript_1B794C - compare RESULT, 3 + compare VAR_RESULT, 3 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7959 - compare RESULT, 5 + compare VAR_RESULT, 5 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7966 - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7973 end @@ -268,7 +268,7 @@ FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F end FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 fadescreen 1 removeobject 240 removeobject 239 @@ -319,16 +319,16 @@ FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973 FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 fadescreen 1 - specialvar RESULT, GetLinkPartnerNames - copyvar VAR_SPECIAL_8, RESULT - copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + specialvar VAR_RESULT, GetLinkPartnerNames + copyvar VAR_0x8008, VAR_RESULT + copyvar VAR_0x8004, VAR_0x8008 special SpawnBerryBlenderLinkPlayerSprites goto FallarborTown_ContestLobby_EventScript_1B799A end FallarborTown_ContestLobby_EventScript_1B799A:: @ 81B799A fadescreen 0 - switch VAR_SPECIAL_8 + switch VAR_0x8008 case 2, FallarborTown_ContestLobby_EventScript_1B78F3 case 3, FallarborTown_ContestLobby_EventScript_1B7901 case 4, FallarborTown_ContestLobby_EventScript_1B790F diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index d34b357ea..aad2e3237 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -14,7 +14,7 @@ EventScript_1C341B: @ 81C341B gUnknown_081C342D:: @ 81C342D lockall msgbox UnknownString_81C34B2, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq EventScript_1C3443 releaseall end @@ -43,10 +43,10 @@ gUnknown_081C3459:: @ 81C3459 gUnknown_081C346A:: @ 81C346A lockall special SafariZoneGetPokeblockNameInFeeder - compare RESULT, 0xFFFF + compare VAR_RESULT, 0xFFFF goto_if_ne EventScript_1C34A9 msgbox UnknownString_81C354E, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq EventScript_1C348E releaseall end @@ -55,7 +55,7 @@ EventScript_1C348E: fadescreen 1 special OpenPokeblockCaseOnFeeder waitstate - compare RESULT, 0xFFFF + compare VAR_RESULT, 0xFFFF goto_if_ne EventScript_1C34A0 end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 49b8c5286..22f998d14 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -2,7 +2,7 @@ Route111_EventScript_1A3858:: @ 81A3858 lock faceplayer msgbox Route111_Text_1A3520, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route111_EventScript_1A3877 msgbox Route111_Text_1A37B5, 4 release @@ -10,29 +10,29 @@ Route111_EventScript_1A3858:: @ 81A3858 Route111_EventScript_1A3877:: @ 81A3877 giveitem_std ITEM_TM43_SECRET_POWER - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_1A38D9 msgbox Route111_Text_1A35C5, 4 closemessage setflag FLAG_RECEIVED_SECRET_POWER clearflag FLAG_HIDE_TM_SALESMAN_SLATEPORT - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq Route111_EventScript_1A38C3 - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq Route111_EventScript_1A38C3 - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq Route111_EventScript_1A38CE - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED release end Route111_EventScript_1A38C3:: @ 81A38C3 - applymovement LAST_TALKED, Route111_Movement_1A38E3 + applymovement VAR_LAST_TALKED, Route111_Movement_1A38E3 waitmovement 0 return Route111_EventScript_1A38CE:: @ 81A38CE - applymovement LAST_TALKED, Route111_Movement_1A38EF + applymovement VAR_LAST_TALKED, Route111_Movement_1A38EF waitmovement 0 return diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 5a84a1b48..486e5d68c 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -2,29 +2,29 @@ Event_TV:: @ 81A6E72 lockall incrementgamestat GAME_STAT_WATCHED_TV special ResetTVShowState - specialvar RESULT, CheckForBigMovieOrEmergencyNewsOnTV - compare RESULT, 2 + specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV + compare VAR_RESULT, 2 goto_if_eq EventScript_1A6F01 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq EventScript_1A6F0B goto_if_unset FLAG_SYS_TV_START, EventScript_1A6EF1 goto_if_set FLAG_SYS_TV_WATCH, EventScript_1A6EF1 - specialvar RESULT, IsTVShowInSearchOfTrainersAiring - compare RESULT, 1 + specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring + compare VAR_RESULT, 1 goto_if_eq EventScript_1A6F66 goto EventScript_1A6F50 end EventScript_1A6EBB: - specialvar VAR_SPECIAL_4, special_0x44 - compare VAR_SPECIAL_4, 255 + specialvar VAR_0x8004, special_0x44 + compare VAR_0x8004, 255 goto_if_eq EventScript_1A6F3F - specialvar RESULT, GetNonMassOutbreakActiveTVShow - compare RESULT, 255 + specialvar VAR_RESULT, GetNonMassOutbreakActiveTVShow + compare VAR_RESULT, 255 goto_if_eq EventScript_1A6F3F - copyvar VAR_SPECIAL_4, RESULT - specialvar RESULT, GetTVShowType - compare RESULT, 0 + copyvar VAR_0x8004, VAR_RESULT + specialvar VAR_RESULT, GetTVShowType + compare VAR_RESULT, 0 goto_if_ne EventScript_1A6F21 end @@ -57,7 +57,7 @@ EventScript_1A6F21: special DoTVShow waitmessage waitbuttonpress - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_ne EventScript_1A6F21 goto EventScript_1A6F37 end @@ -76,7 +76,7 @@ EventScript_1A6F3F: EventScript_1A6F50: special DoPokeNews - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq EventScript_1A6EBB waitmessage waitbuttonpress @@ -87,7 +87,7 @@ EventScript_1A6F66: special DoTVShowInSearchOfTrainers waitmessage waitbuttonpress - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq EventScript_1A6F66 goto EventScript_1A6F37 end |