diff options
138 files changed, 909 insertions, 821 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index fcab8dc1d..51f05a0db 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1302,7 +1302,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL clearflag FLAG_HIDE_STEVENS_LETTER - setvar 0x40c6, 1 + setvar VAR_STEVENS_HOUSE_STATE, 1 clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR @@ -1326,8 +1326,8 @@ EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E return EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62 - setvar 0x4082, 3 - setvar 0x408c, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 clearflag FLAG_HIDE_NORMAN_LITTLEROOT return @@ -1347,15 +1347,15 @@ EventScript_19FC84: checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if 0, Route101_EventScript_1A14DC clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1 - setvar 0x4053, 2 + setvar VAR_LAVARIDGE_RIVAL_STATE, 2 return gUnknown_0819FC9F:: @ 819FC9F - compare 0x4096, 1 + compare VAR_BRINEY_LOCATION, 1 goto_if_eq EventScript_19FCC1 - compare 0x4096, 2 + compare VAR_BRINEY_LOCATION, 2 goto_if_eq EventScript_19FCD7 - compare 0x4096, 3 + compare VAR_BRINEY_LOCATION, 3 goto_if_eq EventScript_19FCF0 end @@ -1396,7 +1396,7 @@ EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09 clearflag FLAG_DEFEATED_ELITE_4_PHOEBE clearflag FLAG_DEFEATED_ELITE_4_GLACIA clearflag FLAG_DEFEATED_ELITE_4_DRAKE - setvar 0x409c, 0 + setvar VAR_ELITE_4_STATE, 0 return DewfordTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B @@ -1421,15 +1421,15 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B return OldaleTown_PokemonCenter_1F_EventScript_19FD49:: @ 819FD49 - setvar 0x4096, 1 + setvar VAR_BRINEY_LOCATION, 1 return OldaleTown_PokemonCenter_1F_EventScript_19FD4F:: @ 819FD4F - setvar 0x4096, 2 + setvar VAR_BRINEY_LOCATION, 2 return OldaleTown_PokemonCenter_1F_EventScript_19FD55:: @ 819FD55 - setvar 0x4096, 3 + setvar VAR_BRINEY_LOCATION, 3 return DewfordTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B @@ -1821,8 +1821,8 @@ DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 DewfordTown_EventScript_1A010C:: @ 81A010C Route104_MrBrineysHouse_EventScript_1A010C:: @ 81A010C Route109_EventScript_1A010C:: @ 81A010C - copyvar 0x8008, 0x4096 - setvar 0x4096, 0 + copyvar 0x8008, VAR_BRINEY_LOCATION + setvar VAR_BRINEY_LOCATION, 0 return UseSurfScript:: @ 81A0117 @@ -2152,23 +2152,23 @@ Route109_EventScript_1A02EF:: @ 81A02EF LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4:: @ 81A02F4 Route101_EventScript_1A02F4:: @ 81A02F4 Route103_EventScript_1A02F4:: @ 81A02F4 - compare 0x4085, 0 + compare VAR_PETALBURG_GYM_STATE, 0 goto_if_eq Route101_EventScript_1A14DC - compare 0x4049, 0 + compare VAR_BIRCH_STATE, 0 call_if 1, Route101_EventScript_1A0358 - compare 0x4049, 1 + compare VAR_BIRCH_STATE, 1 call_if 1, Route101_EventScript_1A0358 - compare 0x4049, 2 + compare VAR_BIRCH_STATE, 2 call_if 1, Route101_EventScript_1A0365 - compare 0x4049, 3 + compare VAR_BIRCH_STATE, 3 call_if 1, Route101_EventScript_1A0365 - compare 0x4049, 4 + compare VAR_BIRCH_STATE, 4 call_if 1, Route101_EventScript_1A0372 - compare 0x4049, 5 + compare VAR_BIRCH_STATE, 5 call_if 1, Route101_EventScript_1A0372 - compare 0x4049, 6 + compare VAR_BIRCH_STATE, 6 call_if 1, Route101_EventScript_1A0358 - compare 0x4049, 7 + compare VAR_BIRCH_STATE, 7 call_if 1, Route101_EventScript_1A0358 return @@ -2266,7 +2266,7 @@ PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE - setvar 0x4096, 0 + setvar VAR_BRINEY_LOCATION, 0 return RusturfTunnel_EventScript_1A0442:: @ 81A0442 @@ -2274,7 +2274,7 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442 removeobject 10 clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE clearflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE - setvar 0x409a, 6 + setvar VAR_RUSTURF_TUNNEL_STATE, 6 setflag FLAG_RUSTURF_TUNNEL_OPENED return @@ -3743,21 +3743,21 @@ EventScript_1A2DAA: EventScript_1A2DB8: closemessage playse 9 - setvar 0x4097, 0 + setvar VAR_0x4097, 0 setflag FLAG_DECORATION_1 special sub_80BB8CC special sub_80BBAF0 setvar 0x8004, 0 setvar 0x8005, 0 special sub_80BBDD0 - setvar 0x4089, 1 + setvar VAR_0x4089, 1 waitstate end SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE applymovement 255, SecretBase_RedCave1_Movement_1A2E11 waitmovement 0 - setvar 0x4097, 1 + setvar VAR_0x4097, 1 msgbox SecretBase_RedCave1_Text_198F89, 5 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 @@ -3780,21 +3780,21 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 gUnknown_081A2E14:: @ 81A2E14 lockall - setvar 0x4097, 1 + setvar VAR_0x4097, 1 playse 9 special sub_80BC114 compare RESULT, 0 goto_if_eq EventScript_1A2E38 clearflag FLAG_DECORATION_1 special sub_80BBAF0 - setvar 0x4089, 0 + setvar VAR_0x4089, 0 waitstate end EventScript_1A2E38: setflag FLAG_DECORATION_1 special sub_80BBAF0 - setvar 0x4089, 0 + setvar VAR_0x4089, 0 waitstate end @@ -3884,7 +3884,7 @@ SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68 setvar 0x8004, 0 setvar 0x8005, 0 special sub_80BBDD0 - setvar 0x4089, 1 + setvar VAR_0x4089, 1 end gUnknown_081A2F7B:: @ 81A2F7B @@ -4660,13 +4660,13 @@ FallarborTown_ContestLobby_EventScript_1AE188:: @ 81AE188 LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 - compare 0x4086, 2 + compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar 0x8005, 6 special sub_80BF2C4 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE - switch 0x4088 + switch VAR_CONTEST_LOCATION case 0, FallarborTown_ContestLobby_EventScript_1AE1FE case 2, FallarborTown_ContestLobby_EventScript_1AE1EE case 1, FallarborTown_ContestLobby_EventScript_1AE1F2 @@ -4766,7 +4766,7 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3 end BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED - compare 0x40bc, 0 + compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F setvar 0x8005, 7 special sub_80BF2C4 @@ -4900,14 +4900,14 @@ GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5 SkyPillar_2F_MapScript2_1C6BB5:: @ 81C6BB5 SkyPillar_4F_MapScript2_1C6BB5:: @ 81C6BB5 - map_script_2 0x4022, 0, S_FallDownHole + map_script_2 VAR_ICE_STEP_COUNT, 0, S_FallDownHole .2byte 0 GraniteCave_B1F_MapScript1_1C6BBF:: @ 81C6BBF MtPyre_2F_MapScript1_1C6BBF:: @ 81C6BBF SkyPillar_2F_MapScript1_1C6BBF:: @ 81C6BBF SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF - copyvar 0x4022, 0x1 + copyvar VAR_ICE_STEP_COUNT, 0x1 end S_FallDownHole:: @ 81C6BC5 diff --git a/data/event_scripts.s b/data/event_scripts.s index d66ec1eb3..5677d2470 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1297,7 +1297,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL clearflag FLAG_HIDE_STEVENS_LETTER - setvar 0x40c6, 1 + setvar VAR_STEVENS_HOUSE_STATE, 1 clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR @@ -1321,8 +1321,8 @@ EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E return EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62 - setvar 0x4082, 3 - setvar 0x408c, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 clearflag FLAG_HIDE_NORMAN_LITTLEROOT return @@ -1342,15 +1342,15 @@ EventScript_19FC84: checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if 0, Route101_EventScript_1A14DC clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1 - setvar 0x4053, 2 + setvar VAR_LAVARIDGE_RIVAL_STATE, 2 return gUnknown_0819FC9F:: @ 819FC9F - compare 0x4096, 1 + compare VAR_BRINEY_LOCATION, 1 goto_if_eq EventScript_19FCC1 - compare 0x4096, 2 + compare VAR_BRINEY_LOCATION, 2 goto_if_eq EventScript_19FCD7 - compare 0x4096, 3 + compare VAR_BRINEY_LOCATION, 3 goto_if_eq EventScript_19FCF0 end @@ -1391,7 +1391,7 @@ EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09 clearflag FLAG_DEFEATED_ELITE_4_PHOEBE clearflag FLAG_DEFEATED_ELITE_4_GLACIA clearflag FLAG_DEFEATED_ELITE_4_DRAKE - setvar 0x409c, 0 + setvar VAR_ELITE_4_STATE, 0 return DewfordTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B @@ -1416,15 +1416,15 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B return OldaleTown_PokemonCenter_1F_EventScript_19FD49:: @ 819FD49 - setvar 0x4096, 1 + setvar VAR_BRINEY_LOCATION, 1 return OldaleTown_PokemonCenter_1F_EventScript_19FD4F:: @ 819FD4F - setvar 0x4096, 2 + setvar VAR_BRINEY_LOCATION, 2 return OldaleTown_PokemonCenter_1F_EventScript_19FD55:: @ 819FD55 - setvar 0x4096, 3 + setvar VAR_BRINEY_LOCATION, 3 return DewfordTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B @@ -1816,8 +1816,8 @@ DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 DewfordTown_EventScript_1A010C:: @ 81A010C Route104_MrBrineysHouse_EventScript_1A010C:: @ 81A010C Route109_EventScript_1A010C:: @ 81A010C - copyvar 0x8008, 0x4096 - setvar 0x4096, 0 + copyvar 0x8008, VAR_BRINEY_LOCATION + setvar VAR_BRINEY_LOCATION, 0 return UseSurfScript:: @ 81A0117 @@ -2147,23 +2147,23 @@ Route109_EventScript_1A02EF:: @ 81A02EF LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4:: @ 81A02F4 Route101_EventScript_1A02F4:: @ 81A02F4 Route103_EventScript_1A02F4:: @ 81A02F4 - compare 0x4085, 0 + compare VAR_PETALBURG_GYM_STATE, 0 goto_if_eq Route101_EventScript_1A14DC - compare 0x4049, 0 + compare VAR_BIRCH_STATE, 0 call_if 1, Route101_EventScript_1A0358 - compare 0x4049, 1 + compare VAR_BIRCH_STATE, 1 call_if 1, Route101_EventScript_1A0358 - compare 0x4049, 2 + compare VAR_BIRCH_STATE, 2 call_if 1, Route101_EventScript_1A0365 - compare 0x4049, 3 + compare VAR_BIRCH_STATE, 3 call_if 1, Route101_EventScript_1A0365 - compare 0x4049, 4 + compare VAR_BIRCH_STATE, 4 call_if 1, Route101_EventScript_1A0372 - compare 0x4049, 5 + compare VAR_BIRCH_STATE, 5 call_if 1, Route101_EventScript_1A0372 - compare 0x4049, 6 + compare VAR_BIRCH_STATE, 6 call_if 1, Route101_EventScript_1A0358 - compare 0x4049, 7 + compare VAR_BIRCH_STATE, 7 call_if 1, Route101_EventScript_1A0358 return @@ -2261,7 +2261,7 @@ PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE - setvar 0x4096, 0 + setvar VAR_BRINEY_LOCATION, 0 return RusturfTunnel_EventScript_1A0442:: @ 81A0442 @@ -2269,7 +2269,7 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442 removeobject 10 clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE clearflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE - setvar 0x409a, 6 + setvar VAR_RUSTURF_TUNNEL_STATE, 6 setflag FLAG_RUSTURF_TUNNEL_OPENED return @@ -3723,21 +3723,21 @@ EventScript_1A2DAA: EventScript_1A2DB8: closemessage playse 9 - setvar 0x4097, 0 + setvar VAR_0x4097, 0 setflag FLAG_DECORATION_1 special sub_80BB8CC special sub_80BBAF0 setvar 0x8004, 0 setvar 0x8005, 0 special sub_80BBDD0 - setvar 0x4089, 1 + setvar VAR_0x4089, 1 waitstate end SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE applymovement 255, SecretBase_RedCave1_Movement_1A2E11 waitmovement 0 - setvar 0x4097, 1 + setvar VAR_0x4097, 1 msgbox SecretBase_RedCave1_Text_198F89, 5 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 @@ -3760,21 +3760,21 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 gUnknown_081A2E14:: @ 81A2E14 lockall - setvar 0x4097, 1 + setvar VAR_0x4097, 1 playse 9 special sub_80BC114 compare RESULT, 0 goto_if_eq EventScript_1A2E38 clearflag FLAG_DECORATION_1 special sub_80BBAF0 - setvar 0x4089, 0 + setvar VAR_0x4089, 0 waitstate end EventScript_1A2E38: setflag FLAG_DECORATION_1 special sub_80BBAF0 - setvar 0x4089, 0 + setvar VAR_0x4089, 0 waitstate end @@ -3864,7 +3864,7 @@ SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68 setvar 0x8004, 0 setvar 0x8005, 0 special sub_80BBDD0 - setvar 0x4089, 1 + setvar VAR_0x4089, 1 end gUnknown_081A2F7B:: @ 81A2F7B @@ -4629,13 +4629,13 @@ FallarborTown_ContestLobby_EventScript_1AE188:: @ 81AE188 LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 - compare 0x4086, 2 + compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar 0x8005, 6 special sub_80BF2C4 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE - switch 0x4088 + switch VAR_CONTEST_LOCATION case 0, FallarborTown_ContestLobby_EventScript_1AE1FE case 2, FallarborTown_ContestLobby_EventScript_1AE1EE case 1, FallarborTown_ContestLobby_EventScript_1AE1F2 @@ -4735,7 +4735,7 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3 end BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED - compare 0x40bc, 0 + compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F setvar 0x8005, 7 special sub_80BF2C4 @@ -4869,14 +4869,14 @@ GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5 SkyPillar_2F_MapScript2_1C6BB5:: @ 81C6BB5 SkyPillar_4F_MapScript2_1C6BB5:: @ 81C6BB5 - map_script_2 0x4022, 0, S_FallDownHole + map_script_2 VAR_ICE_STEP_COUNT, 0, S_FallDownHole .2byte 0 GraniteCave_B1F_MapScript1_1C6BBF:: @ 81C6BBF MtPyre_2F_MapScript1_1C6BBF:: @ 81C6BBF SkyPillar_2F_MapScript1_1C6BBF:: @ 81C6BBF SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF - copyvar 0x4022, 0x1 + copyvar VAR_ICE_STEP_COUNT, 0x1 end S_FallDownHole:: @ 81C6BC5 diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc index 9b1dfea01..ad2217b46 100644 --- a/data/maps/events/CaveOfOrigin_B4F.inc +++ b/data/maps/events/CaveOfOrigin_B4F.inc @@ -5,7 +5,7 @@ CaveOfOrigin_B4F_MapWarps:: @ 838D898 warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 - coord_event 9, 13, 3, 0, 0x409b, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 + coord_event 9, 13, 3, 0, VAR_CAVE_OF_ORIGIN_B4F_STATE, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 coord_event 13, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 coord_event 5, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc index 3b177129a..d89f267e3 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -9,9 +9,9 @@ InsideOfTruck_MapWarps:: @ 8391660 warp_def 4, 3, 0, 127, MAP_NONE InsideOfTruck_MapCoordEvents:: @ 8391678 - coord_event 3, 1, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 - coord_event 3, 2, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 - coord_event 3, 3, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 1, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 2, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 3, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 InsideOfTruck_MapBGEvents:: @ 83916A8 bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index 23debe434..c2842c68e 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -12,15 +12,15 @@ LittlerootTown_MapWarps:: @ 838098C warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB LittlerootTown_MapCoordEvents:: @ 83809A4 - coord_event 10, 1, 3, 0, 0x4050, 0, 0, LittlerootTown_EventScript_14D739 - coord_event 11, 1, 3, 0, 0x4050, 0, 0, LittlerootTown_EventScript_14D797 - coord_event 11, 1, 3, 0, 0x4050, 1, 0, LittlerootTown_EventScript_14D7C7 - coord_event 8, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D89E - coord_event 9, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D8AA - coord_event 10, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D886 - coord_event 11, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D892 - coord_event 10, 2, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D860 - coord_event 11, 2, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D873 + coord_event 10, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D739 + coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D797 + coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 1, 0, LittlerootTown_EventScript_14D7C7 + coord_event 8, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D89E + coord_event 9, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D8AA + coord_event 10, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D886 + coord_event 11, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D892 + coord_event 10, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D860 + coord_event 11, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D873 LittlerootTown_MapBGEvents:: @ 8380A34 bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_14D7F6 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index bb3d3b195..58c8f8993 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -11,7 +11,7 @@ LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704 - coord_event 8, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789 + coord_event 8, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789 LittlerootTown_BrendansHouse_1F_MapEvents:: @ 8385714 map_events LittlerootTown_BrendansHouse_1F_MapObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index 27a0efbed..cbeccb348 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -11,7 +11,7 @@ LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954 - coord_event 2, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35 + coord_event 2, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35 LittlerootTown_MaysHouse_1F_MapEvents:: @ 8385964 map_events LittlerootTown_MaysHouse_1F_MapObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc index e34cb92e8..17efa037a 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -18,7 +18,7 @@ MeteorFalls_1F_1R_MapWarps:: @ 838BBBC warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4 - coord_event 14, 18, 4, 0, 0x40bf, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C + coord_event 14, 18, 4, 0, VAR_METEOR_FALLS_STATE, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4 bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_1R_EventScript_14E842 diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index d0e3ce713..3aaf21244 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -12,12 +12,12 @@ MtPyre_Summit_MapWarps:: @ 838CC68 warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR MtPyre_Summit_MapCoordEvents:: @ 838CC80 - coord_event 22, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4BD - coord_event 23, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4C9 - coord_event 24, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4D5 - coord_event 22, 7, 3, 0, 0x40b9, 2, 0, MtPyre_Summit_EventScript_15D6CE - coord_event 23, 7, 3, 0, 0x40b9, 2, 0, MtPyre_Summit_EventScript_15D6DA - coord_event 24, 7, 3, 0, 0x40b9, 2, 0, MtPyre_Summit_EventScript_15D6E6 + coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4BD + coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4C9 + coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4D5 + coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6CE + coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6DA + coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6E6 MtPyre_Summit_MapBGEvents:: @ 838CCE0 bg_event 9, 25, 0, 7, 0, ITEM_ZINC, 79, 0 diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/events/NewMauville_Entrance.inc index 65405fbe7..8967a1df0 100644 --- a/data/maps/events/NewMauville_Entrance.inc +++ b/data/maps/events/NewMauville_Entrance.inc @@ -3,7 +3,7 @@ NewMauville_Entrance_MapWarps:: @ 838DED4 warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE NewMauville_Entrance_MapCoordEvents:: @ 838DEE4 - coord_event 4, 2, 3, 0, 0x40ba, 0, 0, NewMauville_Entrance_EventScript_15E4DC + coord_event 4, 2, 3, 0, VAR_NEW_MAUVILLE_STATE, 0, 0, NewMauville_Entrance_EventScript_15E4DC NewMauville_Entrance_MapEvents:: @ 838DEF4 map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index cb7420edc..c88c554c6 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -21,7 +21,7 @@ NewMauville_Inside_MapCoordEvents:: @ 838DFD0 coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 33, 6, 3, 0, 0x40ba, 1, 0, NewMauville_Inside_EventScript_15E876 + coord_event 33, 6, 3, 0, VAR_NEW_MAUVILLE_STATE, 1, 0, NewMauville_Inside_EventScript_15E876 NewMauville_Inside_MapBGEvents:: @ 838E070 bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc index 8a41c1bf7..cad717a21 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -11,10 +11,10 @@ OldaleTown_MapWarps:: @ 8380AD8 warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART OldaleTown_MapCoordEvents:: @ 8380AF8 - coord_event 0, 10, 3, 0, 0x4051, 0, 0, OldaleTown_EventScript_14DEFF - coord_event 8, 19, 3, 0, 0x40c7, 1, 0, OldaleTown_EventScript_14DF41 - coord_event 9, 19, 3, 0, 0x40c7, 1, 0, OldaleTown_EventScript_14DF5C - coord_event 10, 19, 3, 0, 0x40c7, 1, 0, OldaleTown_EventScript_14DF77 + coord_event 0, 10, 3, 0, VAR_ROUTE102_ACCESSIBLE, 0, 0, OldaleTown_EventScript_14DEFF + coord_event 8, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF41 + coord_event 9, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF5C + coord_event 10, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF77 OldaleTown_MapBGEvents:: @ 8380B38 bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_14DDAA diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index 739cbf905..4b169abac 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -18,10 +18,10 @@ PetalburgCity_MapWarps:: @ 837F6C8 warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART PetalburgCity_MapCoordEvents:: @ 837F6F8 - coord_event 8, 10, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B836 - coord_event 8, 11, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B842 - coord_event 8, 12, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B84E - coord_event 8, 13, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B85A + coord_event 8, 10, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B836 + coord_event 8, 11, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B842 + coord_event 8, 12, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B84E + coord_event 8, 13, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B85A PetalburgCity_MapBGEvents:: @ 837F738 bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_14B812 diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index 0a1230a37..4094fc103 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -22,8 +22,8 @@ PetalburgWoods_MapWarps:: @ 838C284 warp_def 37, 38, 0, 7, MAP_ROUTE104 PetalburgWoods_MapCoordEvents:: @ 838C2B4 - coord_event 26, 23, 3, 0, 0x4098, 0, 0, PetalburgWoods_EventScript_15CCA8 - coord_event 27, 23, 3, 0, 0x4098, 0, 0, PetalburgWoods_EventScript_15CD42 + coord_event 26, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CCA8 + coord_event 27, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CD42 PetalburgWoods_MapBGEvents:: @ 838C2D4 bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_15CF15 diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc index a527ada51..b19dc1cf0 100644 --- a/data/maps/events/Route101.inc +++ b/data/maps/events/Route101.inc @@ -7,15 +7,15 @@ Route101_MapObjects:: @ 83810BC object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101, 0, 0 Route101_MapCoordEvents:: @ 838114C - coord_event 10, 19, 3, 0, 0x4060, 1, 0, Route101_EventScript_14E948 - coord_event 11, 19, 3, 0, 0x4060, 1, 0, Route101_EventScript_14E948 - coord_event 10, 18, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9B8 - coord_event 11, 18, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9B8 - coord_event 6, 16, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 15, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 17, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 18, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE - coord_event 7, 13, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9E4 + coord_event 10, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 + coord_event 11, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 + coord_event 10, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 + coord_event 11, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 + coord_event 6, 16, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE + coord_event 6, 15, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE + coord_event 6, 17, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE + coord_event 6, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE + coord_event 7, 13, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9E4 Route101_MapBGEvents:: @ 83811DC bg_event 5, 9, 0, 0, 0, Route101_EventScript_14EA76 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 2f21186f4..278fee52b 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -40,11 +40,11 @@ Route110_MapWarps:: @ 8382040 warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE Route110_MapCoordEvents:: @ 8382070 - coord_event 28, 92, 3, 0, 0x40a9, 2, 0, Route110_EventScript_14FC27 - coord_event 29, 92, 3, 0, 0x40a9, 2, 0, Route110_EventScript_14FC27 - coord_event 33, 56, 3, 0, 0x4069, 0, 0, Route110_EventScript_14FD13 - coord_event 34, 56, 3, 0, 0x4069, 0, 0, Route110_EventScript_14FD1E - coord_event 35, 56, 3, 0, 0x4069, 0, 0, Route110_EventScript_14FD29 + coord_event 28, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 + coord_event 29, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 + coord_event 33, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD13 + coord_event 34, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD1E + coord_event 35, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD29 Route110_MapBGEvents:: @ 83820C0 bg_event 15, 25, 0, 0, 0, Route110_EventScript_14F9EF diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc index 9f6e305cc..903d893c3 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -7,10 +7,10 @@ Route110_TrickHouseEntrance_MapWarps:: @ 8392158 warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 Route110_TrickHouseEntrance_MapCoordEvents:: @ 8392170 - coord_event 4, 7, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 5, 6, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 6, 6, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 7, 7, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 4, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 5, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 6, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 7, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0 bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_16158A diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index 77262f4c1..3b1858f33 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -28,7 +28,7 @@ Route116_MapWarps:: @ 8383380 warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL Route116_MapCoordEvents:: @ 8383398 - coord_event 47, 9, 3, 0, 0x406f, 1, 0, Route116_EventScript_150B6E + coord_event 47, 9, 3, 0, VAR_ROUTE116_STATE, 1, 0, Route116_EventScript_150B6E Route116_MapBGEvents:: @ 83833A8 bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index 2faff5e7d..154b96b75 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -21,9 +21,9 @@ Route118_MapObjects:: @ 8383684 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1, 0, 0 Route118_MapCoordEvents:: @ 8383864 - coord_event 43, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FAE - coord_event 44, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FCE - coord_event 45, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FE4 + coord_event 43, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FAE + coord_event 44, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FCE + coord_event 45, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FE4 Route118_MapBGEvents:: @ 8383894 bg_event 47, 14, 0, 8, 0, ITEM_MASTER_BALL, 0, 0 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 4db19c38a..ae3cdce20 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -42,8 +42,8 @@ Route119_MapWarps:: @ 8383C8C warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE Route119_MapCoordEvents:: @ 8383C9C - coord_event 25, 31, 0, 0, 0x4072, 0, 0, Route119_EventScript_1511C5 - coord_event 26, 31, 0, 0, 0x4072, 0, 0, Route119_EventScript_1511D0 + coord_event 25, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511C5 + coord_event 26, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511D0 coord_event 28, 13, 0, 0, 20, 0, 0, 0x0 coord_event 29, 13, 3, 0, 20, 0, 0, 0x0 coord_event 30, 13, 3, 0, 20, 0, 0, 0x0 diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index a2b108ec1..0aae42562 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -26,10 +26,10 @@ Route121_MapWarps:: @ 8384714 warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE Route121_MapCoordEvents:: @ 838471C - coord_event 25, 5, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 - coord_event 25, 6, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 - coord_event 25, 7, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 - coord_event 25, 8, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 + coord_event 25, 5, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 + coord_event 25, 6, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 + coord_event 25, 7, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 + coord_event 25, 8, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 Route121_MapBGEvents:: @ 838475C bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index d718ecd06..64a1d1a66 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -29,19 +29,19 @@ RustboroCity_MapWarps:: @ 837FE64 warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 RustboroCity_MapCoordEvents:: @ 837FEC4 - coord_event 23, 20, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C481 - coord_event 23, 21, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C498 - coord_event 23, 22, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C4AF - coord_event 23, 23, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C4C6 - coord_event 23, 24, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C4DD - coord_event 30, 9, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C620 - coord_event 29, 10, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C62C - coord_event 30, 11, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C638 - coord_event 30, 12, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C644 - coord_event 30, 9, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C74D - coord_event 31, 10, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C759 - coord_event 30, 11, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C765 - coord_event 30, 12, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C771 + coord_event 23, 20, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C481 + coord_event 23, 21, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C498 + coord_event 23, 22, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4AF + coord_event 23, 23, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4C6 + coord_event 23, 24, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4DD + coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C620 + coord_event 29, 10, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C62C + coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C638 + coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C644 + coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C74D + coord_event 31, 10, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C759 + coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C765 + coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C771 RustboroCity_MapBGEvents:: @ 837FF94 bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_14C41C diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index 6d79e5722..f0b67df82 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -17,8 +17,8 @@ RusturfTunnel_MapWarps:: @ 838BE1C RusturfTunnel_MapCoordEvents:: @ 838BE34 coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999 - coord_event 9, 4, 3, 0, 0x409a, 2, 0, RusturfTunnel_EventScript_15C9AB - coord_event 9, 5, 3, 0, 0x409a, 2, 0, RusturfTunnel_EventScript_15C9AB + coord_event 9, 4, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB + coord_event 9, 5, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C99F coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9A5 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index 8651bb61c..09a94cf27 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -11,7 +11,7 @@ SeafloorCavern_Room9_MapWarps:: @ 838D6C8 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0 - coord_event 17, 42, 3, 0, 0x40a2, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA + coord_event 17, 42, 3, 0, VAR_SEAFLOOR_CAVERN_STATE, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA SeafloorCavern_Room9_MapEvents:: @ 838D6E0 map_events SeafloorCavern_Room9_MapObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index 0498d8b16..77f0735cd 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -15,10 +15,10 @@ SlateportCity_Harbor_MapWarps:: @ 8387FF0 warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY SlateportCity_Harbor_MapCoordEvents:: @ 8388010 - coord_event 8, 11, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155F9B - coord_event 8, 12, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155FA7 - coord_event 8, 13, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155FB3 - coord_event 8, 14, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155FBF + coord_event 8, 11, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155F9B + coord_event 8, 12, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FA7 + coord_event 8, 13, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FB3 + coord_event 8, 14, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FBF SlateportCity_Harbor_MapEvents:: @ 8388050 map_events SlateportCity_Harbor_MapObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index 1650b9f27..b432f3c3e 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -20,8 +20,8 @@ SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F SlateportCity_OceanicMuseum_1F_MapCoordEvents:: @ 8387CA0 - coord_event 9, 7, 3, 0, 0x40aa, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 - coord_event 10, 7, 3, 0, 0x40aa, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 + coord_event 9, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 + coord_event 10, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0 bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BC5 diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index 3bbd87f0b..e725b8e80 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -26,7 +26,7 @@ SootopolisCity_MapWarps:: @ 8380710 warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE8 SootopolisCity_MapCoordEvents:: @ 8380770 - coord_event 25, 6, 3, 0, 0x405e, 1, 0, SootopolisCity_EventScript_14D308 + coord_event 25, 6, 3, 0, VAR_SOOTOPOLIS_STATE, 1, 0, SootopolisCity_EventScript_14D308 SootopolisCity_MapBGEvents:: @ 8380780 bg_event 32, 34, 0, 0, 0, SootopolisCity_EventScript_14D2ED diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index 593f2df02..c88f9363c 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -15,9 +15,9 @@ VictoryRoad_1F_MapWarps:: @ 838D98C warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F VictoryRoad_1F_MapCoordEvents:: @ 838D9B4 - coord_event 34, 3, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DE97 - coord_event 34, 4, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DEAB - coord_event 34, 5, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DEBF + coord_event 34, 3, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DE97 + coord_event 34, 4, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEAB + coord_event 34, 5, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEBF VictoryRoad_1F_MapBGEvents:: @ 838D9E4 bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 709c7e0f5..d8aee8038 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -13,11 +13,11 @@ 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 @@ -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,16 +78,16 @@ 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 @@ -100,7 +100,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA special CloseLink - setvar 0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 compare 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -127,7 +127,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 special CloseLink - setvar 0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 compare 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 @@ -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, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 5, 3, 514, 0 @@ -383,7 +383,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 setvar 0x8004, 3 - copyvar 0x4087, 0x8004 + copyvar VAR_CABLE_CLUB_STATE, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 8, 3, 514, 0 @@ -481,7 +481,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 setvar 0x8004, 4 - copyvar 0x4087, 0x8004 + copyvar VAR_CABLE_CLUB_STATE, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 11, 3, 514, 0 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 9234acfdb..f13e2647d 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -7,7 +7,7 @@ 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 @@ -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 @@ -182,7 +182,7 @@ 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 @@ -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 @@ -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 @@ -357,7 +357,7 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 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,15 +431,15 @@ 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 VAR_TEMP_1, 9 setvar VAR_TEMP_2, 9 @@ -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 @@ -809,7 +809,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A 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 @@ -895,7 +895,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 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 @@ -908,7 +908,7 @@ LinkContestRoom1_EventScript_1A5A89:: @ 81A5A89 LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 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 @@ -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 @@ -1046,7 +1046,7 @@ LinkContestRoom1_EventScript_1A5C42:: @ 81A5C42 return LinkContestRoom1_EventScript_1A5C46:: @ 81A5C46 - setvar 0x4099, 1 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 return LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C @@ -1059,7 +1059,7 @@ LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C return LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64 - setvar 0x4099, 2 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2 return LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A @@ -1117,7 +1117,7 @@ LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 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/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index ca90b8b28..902ffd4ba 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -159,7 +159,7 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 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 @@ -250,7 +250,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty special sub_8135A14 - setvar 0x40bc, 1 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index e0aba0b9c..69c160562 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 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 1b5146760..ee702c102 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -72,11 +72,11 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 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..c2e03bc38 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, 0x8008 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, 0x8008 resetobjectpriority 255, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index afd918a96..42f1fccb1 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -114,8 +114,8 @@ 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 call DewfordTown_Gym_EventScript_1A01C0 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index ef86b1df2..ec18ff9b5 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -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 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index bffb94bc4..0e5b493e2 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -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_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 8f0fe97f1..19219a626 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -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_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 50c951b17..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 @@ -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..0e47f9859 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -13,7 +13,7 @@ FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD call FallarborTown_ContestLobby_EventScript_1539F8 special sub_80C4BF0 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/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index e3cef5fcb..37fa85041 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -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..1a4fd9bdc 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 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 8b4384ed8..4ef3ae82c 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,7 +23,7 @@ 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 @@ -111,7 +111,7 @@ LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 removeobject 7 - setvar 0x4053, 2 + setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 fadedefaultbgm compare 0x8008, 0 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index bbfe43bb6..044f72d11 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -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 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/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 6494f2a6f..33c81b108 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 @@ -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..bc61c5ecd 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 @@ -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 @@ -481,9 +481,9 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 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 @@ -577,18 +577,18 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 call LilycoveCity_ContestLobby_EventScript_158F86 special sub_80C4BF0 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 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_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index ca60bbc89..c25a014f3 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -6,7 +6,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C faceplayer checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF - copyvar 0x8005, 0x4043 + copyvar 0x8005, VAR_DEPT_STORE_FLOOR special sub_810E944 message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage @@ -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 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index dbfd79e98..6cdb3367e 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 @@ -100,7 +100,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93 return LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C - copyvar 0x4045, 0x8005 + copyvar VAR_LOTTERY_PRIZE, 0x8005 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..d1ac96d93 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 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 577805fb2..74c53591d 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 diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 13217b340..31f849b9f 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,9 +61,9 @@ 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 @@ -148,7 +148,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F faceplayer setvar 0x8004, 13 special sub_810FDAC - compare 0x4095, 0 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -188,7 +188,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 faceplayer setvar 0x8004, 8 special sub_810FDAC - compare 0x4095, 0 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -228,7 +228,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D faceplayer setvar 0x8004, 9 special sub_810FDAC - compare 0x4095, 0 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -268,7 +268,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 faceplayer setvar 0x8004, 10 special sub_810FDAC - compare 0x4095, 0 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 specialvar RESULT, sub_810FD60 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 17565f7e8..cd0a61fef 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,9 +70,9 @@ 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 @@ -123,7 +123,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B 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 waitdooranim @@ -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 @@ -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..ba530cefc 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 @@ -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 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 8f3b07312..e7f3b6b62 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 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index e23a05243..e3255b289 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 @@ -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 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 020c39eac..ee449d263 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 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 6792c5932..35478a445 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 @@ -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 5b6c47a86..7dc063149 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -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 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 799fb0992..4e4d5cf31 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 @@ -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,8 +84,8 @@ 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 call MauvilleCity_Gym_EventScript_1A01C0 @@ -113,9 +113,9 @@ 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 VAR_MAUVILLE_GYM_STATE, 1 setvar 0x8004, 0 goto MauvilleCity_Gym_EventScript_1566BA end @@ -124,9 +124,9 @@ 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 VAR_MAUVILLE_GYM_STATE, 2 setvar 0x8004, 1 goto MauvilleCity_Gym_EventScript_1566BA end @@ -135,9 +135,9 @@ 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 VAR_MAUVILLE_GYM_STATE, 3 setvar 0x8004, 2 goto MauvilleCity_Gym_EventScript_1566BA end 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/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 527e29dd5..1e7c26511 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -19,7 +19,7 @@ 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 @@ -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 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index b27965d61..9d4f26cfa 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -40,19 +40,19 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E 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_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 7e08cfa69..a11b12fcc 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 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index a51695b59..a831f0dcc 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 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 9d99eb5fb..7b71ebd76 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 @@ -45,7 +45,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C applymovement 255, MtChimney_CableCarStation_Movement_15C1AF waitmovement 0 setvar 0x8004, 1 - setvar 0x40a3, 2 + 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_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 73e2e4d97..34828f415 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -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 @@ -287,7 +287,7 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 compare 0x8008, 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 ba991bcf2..283b6bfed 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -23,7 +23,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593 end NewMauville_Inside_MapScript1_15E59E:: @ 815E59E - compare 0x40ba, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 call_if 1, NewMauville_Inside_EventScript_15E88B end @@ -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/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 351b7ea85..caec9b4a2 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,7 +20,7 @@ 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 @@ -40,11 +40,11 @@ PetalburgCity_EventScript_14B747:: @ 814B747 msgbox PetalburgCity_Text_16D408, 4 closemessage clearflag FLAG_SPECIAL_FLAG_0 - setvar 0x4057, 3 + setvar VAR_PETALBURG_STATE, 3 fadedefaultbgm 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 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 0b6b3842f..727818f34 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -6,9 +6,9 @@ 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 @@ -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 @@ -206,8 +206,8 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 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,7 +398,7 @@ 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 @@ -592,7 +592,7 @@ 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 @@ -622,7 +622,7 @@ 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 diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 1dc99159a..25af3e1cb 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -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..83bfe7da4 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 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index f03d7cc62..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 FLAG_SPECIAL_FLAG_0 - setvar 0x4060, 1 + 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,8 +233,8 @@ 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 + 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 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index ee9decedc..35994cd45 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 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index a04dcd86d..1bf579d77 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, 0x8008 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 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/Route109.inc b/data/scripts/maps/Route109.inc index a9fa7d906..61ad2bddd 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, 0x8008 resetobjectpriority 255, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 5e10782e9..9d6cc22d3 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 @@ -303,7 +303,7 @@ Route110_EventScript_14FCFB:: @ 814FCFB end Route110_EventScript_14FD09:: @ 814FD09 - setvar 0x40a9, 3 + setvar VAR_CYCLING_CHALLENGE_STATE, 3 savebgm 0 fadedefaultbgm return @@ -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 @@ -443,7 +443,7 @@ Route110_EventScript_14FEB2:: @ 814FEB2 compare 0x8008, 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 6eedce42d..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 @@ -35,7 +35,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 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,7 +54,7 @@ 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 VAR_TEMP_1, 0 releaseall 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 aa1345c7e..c825c1234 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -45,7 +45,7 @@ Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E faceplayer msgbox Route110_TrickHouseEnd_Text_19C281, 4 setvar VAR_TEMP_2, 1 - switch 0x4044 + 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..05b570482 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,13 +726,13 @@ 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 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 19ebfbf50..9ebde8451 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -23,13 +23,13 @@ Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE 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 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index be1f84c63..cb129b06d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -370,13 +370,13 @@ Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 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 695c532cf..5fedee3a9 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -13,13 +13,13 @@ Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 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 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index 917b9483b..971d2a275 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -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/Route112.inc b/data/scripts/maps/Route112.inc index d0d464207..f38a296e7 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 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index d414ca8ed..9c572c0ca 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 @@ -46,7 +46,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD applymovement 255, Route112_CableCarStation_Movement_15C0F0 waitmovement 0 setvar 0x8004, 0 - setvar 0x40a3, 1 + 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_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 8d853b88d..3424fbb6f 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 @@ -70,13 +70,13 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 bufferitemname 0, 0x8008 setvar 0x800a, 250 - compare 0x4048, 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 @@ -84,13 +84,13 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 bufferitemname 0, 0x8008 setvar 0x800a, 500 - compare 0x4048, 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 @@ -98,13 +98,13 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 bufferitemname 0, 0x8008 setvar 0x800a, 500 - compare 0x4048, 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 @@ -112,13 +112,13 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 bufferitemname 0, 0x8008 setvar 0x800a, 1000 - compare 0x4048, 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 @@ -126,13 +126,13 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 bufferitemname 0, 0x8008 setvar 0x800a, 1000 - compare 0x4048, 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 @@ -141,13 +141,13 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8008, 13 bufferdecorationname 0, 0x8008 setvar 0x800a, 6000 - compare 0x4048, 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 @@ -156,13 +156,13 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8008, 6 bufferdecorationname 0, 0x8008 setvar 0x800a, 8000 - compare 0x4048, 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 @@ -205,7 +205,7 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 call_if 1, Route113_GlassWorkshop_EventScript_163889 compare 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 - setvar 0x40be, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 release end @@ -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 @@ -299,7 +299,7 @@ Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 call_if 1, Route113_GlassWorkshop_EventScript_163889 compare 0x8009, 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/Route116.inc b/data/scripts/maps/Route116.inc index 9aadedb32..b1b331d00 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 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index ca69e01c4..bc2ab0a51 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -89,7 +89,7 @@ Route118_EventScript_151004:: @ 8151004 call_if 1, Route118_EventScript_151053 compare 0x8008, 2 call_if 1, Route118_EventScript_15105E - setvar 0x4071, 1 + setvar VAR_ROUTE118_STATE, 1 removeobject 19 releaseall end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 954be6f21..ca9acd2d5 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -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,7 +35,7 @@ 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 @@ -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 @@ -166,7 +166,7 @@ Route119_EventScript_151362:: @ 8151362 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 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/Route121.inc b/data/scripts/maps/Route121.inc index 39443d2f9..d1f153117 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 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/Route128.inc b/data/scripts/maps/Route128.inc index a81e73c3e..7a08d0acb 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 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 831cffaea..efe390f8a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -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 @@ -372,7 +372,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 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 @@ -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..71fc9731d 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 @@ -138,7 +138,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT - setvar 0x40c4, 0 + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E @@ -158,7 +158,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT - setvar 0x40c4, 0 + 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..7ed47d35c 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 VAR_RUSTBORO_STATE, 1 + addvar VAR_PETALBURG_GYM_STATE, 1 setvar 0x8008, 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/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 0063564a3..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 @@ -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 d11fc16d3..2dbd716cb 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -4,7 +4,7 @@ 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 @@ -15,12 +15,12 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B 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 @@ -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..f9bf888e2 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -191,20 +191,20 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .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 796775aa2..4079763a3 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -10,15 +10,15 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C 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..0e64282e4 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -13,7 +13,7 @@ SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D call SlateportCity_ContestLobby_EventScript_155448 special sub_80C4BF0 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 5d7a38401..c13dbaf9c 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 - compare 0x40a0, 1 + 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 @@ -62,7 +62,7 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 removeobject 6 removeobject 7 removeobject 8 - setvar 0x40a0, 2 + setvar VAR_SLATEPORT_HARBOR_STATE, 2 compare 0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C compare 0x8008, 1 @@ -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 @@ -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 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 98d2160a8..abbe3f78f 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -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_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 40b410f77..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,7 +16,7 @@ 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 @@ -35,7 +35,7 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 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 @@ -71,7 +71,7 @@ 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 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..90748bbf5 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 @@ -19,11 +19,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 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 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 6c25c34c5..e2afd07dc 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -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 @@ -293,7 +293,7 @@ LinkContestRoom1_EventScript_15F913:: @ 815F913 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 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..11568ad22 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -13,7 +13,7 @@ VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 call VerdanturfTown_ContestLobby_EventScript_153DA1 special sub_80C4BF0 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/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 7e48d3d90..a206d5531 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 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index aa4c8fc0f..21ba933ce 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -1,6 +1,6 @@ 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 @@ -14,7 +14,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 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 waitmovement 0 @@ -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 @@ -150,7 +150,7 @@ 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 @@ -252,9 +252,9 @@ 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 @@ -262,7 +262,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 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 @@ -399,8 +399,8 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE playse 8 removeobject 0x8009 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 diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 892630ac8..ca48bb41f 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 diff --git a/include/constants/vars.h b/include/constants/vars.h index 4f80e5e26..b0662954f 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -43,42 +43,130 @@ #define VAR_OBJ_GFX_ID_E 0x401E #define VAR_OBJ_GFX_ID_F 0x401F +// general purpose vars #define VAR_RECYCLE_GOODS 0x4020 #define VAR_REPEL_STEP_COUNT 0x4021 #define VAR_ICE_STEP_COUNT 0x4022 -#define VAR_FIRST_POKE 0x4023 +#define VAR_STARTER_MON 0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip #define VAR_MIRAGE_RND_H 0x4024 #define VAR_MIRAGE_RND_L 0x4025 #define VAR_SECRET_BASE_MAP 0x4026 - +#define VAR_CYCLING_ROAD_RECORD_COLLISIONS 0x4027 +#define VAR_CYCLING_ROAD_RECORD_TIME_L 0x4028 +#define VAR_CYCLING_ROAD_RECORD_TIME_H 0x4029 #define VAR_HAPPINESS_STEP_COUNTER 0x402A #define VAR_POISON_STEP_COUNTER 0x402B #define VAR_RESET_RTC_ENABLE 0x402C +#define VAR_ENIGMA_BERRY_AVAILABLE 0x402D #define VAR_DAYS 0x4040 #define VAR_DEPT_STORE_FLOOR 0x4043 -#define VAR_POKELOT_PRIZE 0x4045 +#define VAR_TRICK_HOUSE_ROOMS_COMPLETED 0x4044 +#define VAR_LOTTERY_PRIZE 0x4045 #define VAR_NATIONAL_DEX 0x4046 #define VAR_SHROOMISH_SIZE_RECORD 0x4047 #define VAR_ASH_GATHER_COUNT 0x4048 #define VAR_BIRCH_STATE 0x4049 #define VAR_CRUISE_STEP_COUNT 0x404A -#define VAR_POKELOT_RND1 0x404B -#define VAR_POKELOT_RND2 0x404C +#define VAR_LOTTERY_RND_L 0x404B +#define VAR_LOTTERY_RND_H 0x404C #define VAR_BARBOACH_SIZE_RECORD 0x404F +#define VAR_LITTLEROOT_STATE 0x4050 +#define VAR_ROUTE102_ACCESSIBLE 0x4051 + +#define VAR_LAVARIDGE_RIVAL_STATE 0x4053 +#define VAR_CURRENT_SECRET_BASE 0x4054 + +#define VAR_PETALBURG_STATE 0x4057 +#define VAR_SLATEPORT_STATE 0x4058 + +#define VAR_RUSTBORO_STATE 0x405A + +#define VAR_SOOTOPOLIS_STATE 0x405E + +#define VAR_ROUTE101_STATE 0x4060 + +#define VAR_ROUTE103_STATE 0x4062 + +#define VAR_ROUTE110_STATE 0x4069 + +#define VAR_ROUTE116_STATE 0x406F + +#define VAR_ROUTE118_STATE 0x4071 +#define VAR_ROUTE119_STATE 0x4072 + +#define VAR_ROUTE121_STATE 0x4074 +#define VAR_ROUTE128_STATE 0x407B + +#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 // TODO: needs more investigation + +#define VAR_BIRCH_LAB_STATE 0x4084 +#define VAR_PETALBURG_GYM_STATE 0x4085 +#define VAR_LINK_CONTEST_ROOM_STATE 0x4086 +#define VAR_CABLE_CLUB_STATE 0x4087 +#define VAR_CONTEST_LOCATION 0x4088 +#define VAR_0x4089 0x4089 // TODO: related to decorations +#define VAR_CONTEST_PRIZE_PICKUP 0x408A + +#define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C // TODO: needs more investigation +#define VAR_LITTLEROOT_RIVAL_STATE 0x408D +#define VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE 0x408E +#define VAR_DEVON_CORP_3F_STATE 0x408F +#define VAR_BRINEY_HOUSE_STATE 0x4090 + +#define VAR_LITTLEROOT_INTRO_STATE 0x4092 +#define VAR_MAUVILLE_GYM_STATE 0x4093 +#define VAR_LILYCOVE_MUSEUM_2F_STATE 0x4094 +#define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095 +#define VAR_BRINEY_LOCATION 0x4096 +#define VAR_0x4097 0x4097 // TODO: related to creating new secret base +#define VAR_PETALBURG_WOODS_STATE 0x4098 +#define VAR_LILYCOVE_CONTEST_LOBBY_STATE 0x4099 +#define VAR_RUSTURF_TUNNEL_STATE 0x409a +#define VAR_CAVE_OF_ORIGIN_B4F_STATE 0x409B +#define VAR_ELITE_4_STATE 0x409C + +#define VAR_SLATEPORT_HARBOR_STATE 0x40A0 + +#define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 +#define VAR_CABLE_CAR_STATION_STATE 0x40A3 +#define VAR_SAFARI_ZONE_STATE 0x40A4 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE 0x40A5 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_2 0x40A6 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_3 0x40A7 -#define VAR_0x4054 0x4054 +#define VAR_CYCLING_CHALLENGE_STATE 0x40A9 +#define VAR_SLATEPORT_MUSEUM_1F_STATE 0x40AA +#define VAR_TRICK_HOUSE_PUZZLE_1_STATE 0x40AB +#define VAR_TRICK_HOUSE_PUZZLE_2_STATE 0x40AC +#define VAR_TRICK_HOUSE_PUZZLE_3_STATE 0x40AD +#define VAR_TRICK_HOUSE_PUZZLE_4_STATE 0x40AE +#define VAR_TRICK_HOUSE_PUZZLE_5_STATE 0x40AF +#define VAR_TRICK_HOUSE_PUZZLE_6_STATE 0x40B0 +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE 0x40B1 +#define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2 +#define VAR_WEATHER_INSTITUTE_STATE 0x40B3 +#define VAR_PORTHOLE_STATE 0x40B4 +#define VAR_TRICK_HOUSE_STATE 0x40B5 // TODO: needs some further investigation +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 +#define VAR_SLATEPORT_FAN_CLUB_STATE 0x40B7 -#define VAR_0x4089 0x4089 -#define VAR_0x4095 0x4095 -#define VAR_0x4097 0x4097 -#define VAR_0x409a 0x409a -#define VAR_WEATHER_INSTITUTE_CLEARED 0x040B3 -#define VAR_PORTHOLE 0x40B4 +#define VAR_MT_PYRE_STATE 0x40B9 +#define VAR_NEW_MAUVILLE_STATE 0x40BA -#define VAR_0x40BC 0x40BC -#define VAR_0x40C2 0x40C2 +#define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON 0x40BC +#define VAR_JAGGED_PASS_ASH_WEATHER 0x40BD +#define VAR_GLASS_WORKSHOP_STATE 0x40BE +#define VAR_METEOR_FALLS_STATE 0x40BF +#define VAR_GAME_CORNER_STATE 0x40C0 +#define VAR_TRICK_HOUSE_PRIZE_PICKUP 0x40C1 +#define VAR_PACIFIDLOG_TM_RECEIVED_DAY 0x40C2 +#define VAR_VICTORY_ROAD_1F_STATE 0x40C3 +#define VAR_FOSSIL_RESURRECTION_STATE 0x40C4 +#define VAR_WHICH_FOSSIL_REVIVED 0x40C5 +#define VAR_STEVENS_HOUSE_STATE 0x40C6 +#define VAR_OLDALE_STATE 0x40C7 #endif // GUARD_CONSTANTS_VARS_H diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index f71aad090..2f94dd407 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -858,7 +858,7 @@ static void CB2_GiveStarter(void) { u16 starterPoke; - *GetVarPointer(0x4023) = gSpecialVar_Result; + *GetVarPointer(VAR_STARTER_MON) = gSpecialVar_Result; starterPoke = GetStarterPokemon(gSpecialVar_Result); ScriptGiveMon(starterPoke, 5, 0, 0, 0, 0); ResetTasks(); diff --git a/src/engine/mystery_event_script.c b/src/engine/mystery_event_script.c index 12ad329da..2fc62d4f8 100644 --- a/src/engine/mystery_event_script.c +++ b/src/engine/mystery_event_script.c @@ -317,7 +317,7 @@ bool8 MEScrCmd_setenigmaberry(struct ScriptContext *ctx) ctx->data[2] = 2; if (IsEnigmaBerryValid() == TRUE) - VarSet(0x402D, 1); + VarSet(VAR_ENIGMA_BERRY_AVAILABLE, 1); else ctx->data[2] = 1; diff --git a/src/field/field_special_scene.c b/src/field/field_special_scene.c index 853234f32..67b652a57 100644 --- a/src/field/field_special_scene.c +++ b/src/field/field_special_scene.c @@ -291,7 +291,7 @@ bool8 sub_80C7754(void) void Task_HandlePorthole(u8 taskId) { s16 *data = gTasks[taskId].data; - u16 *var = GetVarPointer(VAR_PORTHOLE); + u16 *var = GetVarPointer(VAR_PORTHOLE_STATE); struct WarpData *location = &gSaveBlock1.location; switch (data[0]) @@ -352,7 +352,7 @@ void sub_80C78A0(void) gSprites[spriteId].coordOffsetEnabled = FALSE; - if (VarGet(0x40B4) == 2) + if (VarGet(VAR_PORTHOLE_STATE) == 2) { StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(4)); } diff --git a/src/field/field_specials.c b/src/field/field_specials.c index 87a9e2d5d..43921ed55 100644 --- a/src/field/field_specials.c +++ b/src/field/field_specials.c @@ -99,13 +99,13 @@ u16 GetPlayerAvatarBike(void) return 0; } -static void DetermineCyclingRoadResults(u32 arg0, u8 arg1) +static void DetermineCyclingRoadResults(u32 numFrames, u8 numBikeCollisions) { u8 result; - if (arg1 <= 99) + if (numBikeCollisions <= 99) { - ConvertIntToDecimalStringN(gStringVar1, arg1, STR_CONV_MODE_LEFT_ALIGN, 2); + ConvertIntToDecimalStringN(gStringVar1, numBikeCollisions, STR_CONV_MODE_LEFT_ALIGN, 2); StringAppend(gStringVar1, gOtherText_Times); } else @@ -113,11 +113,11 @@ static void DetermineCyclingRoadResults(u32 arg0, u8 arg1) StringCopy(gStringVar1, gOtherText_99Times); } - if (arg0 < 3600) + if (numFrames < 3600) { - ConvertIntToDecimalStringN(gStringVar2, arg0 / 60, STR_CONV_MODE_RIGHT_ALIGN, 2); + ConvertIntToDecimalStringN(gStringVar2, numFrames / 60, STR_CONV_MODE_RIGHT_ALIGN, 2); gStringVar2[2] = CHAR_DECIMAL_SEPARATOR; - ConvertIntToDecimalStringN(&gStringVar2[3], ((arg0 % 60) * 100) / 60, STR_CONV_MODE_LEADING_ZEROS, 2); + ConvertIntToDecimalStringN(&gStringVar2[3], ((numFrames % 60) * 100) / 60, STR_CONV_MODE_LEADING_ZEROS, 2); StringAppend(gStringVar2, gOtherText_Seconds); } else @@ -126,44 +126,44 @@ static void DetermineCyclingRoadResults(u32 arg0, u8 arg1) } result = 0; - if (arg1 == 0) + if (numBikeCollisions == 0) { result = 5; } - else if (arg1 < 4) + else if (numBikeCollisions < 4) { result = 4; } - else if (arg1 < 10) + else if (numBikeCollisions < 10) { result = 3; } - else if (arg1 < 20) + else if (numBikeCollisions < 20) { result = 2; } - else if (arg1 < 100) + else if (numBikeCollisions < 100) { result = 1; } - if (arg0 / 60 <= 10) + if (numFrames / 60 <= 10) { result += 5; } - else if (arg0 / 60 <= 15) + else if (numFrames / 60 <= 15) { result += 4; } - else if (arg0 / 60 <= 20) + else if (numFrames / 60 <= 20) { result += 3; } - else if (arg0 / 60 <= 40) + else if (numFrames / 60 <= 40) { result += 2; } - else if (arg0 / 60 < 60) + else if (numFrames / 60 < 60) { result += 1; } @@ -173,36 +173,36 @@ static void DetermineCyclingRoadResults(u32 arg0, u8 arg1) } void FinishCyclingRoadChallenge(void) { - const u32 time = gMain.vblankCounter1 - gBikeCyclingTimer; + const u32 numFrames = gMain.vblankCounter1 - gBikeCyclingTimer; - DetermineCyclingRoadResults(time, gBikeCollisions); - RecordCyclingRoadResults(time, gBikeCollisions); + DetermineCyclingRoadResults(numFrames, gBikeCollisions); + RecordCyclingRoadResults(numFrames, gBikeCollisions); } -static void RecordCyclingRoadResults(u32 arg0, u8 arg1) { - u16 high = VarGet(0x4028); - u16 low = VarGet(0x4029); - u32 record = high + (low << 16); +static void RecordCyclingRoadResults(u32 numFrames, u8 numBikeCollisions) { + u16 low = VarGet(VAR_CYCLING_ROAD_RECORD_TIME_L); + u16 high = VarGet(VAR_CYCLING_ROAD_RECORD_TIME_H); + u32 framesRecord = low + (high << 16); - if (record > arg0 || record == 0) + if (framesRecord > numFrames || framesRecord == 0) { - VarSet(0x4028, arg0); - VarSet(0x4029, arg0 >> 16); - VarSet(0x4027, arg1); + VarSet(VAR_CYCLING_ROAD_RECORD_TIME_L, numFrames); + VarSet(VAR_CYCLING_ROAD_RECORD_TIME_H, numFrames >> 16); + VarSet(VAR_CYCLING_ROAD_RECORD_COLLISIONS, numBikeCollisions); } } u16 GetRecordedCyclingRoadResults(void) { - u16 high = VarGet(0x4028); - u16 low = VarGet(0x4029); - u32 record = high + (low << 16); + u16 low = VarGet(VAR_CYCLING_ROAD_RECORD_TIME_L); + u16 high = VarGet(VAR_CYCLING_ROAD_RECORD_TIME_H); + u32 framesRecord = low + (high << 16); - if (record == 0) + if (framesRecord == 0) { return FALSE; } - DetermineCyclingRoadResults(record, VarGet(0x4027)); + DetermineCyclingRoadResults(framesRecord, VarGet(VAR_CYCLING_ROAD_RECORD_COLLISIONS)); return TRUE; } @@ -212,9 +212,9 @@ void UpdateCyclingRoadState(void) { return; } - if (VarGet(0x40a9) == 2 || VarGet(0x40a9) == 3) + if (VarGet(VAR_CYCLING_CHALLENGE_STATE) == 2 || VarGet(VAR_CYCLING_CHALLENGE_STATE) == 3) { - VarSet(0x40a9, 0); + VarSet(VAR_CYCLING_CHALLENGE_STATE, 0); Overworld_SetSavedMusic(SE_STOP); } } @@ -242,7 +242,7 @@ bool32 CountSSTidalStep(u16 delta) u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y) { u16 *varCruiseStepCount = GetVarPointer(VAR_CRUISE_STEP_COUNT); - switch (*GetVarPointer(VAR_PORTHOLE)) + switch (*GetVarPointer(VAR_PORTHOLE_STATE)) { case 1: case 8: @@ -1885,12 +1885,12 @@ u8 sub_810F5BC(void) { if (FlagGet(FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1)) { - VarSet(VAR_0x409a, 4); + VarSet(VAR_RUSTURF_TUNNEL_STATE, 4); return TRUE; } else if (FlagGet(FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2)) { - VarSet(VAR_0x409a, 5); + VarSet(VAR_RUSTURF_TUNNEL_STATE, 5); return TRUE; } } @@ -1919,7 +1919,7 @@ void PutZigzagoonInPlayerParty(void) bool8 IsStarterInParty(void) { u8 i; - u16 starter = GetStarterPokemon(VarGet(VAR_FIRST_POKE)); + u16 starter = GetStarterPokemon(VarGet(VAR_STARTER_MON)); u8 partyCount = CalculatePlayerPartyCount(); for (i = 0; i < partyCount; i++) { @@ -2047,8 +2047,8 @@ void sub_810F8FC(void) u16 sub_810F908(void) { - u16 var40c2 = VarGet(VAR_0x40C2); - if (gLocalTime.days - var40c2 >= 7) + u16 tmReceivedDay = VarGet(VAR_PACIFIDLOG_TM_RECEIVED_DAY); + if (gLocalTime.days - tmReceivedDay >= 7) { return 0; } @@ -2056,12 +2056,12 @@ u16 sub_810F908(void) { return 8; } - return 7 - (gLocalTime.days - var40c2); + return 7 - (gLocalTime.days - tmReceivedDay); } u16 sub_810F950(void) { - VarSet(VAR_0x40C2, gLocalTime.days); + VarSet(VAR_PACIFIDLOG_TM_RECEIVED_DAY, gLocalTime.days); return gLocalTime.days; } @@ -2146,13 +2146,13 @@ void sub_810FAA0(void) FlagClear(0x316); FlagClear(0x317); FlagClear(0x318); - VarSet(VAR_0x4095, 1); + VarSet(VAR_LILYCOVE_FAN_CLUB_STATE, 1); } } u8 sub_810FB10(u8 a0) { - if (VarGet(VAR_0x4095) == 2) + if (VarGet(VAR_LILYCOVE_FAN_CLUB_STATE) == 2) { if ((gSaveBlock1.vars[0x41] & 0x7f) + gUnknown_083F8404[a0] >= 20) { @@ -2355,7 +2355,7 @@ void sub_810FE1C(void *linkRecords, u8 a, u8 b) void sub_810FEFC(void) { - if (VarGet(VAR_0x4095) == 2) + if (VarGet(VAR_LILYCOVE_FAN_CLUB_STATE) == 2) { sub_810FA74(); if (gBattleOutcome == 1) diff --git a/src/field/fldeff_secret_base_pc.c b/src/field/fldeff_secret_base_pc.c index 8d71a4fb9..394c4bc56 100644 --- a/src/field/fldeff_secret_base_pc.c +++ b/src/field/fldeff_secret_base_pc.c @@ -60,7 +60,7 @@ void DoSecretBasePCTurnOffEffect(void) GetXYCoordsOneStepInFrontOfPlayer(&x, &y); PlaySE(SE_PC_OFF); - if (!VarGet(VAR_0x4054)) + if (!VarGet(VAR_CURRENT_SECRET_BASE)) MapGridSetMetatileIdAt(x, y, 3616); else MapGridSetMetatileIdAt(x, y, 3617); diff --git a/src/field/item_use.c b/src/field/item_use.c index 37cd8ba78..cf5f05eb9 100644 --- a/src/field/item_use.c +++ b/src/field/item_use.c @@ -921,7 +921,7 @@ static void PrepareItemUseMessage(void) void ItemUseOutOfBattle_Repel(u8 var) { - if (VarGet(VAR_REPEL_STEP_COUNT) == FALSE) + if (VarGet(VAR_REPEL_STEP_COUNT) == 0) { VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gSpecialVar_ItemId)); PrepareItemUseMessage(); diff --git a/src/field/lottery_corner.c b/src/field/lottery_corner.c index 83febc56e..03de26054 100644 --- a/src/field/lottery_corner.c +++ b/src/field/lottery_corner.c @@ -30,7 +30,7 @@ void ResetLotteryCorner(void) u16 rand = Random(); SetLotteryNumber((Random() << 16) | rand); - VarSet(VAR_POKELOT_PRIZE, 0); + VarSet(VAR_LOTTERY_PRIZE, 0); } void SetRandomLotteryNumber(u16 i) @@ -152,19 +152,19 @@ static u8 GetMatchingDigits(u16 winNumber, u16 otId) // lottery numbers go from 0 to 99999, not 65535 (0xFFFF). interestingly enough, the function that calls GetLotteryNumber shifts to u16, so it cant be anything above 65535 anyway. void SetLotteryNumber(u32 lotteryNum) { - u16 lowNum = lotteryNum >> 16; - u16 highNum = lotteryNum; + u16 high = lotteryNum >> 16; + u16 low = lotteryNum; - VarSet(VAR_POKELOT_RND1, highNum); - VarSet(VAR_POKELOT_RND2, lowNum); + VarSet(VAR_LOTTERY_RND_L, low); + VarSet(VAR_LOTTERY_RND_H, high); } u32 GetLotteryNumber(void) { - u16 highNum = VarGet(VAR_POKELOT_RND1); - u16 lowNum = VarGet(VAR_POKELOT_RND2); + u16 low = VarGet(VAR_LOTTERY_RND_L); + u16 high = VarGet(VAR_LOTTERY_RND_H); - return (lowNum << 16) | highNum; + return (high << 16) | low; } // interestingly, this may have been the original lottery number set function, but GF tried to change it to 32-bit later but didnt finish changing all calls as one GetLotteryNumber still shifts to u16. diff --git a/src/field/overworld.c b/src/field/overworld.c index 834a2afa4..5594d23e6 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -816,7 +816,7 @@ static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp) static bool16 IsInfiltratedWeatherInstitute(struct WarpData *warp) { - if (VarGet(VAR_WEATHER_INSTITUTE_CLEARED)) + if (VarGet(VAR_WEATHER_INSTITUTE_STATE)) return FALSE; if (warp->mapGroup != MAP_GROUP(ROUTE119_WEATHER_INSTITUTE_1F)) return FALSE; diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 19f8e18dc..400074604 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -180,7 +180,7 @@ void sub_80BB5E4(void) if (gUnknown_020387DC != gSaveBlock1.secretBases[i].secretBaseId) continue; gSpecialVar_Result = 1; - VarSet(VAR_0x4054, i); + VarSet(VAR_CURRENT_SECRET_BASE, i); break; } } @@ -284,7 +284,7 @@ void sub_80BB8CC(void) for (idx=0; idx<4; idx++) { gSaveBlock1.secretBases[0].trainerId[idx] = gSaveBlock2.playerTrainerId[idx]; } - VarSet(VAR_0x4054, 0); + VarSet(VAR_CURRENT_SECRET_BASE, 0); nameLength = sub_80BB8A8(gSaveBlock2.playerName); memset(gSaveBlock1.secretBases[0].playerName, 0xFF, OT_NAME_LENGTH); StringCopyN(gSaveBlock1.secretBases[0].playerName, gSaveBlock2.playerName, nameLength); @@ -333,7 +333,7 @@ void sub_80BBA48(u8 taskid) } break; case 2: - curbaseid = VarGet(VAR_0x4054); + curbaseid = VarGet(VAR_CURRENT_SECRET_BASE); if (gSaveBlock1.secretBases[curbaseid].sbr_field_10 < 0xff) gSaveBlock1.secretBases[curbaseid].sbr_field_10++; sub_80BBA14(); @@ -412,7 +412,7 @@ void sub_80BBCCC(u8 flagIn) u16 curBaseId; u16 x, y; if (CurrentMapIsSecretBase()) { - curBaseId = VarGet(VAR_0x4054); + curBaseId = VarGet(VAR_CURRENT_SECRET_BASE); for (x=0; x<16; x++) { if (gSaveBlock1.secretBases[curBaseId].decorations[x] > 0 && gSaveBlock1.secretBases[curBaseId].decorations[x] <= 0x78 && gDecorations[gSaveBlock1.secretBases[curBaseId].decorations[x]].permission != DECORPERM_SOLID_MAT) { sub_80FF394((gSaveBlock1.secretBases[curBaseId].decorationPos[x] >> 4) + 7, (gSaveBlock1.secretBases[curBaseId].decorationPos[x] & 0xF) + 7, gSaveBlock1.secretBases[curBaseId].decorations[x]); @@ -437,7 +437,7 @@ void sub_80BBDD0(void) u8 metatile; u8 permission; u8 ndecor; - u16 curBase = VarGet(VAR_0x4054); + u16 curBase = VarGet(VAR_CURRENT_SECRET_BASE); if (!CurrentMapIsSecretBase()) { roomdecor = gSaveBlock1.playerRoomDecor; roomdecorpos = gSaveBlock1.playerRoomDecorPos; @@ -478,7 +478,7 @@ void sub_80BBDD0(void) void sub_80BBFA4(void) { - int curBase = VarGet(VAR_0x4054); + int curBase = VarGet(VAR_CURRENT_SECRET_BASE); VarSet(VAR_OBJ_GFX_ID_F, gUnknown_083D13EC[sub_80BCCA4(curBase)]); } @@ -571,12 +571,12 @@ u8 *sub_80BC190(u8 *dest, u8 arg1) { // 80bc190 } u8 *GetSecretBaseMapName(u8 *dest) { - gUnknown_020387DC = gSaveBlock1.secretBases[VarGet(VAR_0x4054)].secretBaseId; - return sub_80BC190(dest, VarGet(VAR_0x4054)); + gUnknown_020387DC = gSaveBlock1.secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].secretBaseId; + return sub_80BC190(dest, VarGet(VAR_CURRENT_SECRET_BASE)); } void sub_80BC224(void) { - u8 *var0 = gSaveBlock1.secretBases[(u8)VarGet(VAR_0x4054)].playerName; + u8 *var0 = gSaveBlock1.secretBases[(u8)VarGet(VAR_CURRENT_SECRET_BASE)].playerName; u8 *var1 = gStringVar1; u8 var2 = sub_80BB8A8(var0); u8 *var3 = StringCopyN(var1, var0, var2); @@ -1173,7 +1173,7 @@ void sub_80BCBF8(u8 taskId) void sub_80BCC54(u8 taskId) { - u16 curBaseIndex = VarGet(VAR_0x4054); + u16 curBaseIndex = VarGet(VAR_CURRENT_SECRET_BASE); BuyMenuFreeMemory(); DestroyVerticalScrollIndicator(0); @@ -1199,7 +1199,7 @@ u8 sub_80BCCA4(u8 secretBaseIndex) const u8 *sub_80BCCE8(void) { - u8 param = sub_80BCCA4(VarGet(VAR_0x4054)); + u8 param = sub_80BCCA4(VarGet(VAR_CURRENT_SECRET_BASE)); if (param == 0) return UnknownString_81A1BB2; if (param == 1) return UnknownString_81A1F67; if (param == 2) return UnknownString_81A2254; @@ -1229,7 +1229,7 @@ void unref_sub_80BCD7C(u8 secretBaseIndex) void sub_80BCE1C(void) { - u16 curBaseIndex = VarGet(VAR_0x4054); + u16 curBaseIndex = VarGet(VAR_CURRENT_SECRET_BASE); sub_810FB10(1); CreateSecretBaseEnemyParty(&gSaveBlock1.secretBases[curBaseIndex]); @@ -1237,12 +1237,12 @@ void sub_80BCE1C(void) void sub_80BCE4C() { - gSaveBlock1.secretBases[VarGet(VAR_0x4054)].sbr_field_1_5 = gSpecialVar_Result; + gSaveBlock1.secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].sbr_field_1_5 = gSpecialVar_Result; } void sub_80BCE90() { - u16 curBaseIndex = VarGet(VAR_0x4054); + u16 curBaseIndex = VarGet(VAR_CURRENT_SECRET_BASE); if (!FlagGet(FLAG_DAILY_UNKNOWN_8C2)) { diff --git a/src/field/tv.c b/src/field/tv.c index e9c92335f..c38da1f4c 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -2193,7 +2193,7 @@ void GetMomOrDadStringForTVMessage(void) void sub_80BFD20(void) { - VarSet(VAR_0x40BC, 0); + VarSet(VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0); RemoveFieldObjectByLocalIdAndMap(5, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } diff --git a/src/scene/credits.c b/src/scene/credits.c index 81be60c9f..e7744822b 100644 --- a/src/scene/credits.c +++ b/src/scene/credits.c @@ -1606,7 +1606,7 @@ void spritecb_814580C(struct Sprite *sprite) static void sub_81458DC(void) { struct Unk201C000 *unk201C000 = &ewram1c000; - u16 starter = SpeciesToNationalPokedexNum(GetStarterPokemon(VarGet(VAR_FIRST_POKE))); + u16 starter = SpeciesToNationalPokedexNum(GetStarterPokemon(VarGet(VAR_STARTER_MON))); u16 seenTypesCount; u16 page; u16 dexNum; |