diff options
Diffstat (limited to 'data/scripts')
174 files changed, 2176 insertions, 2176 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index ab700cbc3..55b8e2439 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,6 +1,6 @@ S_BerryTree:: @ 81A14DD special FieldObjectInteractionGetBerryTreeData - switch 0x8004 + 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 0x8005, 0 + compare VAR_SPECIAL_5, 0 goto_if_eq Route102_EventScript_1A15F2 - compare 0x8005, 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, 0x8006 + 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 0x8004, 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 0cedcd0d5..b3926af65 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -13,15 +13,15 @@ RustboroCity_PokemonCenter_2F_MapScript2_1A3D03:: @ 81A3D03 SlateportCity_PokemonCenter_2F_MapScript2_1A3D03:: @ 81A3D03 SootopolisCity_PokemonCenter_2F_MapScript2_1A3D03:: @ 81A3D03 VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D03:: @ 81A3D03 - map_script_2 0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D - map_script_2 0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D - map_script_2 0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D - map_script_2 0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D - map_script_2 0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D + map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D + map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D + map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D + map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D + map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D .2byte 0 OldaleTown_PokemonCenter_2F_EventScript_1A3D2D:: @ 81A3D2D - turnobject 0x8007, 4 + turnobject VAR_SPECIAL_7, 4 end DewfordTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 @@ -39,15 +39,15 @@ RustboroCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 SlateportCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 SootopolisCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 - compare 0x4087, 1 + compare VAR_CABLE_CLUB_STATE, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare 0x4087, 2 + compare VAR_CABLE_CLUB_STATE, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare 0x4087, 5 + compare VAR_CABLE_CLUB_STATE, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare 0x4087, 3 + compare VAR_CABLE_CLUB_STATE, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D74 - compare 0x4087, 4 + compare VAR_CABLE_CLUB_STATE, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D7E end @@ -78,21 +78,21 @@ RustboroCity_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 SlateportCity_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 SootopolisCity_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 - map_script_2 0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_1A3E8D - map_script_2 0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_1A3E8D - map_script_2 0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_1A3E8D - map_script_2 0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_1A3E17 - map_script_2 0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_1A3E7B + map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_1A3E8D + map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_1A3E8D + map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_1A3E8D + map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_1A3E17 + map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_1A3E7B .2byte 0 OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2 special CloseLink - setvar 0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 - compare 0x8007, 0 + compare VAR_SPECIAL_7, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9 - applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 @@ -100,14 +100,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA special CloseLink - setvar 0x4087, 0 - compare 0x8007, 0 + setvar VAR_CABLE_CLUB_STATE, 0 + compare VAR_SPECIAL_7, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C - applymovement 0x8007, 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 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 return @@ -127,12 +127,12 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 special CloseLink - setvar 0x4087, 0 - compare 0x8007, 0 + setvar VAR_CABLE_CLUB_STATE, 0 + compare VAR_SPECIAL_7, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 waitmovement 0 - applymovement 0x8007, 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 0x8007, 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 0x8007, 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 0x8004, 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 0x4087, 0x8004 + 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 0x8004, 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 0x8004, 0 + setvar VAR_SPECIAL_4, 0 return OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C - setvar 0x8004, 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 0x8004, 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 0x8004, 1 + setvar VAR_SPECIAL_4, 1 return OldaleTown_PokemonCenter_2F_EventScript_1A4068:: @ 81A4068 - switch 0x8004 + 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 0x8007, 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 0x8004, 3 - copyvar 0x4087, 0x8004 + 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 0x8007, 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 0x8004, 4 - copyvar 0x4087, 0x8004 + 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 0x8005, 0 + setvar VAR_SPECIAL_5, 0 special sub_8083B90 waitstate end SingleBattleColosseum_EventScript_1A4379:: @ 81A4379 - setvar 0x8005, 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 0x8005, 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 0x8005, 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 0x8005, 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 0x8005, 3 + setvar VAR_SPECIAL_5, 3 special sub_8083B90 waitstate end @@ -663,63 +663,63 @@ DoubleBattleColosseum_EventScript_1A43EF:: @ 81A43EF end TradeCenter_EventScript_1A43F0:: @ 81A43F0 - setvar 0x8005, 0 + setvar VAR_SPECIAL_5, 0 special sub_8083B5C waitstate end TradeCenter_EventScript_1A43FA:: @ 81A43FA - setvar 0x8005, 1 + setvar VAR_SPECIAL_5, 1 special sub_8083B5C waitstate end @ 81A4404 - setvar 0x8005, 2 + setvar VAR_SPECIAL_5, 2 special sub_8083B5C waitstate end @ 81A440E - setvar 0x8005, 3 + setvar VAR_SPECIAL_5, 3 special sub_8083B5C waitstate end RecordCorner_EventScript_1A4418:: @ 81A4418 - setvar 0x8005, 0 + setvar VAR_SPECIAL_5, 0 special sub_80B929C waitstate - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A442D:: @ 81A442D - setvar 0x8005, 1 + setvar VAR_SPECIAL_5, 1 special sub_80B929C waitstate - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A4442:: @ 81A4442 - setvar 0x8005, 2 + setvar VAR_SPECIAL_5, 2 special sub_80B929C waitstate - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A4457:: @ 81A4457 - setvar 0x8005, 3 + setvar VAR_SPECIAL_5, 3 special sub_80B929C waitstate - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A446C:: @ 81A446C - bufferitemname 1, 0x4001 + bufferitemname 1, VAR_TEMP_1 message RecordCorner_Text_1A4E3B waitmessage waitbuttonpress @@ -770,7 +770,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD end RecordCorner_EventScript_1A44BC:: @ 81A44BC - compare 0x4000, 0 + compare VAR_TEMP_0, 0 goto_if 5, RecordCorner_EventScript_1A44D6 special sub_8064EAC message RecordCorner_Text_1A4DD7 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 50202c7d6..9c5c246e2 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -7,11 +7,11 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 call_if 1, FallarborTown_ContestLobby_EventScript_1A4EDD - compare 0x408a, 0 + compare VAR_CONTEST_PRIZE_PICKUP, 0 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E checkflag FLAG_TEMP_1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F - bufferstdstring 0, 0x800b + bufferstdstring 0, VAR_SPECIAL_B msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 @@ -57,7 +57,7 @@ FallarborTown_ContestLobby_EventScript_1A4F44:: @ 81A4F44 FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E msgbox FallarborTown_ContestLobby_Text_1A685A, 4 - switch 0x408a + switch VAR_CONTEST_PRIZE_PICKUP case 4, FallarborTown_ContestLobby_EventScript_1A4F67 end @@ -65,7 +65,7 @@ FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67 giveitem_std ITEM_LUXURY_BALL compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86 - setvar 0x408a, 0 + setvar VAR_CONTEST_PRIZE_PICKUP, 0 closemessage release end @@ -120,7 +120,7 @@ FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 msgbox FallarborTown_ContestLobby_Text_1A6319, 4 choosecontestmon - compare 0x8004, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 special sub_80C43F4 compare RESULT, 0 @@ -182,11 +182,11 @@ FallarborTown_ContestLobby_EventScript_1A513D:: @ 81A513D msgbox FallarborTown_ContestLobby_Text_1A67C1, 4 closemessage releaseall - setvar 0x4086, 1 + setvar VAR_LINK_CONTEST_ROOM_STATE, 1 return LinkContestRoom1_EventScript_1A514D:: @ 81A514D - setvar 0x8006, 0 + setvar VAR_SPECIAL_6, 0 lockall applymovement 14, LinkContestRoom1_Movement_1A5DBF waitmovement 0 @@ -203,7 +203,7 @@ LinkContestRoom1_EventScript_1A514D:: @ 81A514D call LinkContestRoom1_EventScript_1A5A49 call LinkContestRoom1_EventScript_1A5A90 call LinkContestRoom1_EventScript_1A5BAB - setvar 0x4086, 2 + setvar VAR_LINK_CONTEST_ROOM_STATE, 2 return LinkContestRoom1_EventScript_1A51A0:: @ 81A51A0 @@ -215,19 +215,19 @@ LinkContestRoom1_EventScript_1A51A0:: @ 81A51A0 return LinkContestRoom1_EventScript_1A51D2:: @ 81A51D2 - setvar 0x8009, 5 + setvar VAR_SPECIAL_9, 5 return LinkContestRoom1_EventScript_1A51D8:: @ 81A51D8 - setvar 0x8009, 6 + setvar VAR_SPECIAL_9, 6 return LinkContestRoom1_EventScript_1A51DE:: @ 81A51DE - setvar 0x8009, 7 + setvar VAR_SPECIAL_9, 7 return LinkContestRoom1_EventScript_1A51E4:: @ 81A51E4 - setvar 0x8009, 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 0x8008, 0 + setvar VAR_SPECIAL_8, 0 return LinkContestRoom1_EventScript_1A522D:: @ 81A522D - setvar 0x8008, 1 + setvar VAR_SPECIAL_8, 1 return LinkContestRoom1_EventScript_1A5233:: @ 81A5233 - setvar 0x8008, 2 + setvar VAR_SPECIAL_8, 2 return LinkContestRoom1_EventScript_1A5239:: @ 81A5239 - setvar 0x8008, 3 + setvar VAR_SPECIAL_8, 3 return LinkContestRoom1_EventScript_1A523F:: @ 81A523F - setvar 0x8008, 4 + setvar VAR_SPECIAL_8, 4 return LinkContestRoom1_EventScript_1A5245:: @ 81A5245 - bufferstdstring 1, 0x8008 - bufferstdstring 2, 0x8009 + bufferstdstring 1, VAR_SPECIAL_8 + bufferstdstring 2, VAR_SPECIAL_9 call LinkContestRoom1_EventScript_1A525F lockall applymovement 1, LinkContestRoom1_Movement_1A5D87 @@ -270,7 +270,7 @@ LinkContestRoom1_EventScript_1A5245:: @ 81A5245 return LinkContestRoom1_EventScript_1A525F:: @ 81A525F - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5273 msgbox LinkContestRoom1_Text_1A68F0, 3 return @@ -286,21 +286,21 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A call LinkContestRoom1_EventScript_1A5455 call LinkContestRoom1_EventScript_1A53E5 call LinkContestRoom1_EventScript_1A5880 - addvar 0x8006, 1 - compare 0x8006, 4 + addvar VAR_SPECIAL_6, 1 + compare VAR_SPECIAL_6, 4 goto_if 5, LinkContestRoom1_EventScript_1A527A call LinkContestRoom1_EventScript_1A5377 - setvar 0x4001, 6 + setvar VAR_TEMP_1, 6 return LinkContestRoom1_EventScript_1A52AE:: @ 81A52AE - compare 0x8006, 0 + compare VAR_SPECIAL_6, 0 goto_if_eq LinkContestRoom1_EventScript_1A52DB - compare 0x8006, 1 + compare VAR_SPECIAL_6, 1 goto_if_eq LinkContestRoom1_EventScript_1A52ED - compare 0x8006, 2 + compare VAR_SPECIAL_6, 2 goto_if_eq LinkContestRoom1_EventScript_1A52FF - compare 0x8006, 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 0x800b, 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 0x800b, 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 0x800b, 5 + setvar VAR_SPECIAL_B, 5 return LinkContestRoom1_EventScript_1A5311:: @ 81A5311 @@ -333,31 +333,31 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311 applymovement 14, LinkContestRoom1_Movement_1A5DEA waitmovement 0 releaseall - setvar 0x800b, 14 + setvar VAR_SPECIAL_B, 14 return LinkContestRoom1_EventScript_1A5323:: @ 81A5323 special sub_80C4C64 - addvar 0x8006, 1 - buffernumberstring 1, 0x8006 + addvar VAR_SPECIAL_6, 1 + buffernumberstring 1, VAR_SPECIAL_6 lockall - applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall addobject 13 playse 10 lockall - applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall - addvar 0x8006, -1 + addvar VAR_SPECIAL_6, -1 playse 15 special ShowContestEntryMonPic call LinkContestRoom1_EventScript_1A535E return LinkContestRoom1_EventScript_1A535E:: @ 81A535E - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5370 message LinkContestRoom1_Text_1A6A04 waitmessage @@ -385,7 +385,7 @@ LinkContestRoom1_EventScript_1A5377:: @ 81A5377 return LinkContestRoom1_EventScript_1A53B3:: @ 81A53B3 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A53C7 msgbox LinkContestRoom1_Text_1A6A1F, 4 return @@ -396,7 +396,7 @@ LinkContestRoom1_EventScript_1A53C7:: @ 81A53C7 return LinkContestRoom1_EventScript_1A53CE:: @ 81A53CE - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A53DF message LinkContestRoom1_Text_1A6AE1 return @@ -431,34 +431,34 @@ LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 LinkContestRoom1_EventScript_1A5455:: @ 81A5455 special sub_80C47A0 - compare 0x4088, 1 + compare VAR_CONTEST_LOCATION, 1 call_if 1, LinkContestRoom1_EventScript_1A555A - compare 0x4088, 2 + compare VAR_CONTEST_LOCATION, 2 call_if 1, LinkContestRoom1_EventScript_1A55B8 - compare 0x4088, 3 + compare VAR_CONTEST_LOCATION, 3 call_if 1, LinkContestRoom1_EventScript_1A5616 - compare 0x4088, 4 + compare VAR_CONTEST_LOCATION, 4 call_if 1, LinkContestRoom1_EventScript_1A5674 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 call_if 1, LinkContestRoom1_EventScript_1A56D2 - setvar 0x4001, 9 - setvar 0x4002, 9 - setvar 0x4003, 9 - setvar 0x4004, 9 - setvar 0x4005, 9 - setvar 0x4006, 9 - setvar 0x4007, 9 - setvar 0x4008, 9 - compare 0x4000, 0 + setvar VAR_TEMP_1, 9 + setvar VAR_TEMP_2, 9 + setvar VAR_TEMP_3, 9 + setvar VAR_TEMP_4, 9 + setvar VAR_TEMP_5, 9 + setvar VAR_TEMP_6, 9 + setvar VAR_TEMP_7, 9 + setvar VAR_TEMP_8, 9 + compare VAR_TEMP_0, 0 call_if 2, LinkContestRoom1_EventScript_1A54EB - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4006, 0 - setvar 0x4007, 0 - setvar 0x4008, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 return LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB @@ -480,242 +480,242 @@ LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB call_if 1, LinkContestRoom1_EventScript_1A5838 compare RESULT, 7 call_if 1, LinkContestRoom1_EventScript_1A585C - compare 0x4000, 0 + compare VAR_TEMP_0, 0 goto_if 2, LinkContestRoom1_EventScript_1A54EB waitmovement 0 return LinkContestRoom1_EventScript_1A555A:: @ 81A555A - compare 0x8004, 80 + compare VAR_SPECIAL_4, 80 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 70 + compare VAR_SPECIAL_4, 70 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 60 + compare VAR_SPECIAL_4, 60 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 50 + compare VAR_SPECIAL_4, 50 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 40 + compare VAR_SPECIAL_4, 40 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 30 + compare VAR_SPECIAL_4, 30 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 20 + compare VAR_SPECIAL_4, 20 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 10 + compare VAR_SPECIAL_4, 10 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 - compare 0x8004, 230 + compare VAR_SPECIAL_4, 230 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 210 + compare VAR_SPECIAL_4, 210 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 190 + compare VAR_SPECIAL_4, 190 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 170 + compare VAR_SPECIAL_4, 170 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 150 + compare VAR_SPECIAL_4, 150 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 130 + compare VAR_SPECIAL_4, 130 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 110 + compare VAR_SPECIAL_4, 110 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 90 + compare VAR_SPECIAL_4, 90 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5616:: @ 81A5616 - compare 0x8004, 380 + compare VAR_SPECIAL_4, 380 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 350 + compare VAR_SPECIAL_4, 350 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 320 + compare VAR_SPECIAL_4, 320 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 290 + compare VAR_SPECIAL_4, 290 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 260 + compare VAR_SPECIAL_4, 260 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 230 + compare VAR_SPECIAL_4, 230 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 200 + compare VAR_SPECIAL_4, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 170 + compare VAR_SPECIAL_4, 170 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5674:: @ 81A5674 - compare 0x8004, 600 + compare VAR_SPECIAL_4, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 560 + compare VAR_SPECIAL_4, 560 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 520 + compare VAR_SPECIAL_4, 520 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 480 + compare VAR_SPECIAL_4, 480 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 440 + compare VAR_SPECIAL_4, 440 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 400 + compare VAR_SPECIAL_4, 400 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 360 + compare VAR_SPECIAL_4, 360 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 320 + compare VAR_SPECIAL_4, 320 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 - compare 0x8004, 600 + compare VAR_SPECIAL_4, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 550 + compare VAR_SPECIAL_4, 550 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 500 + compare VAR_SPECIAL_4, 500 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 450 + compare VAR_SPECIAL_4, 450 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 400 + compare VAR_SPECIAL_4, 400 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 300 + compare VAR_SPECIAL_4, 300 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 200 + compare VAR_SPECIAL_4, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 100 + compare VAR_SPECIAL_4, 100 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5730:: @ 81A5730 - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_1A5736:: @ 81A5736 - setvar 0x4000, 2 + setvar VAR_TEMP_0, 2 return LinkContestRoom1_EventScript_1A573C:: @ 81A573C - setvar 0x4000, 3 + setvar VAR_TEMP_0, 3 return LinkContestRoom1_EventScript_1A5742:: @ 81A5742 - setvar 0x4000, 4 + setvar VAR_TEMP_0, 4 return LinkContestRoom1_EventScript_1A5748:: @ 81A5748 - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 return LinkContestRoom1_EventScript_1A574E:: @ 81A574E - setvar 0x4000, 6 + setvar VAR_TEMP_0, 6 return LinkContestRoom1_EventScript_1A5754:: @ 81A5754 - setvar 0x4000, 7 + setvar VAR_TEMP_0, 7 return LinkContestRoom1_EventScript_1A575A:: @ 81A575A - setvar 0x4000, 8 + setvar VAR_TEMP_0, 8 return LinkContestRoom1_EventScript_1A5760:: @ 81A5760 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq LinkContestRoom1_EventScript_1A5783 applymovement 6, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4001, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_1, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A5783:: @ 81A5783 return LinkContestRoom1_EventScript_1A5784:: @ 81A5784 - compare 0x4002, 1 + compare VAR_TEMP_2, 1 goto_if_eq LinkContestRoom1_EventScript_1A57A7 applymovement 12, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4002, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_2, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A57A7:: @ 81A57A7 return LinkContestRoom1_EventScript_1A57A8:: @ 81A57A8 - compare 0x4003, 1 + compare VAR_TEMP_3, 1 goto_if_eq LinkContestRoom1_EventScript_1A57CB applymovement 7, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4003, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_3, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A57CB:: @ 81A57CB return LinkContestRoom1_EventScript_1A57CC:: @ 81A57CC - compare 0x4004, 1 + compare VAR_TEMP_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A57EF applymovement 8, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4004, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_4, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A57EF:: @ 81A57EF return LinkContestRoom1_EventScript_1A57F0:: @ 81A57F0 - compare 0x4005, 1 + compare VAR_TEMP_5, 1 goto_if_eq LinkContestRoom1_EventScript_1A5813 applymovement 9, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4005, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_5, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A5813:: @ 81A5813 return LinkContestRoom1_EventScript_1A5814:: @ 81A5814 - compare 0x4006, 1 + compare VAR_TEMP_6, 1 goto_if_eq LinkContestRoom1_EventScript_1A5837 applymovement 10, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4006, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_6, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A5837:: @ 81A5837 return LinkContestRoom1_EventScript_1A5838:: @ 81A5838 - compare 0x4007, 1 + compare VAR_TEMP_7, 1 goto_if_eq LinkContestRoom1_EventScript_1A585B applymovement 11, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4007, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_7, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A585B:: @ 81A585B return LinkContestRoom1_EventScript_1A585C:: @ 81A585C - compare 0x4008, 1 + compare VAR_TEMP_8, 1 goto_if_eq LinkContestRoom1_EventScript_1A587F applymovement 15, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4008, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_8, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A587F:: @ 81A587F @@ -726,7 +726,7 @@ LinkContestRoom1_EventScript_1A5880:: @ 81A5880 release removeobject 13 special sub_80C5164 - switch 0x8006 + 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 0x800b, LinkContestRoom1_Movement_1A5DD4 + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DD4 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58C7:: @ 81A58C7 lockall - applymovement 0x800b, LinkContestRoom1_Movement_1A5DDE + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DDE waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58D4:: @ 81A58D4 lockall - applymovement 0x800b, LinkContestRoom1_Movement_1A5DE6 + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DE6 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58E1:: @ 81A58E1 lockall - applymovement 0x800b, LinkContestRoom1_Movement_1A5DF0 + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DF0 waitmovement 0 releaseall return @@ -771,9 +771,9 @@ LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE applymovement 2, LinkContestRoom1_Movement_1A5D95 waitmovement 0 releaseall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 startcontest - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 lockall applymovement 1, LinkContestRoom1_Movement_1A5D95 applymovement 2, LinkContestRoom1_Movement_1A5D91 @@ -782,7 +782,7 @@ LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE return LinkContestRoom1_EventScript_1A5930:: @ 81A5930 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5944 msgbox LinkContestRoom1_Text_1A6AF5, 3 return @@ -802,14 +802,14 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A waitmovement 0 closemessage releaseall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 showcontestresults - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 playbgm 439, 0 return LinkContestRoom1_EventScript_1A5984:: @ 81A5984 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5998 msgbox LinkContestRoom1_Text_1A6C06, 4 return @@ -821,7 +821,7 @@ LinkContestRoom1_EventScript_1A5998:: @ 81A5998 return LinkContestRoom1_EventScript_1A59A2:: @ 81A59A2 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A59B6 msgbox LinkContestRoom1_Text_1A6C21, 4 return @@ -833,7 +833,7 @@ LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6 return LinkContestRoom1_EventScript_1A59C0:: @ 81A59C0 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A59D4 msgbox LinkContestRoom1_Text_1A6C9D, 4 return @@ -845,7 +845,7 @@ LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4 return LinkContestRoom1_EventScript_1A59DE:: @ 81A59DE - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A59F2 msgbox LinkContestRoom1_Text_1A6D16, 4 return @@ -858,7 +858,7 @@ LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2 LinkContestRoom1_EventScript_1A59FC:: @ 81A59FC special sub_80C47C0 - switch 0x8005 + switch VAR_SPECIAL_5 case 0, LinkContestRoom1_EventScript_1A5A31 case 1, LinkContestRoom1_EventScript_1A5A37 case 2, LinkContestRoom1_EventScript_1A5A3D @@ -866,36 +866,36 @@ LinkContestRoom1_EventScript_1A59FC:: @ 81A59FC return LinkContestRoom1_EventScript_1A5A31:: @ 81A5A31 - setvar 0x4003, 3 + setvar VAR_TEMP_3, 3 return LinkContestRoom1_EventScript_1A5A37:: @ 81A5A37 - setvar 0x4003, 4 + setvar VAR_TEMP_3, 4 return LinkContestRoom1_EventScript_1A5A3D:: @ 81A5A3D - setvar 0x4003, 5 + setvar VAR_TEMP_3, 5 return LinkContestRoom1_EventScript_1A5A43:: @ 81A5A43 - setvar 0x4003, 14 + setvar VAR_TEMP_3, 14 return LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 special sub_80C47F0 special sub_80C4858 - addvar 0x8005, 1 - buffernumberstring 1, 0x8005 - addvar 0x8005, -1 + addvar VAR_SPECIAL_5, 1 + buffernumberstring 1, VAR_SPECIAL_5 + addvar VAR_SPECIAL_5, -1 call LinkContestRoom1_EventScript_1A5A75 - applymovement 0x4003, LinkContestRoom1_Movement_1A5D99 + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5D99 waitmovement 0 playse 223 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 return LinkContestRoom1_EventScript_1A5A75:: @ 81A5A75 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5A89 msgbox LinkContestRoom1_Text_1A6D3C, 4 return @@ -906,9 +906,9 @@ LinkContestRoom1_EventScript_1A5A89:: @ 81A5A89 return LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 - addvar 0x4001, 1 + addvar VAR_TEMP_1, 1 lockall - compare 0x4088, 1 + compare VAR_CONTEST_LOCATION, 1 call_if 2, LinkContestRoom1_EventScript_1A5AE4 applymovement 9, LinkContestRoom1_Movement_1A5DB7 applymovement 12, LinkContestRoom1_Movement_1A5DBB @@ -918,7 +918,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 applymovement 11, LinkContestRoom1_Movement_1A5DBB applymovement 6, LinkContestRoom1_Movement_1A5DB3 applymovement 8, LinkContestRoom1_Movement_1A5DAF - compare 0x4001, 4 + compare VAR_TEMP_1, 4 goto_if 5, LinkContestRoom1_EventScript_1A5A90 delay 30 return @@ -993,7 +993,7 @@ LinkContestRoom1_EventScript_1A5AE4:: @ 81A5AE4 return LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5C4C call LinkContestRoom1_EventScript_1A5C12 checkflag FLAG_TEMP_2 @@ -1003,11 +1003,11 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB call LinkContestRoom1_EventScript_1A5C7F call LinkContestRoom1_EventScript_1A5CE5 playse 223 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 call LinkContestRoom1_EventScript_1A5A90 delay 30 special sub_80C4CF8 - compare 0x8004, 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 0x8004, 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 0x8005, 3 + compare VAR_SPECIAL_5, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C32 return @@ -1046,26 +1046,26 @@ LinkContestRoom1_EventScript_1A5C42:: @ 81A5C42 return LinkContestRoom1_EventScript_1A5C46:: @ 81A5C46 - setvar 0x4099, 1 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 return LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C delay 60 call LinkContestRoom1_EventScript_1A5C6A special sub_80C4CF8 - compare 0x8004, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C64 closemessage return LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64 - setvar 0x4099, 2 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2 return LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A special sub_80C496C special sub_80C47C0 - compare 0x8004, 0x8005 + 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 0x8005 + switch VAR_SPECIAL_5 case 0, LinkContestRoom1_EventScript_1A5CB1 case 1, LinkContestRoom1_EventScript_1A5CBE case 2, LinkContestRoom1_EventScript_1A5CCB @@ -1083,41 +1083,41 @@ LinkContestRoom1_EventScript_1A5C7F:: @ 81A5C7F LinkContestRoom1_EventScript_1A5CB1:: @ 81A5CB1 lockall - applymovement 0x4003, LinkContestRoom1_Movement_1A5DF6 + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5DF6 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A5CBE:: @ 81A5CBE lockall - applymovement 0x4003, LinkContestRoom1_Movement_1A5DFA + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5DFA waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A5CCB:: @ 81A5CCB lockall - applymovement 0x4003, LinkContestRoom1_Movement_1A5DA5 + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5DA5 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 lockall - applymovement 0x4003, LinkContestRoom1_Movement_1A5DA9 + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5DA9 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 special sub_80C47C0 - compare 0x8005, 3 + compare VAR_SPECIAL_5, 3 goto_if_eq LinkContestRoom1_EventScript_1A5CFC msgbox LinkContestRoom1_Text_1A6DF1, 3 return LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC - compare 0x4088, 2 + compare VAR_CONTEST_LOCATION, 2 call_if 1, LinkContestRoom1_EventScript_1A5C42 incrementgamestat GAME_STAT_WON_CONTEST specialvar RESULT, sub_80C4440 @@ -1130,7 +1130,7 @@ LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D msgbox LinkContestRoom1_Text_1A6E1F, 3 - setvar 0x408a, 4 + setvar VAR_CONTEST_PRIZE_PICKUP, 4 return LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index fd3273c78..8c2325e04 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 0x8004, 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 0x8004, 0 + setvar VAR_SPECIAL_4, 0 call Route117_EventScript_1B22CD - setvar 0x8004, 1 + setvar VAR_SPECIAL_4, 1 call Route117_EventScript_1B22CD release end @@ -96,21 +96,21 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 end Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C - specialvar RESULT, sub_8095B6C + specialvar RESULT, GetNumValidDaycarePartyMons compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3 msgbox Route117_PokemonDayCare_Text_1B2947, 4 fadescreen 1 special ChooseSendDaycareMon waitstate - compare 0x8004, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 - specialvar RESULT, sub_8095C10 + specialvar RESULT, CountAlivePartyMonsExceptSelectedOne compare RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD - specialvar 0x8005, GetSelectedDaycareMonNickname + specialvar VAR_SPECIAL_5, GetSelectedDaycareMonNickname waitse - playmoncry 0x8005, 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 0x8004, 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 0x8004, 0 + setvar VAR_SPECIAL_4, 0 compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8 special ShowDaycareLevelMenu waitstate - copyvar 0x8004, RESULT + copyvar VAR_SPECIAL_4, RESULT compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 goto Route117_PokemonDayCare_EventScript_1B24A8 @@ -196,7 +196,7 @@ Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 end Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 - specialvar RESULT, sub_80B7CE8 + specialvar RESULT, HasEnoughMoneyFor compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE msgbox Route117_PokemonDayCare_Text_1B2A30, 4 @@ -207,7 +207,7 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE applymovement 1, Route117_PokemonDayCare_Movement_1B2543 waitmovement 0 specialvar RESULT, TakePokemonFromDaycare - special sub_80B7D0C + special PayMoneyFor playse 95 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 waitse @@ -259,9 +259,9 @@ Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543 Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 msgbox Route117_PokemonDayCare_Text_1B2A88, 4 - setvar 0x8004, 0 + setvar VAR_SPECIAL_4, 0 call Route117_PokemonDayCare_EventScript_1B241A - setvar 0x8004, 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 0x8004, 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 a3d79d09e..e2f43b77e 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 0x8004, Route111_Movement_1AE699 + applymovement VAR_SPECIAL_4, Route111_Movement_1AE699 waitmovement 0 return Route111_EventScript_1AE5EB:: @ 81AE5EB - applymovement 0x8004, Route111_Movement_1AE69B - applymovement 0x8005, 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 0x8004, Route111_Movement_1AE69D - applymovement 0x8005, Route111_Movement_1A083F + applymovement VAR_SPECIAL_4, Route111_Movement_1AE69D + applymovement VAR_SPECIAL_5, Route111_Movement_1A083F waitmovement 0 return @@ -248,7 +248,7 @@ Route120_EventScript_1AE60F:: @ 81AE60F compare RESULT, 0 goto_if_eq Route111_EventScript_1AE69F msgbox Route111_Text_1AC10A, 4 - specialvar RESULT, sub_80BDD18 + specialvar RESULT, GabbyAndTyGetLastBattleTrivia switch RESULT case 0, Route111_EventScript_1AE6AD case 1, Route111_EventScript_1AE6BB @@ -303,14 +303,14 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3 compare RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, 4 - setvar 0x8004, 10 + setvar VAR_SPECIAL_4, 10 call Route111_EventScript_1A00F3 lock faceplayer compare RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC487, 4 - special sub_80BDC14 + special GabbyAndTyAfterInterview setflag FLAG_TEMP_1 release end diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index c1e77a8c7..9ad419da1 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -3,20 +3,20 @@ AbandonedShip_HiddenFloorRooms_MapScripts:: @ 815ED01 .byte 0 AbandonedShip_HiddenFloorRooms_MapScript2_15ED07:: @ 815ED07 - map_script_2 0x4001, 0, AbandonedShip_HiddenFloorRooms_EventScript_15ED11 + map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_15ED11 .2byte 0 AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 - setvar 0x4001, 1 - getplayerxy 0x4002, 0x4003 - setvar 0x4004, 1 - compare 0x4002, 21 + setvar VAR_TEMP_1, 1 + getplayerxy VAR_TEMP_2, VAR_TEMP_3 + setvar VAR_TEMP_4, 1 + compare VAR_TEMP_2, 21 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 - compare 0x4002, 36 + compare VAR_TEMP_2, 36 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F - compare 0x4003, 2 + compare VAR_TEMP_3, 2 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 - switch 0x4004 + switch VAR_TEMP_4 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4 case 3, AbandonedShip_HiddenFloorRooms_EventScript_15EDC5 @@ -26,15 +26,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 end AbandonedShip_HiddenFloorRooms_EventScript_15ED89:: @ 815ED89 - addvar 0x4004, 1 + addvar VAR_TEMP_4, 1 return AbandonedShip_HiddenFloorRooms_EventScript_15ED8F:: @ 815ED8F - addvar 0x4004, 2 + addvar VAR_TEMP_4, 2 return AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 - addvar 0x4004, 3 + addvar VAR_TEMP_4, 3 return AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B @@ -43,7 +43,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B setfieldeffectargument 1, 10 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4D4 + specialvar RESULT, FoundAbandonedShipRoom4Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B waitfieldeffect 54 @@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 end AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 - specialvar RESULT, sub_810F488 + specialvar RESULT, FoundAbandonedShipRoom1Key compare RESULT, 1 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA delay 20 @@ -77,7 +77,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setfieldeffectargument 1, 3 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4FC + specialvar RESULT, FoundAbandonedShipRoom6Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B waitfieldeffect 54 @@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setfieldeffectargument 1, 6 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4B0 + specialvar RESULT, FoundAbandonedShipRoom2Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B waitfieldeffect 54 diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index 5e8ab1062..e1e903cc0 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 @@ -16,7 +16,7 @@ AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index a587fcc92..5ec8197f9 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -9,17 +9,17 @@ AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7 AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall - setvar 0x8008, 1 + setvar VAR_SPECIAL_8, 1 playse 21 - applymovement 0x8008, AquaHideout_B2F_Movement_1A0833 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0833 waitmovement 0 .ifdef SAPPHIRE - applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 .else - applymovement 0x8008, AquaHideout_B2F_Movement_1A0841 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0841 .endif waitmovement 0 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end @@ -31,37 +31,37 @@ MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 end AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD - setvar 0x8008, 1 + setvar VAR_SPECIAL_8, 1 .ifdef SAPPHIRE - setvar 0x8009, 4 + setvar VAR_SPECIAL_9, 4 .else - setvar 0x8009, 3 + setvar VAR_SPECIAL_9, 3 .endif .ifdef SAPPHIRE - applymovement 0x8008, Movement_1A083F + applymovement VAR_SPECIAL_8, Movement_1A083F .else - applymovement 0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843 .endif waitmovement 0 delay 20 - applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_197162, 4 closemessage .ifdef SAPPHIRE - applymovement 0x8008, Movement_1A083F + applymovement VAR_SPECIAL_8, Movement_1A083F .else - applymovement 0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843 .endif .ifdef SAPPHIRE - applymovement 0x8009, AquaHideout_B2F_Movement_15D958 + applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D958 .else - applymovement 0x8009, AquaHideout_B2F_Movement_15D95D + applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D95D .endif waitmovement 0 - removeobject 0x8009 + removeobject VAR_SPECIAL_9 delay 20 - applymovement 0x8008, 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 3065c0cbb..7853b3598 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -3,11 +3,11 @@ BattleTower_BattleRoom_MapScripts:: @ 81608DB .byte 0 BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1 - map_script_2 0x4000, 0, BattleTower_BattleRoom_EventScript_1608EB + map_script_2 VAR_TEMP_0, 0, BattleTower_BattleRoom_EventScript_1608EB .2byte 0 BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 255, BattleTower_BattleRoom_Movement_160AB7 waitmovement 0 @@ -21,26 +21,26 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA waitmessage closemessage special ScrSpecial_HealPlayerParty - setvar 0x8004, 0 - setvar 0x8005, 0 - special sub_813556C + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 0 + special StartSpecialBattle waitstate switch RESULT case 1, BattleTower_BattleRoom_EventScript_160961 special LoadPlayerParty - setvar 0x8004, 0 - setvar 0x8005, 5 - special sub_8135668 - setvar 0x8004, 14 - special sub_8135668 - setvar 0x8004, 3 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 5 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 14 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160961:: @ 8160961 - setvar 0x8004, 6 - special sub_8135668 + setvar VAR_SPECIAL_4, 6 + special SetBattleTowerProperty switch RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 applymovement 1, BattleTower_BattleRoom_Movement_160AC6 @@ -53,7 +53,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 msgbox BattleTower_BattleRoom_Text_19ACDC, 4 special LoadPlayerParty special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty playfanfare 368 waitfanfare special ScrSpecial_HealPlayerParty @@ -89,24 +89,24 @@ BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special LoadPlayerParty - setvar 0x8004, 0 - setvar 0x8005, 4 - special sub_8135668 - setvar 0x8004, 2 - setvar 0x8005, 1 - special sub_8135668 - setvar 0x8004, 7 - special sub_8135668 - setvar 0x8004, 14 - special sub_8135668 - setvar 0x8004, 3 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 4 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 1 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 7 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 14 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 - setvar 0x8004, 2 - special sub_8135BA0 + setvar VAR_SPECIAL_4, 2 + special SaveBattleTowerProgress message BattleTower_BattleRoom_Text_1C6CE1 delay 60 waitmessage diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 828d975fc..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 0x8006, 1 + compare VAR_SPECIAL_6, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E setmetatile 12, 0, 519, 0 setmetatile 12, 1, 527, 0 @@ -16,12 +16,12 @@ BattleTower_Corridor_EventScript_16086E:: @ 816086E end BattleTower_Corridor_MapScript2_160881:: @ 8160881 - map_script_2 0x4000, 0, BattleTower_Corridor_EventScript_16088B + map_script_2 VAR_TEMP_0, 0, BattleTower_Corridor_EventScript_16088B .2byte 0 BattleTower_Corridor_EventScript_16088B:: @ 816088B - setvar 0x4000, 1 - compare 0x8006, 1 + setvar VAR_TEMP_0, 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 @@ -34,7 +34,7 @@ BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 waitmovement 0 BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 warp MAP_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate end diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index c006cdffe..6749c5623 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -4,31 +4,31 @@ BattleTower_Elevator_MapScripts:: @ 81607CF .byte 0 BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA - map_script_2 0x4000, 0, BattleTower_Elevator_EventScript_1607E4 + map_script_2 VAR_TEMP_0, 0, BattleTower_Elevator_EventScript_1607E4 .2byte 0 BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 1, BattleTower_Elevator_Movement_160835 applymovement 255, BattleTower_Elevator_Movement_160839 waitmovement 0 - special sub_810EBEC + special ShakeScreenInElevator waitstate delay 64 applymovement 1, BattleTower_Elevator_Movement_16083D applymovement 255, BattleTower_Elevator_Movement_160841 waitmovement 0 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1 waitstate end BattleTower_Elevator_MapScript2_160821:: @ 8160821 - map_script_2 0x4001, 0, BattleTower_Elevator_EventScript_16082B + map_script_2 VAR_TEMP_1, 0, BattleTower_Elevator_EventScript_16082B .2byte 0 BattleTower_Elevator_EventScript_16082B:: @ 816082B - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 69db45ede..4058d5aae 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -6,27 +6,27 @@ BattleTower_Lobby_MapScripts:: @ 816027E .byte 0 BattleTower_Lobby_MapScript1_160293:: @ 8160293 - special sub_813610C + special TryEnableBravoTrainerBattleTower call BattleTower_Lobby_EventScript_16029C end BattleTower_Lobby_EventScript_16029C:: @ 816029C - setvar 0x8004, 10 - special sub_8135668 + setvar VAR_SPECIAL_4, 10 + special SetBattleTowerProperty checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602CD - specialvar 0x8007, sub_810F404 - compare 0x8007, 50 + specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak + 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 0x8007, sub_810F404 - compare 0x8007, 100 + specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak + compare VAR_SPECIAL_7, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC @@ -41,20 +41,20 @@ BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8 end BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE - map_script_2 0x4001, 0, BattleTower_Lobby_EventScript_1602F8 + map_script_2 VAR_TEMP_1, 0, BattleTower_Lobby_EventScript_1602F8 .2byte 0 BattleTower_Lobby_EventScript_1602F8:: @ 81602F8 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end BattleTower_Lobby_MapScript2_160302:: @ 8160302 - map_script_2 0x4000, 0, BattleTower_Lobby_EventScript_16032C - map_script_2 0x4000, 1, BattleTower_Lobby_EventScript_160330 - map_script_2 0x4000, 2, BattleTower_Lobby_EventScript_160342 - map_script_2 0x4000, 3, BattleTower_Lobby_EventScript_160419 - map_script_2 0x4000, 4, BattleTower_Lobby_EventScript_16044B + map_script_2 VAR_TEMP_0, 0, BattleTower_Lobby_EventScript_16032C + map_script_2 VAR_TEMP_0, 1, BattleTower_Lobby_EventScript_160330 + map_script_2 VAR_TEMP_0, 2, BattleTower_Lobby_EventScript_160342 + map_script_2 VAR_TEMP_0, 3, BattleTower_Lobby_EventScript_160419 + map_script_2 VAR_TEMP_0, 4, BattleTower_Lobby_EventScript_16044B .2byte 0 BattleTower_Lobby_EventScript_16032C:: @ 816032C @@ -66,7 +66,7 @@ BattleTower_Lobby_EventScript_160330:: @ 8160330 faceplayer msgbox BattleTower_Lobby_Text_19A3FD, 4 closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -75,8 +75,8 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 faceplayer message BattleTower_Lobby_Text_19A487 waitmessage - setvar 0x8004, 0 - special sub_81358A4 + setvar VAR_SPECIAL_4, 0 + special BattleTowerUtil compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D special AwardBattleTowerRibbons @@ -89,24 +89,24 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 msgbox BattleTower_Lobby_Text_19A719, 4 BattleTower_Lobby_EventScript_16037D:: @ 816037D - setvar 0x8004, 8 - special sub_81358A4 + setvar VAR_SPECIAL_4, 8 + special BattleTowerUtil compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waitmessage - setvar 0x8004, 13 - special sub_8135668 + setvar VAR_SPECIAL_4, 13 + special SetBattleTowerProperty special DetermineBattleTowerPrize - setvar 0x8004, 3 - special sub_8135BA0 + setvar VAR_SPECIAL_4, 3 + special SaveBattleTowerProgress playse 55 waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD - setvar 0x8004, 0 - setvar 0x8005, 3 - special sub_8135668 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 3 + special SetBattleTowerProperty message BattleTower_Lobby_Text_19A4BB waitmessage special GiveBattleTowerPrize @@ -116,8 +116,8 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD waitmessage playfanfare 370 waitfanfare - setvar 0x8004, 9 - special sub_81358A4 + setvar VAR_SPECIAL_4, 9 + special BattleTowerUtil compare RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 @@ -125,7 +125,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD BattleTower_Lobby_EventScript_1603F8:: @ 81603F8 msgbox BattleTower_Lobby_Text_199FA9, 4 closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -133,7 +133,7 @@ BattleTower_Lobby_EventScript_160408:: @ 8160408 msgbox BattleTower_Lobby_Text_19A520, 4 waitmessage closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -144,48 +144,48 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 waitmessage message BattleTower_Lobby_Text_19A589 waitmessage - setvar 0x8004, 13 - special sub_8135668 - setvar 0x8004, 0 - special sub_8135BA0 + setvar VAR_SPECIAL_4, 13 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 0 + special SaveBattleTowerProgress playse 55 waitse msgbox BattleTower_Lobby_Text_199FA9, 4 closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end BattleTower_Lobby_EventScript_16044B:: @ 816044B lock faceplayer - setvar 0x40bc, 1 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 message BattleTower_Lobby_Text_19A5B1 waitmessage message BattleTower_Lobby_Text_19A5CE waitmessage - setvar 0x8004, 1 - special sub_8135BA0 + setvar VAR_SPECIAL_4, 1 + special SaveBattleTowerProgress playse 55 waitse - setvar 0x8004, 8 - setvar 0x8005, 0 - special sub_8135668 - setvar 0x4000, 5 + setvar VAR_SPECIAL_4, 8 + setvar VAR_SPECIAL_5, 0 + special SetBattleTowerProperty + setvar VAR_TEMP_0, 5 special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate BattleTower_Lobby_EventScript_16049E:: @ 816049E lock faceplayer - setvar 0x8004, 0 - special sub_81358A4 + setvar VAR_SPECIAL_4, 0 + special BattleTowerUtil compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 special SavePlayerParty @@ -209,12 +209,12 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 2, BattleTower_Lobby_EventScript_160652 case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist - compare 0x8004, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq BattleTower_Lobby_EventScript_16060D - setvar 0x8004, 1 - copyvar 0x8005, RESULT - copyvar 0x8006, RESULT - special sub_8135668 + setvar VAR_SPECIAL_4, 1 + copyvar VAR_SPECIAL_5, RESULT + copyvar VAR_SPECIAL_6, RESULT + special SetBattleTowerProperty msgbox BattleTower_Lobby_Text_19A07B, 4 fadescreen 1 special ChooseBattleTowerPlayerParty @@ -228,34 +228,34 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 127, BattleTower_Lobby_EventScript_16064F BattleTower_Lobby_EventScript_160587:: @ 8160587 - setvar 0x8004, 5 - special sub_8135668 - setvar 0x4000, 0 - setvar 0x8004, 11 - special sub_8135668 - setvar 0x8004, 0 - setvar 0x8005, 1 - special sub_8135668 - setvar 0x8004, 8 - setvar 0x8005, 0 - special sub_8135668 + setvar VAR_SPECIAL_4, 5 + special SetBattleTowerProperty + setvar VAR_TEMP_0, 0 + setvar VAR_SPECIAL_4, 11 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 1 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 8 + setvar VAR_SPECIAL_5, 0 + special SetBattleTowerProperty special LoadPlayerParty closemessage delay 2 call S_DoSaveDialog - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 erasebox 0, 0, 15, 10 compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty - special sub_8135A14 - setvar 0x40bc, 1 + special SetBattleTowerParty + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate BattleTower_Lobby_EventScript_160600:: @ 8160600 @@ -276,8 +276,8 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635 goto BattleTower_Lobby_EventScript_160662 BattleTower_Lobby_EventScript_160642:: @ 8160642 - setvar 0x8004, 12 - special sub_8135668 + setvar VAR_SPECIAL_4, 12 + special SetBattleTowerProperty goto BattleTower_Lobby_EventScript_160652 BattleTower_Lobby_EventScript_16064F:: @ 816064F @@ -285,8 +285,8 @@ BattleTower_Lobby_EventScript_16064F:: @ 816064F BattleTower_Lobby_EventScript_160652:: @ 8160652 msgbox BattleTower_Lobby_Text_199FA9, 4 - setvar 0x8004, 11 - special sub_8135668 + setvar VAR_SPECIAL_4, 11 + special SetBattleTowerProperty BattleTower_Lobby_EventScript_160662:: @ 8160662 release @@ -343,7 +343,7 @@ BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 BattleTower_Lobby_EventScript_1606CC:: @ 81606CC msgbox BattleTower_Lobby_Text_19A7C3, 4 - setvar 0x8004, 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 0x8008, 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 @@ -402,11 +402,11 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 end BattleTower_Lobby_EventScript_160773:: @ 8160773 - specialvar RESULT, sub_810F404 + specialvar RESULT, GetBestBattleTowerStreak compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 - setvar 0x8008, 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, 0x8008 + 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 e0aba0b9c..3992ffd2c 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -4,7 +4,7 @@ BattleTower_Outside_MapScripts:: @ 8160156 BattleTower_Outside_MapScript1_16015C:: @ 816015C setflag FLAG_LANDMARK_BATTLE_TOWER - setvar 0x40bc, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 setflag FLAG_HIDE_REPORTER_BATTLE_TOWER end @@ -68,7 +68,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 waitmovement 0 delay 30 hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE - setvar 0x8004, 4 + setvar VAR_SPECIAL_4, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 1b5146760..669b0a5fe 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -65,18 +65,18 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 special ScrSpecial_StartGroudonKyogreBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar RESULT, sub_810E300 + specialvar RESULT, GetBattleOutcome compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag FLAG_HIDE_WALLACE_SOOTOPOLIS setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM - setvar 0x409b, 1 + setvar VAR_CAVE_OF_ORIGIN_B4F_STATE, 1 setflag FLAG_LEGENDARY_BATTLE_COMPLETED clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS clearflag FLAG_SYS_WEATHER_CTRL - setvar 0x40b9, 2 + setvar VAR_MT_PYRE_STATE, 2 clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT releaseall end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index bb1fdeda4..dc733071f 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -140,10 +140,10 @@ DewfordTown_EventScript_14E151:: @ 814E151 clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobjectat 4, MAP_DEWFORD_TOWN - setvar 0x408e, 2 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 resetobjectpriority 255, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 - copyvar 0x4096, 0x8008 + 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 0x4096, 0x8008 + 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 0x8004, 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 0x8004, 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 afd918a96..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 0x8001, 0x8000 - compare 0x8000, 0 + copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 + compare VAR_SPECIAL_0, 0 goto_if_eq DewfordTown_Gym_EventScript_1530BA - compare 0x8000, 1 + compare VAR_SPECIAL_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530B6 - compare 0x8000, 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 0x8000, 0x8001 + compare VAR_SPECIAL_0, VAR_SPECIAL_1 goto_if_eq DewfordTown_Gym_EventScript_1530F5 - copyvar 0x8001, 0x8000 - compare 0x8000, 1 + copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 + compare VAR_SPECIAL_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530F6 - compare 0x8000, 2 + compare VAR_SPECIAL_0, 2 goto_if_eq DewfordTown_Gym_EventScript_153101 - compare 0x8000, 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 0x8000, 0 + setvar VAR_SPECIAL_0, 0 checktrainerflag OPPONENT_HIDEKI goto_if 0, DewfordTown_Gym_EventScript_153135 - addvar 0x8000, 1 + addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 checktrainerflag OPPONENT_TESSA goto_if 0, DewfordTown_Gym_EventScript_153143 - addvar 0x8000, 1 + addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 checktrainerflag OPPONENT_LAURA goto_if 0, DewfordTown_Gym_EventScript_153151 - addvar 0x8000, 1 + addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 return @@ -114,10 +114,10 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 msgbox DewfordTown_Gym_Text_1752E6, 4 setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET - addvar 0x4085, 1 - compare 0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB - setvar 0x8008, 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 a3830ebb8..530a4e04d 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -5,7 +5,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293 lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - special sub_80FA5E4 + special TrendyPhraseIsOld compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532B2 msgbox DewfordTown_Hall_Text_1754C9, 4 @@ -29,7 +29,7 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - special sub_80EB83C + special BufferRandomHobbyOrLifestyleString msgbox DewfordTown_Hall_Text_1755F9, 5 compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532F6 @@ -87,7 +87,7 @@ DewfordTown_Hall_EventScript_153353:: @ 8153353 DewfordTown_Hall_EventScript_153363:: @ 8153363 lockall call DewfordTown_Hall_EventScript_1A0102 - special sub_80FA648 + special GetDewfordHallPaintingNameIndex switch RESULT case 0, DewfordTown_Hall_EventScript_1533CA case 4, DewfordTown_Hall_EventScript_1533CA @@ -121,19 +121,19 @@ DewfordTown_Hall_EventScript_1533E8:: @ 81533E8 DewfordTown_Hall_EventScript_1533F2:: @ 81533F2 lockall - setvar 0x8008, 0 + setvar VAR_SPECIAL_8, 0 goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_1533FE:: @ 81533FE lockall - setvar 0x8008, 1 + setvar VAR_SPECIAL_8, 1 goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_15340A:: @ 815340A call DewfordTown_Hall_EventScript_1A0102 - special sub_80FA648 + special GetDewfordHallPaintingNameIndex switch RESULT case 0, DewfordTown_Hall_EventScript_153470 case 1, DewfordTown_Hall_EventScript_153470 @@ -191,9 +191,9 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC DewfordTown_Hall_EventScript_1534FD:: @ 81534FD applymovement 8, DewfordTown_Hall_Movement_153599 waitmovement 0 - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E - compare 0x8008, 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 0x8008, 0 + compare VAR_SPECIAL_8, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 - compare 0x8008, 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 c1288078f..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 0x800b, 1 + setvar VAR_SPECIAL_B, 1 call DewfordTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index b4fa64cae..9a1bd9fa7 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -21,5 +21,5 @@ EverGrandeCity_EventScript_14D4F7:: @ 814D4F7 EverGrandeCity_EventScript_14D500:: @ 814D500 setflag FLAG_VISITED_EVER_GRANDE_CITY - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 end diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index d59476417..1ca62b61c 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_ChampionsRoom_MapScript1_15B7BF:: @ 815B7BF end EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5 - map_script_2 0x4001, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF @@ -17,7 +17,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF end EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 - map_script_2 0x4001, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE @@ -27,7 +27,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE delay 40 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802 waitmovement 0 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto EverGrandeCity_ChampionsRoom_EventScript_15B805 releaseall end diff --git a/data/scripts/maps/EverGrandeCity_Corridor1.inc b/data/scripts/maps/EverGrandeCity_Corridor1.inc index 104504960..60d1f7253 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor1.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor1.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor1_MapScripts:: @ 815BA0C .byte 0 EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12 - map_script_2 0x4001, 0, EverGrandeCity_Corridor1_EventScript_15BA1C + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor1_EventScript_15BA1C .2byte 0 EverGrandeCity_Corridor1_EventScript_15BA1C:: @ 815BA1C diff --git a/data/scripts/maps/EverGrandeCity_Corridor2.inc b/data/scripts/maps/EverGrandeCity_Corridor2.inc index c7c049020..d74be91c4 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor2.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor2.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor2_MapScripts:: @ 815BA21 .byte 0 EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27 - map_script_2 0x4001, 0, EverGrandeCity_Corridor2_EventScript_15BA31 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor2_EventScript_15BA31 .2byte 0 EverGrandeCity_Corridor2_EventScript_15BA31:: @ 815BA31 diff --git a/data/scripts/maps/EverGrandeCity_Corridor3.inc b/data/scripts/maps/EverGrandeCity_Corridor3.inc index 1714db5cc..006e570ef 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor3.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor3.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor3_MapScripts:: @ 815BA36 .byte 0 EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C - map_script_2 0x4001, 0, EverGrandeCity_Corridor3_EventScript_15BA46 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor3_EventScript_15BA46 .2byte 0 EverGrandeCity_Corridor3_EventScript_15BA46:: @ 815BA46 diff --git a/data/scripts/maps/EverGrandeCity_Corridor4.inc b/data/scripts/maps/EverGrandeCity_Corridor4.inc index 64cc234eb..2ae857aa8 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor4.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor4.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor4_MapScripts:: @ 815BA4B .byte 0 EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51 - map_script_2 0x4001, 0, EverGrandeCity_Corridor4_EventScript_15BA5B + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor4_EventScript_15BA5B .2byte 0 EverGrandeCity_Corridor4_EventScript_15BA5B:: @ 815BA5B diff --git a/data/scripts/maps/EverGrandeCity_Corridor5.inc b/data/scripts/maps/EverGrandeCity_Corridor5.inc index 73c0b5a84..09ce304f6 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor5.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor5.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor5_MapScripts:: @ 815BA60 .byte 0 EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66 - map_script_2 0x4001, 0, EverGrandeCity_Corridor5_EventScript_15BA70 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor5_EventScript_15BA70 .2byte 0 EverGrandeCity_Corridor5_EventScript_15BA70:: @ 815BA70 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index f7088e821..d83745593 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D .byte 0 @ 815B71D - map_script_2 0x4001, 0, EverGrandeCity_DrakesRoom_EventScript_15B727 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_15B727 .2byte 0 EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727 @@ -13,20 +13,20 @@ EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727 end EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C - map_script_2 0x409c, 3, EverGrandeCity_DrakesRoom_EventScript_15B736 + map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_15B736 .2byte 0 EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 lockall call EverGrandeCity_DrakesRoom_EventScript_1A0710 - setvar 0x409c, 4 + setvar VAR_ELITE_4_STATE, 4 releaseall end EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 checkflag FLAG_DEFEATED_ELITE_4_DRAKE call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 - compare 0x409c, 4 + compare VAR_ELITE_4_STATE, 4 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E end @@ -55,7 +55,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B end EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 - setvar 0x8004, 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_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index be9e7a897..0e5b493e2 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_GlaciasRoom_MapScripts:: @ 815B673 .byte 0 EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683 - map_script_2 0x4001, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D @@ -13,20 +13,20 @@ EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D end EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692 - map_script_2 0x409c, 2, EverGrandeCity_GlaciasRoom_EventScript_15B69C + map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_15B69C .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C lockall call EverGrandeCity_GlaciasRoom_EventScript_1A0710 - setvar 0x409c, 3 + setvar VAR_ELITE_4_STATE, 3 releaseall end EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 checkflag FLAG_DEFEATED_ELITE_4_GLACIA call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE - compare 0x409c, 3 + compare VAR_ELITE_4_STATE, 3 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 end diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 904dc7531..501f1e51c 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -4,7 +4,7 @@ EverGrandeCity_HallOfFame_MapScripts:: @ 815BB84 .byte 0 EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F - map_script_2 0x4001, 0, EverGrandeCity_HallOfFame_EventScript_15BB99 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BB99 .2byte 0 EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 @@ -12,7 +12,7 @@ EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 end EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E - map_script_2 0x4001, 0, EverGrandeCity_HallOfFame_EventScript_15BBA8 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BBA8 .2byte 0 EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 @@ -41,7 +41,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 dofieldeffect 62 waitfieldeffect 62 delay 40 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkplayergender compare RESULT, 0 diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 5ffa16d37..19219a626 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_PhoebesRoom_MapScripts:: @ 815B5D9 .byte 0 EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9 - map_script_2 0x4001, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3 @@ -13,20 +13,20 @@ EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3 end EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8 - map_script_2 0x409c, 1, EverGrandeCity_PhoebesRoom_EventScript_15B602 + map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_15B602 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 lockall call EverGrandeCity_PhoebesRoom_EventScript_1A0710 - setvar 0x409c, 2 + setvar VAR_ELITE_4_STATE, 2 releaseall end EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F checkflag FLAG_DEFEATED_ELITE_4_PHOEBE call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 - compare 0x409c, 2 + compare VAR_ELITE_4_STATE, 2 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A end diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index 018658416..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 0x800b, 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 4a8919b98..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 0x800b, 1 + setvar VAR_SPECIAL_B, 1 call EverGrandeCity_PokemonLeague_EventScript_19FD5B waitmessage waitbuttonpress @@ -49,10 +49,10 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 lockall checkflag FLAG_ENTERED_ELITE_FOUR goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 - getplayerxy 0x4000, 0x4001 - compare 0x4000, 11 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 11 call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 - compare 0x4000, 8 + compare VAR_TEMP_0, 8 call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waitmessage diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 6e958aeed..f3df03b7d 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F checkflag FLAG_DEFEATED_ELITE_4_SYDNEY call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 - compare 0x409c, 1 + compare VAR_ELITE_4_STATE, 1 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A end @@ -21,7 +21,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570 EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570 - map_script_2 0x4001, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A .2byte 0 EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A @@ -29,13 +29,13 @@ EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A end EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F - map_script_2 0x409c, 0, EverGrandeCity_SidneysRoom_EventScript_15B589 + map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_15B589 .2byte 0 EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589 lockall call EverGrandeCity_SidneysRoom_EventScript_1A0710 - setvar 0x409c, 1 + setvar VAR_ELITE_4_STATE, 1 releaseall end diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 8ea580e28..23295f778 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -4,7 +4,7 @@ FallarborTown_MapScripts:: @ 814E7E0 FallarborTown_MapScript1_14E7E6:: @ 814E7E6 setflag FLAG_VISITED_FALLARBOR_TOWN - setvar 0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR clearflag FLAG_CONTEST_SKETCH_CREATED end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 72da4cd40..270575bcb 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -7,13 +7,13 @@ FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7 end FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD - setvar 0x800b, 6 + setvar VAR_SPECIAL_B, 6 setvar CONTEST_RANK, 1 call FallarborTown_ContestLobby_EventScript_1A4E92 call FallarborTown_ContestLobby_EventScript_1539F8 - special sub_80C4BF0 + special SetContestTrainerGfxIds call FallarborTown_ContestLobby_EventScript_15FBDB - setvar 0x4088, 2 + setvar VAR_CONTEST_LOCATION, 2 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 17267f926..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 0x8004, 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 001863d5c..0546ef5be 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -24,23 +24,23 @@ FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 - special sub_80F9A4C + special SelectMoveTutorMon waitstate - compare 0x8004, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 - special sub_80FA148 + special IsSelectedMonEgg compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 - compare 0x8005, 0 + compare VAR_SPECIAL_5, 0 goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 - special sub_8132670 + special TeachMoveTutorMove waitstate - compare 0x8004, 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 dd6e83be3..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 0x800b, 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 a0eb6186a..9217ba8f4 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -8,7 +8,7 @@ FortreeCity_Gym_MapScript1_157EDE:: @ 8157EDE end FortreeCity_Gym_MapScript2_157EE2:: @ 8157EE2 - map_script_2 0x4000, 16384, FortreeCity_Gym_EventScript_157EEC + map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_157EEC .2byte 0 FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC @@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 msgbox FortreeCity_Gym_Text_185E73, 4 setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET - setvar 0x8008, 6 + setvar 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 14b9b2c31..f6f8aafa6 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -6,29 +6,29 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 faceplayer checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED goto_if_eq FortreeCity_House1_EventScript_157EAD - setvar 0x8008, 1 - copyvar 0x8004, 0x8008 - specialvar RESULT, sub_804D89C - copyvar 0x8009, RESULT + setvar VAR_SPECIAL_8, 1 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + specialvar RESULT, GetInGameTradeSpeciesInfo + copyvar VAR_SPECIAL_9, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate - copyvar 0x800a, 0x8004 - compare 0x8004, 255 + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 - copyvar 0x8005, 0x800a - specialvar RESULT, sub_804DB2C - copyvar 0x800b, RESULT - compare RESULT, 0x8009 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + specialvar RESULT, GetTradeSpecies + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 goto_if 5, FortreeCity_House1_EventScript_157E9F - copyvar 0x8004, 0x8008 - copyvar 0x8005, 0x800a - special sub_804DB68 - special sub_804E174 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate - bufferspeciesname 0, 0x8009 + 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, 0x8009 + 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 b82927be1..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 0x800b, 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 344ccd479..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 0x8004, 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/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 18cfb904d..37fa85041 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -15,7 +15,7 @@ InsideOfTruck_MapScript1_15FC26:: @ 815FC26 InsideOfTruck_EventScript_15FC29:: @ 815FC29 lockall - setflag 0x4000 + setflag FLAG_SPECIAL_FLAG_0 checkplayergender compare RESULT, 0 goto_if_eq InsideOfTruck_EventScript_15FC45 @@ -25,24 +25,24 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 InsideOfTruck_EventScript_15FC45:: @ 815FC45 setrespawn 1 - setvar 0x4092, 1 + setvar VAR_LITTLEROOT_INTRO_STATE, 1 setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_MAY setflag FLAG_HIDE_BRENDAN_MOM setflag FLAG_HIDE_BRENDAN_UPSTAIRS - setvar 0x408c, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end InsideOfTruck_EventScript_15FC68:: @ 815FC68 setrespawn 2 - setvar 0x4092, 2 + setvar VAR_LITTLEROOT_INTRO_STATE, 2 setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN setflag FLAG_HIDE_MAY_MOM setflag FLAG_HIDE_MAY_UPSTAIRS - setvar 0x4082, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index c7efee318..bf1f0233d 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -8,7 +8,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271 end JaggedPass_MapScript1_15D274:: @ 815D274 - compare 0x40bd, 1 + compare VAR_JAGGED_PASS_ASH_WEATHER, 1 call_if 1, JaggedPass_EventScript_15D280 end @@ -24,7 +24,7 @@ JaggedPass_EventScript_15D285:: @ 815D285 JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 @@ -37,7 +37,7 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3 JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 8b4384ed8..43a8ed7cd 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -9,7 +9,7 @@ LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 - compare 0x4053, 2 + compare VAR_LAVARIDGE_RIVAL_STATE, 2 call_if 1, LavaridgeTown_EventScript_14E4D0 end @@ -23,12 +23,12 @@ LavaridgeTown_EventScript_14E4DF:: @ 814E4DF return LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 - map_script_2 0x4053, 1, LavaridgeTown_EventScript_14E4ED + map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_14E4ED .2byte 0 LavaridgeTown_EventScript_14E4ED:: @ 814E4ED lockall - setvar 0x8008, 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 0x8008, 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 0x8008, 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 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LavaridgeTown_EventScript_14E646 - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LavaridgeTown_EventScript_14E64E removeobject 8 addobject 7 delay 30 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LavaridgeTown_EventScript_14E69A - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 removeobject 7 - setvar 0x4053, 2 + setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 fadedefaultbgm - compare 0x8008, 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 9dd1ae59d..1bbad53bf 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -8,34 +8,34 @@ LavaridgeTown_Gym_1F_MapScript1_153694:: @ 8153694 end LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F - setvar 0x400b, 0 - setvar 0x400c, 0 - setvar 0x400d, 0 - setvar 0x400e, 0 - setvar 0x400f, 0 + setvar VAR_TEMP_B, 0 + setvar VAR_TEMP_C, 0 + setvar VAR_TEMP_D, 0 + setvar VAR_TEMP_E, 0 + setvar VAR_TEMP_F, 0 checktrainerflag OPPONENT_COLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536C6 - setvar 0x400b, 1 + setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 checktrainerflag OPPONENT_ZANE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536D4 - setvar 0x400c, 1 + setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 checktrainerflag OPPONENT_AXLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536E2 - setvar 0x400d, 1 + setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 checktrainerflag OPPONENT_SADIE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536F0 - setvar 0x400e, 1 + setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 checktrainerflag OPPONENT_ANDY goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536FE - setvar 0x400f, 1 + setvar VAR_TEMP_F, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE return @@ -83,13 +83,13 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag FLAG_BADGE04_GET - addvar 0x4085, 1 - compare 0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB - setvar 0x8008, 4 + setvar VAR_SPECIAL_8, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE - setvar 0x4053, 1 + setvar VAR_LAVARIDGE_RIVAL_STATE, 1 goto LavaridgeTown_Gym_1F_EventScript_1537A7 end diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc index 0efda9c1e..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 0x800b, 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 6494f2a6f..5c05639fd 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -5,7 +5,7 @@ LilycoveCity_MapScripts:: @ 814CA15 LilycoveCity_MapScript1_14CA20:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY - setvar 0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE checkflag FLAG_SYS_WEATHER_CTRL call_if 1, LilycoveCity_EventScript_1A02C1 @@ -172,8 +172,8 @@ LilycoveCity_EventScript_14CC79:: @ 814CC79 LilycoveCity_EventScript_14CC82:: @ 814CC82 lockall - specialvar 0x8004, sub_80C4D50 - switch 0x8004 + specialvar VAR_SPECIAL_4, sub_80C4D50 + switch VAR_SPECIAL_4 case 0, LilycoveCity_EventScript_14CCA2 msgbox LilycoveCity_Text_168EA4, 4 releaseall @@ -263,7 +263,7 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_14CE46 case 1, LilycoveCity_EventScript_14CE56 case 2, LilycoveCity_EventScript_14CE66 @@ -294,7 +294,7 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_14CE76 case 1, LilycoveCity_EventScript_14CE86 case 2, LilycoveCity_EventScript_14CE96 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index c97a01989..377c2908d 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -8,14 +8,14 @@ LilycoveCity_ContestLobby_MapScript1_158871:: @ 8158871 end LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877 - map_script_2 0x4099, 1, LilycoveCity_ContestLobby_EventScript_158889 - map_script_2 0x4099, 2, LilycoveCity_ContestLobby_EventScript_158A5B + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_158889 + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_158A5B .2byte 0 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158898 - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 @@ -42,7 +42,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 closemessage special sub_80C4CEC - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar RESULT, GiveMonArtistRibbon compare RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158948 @@ -62,7 +62,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 closemessage applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 4 releaseall end @@ -87,8 +87,8 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 return LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 - specialvar 0x8004, sub_80C4D50 - switch 0x8004 + 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 @@ -190,7 +190,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A @@ -215,7 +215,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 closemessage special sub_80C4CEC - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar RESULT, GiveMonArtistRibbon compare RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 @@ -235,7 +235,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 closemessage applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 11 releaseall end @@ -361,7 +361,7 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 choosecontestmon - compare 0x8004, 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 0x8008, 0x8004 + 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 0x8004, 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 0x8004 + switch VAR_SPECIAL_4 case 0, LilycoveCity_ContestLobby_EventScript_158DD1 case 1, LilycoveCity_ContestLobby_EventScript_158D82 case 2, LilycoveCity_ContestLobby_EventScript_158DC3 @@ -471,19 +471,19 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C - addvar 0x8004, 1 + addvar VAR_SPECIAL_4, 1 buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage - addvar 0x8004, 65535 + addvar VAR_SPECIAL_4, 65535 goto LilycoveCity_ContestLobby_EventScript_158DEE end LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE call LilycoveCity_ContestLobby_EventScript_158E0B - setvar 0x4086, 1 + setvar VAR_LINK_CONTEST_ROOM_STATE, 1 special sub_80C4F70 - setvar 0x4088, 5 + setvar VAR_CONTEST_LOCATION, 5 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_158F08 end @@ -571,24 +571,24 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialvar RESULT, sub_80C5044 compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 - setvar 0x800b, 8 + setvar VAR_SPECIAL_B, 8 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_1A4E92 call LilycoveCity_ContestLobby_EventScript_158F86 - special sub_80C4BF0 + special SetContestTrainerGfxIds call LilycoveCity_ContestLobby_EventScript_15FBDB - setvar 0x4088, 4 + setvar VAR_CONTEST_LOCATION, 4 call LilycoveCity_ContestLobby_EventScript_158F08 waitstate end LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - copyvar 0x4094, 0x1 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 giveitem ITEM_CONTEST_PASS, 1 - setvar 0x800b, 8 + setvar VAR_SPECIAL_B, 8 setvar CONTEST_RANK, 3 - setvar 0x4099, 1 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 setflag FLAG_SYS_RIBBON_GET end diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 00a10b655..7e221122b 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 checkflag FLAG_TEMP_2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD - specialvar RESULT, sub_8090FC0 + specialvar RESULT, CompletedHoennPokedex compare RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index ca60bbc89..1198054f0 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -6,8 +6,8 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C faceplayer checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF - copyvar 0x8005, 0x4043 - special sub_810E944 + copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR + special DisplayCurrentElevatorFloor message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage multichoice 0, 0, 57, 0 @@ -22,46 +22,46 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 - compare 0x4043, 0 + compare VAR_DEPT_STORE_FLOOR, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 0 + setvar VAR_DEPT_STORE_FLOOR, 0 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 - compare 0x4043, 1 + compare VAR_DEPT_STORE_FLOOR, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 1 + setvar VAR_DEPT_STORE_FLOOR, 1 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 - compare 0x4043, 2 + compare VAR_DEPT_STORE_FLOOR, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 2 + setvar VAR_DEPT_STORE_FLOOR, 2 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 - compare 0x4043, 3 + compare VAR_DEPT_STORE_FLOOR, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 3 + setvar VAR_DEPT_STORE_FLOOR, 3 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 - compare 0x4043, 4 + compare VAR_DEPT_STORE_FLOOR, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 4 + setvar VAR_DEPT_STORE_FLOOR, 4 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end @@ -74,7 +74,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 erasebox 0, 0, 29, 19 applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 waitmovement 0 - special sub_810EBEC + special ShakeScreenInElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 2806b6125..ff7722f13 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -78,8 +78,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE multichoice 16, 0, 42, 0 - copyvar 0x4001, RESULT - switch 0x4001 + copyvar VAR_TEMP_1, RESULT + switch VAR_TEMP_1 case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A227 case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_15A232 @@ -88,17 +88,17 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE end LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C:: @ 815A21C - setvar 0x4000, 26 + setvar VAR_TEMP_0, 26 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A227:: @ 815A227 - setvar 0x4000, 27 + setvar VAR_TEMP_0, 27 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A232:: @ 815A232 - setvar 0x4000, 28 + setvar VAR_TEMP_0, 28 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end @@ -127,54 +127,54 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A - checkitemspace 0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoneybox 0, 0 nop - bufferitemname 0, 0x4000 + bufferitemname 0, VAR_TEMP_0 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 - giveitem 0x4000, 1 - bufferitemname 1, 0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E - checkitemspace 0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - giveitem 0x4000, 1 - bufferitemname 1, 0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E - checkitemspace 0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - giveitem 0x4000, 1 - bufferitemname 1, 0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index dbfd79e98..d4dedb0c2 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -9,7 +9,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E lock faceplayer dodailyevents - compare 0x4045, 0 + compare VAR_LOTTERY_PRIZE, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag FLAG_DAILY_PICKED_LOTTO_TICKET goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C @@ -20,8 +20,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 waitmessage special RetrieveLotteryNumber - copyvar 0x8008, RESULT - special sub_810F9AC + copyvar VAR_SPECIAL_8, RESULT + special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 waitmovement 0 @@ -33,23 +33,23 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmovement 0 - compare 0x8004, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY - compare 0x8006, 0 + compare VAR_SPECIAL_6, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A - compare 0x8006, 1 + compare VAR_SPECIAL_6, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - bufferitemname 0, 0x8005 - compare 0x8004, 1 + bufferitemname 0, VAR_SPECIAL_5 + compare VAR_SPECIAL_4, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 - compare 0x8004, 2 + compare VAR_SPECIAL_4, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 - compare 0x8004, 3 + compare VAR_SPECIAL_4, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A - compare 0x8004, 4 + compare VAR_SPECIAL_4, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 - giveitem_std 0x8005 + 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 0x4045, 0x8005 + copyvar VAR_LOTTERY_PRIZE, VAR_SPECIAL_5 goto LilycoveCity_DepartmentStore_1F_EventScript_159EA7 end @@ -111,10 +111,10 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 - giveitem_std 0x4045 + giveitem_std VAR_LOTTERY_PRIZE compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 - setvar 0x4045, 0 + setvar VAR_LOTTERY_PRIZE, 0 release end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 9687c73fe..9554b8fa4 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -50,7 +50,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 msgbox LilycoveCity_Harbor_Text_18B47D, 5 compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E - setvar 0x40b4, 5 + setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_15998A warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate @@ -86,7 +86,7 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar 0x8004, 2 + setvar 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 0x8004, 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_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index f700eed9d..03203ed47 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -4,7 +4,7 @@ LilycoveCity_House3_MapScripts:: @ 8159BE4 LilycoveCity_House3_MapScript1_159BEA:: @ 8159BEA random 4 - copyvar 0x4001, RESULT + copyvar VAR_TEMP_1, RESULT end LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 @@ -41,7 +41,7 @@ LilycoveCity_House3_EventScript_159C32:: @ 8159C32 LilycoveCity_House3_EventScript_159C49:: @ 8159C49 lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D @@ -51,7 +51,7 @@ LilycoveCity_House3_EventScript_159C49:: @ 8159C49 LilycoveCity_House3_EventScript_159C7D:: @ 8159C7D lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D @@ -61,7 +61,7 @@ LilycoveCity_House3_EventScript_159C7D:: @ 8159C7D LilycoveCity_House3_EventScript_159CB1:: @ 8159CB1 lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D @@ -71,7 +71,7 @@ LilycoveCity_House3_EventScript_159CB1:: @ 8159CB1 LilycoveCity_House3_EventScript_159CE5:: @ 8159CE5 lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 577805fb2..120054e91 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -62,7 +62,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D end LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 - map_script_2 0x4094, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15867A + map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15867A .2byte 0 LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A @@ -81,7 +81,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187E1D, 3 - copyvar 0x4094, 0x1 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 releaseall end @@ -98,8 +98,8 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall checkflag FLAG_RECEIVED_GLASS_ORNAMENT goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 - specialvar 0x8004, sub_80C4D50 - switch 0x8004 + specialvar 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 02558e9d3..a3c8d23af 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -14,11 +14,11 @@ LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate - compare 0x8004, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B - special sub_80FA148 + special IsSelectedMonEgg compare RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 special ScrSpecial_CountPokemonMoves @@ -26,9 +26,9 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 - special sub_80F9EEC + special SelectMove fadescreen 0 - compare 0x8005, 4 + compare VAR_SPECIAL_5, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 @@ -39,7 +39,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE end LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 - special sub_80FA0DC + special DeleteMonMove playfanfare 378 waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4 diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 38428311b..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 0x800b, 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 13217b340..4656f0182 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -4,7 +4,7 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 815938A .byte 0 LilycoveCity_PokemonTrainerFanClub_MapScript2_159395:: @ 8159395 - map_script_2 0x4095, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15939F + map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15939F .2byte 0 LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F @@ -24,7 +24,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C waitmovement 0 - setvar 0x4095, 2 + setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2 releaseall end @@ -61,44 +61,44 @@ LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C step_end LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 - compare 0x4095, 1 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 - compare 0x4095, 2 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 2 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 end LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 - special sub_810FCE8 - setvar 0x8004, 8 - specialvar RESULT, sub_810FD60 + special UpdateMovedLilycoveFanClubMembers + setvar VAR_SPECIAL_4, 8 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 - setvar 0x8004, 9 - specialvar RESULT, sub_810FD60 + setvar VAR_SPECIAL_4, 9 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD - setvar 0x8004, 10 - specialvar RESULT, sub_810FD60 + setvar VAR_SPECIAL_4, 10 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 - setvar 0x8004, 11 - specialvar RESULT, sub_810FD60 + setvar VAR_SPECIAL_4, 11 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED - setvar 0x8004, 12 - specialvar RESULT, sub_810FD60 + setvar VAR_SPECIAL_4, 12 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 - setvar 0x8004, 13 - specialvar RESULT, sub_810FD60 + setvar VAR_SPECIAL_4, 13 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD - setvar 0x8004, 14 - specialvar RESULT, sub_810FD60 + setvar VAR_SPECIAL_4, 14 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 - setvar 0x8004, 15 - specialvar RESULT, sub_810FD60 + setvar VAR_SPECIAL_4, 15 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -146,14 +146,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515 LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F lock faceplayer - setvar 0x8004, 13 - special sub_810FDAC - compare 0x4095, 0 + setvar VAR_SPECIAL_4, 13 + special BufferStreakTrainerText + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 @@ -161,7 +161,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F end LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 @@ -186,14 +186,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15959C:: @ 815959C LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 lock faceplayer - setvar 0x8004, 8 - special sub_810FDAC - compare 0x4095, 0 + setvar VAR_SPECIAL_4, 8 + special BufferStreakTrainerText + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 @@ -201,7 +201,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 end LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 @@ -226,14 +226,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159613:: @ 8159613 LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D lock faceplayer - setvar 0x8004, 9 - special sub_810FDAC - compare 0x4095, 0 + setvar VAR_SPECIAL_4, 9 + special BufferStreakTrainerText + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 @@ -241,7 +241,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D end LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 @@ -266,14 +266,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15968A:: @ 815968A LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 lock faceplayer - setvar 0x8004, 10 - special sub_810FDAC - compare 0x4095, 0 + setvar VAR_SPECIAL_4, 10 + special BufferStreakTrainerText + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 @@ -281,7 +281,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 end LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 @@ -306,12 +306,12 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159701:: @ 8159701 LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B lock faceplayer - setvar 0x8004, 11 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + setvar VAR_SPECIAL_4, 11 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 @@ -319,7 +319,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B end LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 @@ -339,12 +339,12 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159763:: @ 8159763 LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D lock faceplayer - setvar 0x8004, 12 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + setvar VAR_SPECIAL_4, 12 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 @@ -352,7 +352,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D end LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 @@ -372,12 +372,12 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5:: @ 81597C5 LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF lock faceplayer - setvar 0x8004, 14 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + setvar VAR_SPECIAL_4, 14 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 @@ -385,7 +385,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF end LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 @@ -405,12 +405,12 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159827:: @ 8159827 LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 lock faceplayer - setvar 0x8004, 15 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + setvar VAR_SPECIAL_4, 15 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 @@ -418,7 +418,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 end LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 13c18d51e..c11546bb5 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -5,19 +5,19 @@ LittlerootTown_MapScripts:: @ 814D509 LittlerootTown_MapScript1_14D514:: @ 814D514 setflag FLAG_VISITED_LITTLEROOT_TOWN - compare 0x4092, 2 + compare VAR_LITTLEROOT_INTRO_STATE, 2 call_if 1, LittlerootTown_EventScript_14D57B checkflag FLAG_RESCUED_BIRCH call_if 0, LittlerootTown_EventScript_14D583 - compare 0x4050, 3 + compare VAR_LITTLEROOT_STATE, 3 call_if 1, LittlerootTown_EventScript_14D5A6 - compare 0x4082, 4 + compare VAR_LITTLEROOT_HOUSES_STATE, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare 0x408c, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare 0x40c7, 1 + compare VAR_OLDALE_STATE, 1 call_if 1, LittlerootTown_EventScript_14D567 - compare 0x408d, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if 1, LittlerootTown_EventScript_14D563 end @@ -26,13 +26,13 @@ LittlerootTown_EventScript_14D563:: @ 814D563 return LittlerootTown_EventScript_14D567:: @ 814D567 - setvar 0x40c7, 2 + setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_RIVAL_OLDALE_TOWN return LittlerootTown_EventScript_14D570:: @ 814D570 - setvar 0x4082, 5 - setvar 0x408c, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5 return LittlerootTown_EventScript_14D57B:: @ 814D57B @@ -40,7 +40,7 @@ LittlerootTown_EventScript_14D57B:: @ 814D57B return LittlerootTown_EventScript_14D583:: @ 814D583 - compare 0x4050, 0 + compare VAR_LITTLEROOT_STATE, 0 goto_if_eq LittlerootTown_EventScript_14D59A setobjectxyperm 1, 10, 1 setobjectmovementtype 1, 7 @@ -70,15 +70,15 @@ LittlerootTown_EventScript_14D5CD:: @ 814D5CD return LittlerootTown_MapScript2_14D5D5:: @ 814D5D5 - map_script_2 0x4092, 1, LittlerootTown_EventScript_14D5EF - map_script_2 0x4092, 2, LittlerootTown_EventScript_14D60D - map_script_2 0x4092, 7, LittlerootTown_EventScript_14D6C5 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_14D5EF + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_14D60D + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 7, LittlerootTown_EventScript_14D6C5 .2byte 0 LittlerootTown_EventScript_14D5EF:: @ 814D5EF lockall - setvar 0x8004, 5 - setvar 0x8005, 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 0x8004, 14 - setvar 0x8005, 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 0x8004, 0x8005 + opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 waitdooranim addobject 4 applymovement 4, LittlerootTown_Movement_14D6AC waitmovement 0 - closedoor 0x8004, 0x8005 + closedoor VAR_SPECIAL_4, VAR_SPECIAL_5 waitdooranim delay 10 applymovement 4, LittlerootTown_Movement_14D6AE @@ -117,18 +117,18 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6B1 applymovement 255, LittlerootTown_Movement_14D6B8 waitmovement 0 - opendoor 0x8004, 0x8005 + opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 waitdooranim applymovement 4, LittlerootTown_Movement_14D6B5 applymovement 255, LittlerootTown_Movement_14D6BD waitmovement 0 setflag FLAG_HIDE_MOM_LITTLEROOT - setvar 0x4092, 3 + setvar VAR_LITTLEROOT_INTRO_STATE, 3 hideobjectat 255, MAP_PETALBURG_CITY - closedoor 0x8004, 0x8005 + closedoor VAR_SPECIAL_4, VAR_SPECIAL_5 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT - clearflag 0x4000 + clearflag FLAG_SPECIAL_FLAG_0 return LittlerootTown_Movement_14D6AC:: @ 814D6AC @@ -172,7 +172,7 @@ LittlerootTown_Movement_14D6C0:: @ 814D6C0 LittlerootTown_EventScript_14D6C5:: @ 814D6C5 lockall - setvar 0x4092, 8 + setvar VAR_LITTLEROOT_INTRO_STATE, 8 releaseall end @@ -191,7 +191,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF goto_if_eq LittlerootTown_EventScript_14D72F checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_EventScript_14D722 - compare 0x4050, 0 + compare VAR_LITTLEROOT_STATE, 0 goto_if 5, LittlerootTown_EventScript_14D708 msgbox LittlerootTown_Text_16ACEB, 4 release @@ -202,7 +202,7 @@ LittlerootTown_EventScript_14D708:: @ 814D708 closemessage applymovement 1, LittlerootTown_Movement_1A083D waitmovement 0 - setvar 0x4050, 2 + setvar VAR_LITTLEROOT_STATE, 2 release end @@ -319,7 +319,7 @@ LittlerootTown_EventScript_14D7C7:: @ 814D7C7 closemessage applymovement 1, LittlerootTown_Movement_1A083D waitmovement 0 - setvar 0x4050, 2 + setvar VAR_LITTLEROOT_STATE, 2 releaseall end @@ -369,39 +369,39 @@ LittlerootTown_EventScript_14D857:: @ 814D857 LittlerootTown_EventScript_14D860:: @ 814D860 lockall - setvar 0x8008, 0 + setvar VAR_SPECIAL_8, 0 setobjectxy 4, 10, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D873:: @ 814D873 lockall - setvar 0x8008, 1 + setvar VAR_SPECIAL_8, 1 setobjectxy 4, 11, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D886:: @ 814D886 lockall - setvar 0x8008, 2 + setvar VAR_SPECIAL_8, 2 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D892:: @ 814D892 lockall - setvar 0x8008, 3 + setvar VAR_SPECIAL_8, 3 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D89E:: @ 814D89E lockall - setvar 0x8008, 4 + setvar VAR_SPECIAL_8, 4 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D8AA:: @ 814D8AA lockall - setvar 0x8008, 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 0x8009, 5 - setvar 0x800a, 8 + setvar VAR_SPECIAL_9, 5 + setvar VAR_SPECIAL_A, 8 return LittlerootTown_EventScript_14D931:: @ 814D931 - setvar 0x8009, 14 - setvar 0x800a, 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 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DA02 - compare 0x8008, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DA17 - compare 0x8008, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DA2C - compare 0x8008, 5 + compare VAR_SPECIAL_8, 5 call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DA56 - compare 0x8008, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DA6B - compare 0x8008, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DA80 - compare 0x8008, 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 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DB46 - compare 0x8008, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DB6C - compare 0x8008, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DB92 - compare 0x8008, 5 + compare VAR_SPECIAL_8, 5 call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DBDE - compare 0x8008, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DC04 - compare 0x8008, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DC2A - compare 0x8008, 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 0x8009, 0x800a + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DB6C:: @ 814DB6C applymovement 4, LittlerootTown_Movement_14DCBA waitmovement 0 - opendoor 0x8009, 0x800a + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DB92:: @ 814DB92 applymovement 4, LittlerootTown_Movement_14DCC1 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DBB8:: @ 814DBB8 applymovement 4, LittlerootTown_Movement_14DCC5 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DBDE:: @ 814DBDE applymovement 4, LittlerootTown_Movement_14DCCA waitmovement 0 - opendoor 0x8009, 0x800a + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DC04:: @ 814DC04 applymovement 4, LittlerootTown_Movement_14DCCF waitmovement 0 - opendoor 0x8009, 0x800a + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DC2A:: @ 814DC2A applymovement 4, LittlerootTown_Movement_14DCD3 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DC50:: @ 814DC50 applymovement 4, LittlerootTown_Movement_14DCDA waitmovement 0 - opendoor 0x8009, 0x800a + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + 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 0x8009, 0x800a + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim goto LittlerootTown_EventScript_14DD2B end @@ -862,7 +862,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 LittlerootTown_EventScript_14DD2B:: @ 814DD2B removeobject 4 setflag FLAG_SYS_B_DASH - setvar 0x4050, 4 + setvar VAR_LITTLEROOT_STATE, 4 release end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index d4dd94aae..4ce1e277a 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B - compare 0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 checkflag FLAG_RECEIVED_RUNNING_SHOES call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 @@ -27,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 return LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A - compare 0x4092, 3 + compare VAR_LITTLEROOT_INTRO_STATE, 3 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 - compare 0x4092, 5 + compare VAR_LITTLEROOT_INTRO_STATE, 5 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC - compare 0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 end @@ -51,11 +51,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526C4:: @ 81526C4 return LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0 - map_script_2 0x4092, 3, LittlerootTown_BrendansHouse_1F_EventScript_152722 - map_script_2 0x4092, 5, LittlerootTown_BrendansHouse_1F_EventScript_1526FA - map_script_2 0x4092, 6, LittlerootTown_BrendansHouse_1F_EventScript_152733 - map_script_2 0x4082, 1, LittlerootTown_BrendansHouse_1F_EventScript_152744 - map_script_2 0x4082, 3, LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_152722 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1526FA + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_152733 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_152744 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE .2byte 0 LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA @@ -76,15 +76,15 @@ LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720 LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 lockall - setvar 0x8004, 1 - setvar 0x8005, 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 0x8004, 0 - setvar 0x8005, 1 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 1 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF end @@ -101,7 +101,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4 setflag FLAG_MET_RIVAL_MOM - setvar 0x4082, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE, 2 releaseall end @@ -116,9 +116,9 @@ LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall - setvar 0x8004, 1 - setvar 0x8005, 0 - applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F + setvar 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 8f3b07312..e0e1a1086 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -6,10 +6,10 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE - compare 0x4092, 4 + compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D - setvar 0x4089, 0 + setvar VAR_0x4089, 0 end LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE @@ -18,7 +18,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE return LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA - map_script_2 0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4 + map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4 .2byte 0 LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 @@ -58,7 +58,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E end LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 - setvar 0x8004, 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 0x8004, 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 e23a05243..af7a2976b 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 - compare 0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E checkflag FLAG_RECEIVED_RUNNING_SHOES call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 @@ -27,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE return LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 - compare 0x4092, 3 + compare VAR_LITTLEROOT_INTRO_STATE, 3 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902 - compare 0x4092, 5 + compare VAR_LITTLEROOT_INTRO_STATE, 5 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA - compare 0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 end @@ -51,11 +51,11 @@ LittlerootTown_MaysHouse_1F_EventScript_152902:: @ 8152902 return LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E - map_script_2 0x4092, 3, LittlerootTown_MaysHouse_1F_EventScript_152960 - map_script_2 0x4092, 5, LittlerootTown_MaysHouse_1F_EventScript_152938 - map_script_2 0x4092, 6, LittlerootTown_MaysHouse_1F_EventScript_152971 - map_script_2 0x408c, 1, LittlerootTown_MaysHouse_1F_EventScript_152982 - map_script_2 0x4082, 3, LittlerootTown_MaysHouse_1F_EventScript_1B6CDE + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_152960 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_152938 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_152971 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_152982 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1B6CDE .2byte 0 LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 @@ -76,15 +76,15 @@ LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 lockall - setvar 0x8004, 1 - setvar 0x8005, 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 0x8004, 1 - setvar 0x8005, 1 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6B2E end @@ -101,7 +101,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4 setflag FLAG_MET_RIVAL_MOM - setvar 0x408c, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2 releaseall end @@ -139,7 +139,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 checkflag FLAG_RIVAL_LEFT_FOR_ROUTE103 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 - compare 0x408d, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4 @@ -163,9 +163,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_152A2B:: @ 8152A2B LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 lockall - setvar 0x8004, 1 - setvar 0x8005, 1 - applymovement 0x8004, LittlerootTown_MaysHouse_1F_Movement_1A0843 + setvar 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 020c39eac..8bd9a01d2 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -6,10 +6,10 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A - compare 0x4092, 4 + compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D - setvar 0x4089, 0 + setvar VAR_0x4089, 0 end LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A @@ -18,7 +18,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A return LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 - map_script_2 0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90 + map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90 .2byte 0 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 @@ -39,8 +39,8 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A playse 9 removeobject LAST_TALKED - setvar 0x408d, 3 - setvar 0x4050, 1 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 + setvar VAR_LITTLEROOT_STATE, 1 savebgm 0 fadedefaultbgm releaseall @@ -206,7 +206,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 end LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C - setvar 0x8004, 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 0x8004, 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 6792c5932..44adab6f1 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -10,7 +10,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript1_152C92:: @ 8152C92 end LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D - map_script_2 0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CA7 + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CA7 .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7 @@ -18,8 +18,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7 end LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC - map_script_2 0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CBE - map_script_2 0x4084, 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D4A + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CBE + map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D4A .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE @@ -37,7 +37,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE end LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA - setvar 0x8004, 0 + setvar VAR_SPECIAL_4, 0 call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678 goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end @@ -53,7 +53,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4 clearflag FLAG_HIDE_BOY_ROUTE101 - setvar 0x4084, 3 + setvar VAR_BIRCH_LAB_STATE, 3 releaseall end @@ -85,7 +85,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock faceplayer - compare 0x4084, 3 + compare VAR_BIRCH_LAB_STATE, 3 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 checkflag FLAG_BIRCH_AIDE_MET goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 @@ -109,7 +109,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A faceplayer checkflag FLAG_UNKNOWN_BIRCH_380 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F - compare 0x4084, 5 + compare VAR_BIRCH_LAB_STATE, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 release @@ -128,11 +128,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 compare RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 - setvar 0x4084, 5 + setvar VAR_BIRCH_LAB_STATE, 5 setflag FLAG_ADVENTURE_STARTED - setvar 0x4051, 1 - setvar 0x408d, 4 - setvar 0x4050, 3 + setvar VAR_ROUTE102_ACCESSIBLE, 1 + setvar VAR_LITTLEROOT_RIVAL_STATE, 4 + setvar VAR_LITTLEROOT_STATE, 3 releaseall end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 6a7e02848..6861e46c8 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -7,7 +7,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - setvar 0x4093, 0 + setvar VAR_MAUVILLE_GYM_STATE, 0 checkflag FLAG_RECEIVED_TM24 call_if 1, MauvilleCity_EventScript_14C053 end @@ -286,7 +286,7 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 faceplayer checkflag FLAG_RECEIVED_TM24 goto_if_eq MauvilleCity_EventScript_14C368 - compare 0x40ba, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_EventScript_14C33C checkflag FLAG_RECEIVED_BASEMENT_KEY goto_if_eq MauvilleCity_EventScript_14C332 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 8228238f3..c2b785254 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -32,8 +32,8 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 end MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE - checkcoins 16385 - compare 0x4001, 9950 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9950 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 compare RESULT, 0 @@ -51,8 +51,8 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE end MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 - checkcoins 16385 - compare 0x4001, 9500 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9500 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 compare RESULT, 0 @@ -109,7 +109,7 @@ MauvilleCity_GameCorner_EventScript_156B88:: @ 8156B88 message MauvilleCity_GameCorner_Text_181E17 waitmessage showcoinsbox 0, 0 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto MauvilleCity_GameCorner_EventScript_156BA6 MauvilleCity_GameCorner_EventScript_156B9B:: @ 8156B9B @@ -128,17 +128,17 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 end MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 bufferdecorationname 0, 88 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 bufferdecorationname 0, 89 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 bufferdecorationname 0, 90 goto MauvilleCity_GameCorner_EventScript_156C0C @@ -146,15 +146,15 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, 5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D - switch 0x4001 + switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156C46 case 2, MauvilleCity_GameCorner_EventScript_156C80 case 3, MauvilleCity_GameCorner_EventScript_156CBA end MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 - checkcoins 16386 - compare 0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, 88 checkdecorspace 88 @@ -169,8 +169,8 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 end MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 - checkcoins 16386 - compare 0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, 89 checkdecorspace 89 @@ -185,8 +185,8 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 end MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA - checkcoins 16386 - compare 0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, 90 checkdecorspace 90 @@ -230,7 +230,7 @@ MauvilleCity_GameCorner_EventScript_156D36:: @ 8156D36 message MauvilleCity_GameCorner_Text_181E17 waitmessage showcoinsbox 0, 0 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto MauvilleCity_GameCorner_EventScript_156D54 MauvilleCity_GameCorner_EventScript_156D49:: @ 8156D49 @@ -251,27 +251,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 end MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 bufferitemname 0, ITEM_TM32 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 bufferitemname 0, ITEM_TM29 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 bufferitemname 0, ITEM_TM35 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 - setvar 0x4001, 4 + setvar VAR_TEMP_1, 4 bufferitemname 0, ITEM_TM24 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE - setvar 0x4001, 5 + setvar VAR_TEMP_1, 5 bufferitemname 0, ITEM_TM13 goto MauvilleCity_GameCorner_EventScript_156DEC @@ -279,7 +279,7 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, 5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 - switch 0x4001 + switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156E3C case 2, MauvilleCity_GameCorner_EventScript_156E76 case 3, MauvilleCity_GameCorner_EventScript_156EB0 @@ -288,8 +288,8 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC end MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C - checkcoins 16386 - compare 0x4002, 1500 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 compare RESULT, 0 @@ -303,8 +303,8 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C end MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 - checkcoins 16386 - compare 0x4002, 3500 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 3500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 compare RESULT, 0 @@ -318,8 +318,8 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 end MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 - checkcoins 16386 - compare 0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 compare RESULT, 0 @@ -333,8 +333,8 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 end MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA - checkcoins 16386 - compare 0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 compare RESULT, 0 @@ -348,8 +348,8 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA end MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 - checkcoins 16386 - compare 0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 compare RESULT, 0 @@ -394,7 +394,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 msgbox MauvilleCity_GameCorner_Text_181F3D, 5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157068 - switch 0x4023 + switch VAR_STARTER_MON case 0, MauvilleCity_GameCorner_EventScript_156FDB case 1, MauvilleCity_GameCorner_EventScript_157005 case 2, MauvilleCity_GameCorner_EventScript_15702F @@ -462,8 +462,8 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C checkflag FLAG_RECEIVED_20_COINS goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA - checkcoins 16385 - compare 0x4001, 1 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA setflag FLAG_RECEIVED_20_COINS givecoins 20 @@ -524,8 +524,8 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 0 - specialvar RESULT, sub_810F424 + setvar VAR_SPECIAL_4, 0 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -535,8 +535,8 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 1 - specialvar RESULT, sub_810F424 + setvar VAR_SPECIAL_4, 1 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -546,8 +546,8 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 2 - specialvar RESULT, sub_810F424 + setvar VAR_SPECIAL_4, 2 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -557,8 +557,8 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 3 - specialvar RESULT, sub_810F424 + setvar VAR_SPECIAL_4, 3 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -568,8 +568,8 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 4 - specialvar RESULT, sub_810F424 + setvar VAR_SPECIAL_4, 4 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -579,8 +579,8 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 5 - specialvar RESULT, sub_810F424 + setvar VAR_SPECIAL_4, 5 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -590,8 +590,8 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 6 - specialvar RESULT, sub_810F424 + setvar VAR_SPECIAL_4, 6 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -601,8 +601,8 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 7 - specialvar RESULT, sub_810F424 + setvar VAR_SPECIAL_4, 7 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -612,8 +612,8 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 8 - specialvar RESULT, sub_810F424 + setvar VAR_SPECIAL_4, 8 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -623,8 +623,8 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 9 - specialvar RESULT, sub_810F424 + setvar VAR_SPECIAL_4, 9 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -634,8 +634,8 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 10 - specialvar RESULT, sub_810F424 + setvar VAR_SPECIAL_4, 10 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -645,8 +645,8 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 11 - specialvar RESULT, sub_810F424 + setvar VAR_SPECIAL_4, 11 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 799fb0992..05287c7de 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -5,7 +5,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 MauvilleCity_Gym_MapScript1_156456:: @ 8156456 checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1565A7 - switch 0x4093 + switch VAR_MAUVILLE_GYM_STATE case 0, MauvilleCity_Gym_EventScript_156491 case 1, MauvilleCity_Gym_EventScript_15657D case 2, MauvilleCity_Gym_EventScript_15658B @@ -46,19 +46,19 @@ MauvilleCity_Gym_EventScript_15649B:: @ 815649B end MauvilleCity_Gym_EventScript_15657D:: @ 815657D - setvar 0x8004, 0 + setvar VAR_SPECIAL_4, 0 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_15658B:: @ 815658B - setvar 0x8004, 1 + setvar VAR_SPECIAL_4, 1 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_156599:: @ 8156599 - setvar 0x8004, 2 + setvar VAR_SPECIAL_4, 2 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end @@ -71,7 +71,7 @@ MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB checkflag FLAG_RECEIVED_TM34 goto_if 0, MauvilleCity_Gym_EventScript_15661D - compare 0x40ba, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 msgbox MauvilleCity_Gym_Text_180EDB, 4 release @@ -84,10 +84,10 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB msgbox MauvilleCity_Gym_Text_180DDA, 4 setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_BADGE03_GET - addvar 0x4085, 1 - compare 0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB - setvar 0x8008, 3 + setvar VAR_SPECIAL_8, 3 call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 special DrawWholeMapView @@ -113,10 +113,10 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 1 + compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - setvar 0x4093, 1 - setvar 0x8004, 0 + setvar VAR_MAUVILLE_GYM_STATE, 1 + setvar VAR_SPECIAL_4, 0 goto MauvilleCity_Gym_EventScript_1566BA end @@ -124,10 +124,10 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 2 + compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - setvar 0x4093, 2 - setvar 0x8004, 1 + setvar VAR_MAUVILLE_GYM_STATE, 2 + setvar VAR_SPECIAL_4, 1 goto MauvilleCity_Gym_EventScript_1566BA end @@ -135,10 +135,10 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 3 + compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - setvar 0x4093, 3 - setvar 0x8004, 2 + setvar VAR_MAUVILLE_GYM_STATE, 3 + 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 de30e21cd..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 0x800b, 1 + setvar VAR_SPECIAL_B, 1 call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 7ce6e3704..a3e396ab0 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -78,7 +78,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C removeobject 8 removeobject 9 setflag FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR - setvar 0x40bf, 1 + setvar VAR_METEOR_FALLS_STATE, 1 releaseall end diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index b3a0c51fe..49d629294 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -3,7 +3,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 msgbox MeteorFalls_1F_2R_Text_193A60, 6 @@ -16,7 +16,7 @@ MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 msgbox MeteorFalls_1F_2R_Text_193C35, 6 @@ -29,7 +29,7 @@ MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index f165bd3ef..fd4b8cfbf 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -53,7 +53,7 @@ MossdeepCity_EventScript_14CFFF:: @ 814CFFF MossdeepCity_EventScript_14D008:: @ 814D008 setflag FLAG_VISITED_MOSSDEEP_CITY - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 end MossdeepCity_EventScript_14D011:: @ 814D011 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 75fc3c6b8..ad3b366a8 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -19,12 +19,12 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special ValidateEReaderTrainer compare RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E - compare 0x40c0, 0 + compare VAR_GAME_CORNER_STATE, 0 call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF end MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 setobjectmovementtype 1, 8 return @@ -35,9 +35,9 @@ MossdeepCity_GameCorner_1F_EventScript_15ACAF:: @ 815ACAF return MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB - map_script_2 0x40c0, 1, MossdeepCity_GameCorner_1F_EventScript_15ACD5 - map_script_2 0x40c0, 2, MossdeepCity_GameCorner_1F_EventScript_15ACD5 - map_script_2 0x40c0, 3, MossdeepCity_GameCorner_1F_EventScript_15ACD5 + map_script_2 VAR_GAME_CORNER_STATE, 1, MossdeepCity_GameCorner_1F_EventScript_15ACD5 + map_script_2 VAR_GAME_CORNER_STATE, 2, MossdeepCity_GameCorner_1F_EventScript_15ACD5 + map_script_2 VAR_GAME_CORNER_STATE, 3, MossdeepCity_GameCorner_1F_EventScript_15ACD5 .2byte 0 MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 @@ -49,14 +49,14 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 moveobjectoffscreen 1 applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmovement 0 - compare 0x40c0, 1 + compare VAR_GAME_CORNER_STATE, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 - compare 0x40c0, 2 + compare VAR_GAME_CORNER_STATE, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B - compare 0x40c0, 3 + compare VAR_GAME_CORNER_STATE, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 special LoadPlayerParty - setvar 0x40c0, 0 + setvar VAR_GAME_CORNER_STATE, 0 releaseall end @@ -84,7 +84,7 @@ MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock faceplayer - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4 release @@ -92,7 +92,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty - special sub_810F414 + special BufferEReaderTrainerName msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 12a94154b..9f20b6310 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -8,7 +8,7 @@ MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60 end MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64 - map_script_2 0x4001, 0, MossdeepCity_GameCorner_B1F_EventScript_15AE6E + map_script_2 VAR_TEMP_1, 0, MossdeepCity_GameCorner_B1F_EventScript_15AE6E .2byte 0 MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E @@ -18,9 +18,9 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E special PrintEReaderTrainerGreeting msgbox gStringVar4, 4 closemessage - setvar 0x8004, 2 - setvar 0x8005, 0 - special sub_813556C + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 0 + special StartSpecialBattle waitstate compare RESULT, 3 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 @@ -33,26 +33,26 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF waitmovement 0 special LoadPlayerParty - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 warp MAP_MOSSDEEP_CITY_GAME_CORNER_1F, 255, 3, 1 waitstate releaseall end MossdeepCity_GameCorner_B1F_EventScript_15AED5:: @ 815AED5 - setvar 0x40c0, 3 + setvar VAR_GAME_CORNER_STATE, 3 msgbox MossdeepCity_GameCorner_B1F_Text_18E796, 4 return MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3 - setvar 0x40c0, 1 + setvar VAR_GAME_CORNER_STATE, 1 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE - setvar 0x40c0, 2 + setvar VAR_GAME_CORNER_STATE, 2 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index b1550a4c1..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 0x8008, 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 c26238102..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 0x800b, 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 7e08cfa69..eababfa6c 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -14,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF return MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 - compare 0x40c6, 1 + compare VAR_STEVENS_HOUSE_STATE, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5 end @@ -24,7 +24,7 @@ MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5 return MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01 - map_script_2 0x40c6, 0, MossdeepCity_StevensHouse_EventScript_15AA0B + map_script_2 VAR_STEVENS_HOUSE_STATE, 0, MossdeepCity_StevensHouse_EventScript_15AA0B .2byte 0 MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B @@ -47,7 +47,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B delay 20 applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76 waitmovement 0 - setvar 0x40c6, 1 + setvar VAR_STEVENS_HOUSE_STATE, 1 releaseall end @@ -77,7 +77,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C getpartysize compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC - copyvar 0x8004, RESULT + copyvar VAR_SPECIAL_4, RESULT removeobject 2 playfanfare 370 message MossdeepCity_StevensHouse_Text_18DD61 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index a51695b59..d93ec772a 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -4,7 +4,7 @@ MtChimney_MapScripts:: @ 815CF7C .byte 0 MtChimney_MapScript1_15CF87:: @ 815CF87 - setvar 0x40bd, 1 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 1 call MtChimney_EventScript_1A0196 end @@ -440,7 +440,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 9d99eb5fb..6b919f2ca 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA .byte 0 MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 - compare 0x40a3, 1 + compare VAR_CABLE_CAR_STATION_STATE, 1 call_if 1, MtChimney_CableCarStation_EventScript_15C111 end @@ -14,7 +14,7 @@ MtChimney_CableCarStation_EventScript_15C111:: @ 815C111 return MtChimney_CableCarStation_MapScript2_15C11D:: @ 815C11D - map_script_2 0x40a3, 1, MtChimney_CableCarStation_EventScript_15C127 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_15C127 .2byte 0 MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 @@ -22,7 +22,7 @@ MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 applymovement 255, MtChimney_CableCarStation_Movement_15C1B4 applymovement 1, MtChimney_CableCarStation_Movement_15C1AA waitmovement 0 - setvar 0x40a3, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 setobjectmovementtype 1, 8 releaseall @@ -44,8 +44,8 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C applymovement 1, MtChimney_CableCarStation_Movement_15C1A5 applymovement 255, MtChimney_CableCarStation_Movement_15C1AF waitmovement 0 - setvar 0x8004, 1 - setvar 0x40a3, 2 + setvar VAR_SPECIAL_4, 1 + setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp special sub_8123218 diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 433b533b3..ae09300a3 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -3,7 +3,7 @@ MtPyre_6F_MapScripts:: @ 815D447 MtPyre_6F_EventScript_15D448:: @ 815D448 trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index 550f74d9a..76f1736c2 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -7,8 +7,8 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C end MtPyre_Exterior_EventScript_15D492:: @ 815D492 - getplayerxy 0x4000, 0x4001 - compare 0x4001, 12 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 12 goto_if 0, MtPyre_Exterior_EventScript_15D4A3 return diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 73e2e4d97..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 0x8008, 0 + setvar VAR_SPECIAL_8, 0 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9 lockall - setvar 0x8008, 1 + setvar VAR_SPECIAL_8, 1 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 lockall - setvar 0x8008, 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 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D593 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D59E - compare 0x8008, 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 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D5BF - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 @@ -70,11 +70,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 MtPyre_Summit_EventScript_15D57A:: @ 815D57A setflag FLAG_MT_PYRE_ORB_STOLEN - setvar 0x4058, 1 + setvar VAR_SLATEPORT_STATE, 1 clearflag FLAG_HIDE_STERN_SLATEPORT clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT - setvar 0x40a0, 1 - setvar 0x40b9, 1 + setvar VAR_SLATEPORT_HARBOR_STATE, 1 + setvar VAR_MT_PYRE_STATE, 1 return MtPyre_Summit_EventScript_15D593:: @ 815D593 @@ -196,7 +196,7 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A end MtPyre_Summit_EventScript_15D669:: @ 815D669 - setvar 0x8004, 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 0x8008, 0 + setvar VAR_SPECIAL_8, 0 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA lockall - setvar 0x8008, 1 + setvar VAR_SPECIAL_8, 1 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 lockall - setvar 0x8008, 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 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D75E - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D769 - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 @@ -280,14 +280,14 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 msgbox MtPyre_Summit_Text_1B6848, 4 .endif closemessage - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D77F - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D78A - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, MtPyre_Summit_EventScript_15D795 removeobject 2 - setvar 0x40b9, 3 + setvar VAR_MT_PYRE_STATE, 3 releaseall end diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index a88b35087..1e4cdf256 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A .byte 0 NewMauville_Entrance_MapScript1_15E495:: @ 815E495 - compare 0x40ba, 0 + compare VAR_NEW_MAUVILLE_STATE, 0 call_if 1, NewMauville_Entrance_EventScript_15E4A1 end @@ -41,7 +41,7 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC setmetatile 5, 1, 717, 1 special DrawWholeMapView playse 20 - setvar 0x40ba, 1 + setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index aefb23c61..283b6bfed 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -5,9 +5,9 @@ NewMauville_Inside_MapScripts:: @ 815E55F .byte 0 NewMauville_Inside_MapScript1_15E56F:: @ 815E56F - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, NewMauville_Inside_EventScript_15E5DA - compare 0x4002, 1 + compare VAR_TEMP_2, 1 call_if 1, NewMauville_Inside_EventScript_15E728 checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, NewMauville_Inside_EventScript_15E58F @@ -18,19 +18,19 @@ NewMauville_Inside_EventScript_15E58F:: @ 815E58F return NewMauville_Inside_MapScript1_15E593:: @ 815E593 - setvar 0x4001, 0 - setvar 0x4002, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 end NewMauville_Inside_MapScript1_15E59E:: @ 815E59E - compare 0x40ba, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 call_if 1, NewMauville_Inside_EventScript_15E88B end NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA lockall - setvar 0x4001, 1 - setvar 0x4002, 0 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 0 playse 21 call NewMauville_Inside_EventScript_15E5DA special DrawWholeMapView @@ -39,8 +39,8 @@ NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 lockall - setvar 0x4001, 0 - setvar 0x4002, 1 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 1 playse 21 call NewMauville_Inside_EventScript_15E728 special DrawWholeMapView @@ -131,7 +131,7 @@ NewMauville_Inside_EventScript_15E876:: @ 815E876 lockall msgbox NewMauville_Inside_Text_1983B1, 4 call NewMauville_Inside_EventScript_15E88B - setvar 0x40ba, 2 + setvar VAR_NEW_MAUVILLE_STATE, 2 releaseall end @@ -150,7 +150,7 @@ NewMauville_Inside_EventScript_15E88B:: @ 815E88B NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0 lockall - compare 0x40ba, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq NewMauville_Inside_EventScript_15E8F6 msgbox NewMauville_Inside_Text_198315, 4 releaseall diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 465cbcfc6..329313e74 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -14,7 +14,7 @@ OldaleTown_MapScript1_14DD68:: @ 814DD68 end OldaleTown_EventScript_14DD8C:: @ 814DD8C - setvar 0x4051, 1 + setvar VAR_ROUTE102_ACCESSIBLE, 1 return OldaleTown_EventScript_14DD92:: @ 814DD92 @@ -278,7 +278,7 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6 applymovement 4, OldaleTown_Movement_14DFE5 waitmovement 0 removeobject 4 - setvar 0x40c7, 2 + setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_RIVAL_OLDALE_TOWN releaseall end diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index cbf3acd27..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 0x800b, 1 + setvar VAR_SPECIAL_B, 1 call OldaleTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index f073201ca..df7f42a8b 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK goto_if 0, PacifidlogTown_House2_EventScript_1A14DC - specialvar RESULT, sub_810F908 + specialvar RESULT, GetDaysUntilPacifidlogTMAvailable compare RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_1541E8 return @@ -49,7 +49,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - special sub_810F950 + special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_179283, 4 release end @@ -65,13 +65,13 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - special sub_810F950 + special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_179283, 4 release end PacifidlogTown_House2_EventScript_154254:: @ 8154254 - specialvar RESULT, sub_810F908 + specialvar RESULT, GetDaysUntilPacifidlogTMAvailable buffernumberstring 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 624a221d5..f5f93f05a 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -6,29 +6,29 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E faceplayer checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED goto_if_eq PacifidlogTown_House3_EventScript_154338 - setvar 0x8008, 2 - copyvar 0x8004, 0x8008 - specialvar RESULT, sub_804D89C - copyvar 0x8009, RESULT + setvar VAR_SPECIAL_8, 2 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + specialvar RESULT, GetInGameTradeSpeciesInfo + copyvar VAR_SPECIAL_9, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate - copyvar 0x800a, 0x8004 - compare 0x8004, 255 + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 - copyvar 0x8005, 0x800a - specialvar RESULT, sub_804DB2C - copyvar 0x800b, RESULT - compare RESULT, 0x8009 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + specialvar RESULT, GetTradeSpecies + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 goto_if 5, PacifidlogTown_House3_EventScript_15432A - copyvar 0x8004, 0x8008 - copyvar 0x8005, 0x800a - special sub_804DB68 - special sub_804E174 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate - bufferspeciesname 0, 0x8009 + 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, 0x8009 + 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 95d5448e8..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 0x800b, 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 45cdce991..2ac3f35f9 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -5,9 +5,9 @@ PetalburgCity_MapScripts:: @ 814B70C PetalburgCity_MapScript1_14B717:: @ 814B717 setflag FLAG_VISITED_PETALBURG_CITY - compare 0x4057, 0 + compare VAR_PETALBURG_STATE, 0 call_if 1, PetalburgCity_EventScript_14B731 - compare 0x4057, 2 + compare VAR_PETALBURG_STATE, 2 call_if 1, PetalburgCity_EventScript_14B739 end @@ -20,12 +20,12 @@ PetalburgCity_EventScript_14B739:: @ 814B739 return PetalburgCity_MapScript2_14B73D:: @ 814B73D - map_script_2 0x4057, 2, PetalburgCity_EventScript_14B747 + map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_14B747 .2byte 0 PetalburgCity_EventScript_14B747:: @ 814B747 lockall - setflag 0x4000 + setflag FLAG_SPECIAL_FLAG_0 special SavePlayerParty special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_14B7ED @@ -39,12 +39,12 @@ PetalburgCity_EventScript_14B747:: @ 814B747 waitmovement 0, 0, 2 msgbox PetalburgCity_Text_16D408, 4 closemessage - clearflag 0x4000 - setvar 0x4057, 3 + clearflag FLAG_SPECIAL_FLAG_0 + setvar VAR_PETALBURG_STATE, 3 fadedefaultbgm - clearflag 0x4001 + clearflag FLAG_SPECIAL_FLAG_1 special LoadPlayerParty - setvar 0x4085, 1 + setvar VAR_PETALBURG_GYM_STATE, 1 warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 waitstate releaseall @@ -156,25 +156,25 @@ PetalburgCity_EventScript_14B82D:: @ 814B82D PetalburgCity_EventScript_14B836:: @ 814B836 lockall - setvar 0x8008, 0 + setvar VAR_SPECIAL_8, 0 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B842:: @ 814B842 lockall - setvar 0x8008, 1 + setvar VAR_SPECIAL_8, 1 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B84E:: @ 814B84E lockall - setvar 0x8008, 2 + setvar VAR_SPECIAL_8, 2 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B85A:: @ 814B85A lockall - setvar 0x8008, 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 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_EventScript_14B91B - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_EventScript_14B930 - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_EventScript_14B93B - compare 0x8008, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closemessage - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_EventScript_14B965 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_EventScript_14B977 - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_EventScript_14B989 - compare 0x8008, 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 add786bf0..1bd1649cf 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -6,14 +6,14 @@ PetalburgCity_Gym_MapScripts:: @ 8154477 .byte 0 PetalburgCity_Gym_MapScript1_15448C:: @ 815448C - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if_eq PetalburgCity_Gym_EventScript_1544A3 - compare 0x4085, 7 + compare VAR_PETALBURG_GYM_STATE, 7 call_if 4, PetalburgCity_Gym_EventScript_1544ED end PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 - setvar 0x8005, 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 0x8005, 1 + setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A call PetalburgCity_Gym_EventScript_154FBB call PetalburgCity_Gym_EventScript_154FDC @@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED return PetalburgCity_Gym_MapScript1_15451B:: @ 815451B - compare 0x4085, 1 + compare VAR_PETALBURG_GYM_STATE, 1 call_if 1, PetalburgCity_Gym_EventScript_15453B - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 checkflag FLAG_SYS_GAME_CLEAR call_if 1, PetalburgCity_Gym_EventScript_15454B @@ -65,7 +65,7 @@ PetalburgCity_Gym_EventScript_15454B:: @ 815454B return PetalburgCity_Gym_MapScript2_154553:: @ 8154553 - map_script_2 0x4085, 1, PetalburgCity_Gym_EventScript_15455D + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15455D .2byte 0 PetalburgCity_Gym_EventScript_15455D:: @ 815455D @@ -73,7 +73,7 @@ PetalburgCity_Gym_EventScript_15455D:: @ 815455D end PetalburgCity_Gym_MapScript2_154562:: @ 8154562 - map_script_2 0x4085, 1, PetalburgCity_Gym_EventScript_15456C + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15456C .2byte 0 PetalburgCity_Gym_EventScript_15456C:: @ 815456C @@ -91,7 +91,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C applymovement 255, PetalburgCity_Gym_Movement_1A0841 waitmovement 0 msgbox PetalburgCity_Gym_Text_17A2A4, 4 - setvar 0x4085, 2 + setvar VAR_PETALBURG_GYM_STATE, 2 releaseall end @@ -105,7 +105,7 @@ PetalburgCity_Gym_Movement_1545B4:: @ 81545B4 PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 lock faceplayer - switch 0x4085 + switch VAR_PETALBURG_GYM_STATE case 2, PetalburgCity_Gym_EventScript_154907 case 3, PetalburgCity_Gym_EventScript_154911 case 4, PetalburgCity_Gym_EventScript_15491B @@ -122,92 +122,92 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 end PetalburgCity_Gym_EventScript_15463D:: @ 815463D - setvar 0x8008, 0 + setvar VAR_SPECIAL_8, 0 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154648:: @ 8154648 - setvar 0x8008, 1 + setvar VAR_SPECIAL_8, 1 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154653:: @ 8154653 - setvar 0x8008, 2 + setvar VAR_SPECIAL_8, 2 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_15465E:: @ 815465E - setvar 0x8008, 3 + setvar VAR_SPECIAL_8, 3 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 playse 8 - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154800 - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15481C - compare 0x8008, 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 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154884 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15488F - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548A1 - compare 0x8008, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548C5 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548D0 - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548DB - compare 0x8008, 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 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_15492F - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154930 - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15493B - compare 0x8008, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_15493C - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548FC - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare 0x8008, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage - setflag 0x4001 + setflag FLAG_SPECIAL_FLAG_1 playbgm 420, 0 - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15484E - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_154860 - compare 0x8008, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 removeobject 10 setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 - setvar 0x4085, 1 - setvar 0x4057, 2 + setvar VAR_PETALBURG_GYM_STATE, 1 + setvar VAR_PETALBURG_STATE, 2 clearflag FLAG_HIDE_WALLY_PETALBURG clearflag FLAG_HIDE_WALLY_PETALBURG_GYM setflag FLAG_HIDE_RIVAL_BIRCH_LAB @@ -372,7 +372,7 @@ PetalburgCity_Gym_EventScript_154969:: @ 8154969 checkpcitem ITEM_ENIGMA_BERRY, 1 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 - compare 0x402d, 0 + compare VAR_ENIGMA_BERRY_AVAILABLE, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 msgbox PetalburgCity_Gym_Text_1C5570, 4 setvar RESULT, 1 @@ -386,7 +386,7 @@ PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 giveitem_std ITEM_ENIGMA_BERRY compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B - setvar 0x402d, 0 + setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 release end @@ -398,12 +398,12 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 call PetalburgCity_Gym_EventScript_1A02C5 msgbox PetalburgCity_Gym_Text_17A805, 4 setflag FLAG_DEFEATED_PETALBURG_GYM - setvar 0x4085, 7 + setvar VAR_PETALBURG_GYM_STATE, 7 setflag FLAG_BADGE05_GET call PetalburgCity_Gym_EventScript_1A0424 setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM clearflag FLAG_HIDE_WATTSON_MAUVILLE - setvar 0x8008, 5 + setvar VAR_SPECIAL_8, 5 call PetalburgCity_Gym_EventScript_1A01C0 clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL call PetalburgCity_Gym_EventScript_1544ED @@ -592,10 +592,10 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 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 @@ -622,10 +622,10 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 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 0x8008, 7 - setvar 0x8009, 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 0x8008, 1 - setvar 0x8009, 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 0x8008, 7 - setvar 0x8009, 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 0x8008, 1 - setvar 0x8009, 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 0x8008, 1 - setvar 0x8009, 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 0x8008, 7 - setvar 0x8009, 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 0x8008, 1 - setvar 0x8009, 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 0x8008, 7 - setvar 0x8009, 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 0x8008, 1 - setvar 0x8009, 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 0x8008, 7 - setvar 0x8009, 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 0x8005, 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 0x8005, 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 0x8005, 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 0x8005, 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 0x8005, 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 0x8005, 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 0x8005, 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 0x8004, 1 - compare 0x8005, 0 + setvar VAR_SPECIAL_4, 1 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 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 0x8004, 2 - compare 0x8005, 0 + setvar VAR_SPECIAL_4, 2 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 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 0x8004, 3 - compare 0x8005, 0 + setvar VAR_SPECIAL_4, 3 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 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 0x8004, 4 - compare 0x8005, 0 + setvar VAR_SPECIAL_4, 4 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 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 0x8004, 5 - compare 0x8005, 0 + setvar VAR_SPECIAL_4, 5 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 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 0x8004, 6 - compare 0x8005, 0 + setvar VAR_SPECIAL_4, 6 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 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 0x8004, 7 - compare 0x8005, 0 + setvar VAR_SPECIAL_4, 7 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 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 0x8004, 8 - compare 0x8005, 0 + setvar VAR_SPECIAL_4, 8 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 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 1dc99159a..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 0x800b, 1 + setvar VAR_SPECIAL_B, 1 call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress @@ -34,11 +34,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 end PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F - compare 0x4023, 0 + compare VAR_STARTER_MON, 0 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 - compare 0x4023, 1 + compare VAR_STARTER_MON, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B - compare 0x4023, 2 + compare VAR_STARTER_MON, 2 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index be74cbf4c..73eb4f661 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -111,7 +111,7 @@ PetalburgWoods_EventScript_15CE4D:: @ 815CE4D PetalburgWoods_EventScript_15CE69:: @ 815CE69 removeobject 4 - setvar 0x4098, 1 + setvar VAR_PETALBURG_WOODS_STATE, 1 releaseall end @@ -271,7 +271,7 @@ PetalburgWoods_EventScript_15CF27:: @ 815CF27 PetalburgWoods_EventScript_15CF3E:: @ 815CF3E trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 1810a6495..6749f2136 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -8,12 +8,12 @@ Route101_MapScript1_14E92F:: @ 814E92F end Route101_MapScript2_14E935:: @ 814E935 - map_script_2 0x4060, 0, Route101_EventScript_14E93F + map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_14E93F .2byte 0 Route101_EventScript_14E93F:: @ 814E93F - setflag 0x4000 - setvar 0x4060, 1 + setflag FLAG_SPECIAL_FLAG_0 + setvar VAR_ROUTE101_STATE, 1 end Route101_EventScript_14E948:: @ 814E948 @@ -37,7 +37,7 @@ Route101_EventScript_14E948:: @ 814E948 waitmovement 0 msgbox Route101_Text_16D119, 4 closemessage - setvar 0x4060, 2 + setvar VAR_ROUTE101_STATE, 2 releaseall end @@ -233,9 +233,9 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA clearflag FLAG_HIDE_BIRCH_IN_LAB setflag FLAG_HIDE_BIRCH_STARTERS_BAG - setvar 0x4084, 2 - setvar 0x4060, 3 - clearflag 0x4000 + setvar VAR_BIRCH_LAB_STATE, 2 + setvar VAR_ROUTE101_STATE, 3 + clearflag FLAG_SPECIAL_FLAG_0 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 95a0a4a1f..ad1571caa 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -19,7 +19,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index ee9decedc..bfcbeb87a 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -26,7 +26,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB applymovement 2, Route103_Movement_1A0835 waitmovement 0 msgbox Route103_Text_16D5B6, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route103_EventScript_14EC5D case 1, Route103_EventScript_14EC6D case 2, Route103_EventScript_14EC7D @@ -42,7 +42,7 @@ Route103_EventScript_14EC04:: @ 814EC04 applymovement 2, Route103_Movement_1A0835 waitmovement 0 msgbox Route103_Text_16D7A9, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route103_EventScript_14EC8D case 1, Route103_EventScript_14EC9D case 2, Route103_EventScript_14ECAD @@ -117,11 +117,11 @@ Route103_EventScript_14ED29:: @ 814ED29 Route103_EventScript_14ED46:: @ 814ED46 removeobject 2 - setvar 0x4062, 1 - setvar 0x4084, 4 + setvar VAR_ROUTE103_STATE, 1 + setvar VAR_BIRCH_LAB_STATE, 4 clearflag FLAG_HIDE_RIVAL_BIRCH_LAB setflag FLAG_DEFEATED_RIVAL_ROUTE103 - setvar 0x40c7, 1 + setvar VAR_OLDALE_STATE, 1 clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN savebgm 0 fadedefaultbgm @@ -173,7 +173,7 @@ Route103_EventScript_14ED94:: @ 814ED94 Route103_EventScript_14EDAB:: @ 814EDAB trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 msgbox Route103_Text_1B7E50, 6 @@ -186,7 +186,7 @@ Route103_EventScript_14EDD6:: @ 814EDD6 Route103_EventScript_14EDF1:: @ 814EDF1 trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE1C msgbox Route103_Text_1B7F40, 6 @@ -204,7 +204,7 @@ Route103_EventScript_14EE37:: @ 814EE37 Route103_EventScript_14EE4E:: @ 814EE4E trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index a04dcd86d..c90a97531 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -4,7 +4,7 @@ Route104_MapScripts:: @ 814EE8C .byte 0 Route104_MapScript2_14EE97:: @ 814EE97 - map_script_2 0x408e, 1, Route104_EventScript_14EEA1 + map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_14EEA1 .2byte 0 Route104_EventScript_14EEA1:: @ 814EEA1 @@ -153,11 +153,11 @@ Route104_EventScript_14EFD5:: @ 814EFD5 call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 - copyvar 0x4096, 0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 - setvar 0x408e, 0 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_EventScript_14F08B checkflag FLAG_DELIVERED_STEVEN_LETTER @@ -409,7 +409,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 @@ -422,7 +422,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 @@ -435,7 +435,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 4eb1d9705..cb52908f5 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -4,7 +4,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag FLAG_LANDMARK_MR_BRINEY_HOUSE - compare 0x4090, 1 + compare VAR_BRINEY_HOUSE_STATE, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 checkflag FLAG_RECEIVED_POKENAV call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 @@ -79,7 +79,7 @@ Route104_MrBrineysHouse_EventScript_15BDA1:: @ 815BDA1 Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB msgbox Route104_MrBrineysHouse_Text_191BFD, 4 call Route104_MrBrineysHouse_EventScript_1A010C - setvar 0x408e, 1 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1 clearflag FLAG_HIDE_MR_BRINEY_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 2ec903363..ae65c7013 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -17,7 +17,7 @@ Route106_EventScript_14F34F:: @ 814F34F Route106_EventScript_14F366:: @ 814F366 trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index b6973407b..ad2d293fc 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -8,7 +8,7 @@ Route107_EventScript_14F3BC:: @ 814F3BC Route107_EventScript_14F3D3:: @ 814F3D3 trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index a9fa7d906..28bf046a4 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 0x4096, 0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 @@ -396,7 +396,7 @@ Route109_EventScript_14F7F2:: @ 814F7F2 Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 @@ -409,7 +409,7 @@ Route109_EventScript_14F830:: @ 814F830 Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 5e10782e9..586031a1a 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -12,7 +12,7 @@ Route110_MapScript1_14F914:: @ 814F914 call Route110_EventScript_1A0196 call Route110_EventScript_1A014E call Route110_EventScript_1A0172 - compare 0x40a9, 1 + compare VAR_CYCLING_CHALLENGE_STATE, 1 call_if 1, Route110_EventScript_14F92F end @@ -21,12 +21,12 @@ Route110_EventScript_14F92F:: @ 814F92F return Route110_MapScript2_14F933:: @ 814F933 - map_script_2 0x40a9, 1, Route110_EventScript_14F93D + map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_14F93D .2byte 0 Route110_EventScript_14F93D:: @ 814F93D special ScrSpecial_BeginCyclingRoadChallenge - setvar 0x40a9, 2 + setvar VAR_CYCLING_CHALLENGE_STATE, 2 return Route110_EventScript_14F946:: @ 814F946 @@ -149,7 +149,7 @@ Route110_EventScript_14FA53:: @ 814FA53 specialvar RESULT, GetPlayerAvatarBike compare RESULT, 1 goto_if_eq Route110_EventScript_14FA84 - compare 0x40a9, 0 + compare VAR_CYCLING_CHALLENGE_STATE, 0 goto_if_eq Route110_EventScript_14FA7A msgbox Route110_Text_16F26A, 4 release @@ -177,7 +177,7 @@ Route110_EventScript_14FAA5:: @ 814FAA5 Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 msgbox Route110_Text_1BA829, 6 @@ -205,7 +205,7 @@ Route110_EventScript_14FB28:: @ 814FB28 Route110_EventScript_14FB3F:: @ 814FB3F trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FB66 msgbox Route110_Text_1BA3A5, 6 @@ -223,7 +223,7 @@ Route110_EventScript_14FB7D:: @ 814FB7D Route110_EventScript_14FB94:: @ 814FB94 trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBBB msgbox Route110_Text_1BA52E, 6 @@ -236,7 +236,7 @@ Route110_EventScript_14FBBB:: @ 814FBBB Route110_EventScript_14FBD2:: @ 814FBD2 trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 @@ -303,23 +303,23 @@ Route110_EventScript_14FCFB:: @ 814FCFB end Route110_EventScript_14FD09:: @ 814FD09 - setvar 0x40a9, 3 + setvar VAR_CYCLING_CHALLENGE_STATE, 3 savebgm 0 fadedefaultbgm return Route110_EventScript_14FD13:: @ 814FD13 - setvar 0x8008, 1 + setvar VAR_SPECIAL_8, 1 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD1E:: @ 814FD1E - setvar 0x8008, 2 + setvar VAR_SPECIAL_8, 2 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD29:: @ 814FD29 - setvar 0x8008, 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 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route110_EventScript_14FF14 - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route110_EventScript_14FF1F - compare 0x8008, 3 + compare VAR_SPECIAL_8, 3 call_if 1, Route110_EventScript_14FF2A checkplayergender compare RESULT, 0 @@ -361,7 +361,7 @@ Route110_EventScript_14FDAC:: @ 814FDAC Route110_EventScript_14FDB1:: @ 814FDB1 msgbox Route110_Text_16E7A1, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route110_EventScript_14FDE0 case 1, Route110_EventScript_14FDF0 case 2, Route110_EventScript_14FE00 @@ -391,7 +391,7 @@ Route110_EventScript_14FE10:: @ 814FE10 Route110_EventScript_14FE2B:: @ 814FE2B msgbox Route110_Text_16E99A, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route110_EventScript_14FE5A case 1, Route110_EventScript_14FE6A case 2, Route110_EventScript_14FE7A @@ -425,25 +425,25 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closemessage - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route110_EventScript_14FF56 - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route110_EventScript_14FF5E - compare 0x8008, 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 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route110_EventScript_14FF35 - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route110_EventScript_14FF40 - compare 0x8008, 3 + compare VAR_SPECIAL_8, 3 call_if 1, Route110_EventScript_14FF4B removeobject 29 - setvar 0x4069, 1 + setvar VAR_ROUTE110_STATE, 1 savebgm 0 fadedefaultbgm releaseall diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 8e33517ca..af72dedd0 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -3,14 +3,14 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 .byte 0 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE - compare 0x40a9, 3 + compare VAR_CYCLING_CHALLENGE_STATE, 3 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 - compare 0x40a9, 2 + compare VAR_CYCLING_CHALLENGE_STATE, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 end Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5:: @ 81634E5 - setvar 0x40a9, 1 + setvar VAR_CYCLING_CHALLENGE_STATE, 1 return Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB:: @ 81634EB @@ -29,13 +29,13 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D:: @ 816351D @ You're on the Mach Bike! - setvar 0x40a9, 1 + setvar VAR_CYCLING_CHALLENGE_STATE, 1 return Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523 @@ -54,8 +54,8 @@ Route110_SeasideCyclingRoadNorthEntrance_Movement_163538:: @ 8163538 Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A @ Coord event directly in front of the gatesman heading right to left lockall - setvar 0x40a9, 0 + setvar VAR_CYCLING_CHALLENGE_STATE, 0 clearflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 51cab5ddd..2f54753ab 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -14,7 +14,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end @@ -33,6 +33,6 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD lockall clearflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.inc b/data/scripts/maps/Route110_TrickHouseCorridor.inc index 7b3d93118..be70476e6 100644 --- a/data/scripts/maps/Route110_TrickHouseCorridor.inc +++ b/data/scripts/maps/Route110_TrickHouseCorridor.inc @@ -3,5 +3,5 @@ Route110_TrickHouseCorridor_MapScripts:: @ 8161CEC .byte 0 Route110_TrickHouseCorridor_MapScript1_161CF2:: @ 8161CF2 - setvar 0x40b5, 1 + setvar VAR_TRICK_HOUSE_STATE, 1 end diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 813cbb9e9..c825c1234 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -6,18 +6,18 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 .byte 0 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161994 end Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957 - setvar 0x4001, 0 - setvar 0x4002, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 special SetTrickHouseEndRoomFlag end Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 - map_script_2 0x4002, 0, Route110_TrickHouseEnd_EventScript_16196F + map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_16196F .2byte 0 Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F @@ -27,11 +27,11 @@ Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F end Route110_TrickHouseEnd_MapScript2_16197C:: @ 816197C - map_script_2 0x4001, 0, Route110_TrickHouseEnd_EventScript_161986 + map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_161986 .2byte 0 Route110_TrickHouseEnd_EventScript_161986:: @ 8161986 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 call Route110_TrickHouseEnd_EventScript_161994 special DrawWholeMapView end @@ -44,8 +44,8 @@ Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E lock faceplayer msgbox Route110_TrickHouseEnd_Text_19C281, 4 - setvar 0x4002, 1 - switch 0x4044 + setvar VAR_TEMP_2, 1 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED case 0, Route110_TrickHouseEnd_EventScript_161A0B case 1, Route110_TrickHouseEnd_EventScript_161A47 case 2, Route110_TrickHouseEnd_EventScript_161A83 @@ -59,7 +59,7 @@ Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C2B2, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_RARE_CANDY compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -72,7 +72,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C333, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TIMER_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -85,7 +85,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C3A7, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_HARD_STONE compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -98,7 +98,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C41F, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_SMOKE_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -111,7 +111,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C491, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TM12 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -124,7 +124,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C515, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_MAGNET compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -137,7 +137,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C567, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_PP_MAX compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -165,7 +165,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF waitmovement 0 delay 30 msgbox Route110_TrickHouseEnd_Text_19C691, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 .ifdef SAPPHIRE givedecoration_std 32 .else @@ -186,19 +186,19 @@ Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E applymovement 1, Route110_TrickHouseEnd_Movement_16131E waitmovement 0 removeobject 1 - addvar 0x4044, 1 + addvar VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 return Route110_TrickHouseEnd_EventScript_161C4E:: @ 8161C4E call Route110_TrickHouseEnd_EventScript_1A02A5 msgbox Route110_TrickHouseEnd_Text_19C92E, 4 - setvar 0x40c1, 1 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_161C61:: @ 8161C61 call Route110_TrickHouseEnd_EventScript_1A02B8 msgbox Route110_TrickHouseEnd_Text_19C7D7, 4 - setvar 0x40c1, 1 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_161C74:: @ 8161C74 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index b9582b64c..8a8dd2763 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -6,19 +6,19 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B setflag FLAG_LANDMARK_TRICK_HOUSE - compare 0x40b5, 1 + compare VAR_TRICK_HOUSE_STATE, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE - compare 0x40c1, 1 + compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2 - compare 0x40a6, 1 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E - compare 0x40a7, 5 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare 0x40a7, 3 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare 0x40a7, 0 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - switch 0x40a7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_16109A case 1, Route110_TrickHouseEntrance_EventScript_1610A0 case 3, Route110_TrickHouseEntrance_EventScript_1610A6 @@ -26,39 +26,39 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B end Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2 - setvar 0x40a5, 1 - compare 0x4044, 8 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8 - setvar 0x40a7, 2 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2 end Route110_TrickHouseEntrance_EventScript_160FC8:: @ 8160FC8 - setvar 0x40a7, 6 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6 end Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE - setvar 0x40b5, 0 - setvar 0x40a7, 5 - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_STATE, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE - setvar 0x40a7, 0 - compare 0x4044, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_16103C - compare 0x4044, 2 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_161046 - compare 0x4044, 3 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_161050 - compare 0x4044, 4 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_16105A - compare 0x4044, 5 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_161064 - compare 0x4044, 6 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_16106E - compare 0x4044, 7 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_161078 - compare 0x4044, 8 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 call_if 1, Route110_TrickHouseEntrance_EventScript_161082 return @@ -98,11 +98,11 @@ Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 return Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082 - setvar 0x40a7, 4 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4 return Route110_TrickHouseEntrance_EventScript_161088:: @ 8161088 - setvar 0x40a7, 3 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 return Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E @@ -111,30 +111,30 @@ Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E end Route110_TrickHouseEntrance_EventScript_16109A:: @ 816109A - setvar 0x40a5, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 0 end Route110_TrickHouseEntrance_EventScript_1610A0:: @ 81610A0 - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_EventScript_1610A6:: @ 81610A6 - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_EventScript_1610AC:: @ 81610AC - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2 - map_script_2 0x40a6, 1, Route110_TrickHouseEntrance_EventScript_1610F4 - map_script_2 0x40a7, 0, Route110_TrickHouseEntrance_EventScript_161105 - map_script_2 0x40a7, 1, Route110_TrickHouseEntrance_EventScript_1611AB - map_script_2 0x40a7, 2, Route110_TrickHouseEntrance_EventScript_1611AF - map_script_2 0x40a7, 3, Route110_TrickHouseEntrance_EventScript_1611AF - map_script_2 0x40a7, 4, Route110_TrickHouseEntrance_EventScript_1611AB - map_script_2 0x40a7, 5, Route110_TrickHouseEntrance_EventScript_1611AB - map_script_2 0x40a7, 6, Route110_TrickHouseEntrance_EventScript_1611BE + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1610F4 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_161105 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_1611AB + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_1611AF + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_1611AF + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_1611AB + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_1611AB + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_1611BE .2byte 0 Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 @@ -147,7 +147,7 @@ Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 addobject 1 hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - switch 0x4044 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED case 0, Route110_TrickHouseEntrance_EventScript_16116B case 1, Route110_TrickHouseEntrance_EventScript_161173 case 2, Route110_TrickHouseEntrance_EventScript_161193 @@ -207,13 +207,13 @@ Route110_TrickHouseEntrance_EventScript_1611BE:: @ 81611BE end Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD - map_script_2 0x40a6, 1, Route110_TrickHouseEntrance_EventScript_1611D7 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1611D7 .2byte 0 Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall delay 20 - compare 0x4044, 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closemessage @@ -224,8 +224,8 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 - setvar 0x40a7, 1 - setvar 0x40a6, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0 releaseall end @@ -235,7 +235,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A lockall - switch 0x40a7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_16124D case 2, Route110_TrickHouseEntrance_EventScript_16136E case 3, Route110_TrickHouseEntrance_EventScript_161330 @@ -248,24 +248,24 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 waitmovement 0 - compare 0x4044, 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD - compare 0x4044, 1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6 - compare 0x4044, 2 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF - compare 0x4044, 3 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8 - compare 0x4044, 4 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1 - compare 0x4044, 5 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA - compare 0x4044, 6 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_161303 - compare 0x4044, 7 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closemessage - setvar 0x40a6, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall @@ -351,19 +351,19 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C07E, 4 - compare 0x4044, 1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE - compare 0x4044, 2 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA - compare 0x4044, 3 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 goto_if_eq Route110_TrickHouseEntrance_EventScript_161426 - compare 0x4044, 4 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 goto_if_eq Route110_TrickHouseEntrance_EventScript_161452 - compare 0x4044, 5 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E - compare 0x4044, 6 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA - compare 0x4044, 7 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6 end @@ -438,8 +438,8 @@ Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 end Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502 - setvar 0x40c1, 0 - setvar 0x40a7, 3 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841 waitmovement 0 releaseall @@ -473,14 +473,14 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 - setvar 0x40c1, 0 - setvar 0x40a7, 5 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 releaseall end Route110_TrickHouseEntrance_EventScript_16158A:: @ 816158A lockall - switch 0x40a7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_1615BD case 1, Route110_TrickHouseEntrance_EventScript_1615C7 case 4, Route110_TrickHouseEntrance_EventScript_1616B8 @@ -508,7 +508,7 @@ Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_16165E waitmovement 0 - switch 0x4044 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED case 0, Route110_TrickHouseEntrance_EventScript_161660 case 1, Route110_TrickHouseEntrance_EventScript_16166B case 2, Route110_TrickHouseEntrance_EventScript_161676 @@ -577,7 +577,7 @@ Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8 end Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2 - compare 0x4044, 8 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7 msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4 releaseall @@ -590,7 +590,7 @@ Route110_TrickHouseEntrance_EventScript_1616D7:: @ 81616D7 gUnknown_081616E1:: @ 81616E1 lockall - switch 0x4044 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED case 0, Route110_TrickHouseEntrance_EventScript_161740 case 1, Route110_TrickHouseEntrance_EventScript_161769 case 2, Route110_TrickHouseEntrance_EventScript_161792 @@ -602,88 +602,88 @@ gUnknown_081616E1:: @ 81616E1 end Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 - compare 0x40AB, 0 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CAD1, 4 playse SE_PIN - setvar 0x40AB, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 - compare 0x40AC, 0 + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CCCB, 4 playse SE_PIN - setvar 0x40AC, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 - compare 0x40AD, 0 + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CEF9, 4 playse SE_PIN - setvar 0x40AD, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB - compare 0x40AE, 0 + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D164, 4 playse SE_PIN - setvar 0x40AE, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 - compare 0x40AF, 0 + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D3A5, 4 playse SE_PIN - setvar 0x40AF, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D - compare 0x40B0, 0 + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DC0A, 4 playse SE_PIN - setvar 0x40B0, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 - compare 0x40B1, 0 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DE8D, 4 playse SE_PIN - setvar 0x40B1, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F - compare 0x40B2, 0 + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819E0FF, 4 playse SE_PIN - setvar 0x40B2, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall @@ -726,33 +726,33 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 lockall msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 releaseall - compare 0x4044, 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1 - compare 0x4044, 1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6 - compare 0x4044, 2 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_16190B - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1 - setvar 0x8004, 6 - setvar 0x8005, 3 - setvar 0x8006, 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 0x8004, 11 - setvar 0x8005, 5 - setvar 0x8006, 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 0x8004, 9 - setvar 0x8005, 2 - setvar 0x8006, 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/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index 4fffd9914..df0484baf 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8 .byte 0 Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE - compare 0x40ab, 2 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D0A end @@ -13,13 +13,13 @@ Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 lockall - compare 0x40ab, 0 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D26 goto Route110_TrickHousePuzzle1_EventScript_161892 end Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26 - setvar 0x40ab, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1 goto Route110_TrickHousePuzzle1_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 6425d05cb..9ebde8451 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -4,38 +4,38 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 .byte 0 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C - compare 0x4002, 1 + compare VAR_TEMP_2, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F - compare 0x4003, 1 + compare VAR_TEMP_3, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 - compare 0x4004, 1 + compare VAR_TEMP_4, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 end Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 end Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 lockall - compare 0x40ac, 0 + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 goto_if_eq Route110_TrickHousePuzzle2_EventScript_161DD5 goto Route110_TrickHousePuzzle2_EventScript_161892 end Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 - setvar 0x40ac, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1 goto Route110_TrickHousePuzzle2_EventScript_16189C end Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E2C special DrawWholeMapView @@ -44,7 +44,7 @@ Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 lockall - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E3F special DrawWholeMapView @@ -53,7 +53,7 @@ Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 lockall - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E52 special DrawWholeMapView @@ -62,7 +62,7 @@ Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 lockall - setvar 0x4004, 1 + setvar VAR_TEMP_4, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E65 special DrawWholeMapView diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 54cea16c9..cb129b06d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -5,22 +5,22 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 - compare 0x4009, 0 + compare VAR_TEMP_9, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 end Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4006, 0 - setvar 0x4007, 0 - setvar 0x4008, 0 - setvar 0x4009, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 + setvar VAR_TEMP_9, 0 end Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 @@ -31,19 +31,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmetatile 13, 7, 600, 0 setmetatile 1, 3, 600, 0 setmetatile 10, 2, 600, 0 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 - compare 0x4008, 6 + compare VAR_TEMP_8, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 - compare 0x4008, 7 + compare VAR_TEMP_8, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB return @@ -247,43 +247,43 @@ Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB lockall - setvar 0x4008, 1 + setvar VAR_TEMP_8, 1 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625B7:: @ 81625B7 lockall - setvar 0x4008, 2 + setvar VAR_TEMP_8, 2 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625C3:: @ 81625C3 lockall - setvar 0x4008, 3 + setvar VAR_TEMP_8, 3 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625CF:: @ 81625CF lockall - setvar 0x4008, 4 + setvar VAR_TEMP_8, 4 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625DB:: @ 81625DB lockall - setvar 0x4008, 5 + setvar VAR_TEMP_8, 5 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625E7:: @ 81625E7 lockall - setvar 0x4008, 6 + setvar VAR_TEMP_8, 6 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625F3:: @ 81625F3 lockall - setvar 0x4008, 7 + setvar VAR_TEMP_8, 7 goto Route110_TrickHousePuzzle3_EventScript_1625FF end @@ -295,88 +295,88 @@ Route110_TrickHousePuzzle3_EventScript_1625FF:: @ 81625FF end Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4006, 0 - setvar 0x4007, 0 - compare 0x4008, 1 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B - compare 0x4008, 6 + compare VAR_TEMP_8, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 - compare 0x4008, 7 + compare VAR_TEMP_8, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 return Route110_TrickHousePuzzle3_EventScript_162683:: @ 8162683 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 return Route110_TrickHousePuzzle3_EventScript_162689:: @ 8162689 - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 return Route110_TrickHousePuzzle3_EventScript_16268F:: @ 816268F - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 return Route110_TrickHousePuzzle3_EventScript_162695:: @ 8162695 - setvar 0x4004, 1 + setvar VAR_TEMP_4, 1 return Route110_TrickHousePuzzle3_EventScript_16269B:: @ 816269B - setvar 0x4005, 1 + setvar VAR_TEMP_5, 1 return Route110_TrickHousePuzzle3_EventScript_1626A1:: @ 81626A1 - setvar 0x4006, 1 + setvar VAR_TEMP_6, 1 return Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 - setvar 0x4007, 1 + setvar VAR_TEMP_7, 1 return Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare 0x4009, 0 + compare VAR_TEMP_9, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView - compare 0x4009, 1 + compare VAR_TEMP_9, 1 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD - compare 0x4009, 0 + compare VAR_TEMP_9, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626E4 end Route110_TrickHousePuzzle3_EventScript_1626DD:: @ 81626DD - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 releaseall end Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 releaseall end Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB lockall - compare 0x40ad, 0 + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626FD goto Route110_TrickHousePuzzle3_EventScript_161892 end Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD - setvar 0x40ad, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1 goto Route110_TrickHousePuzzle3_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 0c9fc426f..3808f1f2d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -3,13 +3,13 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 816274D Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E lockall - compare 0x40ae, 0 + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 goto_if_eq Route110_TrickHousePuzzle4_EventScript_162760 goto Route110_TrickHousePuzzle4_EventScript_161892 end Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760 - setvar 0x40ae, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1 goto Route110_TrickHousePuzzle4_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 4b9031715..5fedee3a9 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -3,23 +3,23 @@ Route110_TrickHousePuzzle5_MapScripts:: @ 81627B0 .byte 0 Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4008, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_8, 0 end Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 lockall - compare 0x40af, 0 + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7 goto Route110_TrickHousePuzzle5_EventScript_161892 end Route110_TrickHousePuzzle5_EventScript_1627E7:: @ 81627E7 - setvar 0x40af, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1 goto Route110_TrickHousePuzzle5_EventScript_16189C end @@ -27,9 +27,9 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 lockall applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F end @@ -37,9 +37,9 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 lockall applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4002, 1 + compare VAR_TEMP_2, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end @@ -47,9 +47,9 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 lockall applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4003, 1 + compare VAR_TEMP_3, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 end @@ -57,9 +57,9 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 lockall applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4004, 1 + compare VAR_TEMP_4, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B end @@ -67,109 +67,109 @@ Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 lockall applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4005, 1 + compare VAR_TEMP_5, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162897:: @ 8162897 lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628A3:: @ 81628A3 lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628AF:: @ 81628AF lockall - setvar 0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628BB:: @ 81628BB lockall - setvar 0x4009, 3 + setvar VAR_TEMP_9, 3 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628C7:: @ 81628C7 lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_1628D3:: @ 81628D3 lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_1628DF:: @ 81628DF lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_1628EB:: @ 81628EB lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_1628F7:: @ 81628F7 lockall - setvar 0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_162903:: @ 8162903 lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_16290F:: @ 816290F lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_16291B:: @ 816291B lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162927:: @ 8162927 lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933 lockall - setvar 0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F - setvar 0x4001, 1 - setvar 0x4008, 1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_8, 1 playse 21 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 @@ -180,18 +180,18 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F end Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 - setvar 0x4002, 1 - setvar 0x4008, 2 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_8, 2 playse 21 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 @@ -202,18 +202,18 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 end Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 - setvar 0x4003, 1 - setvar 0x4008, 3 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_8, 3 playse 21 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 @@ -224,18 +224,18 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 end Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B - setvar 0x4004, 1 - setvar 0x4008, 4 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_8, 4 playse 21 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 @@ -246,18 +246,18 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B end Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F - setvar 0x4005, 1 - setvar 0x4008, 5 + setvar VAR_TEMP_5, 1 + setvar VAR_TEMP_8, 5 playse 21 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 @@ -418,80 +418,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 end Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 - compare 0x4009, 4 + compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 - compare 0x4009, 5 + compare VAR_TEMP_9, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index ddf845142..971d2a275 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle6_MapScript1_1630D8:: @ 81630D8 end Route110_TrickHousePuzzle6_MapScript2_1630DC:: @ 81630DC - map_script_2 0x4000, 16384, Route110_TrickHousePuzzle6_EventScript_1630E6 + map_script_2 VAR_TEMP_0, 16384, Route110_TrickHousePuzzle6_EventScript_1630E6 .2byte 0 Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 @@ -17,13 +17,13 @@ Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA lockall - compare 0x40b0, 0 + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 goto_if_eq Route110_TrickHousePuzzle6_EventScript_1630FC goto Route110_TrickHousePuzzle6_EventScript_161892 end Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC - setvar 0x40b0, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1 goto Route110_TrickHousePuzzle6_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 4ff925639..66aa8b5e7 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -73,7 +73,7 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 return Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 - compare 0x40b6, 1 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 @@ -86,33 +86,33 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E end Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F - compare 0x40b6, 1 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 call_if 1, Route110_TrickHousePuzzle7_EventScript_163167 end Route110_TrickHousePuzzle7_MapScript2_16327B:: @ 816327B - map_script_2 0x40b6, 1, Route110_TrickHousePuzzle7_EventScript_163285 + map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_163285 .2byte 0 Route110_TrickHousePuzzle7_EventScript_163285:: @ 8163285 - setvar 0x40b6, 0 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0 end Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B lockall - compare 0x40b1, 0 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16329D goto Route110_TrickHousePuzzle7_EventScript_161892 end Route110_TrickHousePuzzle7_EventScript_16329D:: @ 816329D - setvar 0x40b1, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1 goto Route110_TrickHousePuzzle7_EventScript_16189C end Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 lockall - setvar 0x40b6, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 waitstate releaseall diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index 5f0b00684..2c55aae4c 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -3,13 +3,13 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 816341B Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C lockall - compare 0x40b2, 0 + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 goto_if_eq Route110_TrickHousePuzzle8_EventScript_16342E goto Route110_TrickHousePuzzle8_EventScript_161892 end Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E - setvar 0x40b2, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1 goto Route110_TrickHousePuzzle8_EventScript_16189C end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 0a7e6befc..5336bd510 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -21,16 +21,16 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 end Route111_EventScript_14FFCD:: @ 814FFCD - getplayerxy 0x4000, 0x4001 - compare 0x4001, 34 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 34 goto_if 0, Route111_EventScript_15000C - compare 0x4001, 107 + compare VAR_TEMP_1, 107 goto_if 2, Route111_EventScript_15000C - compare 0x4001, 72 + compare VAR_TEMP_1, 72 goto_if 2, Route111_EventScript_150009 - compare 0x4000, 2000 + compare VAR_TEMP_0, 2000 goto_if 2, Route111_EventScript_15000C - compare 0x4000, 8 + compare VAR_TEMP_0, 8 goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 @@ -140,25 +140,25 @@ Route111_EventScript_150100:: @ 8150100 @ 815010A lockall - setvar 0x8004, 0 + setvar VAR_SPECIAL_4, 0 goto Route111_EventScript_15013A end Route111_EventScript_150116:: @ 8150116 lockall - setvar 0x8004, 1 + setvar VAR_SPECIAL_4, 1 goto Route111_EventScript_15013A end Route111_EventScript_150122:: @ 8150122 lockall - setvar 0x8004, 2 + setvar VAR_SPECIAL_4, 2 goto Route111_EventScript_15013A end @ 815012E lockall - setvar 0x8004, 3 + setvar VAR_SPECIAL_4, 3 goto Route111_EventScript_15013A end @@ -166,20 +166,20 @@ Route111_EventScript_15013A:: @ 815013A checkitem ITEM_GO_GOGGLES, 1 compare RESULT, 0 goto_if_eq Route111_EventScript_150151 - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 releaseall end Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closemessage - compare 0x8004, 0 + compare VAR_SPECIAL_4, 0 call_if 1, Route111_EventScript_150188 - compare 0x8004, 1 + compare VAR_SPECIAL_4, 1 call_if 1, Route111_EventScript_150193 - compare 0x8004, 2 + compare VAR_SPECIAL_4, 2 call_if 1, Route111_EventScript_15019E - compare 0x8004, 3 + compare VAR_SPECIAL_4, 3 call_if 1, Route111_EventScript_1501A9 releaseall end @@ -224,7 +224,7 @@ Route111_EventScript_1501BC:: @ 81501BC setweather 2 fadenewbgm 360 doweather - setvar 0x4003, 0 + setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 @@ -392,7 +392,7 @@ Route111_EventScript_1503EC:: @ 81503EC Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 @@ -420,7 +420,7 @@ Route111_EventScript_15046F:: @ 815046F Route111_EventScript_150486:: @ 8150486 trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 @@ -433,7 +433,7 @@ Route111_EventScript_1504AD:: @ 81504AD Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 981971e41..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 0x8008, 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 0x8008, 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 0x8008, 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 0x8008, 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 0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D + applymovement VAR_SPECIAL_8, Route111_WinstrateFamilysHouse_Movement_1A083D waitmovement 0 release end diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index d0d464207..83d93f222 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -4,7 +4,7 @@ Route112_MapScripts:: @ 8150502 Route112_MapScript1_150508:: @ 8150508 call Route112_EventScript_1A0196 - setvar 0x40bd, 0 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end Route112_EventScript_150513:: @ 8150513 @@ -38,7 +38,7 @@ Route112_EventScript_150549:: @ 8150549 Route112_EventScript_150560:: @ 8150560 trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index d414ca8ed..cba6c33e8 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E setescapewarp MAP_ROUTE112, 255, 28, 28 - compare 0x40a3, 2 + compare VAR_CABLE_CAR_STATION_STATE, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end @@ -15,7 +15,7 @@ Route112_CableCarStation_EventScript_15C052:: @ 815C052 return Route112_CableCarStation_MapScript2_15C05E:: @ 815C05E - map_script_2 0x40a3, 2, Route112_CableCarStation_EventScript_15C068 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_15C068 .2byte 0 Route112_CableCarStation_EventScript_15C068:: @ 815C068 @@ -23,7 +23,7 @@ Route112_CableCarStation_EventScript_15C068:: @ 815C068 applymovement 255, Route112_CableCarStation_Movement_15C0F5 applymovement 1, Route112_CableCarStation_Movement_15C0EB waitmovement 0 - setvar 0x40a3, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 setobjectmovementtype 1, 8 releaseall @@ -45,8 +45,8 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD applymovement 1, Route112_CableCarStation_Movement_15C0E6 applymovement 255, Route112_CableCarStation_Movement_15C0F0 waitmovement 0 - setvar 0x8004, 0 - setvar 0x40a3, 1 + setvar VAR_SPECIAL_4, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp special sub_8123218 diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 37fd0ed3f..1b589fcde 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -13,10 +13,10 @@ Route113_MapScript1_1505DA:: @ 81505DA end Route113_EventScript_1505E5:: @ 81505E5 - getplayerxy 0x4000, 0x4001 - compare 0x4000, 19 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 19 goto_if 0, Route113_EventScript_150604 - compare 0x4000, 84 + compare VAR_TEMP_0, 84 goto_if 2, Route113_EventScript_150604 setweather 7 return @@ -60,7 +60,7 @@ Route113_EventScript_150652:: @ 8150652 Route113_EventScript_150669:: @ 8150669 trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 @@ -73,7 +73,7 @@ Route113_EventScript_150690:: @ 8150690 Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 8d853b88d..bc32449cd 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -4,26 +4,26 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 setflag FLAG_LANDMARK_GLASS_WORKSHOP - compare 0x40be, 1 + compare VAR_GLASS_WORKSHOP_STATE, 1 call_if 1, Route113_GlassWorkshop_EventScript_16355F end Route113_GlassWorkshop_EventScript_16355F:: @ 816355F - setvar 0x40be, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 return Route113_GlassWorkshop_EventScript_163565:: @ 8163565 lock faceplayer - compare 0x40be, 10 + compare VAR_GLASS_WORKSHOP_STATE, 10 goto_if 4, Route113_GlassWorkshop_EventScript_1638D2 - compare 0x40be, 2 + compare VAR_GLASS_WORKSHOP_STATE, 2 goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 - compare 0x40be, 1 + compare VAR_GLASS_WORKSHOP_STATE, 1 goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 giveitem_std ITEM_SOOT_SACK - setvar 0x40be, 1 + setvar VAR_GLASS_WORKSHOP_STATE, 1 msgbox Route113_GlassWorkshop_Text_19E59B, 4 release end @@ -38,7 +38,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 - compare 0x4048, 250 + compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waitmessage @@ -51,7 +51,7 @@ Route113_GlassWorkshop_EventScript_1635E4:: @ 81635E4 end Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE - setvar 0x8009, 0 + setvar VAR_SPECIAL_9, 0 special ShowGlassWorkshopMenu waitstate switch RESULT @@ -67,102 +67,102 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE end Route113_GlassWorkshop_EventScript_163660:: @ 8163660 - setvar 0x8008, 39 - bufferitemname 0, 0x8008 - setvar 0x800a, 250 - compare 0x4048, 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 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 10 - subvar 0x4048, 250 + setvar VAR_GLASS_WORKSHOP_STATE, 10 + subvar VAR_ASH_GATHER_COUNT, 250 goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_16369C:: @ 816369C - setvar 0x8008, 40 - bufferitemname 0, 0x8008 - setvar 0x800a, 500 - compare 0x4048, 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 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 11 - subvar 0x4048, 500 + setvar VAR_GLASS_WORKSHOP_STATE, 11 + subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 - setvar 0x8008, 41 - bufferitemname 0, 0x8008 - setvar 0x800a, 500 - compare 0x4048, 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 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 12 - subvar 0x4048, 500 + setvar VAR_GLASS_WORKSHOP_STATE, 12 + subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_163714:: @ 8163714 - setvar 0x8008, 43 - bufferitemname 0, 0x8008 - setvar 0x800a, 1000 - compare 0x4048, 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 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 13 - subvar 0x4048, 1000 + setvar VAR_GLASS_WORKSHOP_STATE, 13 + subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_163750:: @ 8163750 - setvar 0x8008, 42 - bufferitemname 0, 0x8008 - setvar 0x800a, 1000 - compare 0x4048, 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 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 14 - subvar 0x4048, 1000 + setvar VAR_GLASS_WORKSHOP_STATE, 14 + subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_16378C:: @ 816378C - setvar 0x8009, 1 - setvar 0x8008, 13 - bufferdecorationname 0, 0x8008 - setvar 0x800a, 6000 - compare 0x4048, 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 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 15 - subvar 0x4048, 6000 + setvar VAR_GLASS_WORKSHOP_STATE, 15 + subvar VAR_ASH_GATHER_COUNT, 6000 goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD - setvar 0x8009, 1 - setvar 0x8008, 6 - bufferdecorationname 0, 0x8008 - setvar 0x800a, 8000 - compare 0x4048, 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 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 16 - subvar 0x4048, 8000 + setvar VAR_GLASS_WORKSHOP_STATE, 16 + subvar VAR_ASH_GATHER_COUNT, 8000 goto Route113_GlassWorkshop_EventScript_163851 end @@ -172,15 +172,15 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E end Route113_GlassWorkshop_EventScript_163818:: @ 8163818 - setvar 0x800a, 250 - subvar 0x800a, 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 0x800a, 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 0x8009, 0 + compare VAR_SPECIAL_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare 0x8009, 1 + compare VAR_SPECIAL_9, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 - setvar 0x40be, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 release end Route113_GlassWorkshop_EventScript_163889:: @ 8163889 - giveitem_std 0x8008 + giveitem_std VAR_SPECIAL_8 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 - givedecoration_std 0x8008 + givedecoration_std VAR_SPECIAL_8 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -234,7 +234,7 @@ Route113_GlassWorkshop_EventScript_1638C3:: @ 81638C3 end Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 - switch 0x40be + switch VAR_GLASS_WORKSHOP_STATE case 10, Route113_GlassWorkshop_EventScript_163925 case 11, Route113_GlassWorkshop_EventScript_163939 case 12, Route113_GlassWorkshop_EventScript_16394D @@ -245,61 +245,61 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 end Route113_GlassWorkshop_EventScript_163925:: @ 8163925 - setvar 0x8009, 0 - setvar 0x8008, 39 - bufferitemname 0, 0x8008 + 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 0x8009, 0 - setvar 0x8008, 40 - bufferitemname 0, 0x8008 + 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 0x8009, 0 - setvar 0x8008, 41 - bufferitemname 0, 0x8008 + 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 0x8009, 0 - setvar 0x8008, 43 - bufferitemname 0, 0x8008 + 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 0x8009, 0 - setvar 0x8008, 42 - bufferitemname 0, 0x8008 + 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 0x8009, 1 - setvar 0x8008, 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 0x8009, 1 - setvar 0x8008, 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 0x8009, 0 + compare VAR_SPECIAL_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare 0x8009, 1 + compare VAR_SPECIAL_9, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 - setvar 0x40be, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 release end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 302c162b0..f6bb6d8ba 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -87,7 +87,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 @@ -100,7 +100,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 8e0eb7855..f16c2088a 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -15,7 +15,7 @@ Route115_EventScript_150940:: @ 8150940 Route115_EventScript_150949:: @ 8150949 trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150970 msgbox Route115_Text_1BCA0E, 6 @@ -33,7 +33,7 @@ Route115_EventScript_150987:: @ 8150987 Route115_EventScript_15099E:: @ 815099E trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_1509C5 msgbox Route115_Text_1BCBDE, 6 @@ -46,7 +46,7 @@ Route115_EventScript_1509C5:: @ 81509C5 Route115_EventScript_1509DC:: @ 81509DC trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 9aadedb32..4e08705cf 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -130,7 +130,7 @@ Route116_EventScript_150B5D:: @ 8150B5D lock faceplayer msgbox Route116_Text_17032A, 4 - setvar 0x406f, 2 + setvar VAR_ROUTE116_STATE, 2 release end @@ -140,7 +140,7 @@ Route116_EventScript_150B6E:: @ 8150B6E applymovement 255, Route116_Movement_1A083F waitmovement 0 msgbox Route116_Text_17032A, 4 - setvar 0x406f, 2 + setvar VAR_ROUTE116_STATE, 2 releaseall end @@ -150,7 +150,7 @@ Route116_EventScript_150B8F:: @ 8150B8F checkitem ITEM_BLACK_GLASSES, 1 compare RESULT, 1 goto_if_eq Route116_EventScript_150BCA - specialvar RESULT, sub_810F828 + specialvar RESULT, FoundBlackGlasses compare RESULT, 1 goto_if_eq Route116_EventScript_150BBB msgbox Route116_Text_1708EE, 4 @@ -166,7 +166,7 @@ Route116_EventScript_150BBB:: @ 8150BBB Route116_EventScript_150BCA:: @ 8150BCA msgbox Route116_Text_1708EE, 4 msgbox Route116_Text_170921, 4 - specialvar RESULT, sub_810F828 + specialvar RESULT, FoundBlackGlasses compare RESULT, 1 goto_if_eq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 @@ -240,7 +240,7 @@ Route116_EventScript_150C79:: @ 8150C79 Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150CB7 msgbox Route116_Text_1BD248, 6 @@ -263,7 +263,7 @@ Route116_EventScript_150CE5:: @ 8150CE5 Route116_EventScript_150CFC:: @ 8150CFC trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 44c4c156c..fa648f79e 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -40,7 +40,7 @@ Route117_EventScript_150D84:: @ 8150D84 Route117_EventScript_150D8D:: @ 8150D8D trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DB4 msgbox Route117_Text_1BD4F9, 6 @@ -53,7 +53,7 @@ Route117_EventScript_150DB4:: @ 8150DB4 Route117_EventScript_150DCB:: @ 8150DCB trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DF2 msgbox Route117_Text_1BD69B, 6 @@ -66,7 +66,7 @@ Route117_EventScript_150DF2:: @ 8150DF2 Route117_EventScript_150E09:: @ 8150E09 trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E30 msgbox Route117_Text_1BD7F5, 6 @@ -79,7 +79,7 @@ Route117_EventScript_150E30:: @ 8150E30 Route117_EventScript_150E47:: @ 8150E47 trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E6E msgbox Route117_Text_1BD98F, 6 @@ -97,7 +97,7 @@ Route117_EventScript_150E85:: @ 8150E85 Route117_EventScript_150E9C:: @ 8150E9C trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150EC7 msgbox Route117_Text_1BDC44, 6 @@ -110,7 +110,7 @@ Route117_EventScript_150EC7:: @ 8150EC7 Route117_EventScript_150EE2:: @ 8150EE2 trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index ca69e01c4..63decb5d6 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -50,7 +50,7 @@ Route118_EventScript_150FA5:: @ 8150FA5 Route118_EventScript_150FAE:: @ 8150FAE lockall - setvar 0x8008, 0 + setvar 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 0x8008, 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 0x8008, 2 + setvar VAR_SPECIAL_8, 2 applymovement 255, Route118_Movement_1A0841 waitmovement 0 applymovement 19, Route118_Movement_15106B @@ -83,13 +83,13 @@ Route118_EventScript_151004:: @ 8151004 delay 30 msgbox Route118_Text_170D66, 4 closemessage - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, Route118_EventScript_151048 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route118_EventScript_151053 - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route118_EventScript_15105E - setvar 0x4071, 1 + setvar VAR_ROUTE118_STATE, 1 removeobject 19 releaseall end @@ -161,7 +161,7 @@ Route118_Movement_151086:: @ 8151086 Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 @@ -184,7 +184,7 @@ Route118_EventScript_1510E4:: @ 81510E4 Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index aff1254a9..e82d7b313 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -9,9 +9,9 @@ Route119_MapScript1_151172:: @ 8151172 end Route119_EventScript_15117C:: @ 815117C - compare 0x8004, 6 + compare VAR_SPECIAL_4, 6 call_if 1, Route119_EventScript_151193 - compare 0x8004, 7 + compare VAR_SPECIAL_4, 7 call_if 1, Route119_EventScript_151197 return @@ -27,7 +27,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A014E call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 - compare 0x40b3, 1 + compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if 1, Route119_EventScript_1511B9 special SetRoute119Weather end @@ -35,16 +35,16 @@ Route119_MapScript1_15119B:: @ 815119B Route119_EventScript_1511B9:: @ 81511B9 setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F - setvar 0x40b3, 2 + setvar VAR_WEATHER_INSTITUTE_STATE, 2 return Route119_EventScript_1511C5:: @ 81511C5 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto Route119_EventScript_1511DB end Route119_EventScript_1511D0:: @ 81511D0 - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto Route119_EventScript_1511DB end @@ -57,16 +57,16 @@ Route119_EventScript_1511DB:: @ 81511DB compare RESULT, 1 call_if 1, Route119_EventScript_151259 delay 65 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513A6 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513B1 applymovement 255, Route119_Movement_1A0845 waitmovement 0 delay 30 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513D2 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513E1 removeobject 25 addobject 16 @@ -89,7 +89,7 @@ Route119_EventScript_151259:: @ 8151259 Route119_EventScript_15125E:: @ 815125E msgbox Route119_Text_1710BB, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route119_EventScript_15128D case 1, Route119_EventScript_15129D case 2, Route119_EventScript_1512AD @@ -119,7 +119,7 @@ Route119_EventScript_1512BD:: @ 81512BD Route119_EventScript_1512D8:: @ 81512D8 msgbox Route119_Text_171358, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route119_EventScript_151307 case 1, Route119_EventScript_151317 case 2, Route119_EventScript_151327 @@ -154,19 +154,19 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closemessage - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513D2 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513E1 removeobject 16 addobject 25 delay 30 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513BC - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513C7 removeobject 25 - setvar 0x4072, 1 + setvar VAR_ROUTE119_STATE, 1 savebgm 0 fadedefaultbgm releaseall @@ -296,7 +296,7 @@ Route119_EventScript_1514A8:: @ 81514A8 Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 @@ -309,7 +309,7 @@ Route119_EventScript_1514E6:: @ 81514E6 Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 3dc9672e3..8a5c1033f 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -4,7 +4,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 call Route119_WeatherInstitute_1F_EventScript_1A0196 - compare 0x40b3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41 end @@ -17,7 +17,7 @@ Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D lock faceplayer special GetPlayerBigGuyGirlString - compare 0x40b3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 goto_if_eq Route119_WeatherInstitute_1F_EventScript_163C67 msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 991725b8c..50f453465 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -4,9 +4,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 call Route119_WeatherInstitute_2F_EventScript_1A0196 - compare 0x40b3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4 - compare 0x40b3, 1 + compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0 end @@ -38,7 +38,7 @@ Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4 closemessage - setvar 0x40b3, 1 + setvar VAR_WEATHER_INSTITUTE_STATE, 1 clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F fadedefaultbgm fadescreen 1 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index cd84f95af..d2866cceb 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,17 +10,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare 0x8004, 0 + compare VAR_SPECIAL_4, 0 call_if 1, Route120_EventScript_15166B - compare 0x8004, 1 + compare VAR_SPECIAL_4, 1 call_if 1, Route120_EventScript_151672 - compare 0x8004, 2 + compare VAR_SPECIAL_4, 2 call_if 1, Route120_EventScript_151676 - compare 0x8004, 3 + compare VAR_SPECIAL_4, 3 call_if 1, Route120_EventScript_15167A - compare 0x8004, 4 + compare VAR_SPECIAL_4, 4 call_if 1, Route120_EventScript_15167E - compare 0x8004, 5 + compare VAR_SPECIAL_4, 5 call_if 1, Route120_EventScript_151682 return @@ -80,12 +80,12 @@ Route120_MapScript1_1516DF:: @ 81516DF end Route120_EventScript_1516EA:: @ 81516EA - getplayerxy 0x4000, 0x4001 - compare 0x4001, 14 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 14 goto_if 3, Route120_EventScript_151715 - compare 0x4001, 60 + compare VAR_TEMP_1, 60 goto_if 3, Route120_EventScript_151719 - compare 0x4001, 61 + compare VAR_TEMP_1, 61 goto_if 4, Route120_EventScript_151711 return @@ -98,9 +98,9 @@ Route120_EventScript_151715:: @ 8151715 return Route120_EventScript_151719:: @ 8151719 - compare 0x4000, 7 + compare VAR_TEMP_0, 7 goto_if 3, Route120_EventScript_151735 - compare 0x4000, 19 + compare VAR_TEMP_0, 19 goto_if 3, Route120_EventScript_151715 goto Route120_EventScript_151735 end @@ -135,32 +135,32 @@ Route120_EventScript_151739:: @ 8151739 end Route120_EventScript_1517DC:: @ 81517DC - setvar 0x8004, ITEM_FIGY_BERRY + setvar VAR_SPECIAL_4, ITEM_FIGY_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 - setvar 0x8004, ITEM_WIKI_BERRY + setvar VAR_SPECIAL_4, ITEM_WIKI_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 - setvar 0x8004, ITEM_MAGO_BERRY + setvar VAR_SPECIAL_4, ITEM_MAGO_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD - setvar 0x8004, ITEM_AGUAV_BERRY + setvar VAR_SPECIAL_4, ITEM_AGUAV_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 - setvar 0x8004, ITEM_IAPAPA_BERRY + setvar VAR_SPECIAL_4, ITEM_IAPAPA_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151813:: @ 8151813 - giveitem_std 0x8004 + 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 0x8004, 0 + setvar VAR_SPECIAL_4, 0 setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE @@ -292,7 +292,7 @@ Route120_EventScript_1519B3:: @ 81519B3 Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 @@ -315,7 +315,7 @@ Route120_EventScript_151A1F:: @ 8151A1F Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 39443d2f9..6108b129d 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -29,7 +29,7 @@ Route121_EventScript_151B25:: @ 8151B25 removeobject 12 removeobject 13 removeobject 14 - setvar 0x4074, 1 + setvar VAR_ROUTE121_STATE, 1 releaseall end @@ -73,7 +73,7 @@ Route121_EventScript_151B72:: @ 8151B72 Route121_EventScript_151B89:: @ 8151B89 trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151BB0 msgbox Route121_Text_1BFA9D, 6 @@ -101,7 +101,7 @@ Route121_EventScript_151BF9:: @ 8151BF9 Route121_EventScript_151C14:: @ 8151C14 trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 431444dae..6235e3b1c 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -3,7 +3,7 @@ Route121_SafariZoneEntrance_MapScripts:: @ 815C323 .byte 0 Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329 - map_script_2 0x40a4, 1, Route121_SafariZoneEntrance_EventScript_15C333 + map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_15C333 .2byte 0 Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333 @@ -11,7 +11,7 @@ Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333 applymovement 255, Route121_SafariZoneEntrance_Movement_15C348 waitmovement 0 special ExitSafariMode - setvar 0x40a4, 0 + setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end @@ -81,7 +81,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E waitmovement 0 special EnterSafariMode - setvar 0x40a4, 2 + setvar VAR_SAFARI_ZONE_STATE, 2 warp MAP_SAFARI_ZONE_SOUTHEAST, 255, 32, 33 waitstate end diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index adfebfe08..a25c306cc 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -62,7 +62,7 @@ Route123_EventScript_151CFF:: @ 8151CFF Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 @@ -75,7 +75,7 @@ Route123_EventScript_151D3D:: @ 8151D3D Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 6948bff87..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 0x8004, 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 0x8004, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 - compare 0x8004, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E - compare 0x8004, 2 + compare VAR_SPECIAL_4, 2 goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F - compare 0x8004, 3 + compare VAR_SPECIAL_4, 3 goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 - compare 0x8004, 4 + compare VAR_SPECIAL_4, 4 goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 - compare 0x8004, 5 + compare VAR_SPECIAL_4, 5 goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 3e062bfdc..289ea2d29 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -23,7 +23,7 @@ Route124_EventScript_151E0F:: @ 8151E0F Route124_EventScript_151E26:: @ 8151E26 trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151E4D msgbox Route124_Text_1C080E, 6 @@ -46,7 +46,7 @@ Route124_EventScript_151E7B:: @ 8151E7B Route124_EventScript_151E92:: @ 8151E92 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151EBD msgbox Route124_Text_1C0B72, 6 @@ -59,7 +59,7 @@ Route124_EventScript_151EBD:: @ 8151EBD Route124_EventScript_151ED8:: @ 8151ED8 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 4902d9f08..4061dcd7e 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -23,13 +23,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164329 goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 end Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 checkitem ITEM_RED_SHARD, 1 compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A @@ -45,19 +45,19 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 return Route124_DivingTreasureHuntersHouse_EventScript_163E8A:: @ 8163E8A - addvar 0x4001, 1 + addvar VAR_TEMP_1, 1 return Route124_DivingTreasureHuntersHouse_EventScript_163E90:: @ 8163E90 - addvar 0x4001, 2 + addvar VAR_TEMP_1, 2 return Route124_DivingTreasureHuntersHouse_EventScript_163E96:: @ 8163E96 - addvar 0x4001, 4 + addvar VAR_TEMP_1, 4 return Route124_DivingTreasureHuntersHouse_EventScript_163E9C:: @ 8163E9C - addvar 0x4001, 8 + addvar VAR_TEMP_1, 8 return Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2 @@ -68,7 +68,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2 Route124_DivingTreasureHuntersHouse_EventScript_163EB0:: @ 8163EB0 message Route124_DivingTreasureHuntersHouse_Text_19F5C5 waitmessage - switch 0x4001 + switch VAR_TEMP_1 case 1, Route124_DivingTreasureHuntersHouse_EventScript_163F61 case 2, Route124_DivingTreasureHuntersHouse_EventScript_163F87 case 3, Route124_DivingTreasureHuntersHouse_EventScript_163FAD @@ -224,46 +224,46 @@ Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F end Route124_DivingTreasureHuntersHouse_EventScript_164256:: @ 8164256 - setvar 0x8008, 48 - setvar 0x8009, 95 + setvar VAR_SPECIAL_8, 48 + setvar VAR_SPECIAL_9, 95 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 - setvar 0x8008, 50 - setvar 0x8009, 96 + setvar VAR_SPECIAL_8, 50 + setvar VAR_SPECIAL_9, 96 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 - setvar 0x8008, 49 - setvar 0x8009, 97 + setvar VAR_SPECIAL_8, 49 + setvar VAR_SPECIAL_9, 97 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 - setvar 0x8008, 51 - setvar 0x8009, 98 + setvar VAR_SPECIAL_8, 51 + setvar VAR_SPECIAL_9, 98 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - bufferitemname 0, 0x8008 - bufferitemname 1, 0x8009 + 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 0x8009, 1 + checkitemspace VAR_SPECIAL_9, 1 compare RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 - checkitem 0x8008, 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 0x8008, 1 - giveitem_std 0x8009 + takeitem VAR_SPECIAL_8, 1 + giveitem_std VAR_SPECIAL_9 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 compare RESULT, 1 diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index ea24434e2..58bf75c51 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -29,7 +29,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index a81e73c3e..a97a1e93f 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -10,7 +10,7 @@ Route128_MapScript1_152126:: @ 8152126 end Route128_MapScript2_152135:: @ 8152135 - map_script_2 0x407b, 1, Route128_EventScript_15213F + map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_15213F .2byte 0 Route128_EventScript_15213F:: @ 815213F @@ -82,7 +82,7 @@ Route128_EventScript_15213F:: @ 815213F delay 15 removeobject 3 waitfieldeffect 30 - setvar 0x407b, 2 + setvar VAR_ROUTE128_STATE, 2 releaseall end @@ -182,7 +182,7 @@ Route128_Movement_1522A1:: @ 81522A1 Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_1522CB msgbox Route128_Text_1C1CC3, 6 @@ -195,7 +195,7 @@ Route128_EventScript_1522CB:: @ 81522CB Route128_EventScript_1522E2:: @ 81522E2 trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index c45389b9f..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 0x8004, 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 0x8004, 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 0x8004, 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 0x8004, 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 0x8004, 4 + setvar VAR_SPECIAL_4, 4 goto RustboroCity_EventScript_14C4F4 end @@ -180,9 +180,9 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 setobjectxyperm 9, 30, 10 clearflag FLAG_HIDE_DEVON_RUSTBORO setflag FLAG_DEVON_GOODS_STOLEN - setvar 0x405a, 2 - setvar 0x409a, 2 - setvar 0x406f, 1 + setvar VAR_RUSTBORO_STATE, 2 + setvar VAR_RUSTURF_TUNNEL_STATE, 2 + setvar VAR_ROUTE116_STATE, 1 clearflag FLAG_HIDE_BRINEY_ROUTE116 clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL @@ -334,45 +334,45 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF RustboroCity_EventScript_14C614:: @ 814C614 waitse - setvar 0x4001, 4 + setvar VAR_TEMP_1, 4 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C620:: @ 814C620 lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C62C:: @ 814C62C lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C638:: @ 814C638 lockall - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C644:: @ 814C644 lockall - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C650:: @ 814C650 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, RustboroCity_EventScript_14C691 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RustboroCity_EventScript_14C6BD - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RustboroCity_EventScript_14C6E9 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_14C715 setflag FLAG_UNKNOWN_9F - setvar 0x405a, 3 + setvar VAR_RUSTBORO_STATE, 3 moveobjectoffscreen 9 msgbox RustboroCity_Text_166EA5, 4 releaseall @@ -434,38 +434,38 @@ RustboroCity_Movement_14C74B:: @ 814C74B RustboroCity_EventScript_14C74D:: @ 814C74D lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C759:: @ 814C759 lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C765:: @ 814C765 lockall - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C771:: @ 814C771 lockall - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C77D:: @ 814C77D - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, RustboroCity_EventScript_14C7FE - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RustboroCity_EventScript_14C82A - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RustboroCity_EventScript_14C856 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_14C882 - compare 0x4001, 4 + compare VAR_TEMP_1, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem_std ITEM_GREAT_BALL @@ -475,7 +475,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D closemessage setflag FLAG_RETURNED_DEVON_GOODS setflag FLAG_HIDE_DEVON_RUSTBORO - setvar 0x405a, 5 + setvar VAR_RUSTBORO_STATE, 5 delay 30 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 89d59258d..c997935cc 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -3,18 +3,18 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA .byte 0 RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC end RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC - setvar 0x40c4, 2 + setvar VAR_FOSSIL_RESURRECTION_STATE, 2 return RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 lock faceplayer - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 release @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 lock faceplayer - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag FLAG_MET_DEVON_EMPLOYEE goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 @@ -39,7 +39,7 @@ RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519 RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 lock faceplayer - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag FLAG_RECEIVED_POKENAV goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 @@ -55,7 +55,7 @@ RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543 RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D lock faceplayer - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 release @@ -64,9 +64,9 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 lock faceplayer - compare 0x40c4, 2 + compare VAR_FOSSIL_RESURRECTION_STATE, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4 checkitem ITEM_ROOT_FOSSIL, 1 @@ -91,8 +91,8 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 takeitem ITEM_ROOT_FOSSIL, 1 - setvar 0x40c4, 1 - setvar 0x40c5, 1 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 1 release end @@ -109,8 +109,8 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 takeitem ITEM_CLAW_FOSSIL, 1 - setvar 0x40c4, 1 - setvar 0x40c5, 2 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 2 release end @@ -125,9 +125,9 @@ RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640 end RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A - compare 0x40c5, 1 + compare VAR_WHICH_FOSSIL_REVIVED, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661 - compare 0x40c5, 2 + compare VAR_WHICH_FOSSIL_REVIVED, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4 end @@ -137,8 +137,8 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar 0x8004, RESULT - setvar 0x40c4, 0 + copyvar VAR_SPECIAL_4, RESULT + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E @@ -157,8 +157,8 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar 0x8004, RESULT - setvar 0x40c4, 0 + copyvar VAR_SPECIAL_4, RESULT + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index e2e70d4c0..af5d5d6ee 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 - compare 0x408f, 0 + compare VAR_DEVON_CORP_3F_STATE, 0 call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D end @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D return RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739 - map_script_2 0x408f, 0, RustboroCity_DevonCorp_3F_EventScript_157743 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157743 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 end RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 - map_script_2 0x408f, 0, RustboroCity_DevonCorp_3F_EventScript_157752 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157752 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 @@ -62,9 +62,9 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE - setvar 0x4096, 1 + setvar VAR_BRINEY_LOCATION, 1 clearflag FLAG_HIDE_RIVAL_RUSTBORO - setvar 0x408f, 1 + setvar VAR_DEVON_CORP_3F_STATE, 1 releaseall end diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 0dc403ec7..1e2256b47 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -16,11 +16,11 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE msgbox RustboroCity_Gym_Text_1840D5, 4 setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET - setvar 0x405a, 1 - addvar 0x4085, 1 - setvar 0x8008, 1 + setvar VAR_RUSTBORO_STATE, 1 + addvar VAR_PETALBURG_GYM_STATE, 1 + setvar VAR_SPECIAL_8, 1 call RustboroCity_Gym_EventScript_1A01C0 - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, RustboroCity_Gym_EventScript_1A00FB goto RustboroCity_Gym_EventScript_15793C end diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 0cad33204..2e0d106bb 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -6,27 +6,27 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D faceplayer checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED goto_if_eq RustboroCity_House1_EventScript_157D13 - setvar 0x8008, 0 - copyvar 0x8004, 0x8008 - specialvar RESULT, sub_804D89C - copyvar 0x8009, RESULT + setvar VAR_SPECIAL_8, 0 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + specialvar RESULT, GetInGameTradeSpeciesInfo + copyvar VAR_SPECIAL_9, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB - special sub_80F9A0C + special SelectMonForNPCTrade waitstate - copyvar 0x800a, 0x8004 - compare 0x8004, 255 + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB - copyvar 0x8005, 0x800a - specialvar RESULT, sub_804DB2C - copyvar 0x800b, RESULT - compare RESULT, 0x8009 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + specialvar RESULT, GetTradeSpecies + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 goto_if 5, RustboroCity_House1_EventScript_157D05 - copyvar 0x8004, 0x8008 - copyvar 0x8005, 0x800a - special sub_804DB68 - special sub_804E174 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate msgbox RustboroCity_House1_Text_184F6B, 4 setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED @@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - bufferspeciesname 0, 0x8009 + 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 a1c0ac31b..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 0x800b, 1 + setvar VAR_SPECIAL_B, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 64fce8118..d50e7cec0 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -4,13 +4,13 @@ RusturfTunnel_MapScripts:: @ 815C745 .byte 0 RusturfTunnel_MapScript2_15C750:: @ 815C750 - map_script_2 0x409a, 4, RusturfTunnel_EventScript_15C7D1 - map_script_2 0x409a, 5, RusturfTunnel_EventScript_15C7D1 + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_15C7D1 + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_15C7D1 .2byte 0 RusturfTunnel_MapScript1_15C762:: @ 815C762 call RusturfTunnel_EventScript_1A0196 - compare 0x409a, 2 + compare VAR_RUSTURF_TUNNEL_STATE, 2 call_if 1, RusturfTunnel_EventScript_15C773 end @@ -52,35 +52,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_15C8CA - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C8DF - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C8EB - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C8EB giveitem_std ITEM_HM04 setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_15C880 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C892 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closemessage - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_15C8F7 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C909 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall @@ -266,15 +266,15 @@ RusturfTunnel_Movement_15C994:: @ 815C994 step_end RusturfTunnel_EventScript_15C999:: @ 815C999 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 end RusturfTunnel_EventScript_15C99F:: @ 815C99F - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 end RusturfTunnel_EventScript_15C9A5:: @ 815C9A5 - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 end RusturfTunnel_EventScript_15C9AB:: @ 815C9AB @@ -286,7 +286,7 @@ RusturfTunnel_EventScript_15C9AB:: @ 815C9AB waitmovement 0 moveobjectoffscreen 6 moveobjectoffscreen 7 - setvar 0x409a, 3 + setvar VAR_RUSTURF_TUNNEL_STATE, 3 releaseall end @@ -343,8 +343,8 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA removeobject 7 clearflag FLAG_DEVON_GOODS_STOLEN setflag FLAG_RECOVERED_DEVON_GOODS - setvar 0x405a, 4 - setvar 0x4090, 1 + setvar VAR_RUSTBORO_STATE, 4 + setvar VAR_BRINEY_HOUSE_STATE, 1 setflag FLAG_HIDE_BRINEY_ROUTE116 release end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 8e9a404a2..fc018a7b9 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -3,15 +3,15 @@ SSTidalCorridor_MapScripts:: @ 815FC94 .byte 0 SSTidalCorridor_MapScript2_15FC9A:: @ 815FC9A - map_script_2 0x40b4, 1, SSTidalCorridor_EventScript_15FCBC - map_script_2 0x40b4, 5, SSTidalCorridor_EventScript_15FCD2 - map_script_2 0x40b4, 9, SSTidalCorridor_EventScript_15FD24 - map_script_2 0x40b4, 10, SSTidalCorridor_EventScript_15FD3A + map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_15FCBC + map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_15FCD2 + map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_15FD24 + map_script_2 VAR_PORTHOLE_STATE, 10, SSTidalCorridor_EventScript_15FD3A .2byte 0 SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC special SetSSTidalFlag - setvar 0x40b4, 2 + setvar VAR_PORTHOLE_STATE, 2 lockall playse 73 msgbox SSTidalCorridor_Text_199007, 4 @@ -19,7 +19,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC end SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 - setvar 0x40b4, 6 + setvar VAR_PORTHOLE_STATE, 6 lockall playse 73 msgbox SSTidalCorridor_Text_199088, 4 @@ -28,28 +28,28 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 special SetSSTidalFlag - setvar 0x40b4, 7 + setvar VAR_PORTHOLE_STATE, 7 playse 73 msgbox SSTidalRooms_Text_199007, 4 return SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 special ResetSSTidalFlag - setvar 0x40b4, 4 + setvar VAR_PORTHOLE_STATE, 4 playse 73 msgbox SSTidalRooms_Text_1990F8, 4 return gUnknown_0815FD0D:: @ 815FD0D - compare 0x40B4, 2 + compare VAR_PORTHOLE_STATE, 2 goto_if_eq SSTidalCorridor_EventScript_15FD24 - compare 0x40B4, 7 + compare VAR_PORTHOLE_STATE, 7 goto_if_eq SSTidalCorridor_EventScript_15FD3A end SSTidalCorridor_EventScript_15FD24:: @ 815FD24 special ResetSSTidalFlag - setvar 0x40b4, 3 + setvar VAR_PORTHOLE_STATE, 3 lockall playse 73 msgbox SSTidalCorridor_Text_199088, 4 @@ -58,7 +58,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24 SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A special ResetSSTidalFlag - setvar 0x40b4, 8 + setvar VAR_PORTHOLE_STATE, 8 lockall playse 73 msgbox SSTidalCorridor_Text_1990B4, 4 @@ -67,13 +67,13 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A SSTidalRooms_EventScript_15FD50:: @ 815FD50 special ResetSSTidalFlag - setvar 0x40b4, 8 + setvar VAR_PORTHOLE_STATE, 8 playse 73 msgbox SSTidalRooms_Text_1990B4, 4 return SSTidalRooms_EventScript_15FD64:: @ 815FD64 - switch 0x40b4 + switch VAR_PORTHOLE_STATE case 2, SSTidalRooms_EventScript_15FCF9 case 3, SSTidalRooms_EventScript_15FCF9 case 6, SSTidalRooms_EventScript_15FCE5 @@ -113,9 +113,9 @@ SSTidalCorridor_EventScript_15FDCD:: @ 815FDCD SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 lock faceplayer - compare 0x40b4, 4 + compare VAR_PORTHOLE_STATE, 4 goto_if_eq SSTidalCorridor_EventScript_15FDF8 - compare 0x40b4, 8 + compare VAR_PORTHOLE_STATE, 8 goto_if_eq SSTidalCorridor_EventScript_15FE17 msgbox SSTidalCorridor_Text_19913B, 4 release @@ -147,9 +147,9 @@ SSTidalCorridor_EventScript_15FE36:: @ 815FE36 SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A lockall - compare 0x40b4, 2 + compare VAR_PORTHOLE_STATE, 2 goto_if_eq SSTidalCorridor_EventScript_15FE5B - compare 0x40b4, 7 + compare VAR_PORTHOLE_STATE, 7 goto_if_eq SSTidalCorridor_EventScript_15FE5B msgbox SSTidalCorridor_Text_199268, 4 releaseall diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 6d31cf981..2dbd716cb 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -4,23 +4,23 @@ SafariZone_Southeast_MapScripts:: @ 8160036 .byte 0 SafariZone_Southeast_MapScript2_160041:: @ 8160041 - map_script_2 0x40a4, 2, SafariZone_Southeast_EventScript_16004B + map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_Southeast_EventScript_16004B .2byte 0 SafariZone_Southeast_EventScript_16004B:: @ 816004B lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 applymovement 255, SafariZone_Southeast_Movement_160087 waitmovement 0 applymovement 1, SafariZone_Southeast_Movement_160089 waitmovement 0 setobjectxyperm 1, 32, 34 - setvar 0x40a4, 0 + setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end SafariZone_Southeast_MapScript1_160073:: @ 8160073 - compare 0x40a4, 2 + compare VAR_SAFARI_ZONE_STATE, 2 call_if 1, SafariZone_Southeast_EventScript_16007F end @@ -52,7 +52,7 @@ SafariZone_Southeast_EventScript_16009E:: @ 816009E SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 lock faceplayer - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if_eq SafariZone_Southeast_EventScript_1600D1 msgbox SafariZone_Southeast_Text_1C3A56, 5 compare RESULT, 1 @@ -62,7 +62,7 @@ SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 end SafariZone_Southeast_EventScript_1600D1:: @ 81600D1 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 msgbox SafariZone_Southeast_Text_1C3B2D, 4 release end @@ -92,7 +92,7 @@ SafariZone_Southeast_EventScript_16011F:: @ 816011F end SafariZone_Southeast_EventScript_160139:: @ 8160139 - setvar 0x40a4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index b31e8fc25..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 0x8004, 2 - setvar 0x8005, 3 - setvar 0x8006, 4 - setvar 0x8007, 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 0x8004 + addobject VAR_SPECIAL_4 applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 - applymovement 0x8004, 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 0x8004, 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 0x8004, 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 0x8004, 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 0x8004, 1 - setvar 0x8005, 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 0x8004, 2 - setvar 0x8005, 2 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 2 special sub_810F758 waitstate delay 30 - setvar 0x8004, 2 - setvar 0x8005, 3 - setvar 0x8006, 4 - setvar 0x8007, 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 0x8004, 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 0x8004, 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 0x8005 - addobject 0x8006 - addobject 0x8007 - applymovement 0x8007, SeafloorCavern_Room9_Movement_15DD63 - applymovement 0x8006, SeafloorCavern_Room9_Movement_15DD63 - applymovement 0x8005, 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 0x8004, 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 0x8004, SeafloorCavern_Room9_Movement_1A0833 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0833 waitmovement 0 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0835 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0835 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4723, 4 @@ -183,28 +183,28 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4E37, 4 .endif closemessage - applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD60 - applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD46 + applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD60 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD46 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4818, 4 .else msgbox SeafloorCavern_Room9_Text_1B4ECA, 4 .endif - setvar 0x407b, 1 + setvar VAR_ROUTE128_STATE, 1 clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS - setvar 0x405e, 1 + setvar VAR_SOOTOPOLIS_STATE, 1 clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128 clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128 setflag FLAG_SYS_WEATHER_CTRL setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE - setvar 0x40c6, 1 - setvar 0x40a2, 1 + setvar VAR_STEVENS_HOUSE_STATE, 1 + setvar VAR_SEAFLOOR_CAVERN_STATE, 1 setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/scripts/maps/SecretBase_YellowCave4.inc index f72c3d76e..bb673b7b6 100644 --- a/data/scripts/maps/SecretBase_YellowCave4.inc +++ b/data/scripts/maps/SecretBase_YellowCave4.inc @@ -19,5 +19,5 @@ SecretBase_RedCave1_MapScript2_15F358:: @ 815F358 .2byte 0 SecretBase_RedCave1_MapScript2_15F362:: @ 815F362 - map_script_2 0x4097, 0, SecretBase_RedCave1_EventScript_1A2DDE + map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_1A2DDE .2byte 0 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 56fc0e59b..4079763a3 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -4,21 +4,21 @@ SlateportCity_MapScripts:: @ 814BA36 SlateportCity_MapScript1_14BA3C:: @ 814BA3C .ifdef SAPPHIRE - setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M .else - setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif - setvar 0x40aa, 0 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_14BA5C - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BA68 end SlateportCity_EventScript_14BA5C:: @ 814BA5C setflag FLAG_VISITED_SLATEPORT_CITY - setvar 0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT return @@ -95,7 +95,7 @@ SlateportCity_EventScript_14BB35:: @ 814BB35 SlateportCity_EventScript_14BB3F:: @ 814BB3F lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BB56 msgbox SlateportCity_Text_164814, 4 release @@ -109,7 +109,7 @@ SlateportCity_EventScript_14BB56:: @ 814BB56 SlateportCity_EventScript_14BB60:: @ 814BB60 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BB77 msgbox SlateportCity_Text_1648A0, 4 release @@ -123,7 +123,7 @@ SlateportCity_EventScript_14BB77:: @ 814BB77 SlateportCity_EventScript_14BB81:: @ 814BB81 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BBA1 checkflag FLAG_RECEIVED_SECRET_POWER goto_if_eq SlateportCity_EventScript_14BBAB @@ -144,7 +144,7 @@ SlateportCity_EventScript_14BBAB:: @ 814BBAB SlateportCity_EventScript_14BBB5:: @ 814BBB5 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BBCC msgbox SlateportCity_Text_164A30, 4 release @@ -156,7 +156,7 @@ SlateportCity_EventScript_14BBCC:: @ 814BBCC end SlateportCity_EventScript_14BBD6:: @ 814BBD6 - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 goto_if_eq SlateportCity_EventScript_14BBEA msgbox SlateportCity_Text_164AA9, 2 end @@ -168,7 +168,7 @@ SlateportCity_EventScript_14BBEA:: @ 814BBEA SlateportCity_EventScript_14BBF3:: @ 814BBF3 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BC0A msgbox SlateportCity_Text_164B34, 4 release @@ -253,7 +253,7 @@ SlateportCity_EventScript_14BCAF:: @ 814BCAF SlateportCity_EventScript_14BCB8:: @ 814BCB8 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BCCF msgbox SlateportCity_Text_164F9E, 4 release @@ -537,7 +537,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR - setvar 0x4058, 2 + setvar VAR_SLATEPORT_STATE, 2 warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate releaseall diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index c4a44d9c9..2fd62e9af 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -7,13 +7,13 @@ SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417 end SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D - setvar 0x800b, 7 + setvar VAR_SPECIAL_B, 7 setvar CONTEST_RANK, 2 call SlateportCity_ContestLobby_EventScript_1A4E92 call SlateportCity_ContestLobby_EventScript_155448 - special sub_80C4BF0 + special SetContestTrainerGfxIds call SlateportCity_ContestLobby_EventScript_15FBDB - setvar 0x4088, 3 + setvar VAR_CONTEST_LOCATION, 3 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 304013b08..72f2d0382 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -4,8 +4,8 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 - setvar 0x4001, 0 - compare 0x40a0, 1 + setvar VAR_TEMP_1, 0 + compare VAR_SLATEPORT_HARBOR_STATE, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 checkflag FLAG_SYS_GAME_CLEAR call_if 1, SlateportCity_Harbor_EventScript_155F85 @@ -24,25 +24,25 @@ SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B lockall - setvar 0x8008, 0 + setvar VAR_SPECIAL_8, 0 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7 lockall - setvar 0x8008, 1 + setvar VAR_SPECIAL_8, 1 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 lockall - setvar 0x8008, 2 + setvar VAR_SPECIAL_8, 2 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF lockall - setvar 0x8008, 3 + setvar VAR_SPECIAL_8, 3 applymovement 255, SlateportCity_Harbor_Movement_1560C2 waitmovement 0 goto SlateportCity_Harbor_EventScript_155FD5 @@ -62,14 +62,14 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 removeobject 6 removeobject 7 removeobject 8 - setvar 0x40a0, 2 - compare 0x8008, 0 + setvar VAR_SLATEPORT_HARBOR_STATE, 2 + compare VAR_SPECIAL_8, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, SlateportCity_Harbor_EventScript_156071 - compare 0x8008, 2 + compare VAR_SPECIAL_8, 2 call_if 1, SlateportCity_Harbor_EventScript_156086 - compare 0x8008, 3 + compare VAR_SPECIAL_8, 3 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage @@ -193,7 +193,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F msgbox SlateportCity_Harbor_Text_17FB81, 5 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A - setvar 0x40b4, 1 + setvar VAR_PORTHOLE_STATE, 1 call SlateportCity_Harbor_EventScript_156196 warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate @@ -229,7 +229,7 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar 0x8004, 5 + setvar VAR_SPECIAL_4, 5 call SlateportCity_Harbor_EventScript_1A040E return @@ -274,7 +274,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_156265 checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq SlateportCity_Harbor_EventScript_156258 - compare 0x40a0, 2 + compare VAR_SLATEPORT_HARBOR_STATE, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 closemessage @@ -300,7 +300,7 @@ SlateportCity_Harbor_EventScript_156265:: @ 8156265 end SlateportCity_Harbor_EventScript_15626F:: @ 815626F - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq SlateportCity_Harbor_EventScript_156380 checkitem ITEM_SCANNER, 1 compare RESULT, 1 @@ -369,7 +369,7 @@ SlateportCity_Harbor_EventScript_156374:: @ 8156374 end SlateportCity_Harbor_EventScript_156380:: @ 8156380 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 msgbox SlateportCity_Harbor_Text_180491, 4 release end diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index c72aa229a..aa1157d7e 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -13,11 +13,11 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate - compare 0x8004, 255 + compare VAR_SPECIAL_4, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 - compare 0x8004, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -30,12 +30,12 @@ SlateportCity_House1_EventScript_1556C9:: @ 81556C9 specialvar RESULT, ScriptGetPartyMonSpecies compare RESULT, SPECIES_EGG goto_if_eq SlateportCity_House1_EventScript_15571C - special sub_80BFAE0 - special sub_80BFB10 + special TV_CopyNicknameToStringVar1AndEnsureTerminated + special TV_CheckMonOTIDEqualsPlayerID compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 - specialvar RESULT, sub_810F96C - special sub_80BFAE0 + specialvar RESULT, MonOTNameMatchesPlayer + special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 msgbox SlateportCity_House1_Text_17D505, 5 @@ -58,8 +58,8 @@ SlateportCity_House1_EventScript_155726:: @ 8155726 SlateportCity_House1_EventScript_155730:: @ 8155730 msgbox SlateportCity_House1_Text_17D580, 4 call SlateportCity_House1_EventScript_1A0678 - specialvar RESULT, sub_80BF9B4 - special sub_80BFAE0 + specialvar RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged + special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 9e002e61e..abbe3f78f 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -4,11 +4,11 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 .ifdef SAPPHIRE - setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M .else - setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif end @@ -51,7 +51,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D updatemoneybox 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 4 - setvar 0x40aa, 1 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox 0, 0 releaseall end @@ -69,7 +69,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E22D, 4 - setvar 0x40aa, 1 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox 0, 0 releaseall end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 7fcd0fff1..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 0x8004, 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 ac4e8f240..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 0x800b, 1 + setvar VAR_SPECIAL_B, 1 call SlateportCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 593e18fee..6e7d2614b 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonFanClub_MapScript1_15576A:: @ 815576A SlateportCity_PokemonFanClub_EventScript_15576B:: @ 815576B lock faceplayer - switch 0x40b7 + switch VAR_SLATEPORT_FAN_CLUB_STATE case 0, SlateportCity_PokemonFanClub_EventScript_155795 case 1, SlateportCity_PokemonFanClub_EventScript_1557A8 case 2, SlateportCity_PokemonFanClub_EventScript_1557FE @@ -16,13 +16,13 @@ SlateportCity_PokemonFanClub_EventScript_15576B:: @ 815576B end SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 - setvar 0x40b7, 1 + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1 msgbox SlateportCity_PokemonFanClub_Text_17D773, 4 goto SlateportCity_PokemonFanClub_EventScript_155808 end SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 - setvar 0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag FLAG_RECEIVED_GREEN_SCARF @@ -33,9 +33,9 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag FLAG_RECEIVED_RED_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - compare 0x4002, 5 + compare VAR_TEMP_2, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D - compare 0x40b7, 2 + compare VAR_SLATEPORT_FAN_CLUB_STATE, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 goto SlateportCity_PokemonFanClub_EventScript_155808 @@ -48,7 +48,7 @@ SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE checkflag FLAG_RECEIVED_GREEN_SCARF @@ -60,7 +60,7 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 checkflag FLAG_RECEIVED_RED_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 bufferleadmonspeciesname 0 - switch 0x4001 + switch VAR_TEMP_1 case 0, SlateportCity_PokemonFanClub_EventScript_155899 case 1, SlateportCity_PokemonFanClub_EventScript_1558A3 case 2, SlateportCity_PokemonFanClub_EventScript_1558D4 @@ -71,11 +71,11 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 end SlateportCity_PokemonFanClub_EventScript_15588D:: @ 815588D - setvar 0x40b7, 2 + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2 return SlateportCity_PokemonFanClub_EventScript_155893:: @ 8155893 - addvar 0x4002, 1 + addvar VAR_TEMP_2, 1 return SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 @@ -150,7 +150,7 @@ SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 return SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 return SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 @@ -160,7 +160,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 return SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 return SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 @@ -170,7 +170,7 @@ SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 return SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 return SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 @@ -180,7 +180,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 return SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 - setvar 0x4001, 4 + setvar VAR_TEMP_1, 4 return SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE @@ -190,7 +190,7 @@ SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE return SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F - setvar 0x4001, 5 + setvar VAR_TEMP_1, 5 return SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index f4842bd40..e29700981 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -45,7 +45,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123 call SootopolisCity_EventScript_1A02C1 setobjectxyperm 1, 29, 19 setobjectxyperm 2, 33, 19 - compare 0x405e, 1 + compare VAR_SOOTOPOLIS_STATE, 1 call_if 1, SootopolisCity_EventScript_14D142 return @@ -288,7 +288,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 setobjectmovementtype 5, 9 moveobjectoffscreen 10 setobjectmovementtype 10, 10 - setvar 0x405e, 2 + setvar VAR_SOOTOPOLIS_STATE, 2 releaseall end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 65ed13d87..38514b03b 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -6,7 +6,7 @@ SootopolisCity_Gym_1F_MapScripts:: @ 815AF07 .byte 0 SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C - setvar 0x4022, 1 + setvar VAR_ICE_STEP_COUNT, 1 end SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 @@ -15,15 +15,15 @@ SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 call SootopolisCity_Gym_1F_EventScript_15AF2E - special sub_8069D78 + special SetSootopolisGymCrackedIceMetatiles end SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E - compare 0x4022, 8 + compare VAR_ICE_STEP_COUNT, 8 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85 - compare 0x4022, 28 + compare VAR_ICE_STEP_COUNT, 28 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 - compare 0x4022, 69 + compare VAR_ICE_STEP_COUNT, 69 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 setmetatile 8, 4, 519, 0 setmetatile 8, 5, 519, 0 @@ -40,14 +40,14 @@ SootopolisCity_Gym_1F_EventScript_15AF85:: @ 815AF85 return SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86 - map_script_2 0x4022, 8, SootopolisCity_Gym_1F_EventScript_15AFA8 - map_script_2 0x4022, 28, SootopolisCity_Gym_1F_EventScript_15AFBC - map_script_2 0x4022, 69, SootopolisCity_Gym_1F_EventScript_15AFD0 - map_script_2 0x4022, 0, SootopolisCity_Gym_1F_EventScript_15AFE4 + map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_15AFA8 + map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_15AFBC + map_script_2 VAR_ICE_STEP_COUNT, 69, SootopolisCity_Gym_1F_EventScript_15AFD0 + map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_15AFE4 .2byte 0 SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 - addvar 0x4022, 1 + addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E @@ -55,7 +55,7 @@ SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 end SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC - addvar 0x4022, 1 + addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E @@ -63,7 +63,7 @@ SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC end SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 - addvar 0x4022, 1 + addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E @@ -102,7 +102,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET - setvar 0x8008, 8 + setvar 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 bdff79375..91dd3490b 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -6,9 +6,9 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 lock faceplayer msgbox SootopolisCity_House8_Text_1900F7, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate - copyvar RESULT, 0x8004 + copyvar RESULT, VAR_SPECIAL_4 compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize @@ -55,9 +55,9 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 lock faceplayer msgbox SootopolisCity_House8_Text_190431, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate - copyvar RESULT, 0x8004 + 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 7b87bc7fc..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 0x800B, 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 f62becf08..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 0x8004, 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 ea2f852f4..cbc451a18 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -14,9 +14,9 @@ SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C .ifdef SAPPHIRE - setvar 0x4011, 188 + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIOS .else - setvar 0x4011, 187 + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIAS .endif call SouthernIsland_Interior_EventScript_160B77 end @@ -30,16 +30,16 @@ SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 end SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F - setvar 0x4010, 100 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL return SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 - setvar 0x4010, 105 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL return SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B lockall - setvar 0x8008, 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 cb5c713ee..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 0x8004, 0x8005 - compare 0x8004, 12 + getplayerxy VAR_SPECIAL_4, VAR_SPECIAL_5 + compare VAR_SPECIAL_4, 12 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 - compare 0x8005, 44 + compare VAR_SPECIAL_5, 44 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 1e0f14728..e2afd07dc 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -7,7 +7,7 @@ UnknownMap_25_34_MapScripts:: @ 815F580 LinkContestRoom1_MapScript1_15F595:: @ 815F595 call LinkContestRoom1_EventScript_15F5A5 - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 call LinkContestRoom1_EventScript_15F630 end @@ -46,7 +46,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, LinkContestRoom1_EventScript_15F600 end @@ -55,11 +55,11 @@ LinkContestRoom1_EventScript_15F600:: @ 815F600 return LinkContestRoom1_MapScript2_15F606:: @ 815F606 - map_script_2 0x4086, 1, LinkContestRoom1_EventScript_15F61A + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F61A .2byte 0 LinkContestRoom1_MapScript2_15F610:: @ 815F610 - map_script_2 0x4086, 1, LinkContestRoom1_EventScript_15F625 + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F625 .2byte 0 LinkContestRoom1_EventScript_15F61A:: @ 815F61A @@ -75,12 +75,12 @@ LinkContestRoom1_EventScript_15F625:: @ 815F625 LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 - compare 0x4000, 8 + compare VAR_TEMP_0, 8 goto_if 0, LinkContestRoom1_EventScript_15F630 return LinkContestRoom1_EventScript_15F646:: @ 815F646 - switch 0x4000 + switch VAR_TEMP_0 case 1, LinkContestRoom1_EventScript_15F699 case 2, LinkContestRoom1_EventScript_15F6A4 case 3, LinkContestRoom1_EventScript_15F6AF @@ -91,38 +91,38 @@ LinkContestRoom1_EventScript_15F646:: @ 815F646 end LinkContestRoom1_EventScript_15F699:: @ 815F699 - copyvar 0x4014, 0x4001 - addvar 0x4000, 1 + copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6A4:: @ 815F6A4 - copyvar 0x4015, 0x4001 - addvar 0x4000, 1 + copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6AF:: @ 815F6AF - copyvar 0x4016, 0x4001 - addvar 0x4000, 1 + copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6BA:: @ 815F6BA - copyvar 0x4017, 0x4001 - addvar 0x4000, 1 + copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6C5:: @ 815F6C5 - copyvar 0x4018, 0x4001 - addvar 0x4000, 1 + copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6D0:: @ 815F6D0 - copyvar 0x4019, 0x4001 - addvar 0x4000, 1 + copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB - copyvar 0x401a, 0x4001 - addvar 0x4000, 1 + copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6 @@ -165,135 +165,135 @@ LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6 end LinkContestRoom1_EventScript_15F859:: @ 815F859 - setvar 0x4001, 5 + setvar VAR_TEMP_1, 5 return LinkContestRoom1_EventScript_15F85F:: @ 815F85F - setvar 0x4001, 6 + setvar VAR_TEMP_1, 6 return LinkContestRoom1_EventScript_15F865:: @ 815F865 - setvar 0x4001, 7 + setvar VAR_TEMP_1, 7 return LinkContestRoom1_EventScript_15F86B:: @ 815F86B - setvar 0x4001, 8 + setvar VAR_TEMP_1, 8 return LinkContestRoom1_EventScript_15F871:: @ 815F871 - setvar 0x4001, 10 + setvar VAR_TEMP_1, 10 return LinkContestRoom1_EventScript_15F877:: @ 815F877 - setvar 0x4001, 11 + setvar VAR_TEMP_1, 11 return LinkContestRoom1_EventScript_15F87D:: @ 815F87D - setvar 0x4001, 12 + setvar VAR_TEMP_1, 12 return LinkContestRoom1_EventScript_15F883:: @ 815F883 - setvar 0x4001, 13 + setvar VAR_TEMP_1, 13 return LinkContestRoom1_EventScript_15F889:: @ 815F889 - setvar 0x4001, 14 + setvar VAR_TEMP_1, 14 return LinkContestRoom1_EventScript_15F88F:: @ 815F88F - setvar 0x4001, 15 + setvar VAR_TEMP_1, 15 return LinkContestRoom1_EventScript_15F895:: @ 815F895 - setvar 0x4001, 17 + setvar VAR_TEMP_1, 17 return LinkContestRoom1_EventScript_15F89B:: @ 815F89B - setvar 0x4001, 18 + setvar VAR_TEMP_1, 18 return LinkContestRoom1_EventScript_15F8A1:: @ 815F8A1 - setvar 0x4001, 19 + setvar VAR_TEMP_1, 19 return LinkContestRoom1_EventScript_15F8A7:: @ 815F8A7 - setvar 0x4001, 20 + setvar VAR_TEMP_1, 20 return LinkContestRoom1_EventScript_15F8AD:: @ 815F8AD - setvar 0x4001, 21 + setvar VAR_TEMP_1, 21 return LinkContestRoom1_EventScript_15F8B3:: @ 815F8B3 - setvar 0x4001, 22 + setvar VAR_TEMP_1, 22 return LinkContestRoom1_EventScript_15F8B9:: @ 815F8B9 - setvar 0x4001, 25 + setvar VAR_TEMP_1, 25 return LinkContestRoom1_EventScript_15F8BF:: @ 815F8BF - setvar 0x4001, 26 + setvar VAR_TEMP_1, 26 return LinkContestRoom1_EventScript_15F8C5:: @ 815F8C5 - setvar 0x4001, 27 + setvar VAR_TEMP_1, 27 return LinkContestRoom1_EventScript_15F8CB:: @ 815F8CB - setvar 0x4001, 47 + setvar VAR_TEMP_1, 47 return LinkContestRoom1_EventScript_15F8D1:: @ 815F8D1 - setvar 0x4001, 30 + setvar VAR_TEMP_1, 30 return LinkContestRoom1_EventScript_15F8D7:: @ 815F8D7 - setvar 0x4001, 31 + setvar VAR_TEMP_1, 31 return LinkContestRoom1_EventScript_15F8DD:: @ 815F8DD - setvar 0x4001, 32 + setvar VAR_TEMP_1, 32 return LinkContestRoom1_EventScript_15F8E3:: @ 815F8E3 - setvar 0x4001, 33 + setvar VAR_TEMP_1, 33 return LinkContestRoom1_EventScript_15F8E9:: @ 815F8E9 - setvar 0x4001, 34 + setvar VAR_TEMP_1, 34 return LinkContestRoom1_EventScript_15F8EF:: @ 815F8EF - setvar 0x4001, 35 + setvar VAR_TEMP_1, 35 return LinkContestRoom1_EventScript_15F8F5:: @ 815F8F5 - setvar 0x4001, 36 + setvar VAR_TEMP_1, 36 return LinkContestRoom1_EventScript_15F8FB:: @ 815F8FB - setvar 0x4001, 37 + setvar VAR_TEMP_1, 37 return LinkContestRoom1_EventScript_15F901:: @ 815F901 - setvar 0x4001, 38 + setvar VAR_TEMP_1, 38 return LinkContestRoom1_EventScript_15F907:: @ 815F907 - setvar 0x4001, 44 + setvar VAR_TEMP_1, 44 return LinkContestRoom1_EventScript_15F90D:: @ 815F90D - setvar 0x4001, 45 + setvar VAR_TEMP_1, 45 return LinkContestRoom1_EventScript_15F913:: @ 815F913 - setvar 0x4001, 46 + setvar VAR_TEMP_1, 46 return LinkContestRoom1_EventScript_15F919:: @ 815F919 - switch 0x4088 + switch VAR_CONTEST_LOCATION case 1, LinkContestRoom1_EventScript_15F956 case 2, LinkContestRoom1_EventScript_15F969 case 3, LinkContestRoom1_EventScript_15F9C4 @@ -372,7 +372,7 @@ LinkContestRoom1_EventScript_15FA70:: @ 815FA70 return LinkContestRoom1_EventScript_15FB64:: @ 815FB64 - switch 0x4088 + switch VAR_CONTEST_LOCATION case 1, LinkContestRoom1_EventScript_15FBA1 case 2, LinkContestRoom1_EventScript_15FBAD case 3, LinkContestRoom1_EventScript_15FBB9 @@ -421,9 +421,9 @@ VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB return FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3 - setvar 0x4013, 100 + setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL return FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9 - setvar 0x4013, 105 + setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_NORMAL return diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index b9e9b85a5..ca2a3c245 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -4,7 +4,7 @@ VerdanturfTown_MapScripts:: @ 814E854 VerdanturfTown_MapScript1_14E85A:: @ 814E85A setflag FLAG_VISITED_VERDANTURF_TOWN - setvar 0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 3694f089d..016b2e7ba 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -7,13 +7,13 @@ VerdanturfTown_ContestLobby_MapScript1_153D70:: @ 8153D70 end VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 - setvar 0x800b, 5 + setvar VAR_SPECIAL_B, 5 setvar CONTEST_RANK, 0 call VerdanturfTown_ContestLobby_EventScript_1A4E92 call VerdanturfTown_ContestLobby_EventScript_153DA1 - special sub_80C4BF0 + special SetContestTrainerGfxIds call VerdanturfTown_ContestLobby_EventScript_15FBDB - setvar 0x4088, 1 + setvar VAR_CONTEST_LOCATION, 1 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc index 598c3f60b..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 0x800b, 1 + setvar VAR_SPECIAL_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 7e48d3d90..ed0440343 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -44,7 +44,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD moveobjectoffscreen 4 setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - setvar 0x40c3, 1 + setvar VAR_VICTORY_ROAD_1F_STATE, 1 releaseall end @@ -93,7 +93,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 3ccfbeb29..58dacb2f3 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -26,7 +26,7 @@ SpeakToBard: end yes_hear_song: - setvar 0x8004, 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 0x8004, 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 0x8004, 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 0x8004, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq cancelled_get_menu - compare 0x8004, 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 0x8006, 0 + compare VAR_SPECIAL_6, 0 goto_if_eq cancelled_give_menu - compare 0x8006, 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 0x8008, 0 - setvar 0x8009, 0 - setvar 0x800a, 0 - setvar 0x800b, 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 0x8008, 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 0x8008, 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 d8f628709..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 0x8004, 0 + setvar VAR_SPECIAL_4, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare 0x8004, 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 0x8004, 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 0x8004, 0 + setvar VAR_SPECIAL_4, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare 0x8004, 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 ea8128ee3..d93ff7660 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -1,22 +1,22 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6950:: @ 81B6950 LittlerootTown_MaysHouse_2F_EventScript_1B6950:: @ 81B6950 - setvar 0x4092, 5 + setvar VAR_LITTLEROOT_INTRO_STATE, 5 return LittlerootTown_BrendansHouse_1F_EventScript_1B6956:: @ 81B6956 LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 - applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 - compare 0x8005, 0 + compare VAR_SPECIAL_5, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F - compare 0x8005, 1 + compare VAR_SPECIAL_5, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 closemessage - setvar 0x4092, 4 + setvar VAR_LITTLEROOT_INTRO_STATE, 4 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 - applymovement 0x8004, 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 0x8004, 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 0x8004, 0 + setvar VAR_SPECIAL_4, 0 goto LittlerootTown_BrendansHouse_2F_EventScript_1B69EB end LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF lockall - setvar 0x8004, 1 + setvar VAR_SPECIAL_4, 1 goto LittlerootTown_MaysHouse_2F_EventScript_1B69EB end @@ -64,7 +64,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, 4 call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B delay 30 - setvar 0x4092, 6 + setvar VAR_LITTLEROOT_INTRO_STATE, 6 setflag FLAG_SET_WALL_CLOCK setflag FLAG_HIDE_MACHOKE_MOVER_1 setflag FLAG_HIDE_MACHOKE_MOVER_2 @@ -74,33 +74,33 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 playse 9 - removeobject 0x8008 + removeobject VAR_SPECIAL_8 releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 - setvar 0x8008, 14 - addobject 0x8008 - applymovement 0x8008, 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 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 + applymovement VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 - setvar 0x8008, 14 - addobject 0x8008 - applymovement 0x8008, 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 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 + applymovement VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 waitmovement 0 return @@ -150,12 +150,12 @@ LittlerootTown_BrendansHouse_2F_Movement_1B6AB4:: @ 81B6AB4 LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 - setvar 0x4092, 7 + setvar VAR_LITTLEROOT_INTRO_STATE, 7 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF - applymovement 0x8005, 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 0x8005, 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 @@ -173,14 +173,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, 4 msgbox LittlerootTown_BrendansHouse_1F_Text_172644, 4 closemessage - setvar 0x4001, 1 - applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 + setvar VAR_TEMP_1, 1 + 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 0x8005, 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 0x8005, 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 @@ -198,8 +198,8 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, 4 msgbox LittlerootTown_MaysHouse_1F_Text_172644, 4 closemessage - setvar 0x4001, 1 - applymovement 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 + setvar VAR_TEMP_1, 1 + 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 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 - applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, 4 closemessage @@ -252,17 +252,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 lock faceplayer - compare 0x4082, 4 + compare VAR_LITTLEROOT_HOUSES_STATE, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 - compare 0x408c, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 checkflag FLAG_BADGE05_GET goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 - compare 0x4092, 7 + compare VAR_LITTLEROOT_INTRO_STATE, 7 goto_if 4, LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 release @@ -366,85 +366,85 @@ 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 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 playse 21 - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 delay 20 - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD - compare 0x8008, 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 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4 closemessage - compare 0x8008, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 - compare 0x8008, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playse 8 - removeobject 0x8009 + removeobject VAR_SPECIAL_9 setflag FLAG_RECEIVED_SS_TICKET - setvar 0x4082, 4 - setvar 0x408c, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD:: @ 81B6DAD - setvar 0x8008, 0 - setvar 0x8009, 5 - setvar 0x800a, 1 + setvar VAR_SPECIAL_8, 0 + setvar VAR_SPECIAL_9, 5 + setvar VAR_SPECIAL_A, 1 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD:: @ 81B6DBD - setvar 0x8008, 1 - setvar 0x8009, 5 - setvar 0x800a, 1 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 5 + setvar VAR_SPECIAL_A, 1 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD:: @ 81B6DCD - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E33 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E33 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8:: @ 81B6DD8 - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E36 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E36 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3:: @ 81B6DE3 - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E39 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E39 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE:: @ 81B6DEE - applymovement 0x8009, 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 0x8009, 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 0x8009, 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 42e73e17c..eb12ab148 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -1,34 +1,34 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 - setvar 0x8008, 4 - setvar 0x8009, 1 - applymovement 0x8008, 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 0x8008, 2 - setvar 0x8009, 2 + setvar VAR_SPECIAL_8, 2 + setvar VAR_SPECIAL_9, 2 applymovement 6, SlateportCity_ContestLobby_Movement_1A083D - applymovement 0x8008, 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 0x8008, 2 - setvar 0x8009, 1 - applymovement 0x8008, 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 0x8008, 3 - setvar 0x8009, 3 + setvar VAR_SPECIAL_8, 3 + setvar VAR_SPECIAL_9, 3 applymovement 9, LilycoveCity_ContestLobby_Movement_1A083D applymovement 10, LilycoveCity_ContestLobby_Movement_1A083D - applymovement 0x8008, LilycoveCity_ContestLobby_Movement_1B7821 + applymovement VAR_SPECIAL_8, LilycoveCity_ContestLobby_Movement_1B7821 waitmovement 0 goto LilycoveCity_ContestLobby_EventScript_1B7681 end @@ -53,7 +53,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 - specialvar RESULT, sub_810CA00 + specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF compare RESULT, 65535 @@ -92,9 +92,9 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 end FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 - copyvar 0x8004, 0x8009 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_9 fadescreen 1 - special sub_804E538 + special DoBerryBlending waitstate releaseall end @@ -122,22 +122,22 @@ FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780 end FallarborTown_ContestLobby_EventScript_1B778A:: @ 81B778A - setvar 0x8008, 4 + setvar VAR_SPECIAL_8, 4 goto FallarborTown_ContestLobby_EventScript_1B77B6 end SlateportCity_ContestLobby_EventScript_1B7795:: @ 81B7795 - setvar 0x8008, 2 + setvar VAR_SPECIAL_8, 2 goto SlateportCity_ContestLobby_EventScript_1B77B6 end VerdanturfTown_ContestLobby_EventScript_1B77A0:: @ 81B77A0 - setvar 0x8008, 2 + setvar VAR_SPECIAL_8, 2 goto VerdanturfTown_ContestLobby_EventScript_1B77B6 end LilycoveCity_ContestLobby_EventScript_1B77AB:: @ 81B77AB - setvar 0x8008, 3 + setvar VAR_SPECIAL_8, 3 goto LilycoveCity_ContestLobby_EventScript_1B77B6 end @@ -214,7 +214,7 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B checkitem ITEM_POKEBLOCK_CASE, 1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 - specialvar RESULT, sub_810CA00 + specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 compare RESULT, 65535 @@ -270,13 +270,13 @@ FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F end FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D - setvar 0x8004, 0 + setvar VAR_SPECIAL_4, 0 fadescreen 1 removeobject 240 removeobject 239 removeobject 238 removeobject 237 - special sub_804E538 + special DoBerryBlending waitstate releaseall end @@ -322,15 +322,15 @@ FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973 FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 fadescreen 1 specialvar RESULT, GetLinkPartnerNames - copyvar 0x8008, RESULT - copyvar 0x8004, 0x8008 + 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 0x8008 + 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/safari_zone.inc b/data/scripts/safari_zone.inc index 892630ac8..5dba65b8a 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,11 +1,11 @@ gUnknown_081C340A:: @ 81C340A - setvar 0x40a4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end EventScript_1C341B: @ 81C341B - setvar 0x40a4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate @@ -53,7 +53,7 @@ gUnknown_081C346A:: @ 81C346A EventScript_1C348E: fadescreen 1 - special sub_810BAF4 + special OpenPokeblockCaseOnFeeder waitstate compare RESULT, 0xFFFF goto_if 5, EventScript_1C34A0 diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index cf5fb26c5..cf82cf943 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -1,7 +1,7 @@ Event_TV:: @ 81A6E72 lockall incrementgamestat GAME_STAT_WATCHED_TV - special sub_80C2014 + special ResetTVShowState specialvar RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare RESULT, 2 goto_if_eq EventScript_1A6F01 @@ -18,14 +18,14 @@ Event_TV:: @ 81A6E72 end EventScript_1A6EBB: - specialvar 0x8004, special_0x44 - compare 0x8004, 255 + specialvar VAR_SPECIAL_4, special_0x44 + compare VAR_SPECIAL_4, 255 goto_if_eq EventScript_1A6F3F - specialvar RESULT, special_0x4a + specialvar RESULT, GetNonMassOutbreakActiveTVShow compare RESULT, 255 goto_if_eq EventScript_1A6F3F - copyvar 0x8004, RESULT - specialvar RESULT, sub_80BDA0C + copyvar VAR_SPECIAL_4, RESULT + specialvar RESULT, GetTVShowType compare RESULT, 0 goto_if 5, EventScript_1A6F21 end @@ -77,7 +77,7 @@ EventScript_1A6F3F: end EventScript_1A6F50: - special sub_80BECE8 + special DoPokeNews compare RESULT, 0 goto_if_eq EventScript_1A6EBB waitmessage |