diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-22 12:36:12 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-24 10:13:52 -0600 |
| commit | 4b5ad9de049a63b101b2bf5f2f2cb92beb26e5fb (patch) | |
| tree | b885eb0ae66ea9d9af219bd588b8ccd96fe77f29 | |
| parent | 30c77aa4ca5502b07a9ccdf2012a7da265e8bffa (diff) | |
Name and use temp var constants
92 files changed, 711 insertions, 700 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 4501d62b6..1a2237705 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -2138,14 +2138,14 @@ Event_WorldMap:: @ 81A02D6 DewfordTown_EventScript_1A02E7:: @ 81A02E7 Route104_EventScript_1A02E7:: @ 81A02E7 Route109_EventScript_1A02E7:: @ 81A02E7 - setflag 0x4001 + setflag FLAG_SPECIAL_FLAG_1 playbgm 431, 0 return DewfordTown_EventScript_1A02EF:: @ 81A02EF Route104_EventScript_1A02EF:: @ 81A02EF Route109_EventScript_1A02EF:: @ 81A02EF - clearflag 0x4001 + clearflag FLAG_SPECIAL_FLAG_1 fadedefaultbgm return @@ -2309,7 +2309,7 @@ CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0 waitse playmoncry SPECIES_GROUDON_OR_KYOGRE, 2 waitmoncry - setvar 0x4005, 1 + setvar VAR_TEMP_5, 1 releaseall end @@ -2318,20 +2318,20 @@ CaveOfOrigin_B1F_EventScript_1A04AF:: @ 81A04AF CaveOfOrigin_B2F_EventScript_1A04AF:: @ 81A04AF CaveOfOrigin_B3F_EventScript_1A04AF:: @ 81A04AF lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto CaveOfOrigin_1F_EventScript_1A04D3 end CaveOfOrigin_B2F_EventScript_1A04BB:: @ 81A04BB CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB lockall - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 goto CaveOfOrigin_B2F_EventScript_1A04D3 end @ 81A04C7 lockall - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 goto CaveOfOrigin_B2F_EventScript_1A04D3 end @@ -2349,11 +2349,11 @@ CaveOfOrigin_B1F_EventScript_1A04E3:: @ 81A04E3 CaveOfOrigin_B2F_EventScript_1A04E3:: @ 81A04E3 CaveOfOrigin_B3F_EventScript_1A04E3:: @ 81A04E3 CaveOfOrigin_B4F_EventScript_1A04E3:: @ 81A04E3 - setvar 0x4001, 1 - setvar 0x4002, 1 - setvar 0x4003, 1 - setvar 0x4004, 1 - setvar 0x4005, 1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_5, 1 return AquaHideout_B1F_EventScript_1A04FD:: @ 81A04FD diff --git a/data/event_scripts.s b/data/event_scripts.s index 76b080a5b..b18e4eb1a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -8,6 +8,7 @@ #include "constants/opponents.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/vars.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" @@ -2132,14 +2133,14 @@ Event_WorldMap:: @ 81A02D6 DewfordTown_EventScript_1A02E7:: @ 81A02E7 Route104_EventScript_1A02E7:: @ 81A02E7 Route109_EventScript_1A02E7:: @ 81A02E7 - setflag 0x4001 + setflag FLAG_SPECIAL_FLAG_1 playbgm 431, 0 return DewfordTown_EventScript_1A02EF:: @ 81A02EF Route104_EventScript_1A02EF:: @ 81A02EF Route109_EventScript_1A02EF:: @ 81A02EF - clearflag 0x4001 + clearflag FLAG_SPECIAL_FLAG_1 fadedefaultbgm return @@ -2303,7 +2304,7 @@ CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0 waitse playmoncry SPECIES_GROUDON_OR_KYOGRE, 2 waitmoncry - setvar 0x4005, 1 + setvar VAR_TEMP_5, 1 releaseall end @@ -2312,20 +2313,20 @@ CaveOfOrigin_B1F_EventScript_1A04AF:: @ 81A04AF CaveOfOrigin_B2F_EventScript_1A04AF:: @ 81A04AF CaveOfOrigin_B3F_EventScript_1A04AF:: @ 81A04AF lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto CaveOfOrigin_1F_EventScript_1A04D3 end CaveOfOrigin_B2F_EventScript_1A04BB:: @ 81A04BB CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB lockall - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 goto CaveOfOrigin_B2F_EventScript_1A04D3 end @ 81A04C7 lockall - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 goto CaveOfOrigin_B2F_EventScript_1A04D3 end @@ -2343,11 +2344,11 @@ CaveOfOrigin_B1F_EventScript_1A04E3:: @ 81A04E3 CaveOfOrigin_B2F_EventScript_1A04E3:: @ 81A04E3 CaveOfOrigin_B3F_EventScript_1A04E3:: @ 81A04E3 CaveOfOrigin_B4F_EventScript_1A04E3:: @ 81A04E3 - setvar 0x4001, 1 - setvar 0x4002, 1 - setvar 0x4003, 1 - setvar 0x4004, 1 - setvar 0x4005, 1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_5, 1 return AquaHideout_B1F_EventScript_1A04FD:: @ 81A04FD diff --git a/data/map_events.s b/data/map_events.s index e7fb03fb6..0a2a25fb0 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -2,6 +2,7 @@ #include "constants/items.h" #include "constants/map_objects.h" #include "constants/maps.h" +#include "constants/vars.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index c4b0abc78..745a40543 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -18,8 +18,8 @@ AquaHideout_B2F_MapWarps:: @ 838CF94 warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F AquaHideout_B2F_MapCoordEvents:: @ 838CFE4 - coord_event 28, 17, 3, 0, 0x4001, 0, 0, AquaHideout_B2F_EventScript_15D8BD - coord_event 28, 16, 3, 0, 0x4001, 0, 0, AquaHideout_B2F_EventScript_15D8BD + coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD + coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD AquaHideout_B2F_MapEvents:: @ 838D004 map_events AquaHideout_B2F_MapObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/events/CaveOfOrigin_1F.inc index 1e2185e9b..b0d77795c 100644 --- a/data/maps/events/CaveOfOrigin_1F.inc +++ b/data/maps/events/CaveOfOrigin_1F.inc @@ -3,9 +3,9 @@ CaveOfOrigin_1F_MapWarps:: @ 838D718 warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F CaveOfOrigin_1F_MapCoordEvents:: @ 838D728 - coord_event 7, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF - coord_event 6, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF - coord_event 5, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 7, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF CaveOfOrigin_1F_MapEvents:: @ 838D758 map_events 0x0, CaveOfOrigin_1F_MapWarps, CaveOfOrigin_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc index 905954d9b..a91ee50e4 100644 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ b/data/maps/events/CaveOfOrigin_B1F.inc @@ -3,9 +3,9 @@ CaveOfOrigin_B1F_MapWarps:: @ 838D76C warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_B2F CaveOfOrigin_B1F_MapCoordEvents:: @ 838D77C - coord_event 12, 15, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF - coord_event 12, 16, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF - coord_event 12, 17, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 15, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 16, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 17, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF CaveOfOrigin_B1F_MapEvents:: @ 838D7AC map_events 0x0, CaveOfOrigin_B1F_MapWarps, CaveOfOrigin_B1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B2F.inc b/data/maps/events/CaveOfOrigin_B2F.inc index 2d98e50ac..5d03aaaa2 100644 --- a/data/maps/events/CaveOfOrigin_B2F.inc +++ b/data/maps/events/CaveOfOrigin_B2F.inc @@ -3,9 +3,9 @@ CaveOfOrigin_B2F_MapWarps:: @ 838D7C0 warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B2F_MapCoordEvents:: @ 838D7D0 - coord_event 10, 6, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF - coord_event 10, 5, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF - coord_event 14, 13, 3, 0, 0x4002, 0, 0, CaveOfOrigin_B2F_EventScript_1A04BB + coord_event 10, 6, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 10, 5, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 14, 13, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B2F_EventScript_1A04BB CaveOfOrigin_B2F_MapEvents:: @ 838D800 map_events 0x0, CaveOfOrigin_B2F_MapWarps, CaveOfOrigin_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/events/CaveOfOrigin_B3F.inc index 2561dee6a..6f9544aa2 100644 --- a/data/maps/events/CaveOfOrigin_B3F.inc +++ b/data/maps/events/CaveOfOrigin_B3F.inc @@ -6,9 +6,9 @@ CaveOfOrigin_B3F_MapWarps:: @ 838D82C warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B4F CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C - coord_event 5, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF - coord_event 8, 6, 3, 0, 0x4002, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB - coord_event 8, 5, 3, 0, 0x4002, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB + coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF + coord_event 8, 6, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB + coord_event 8, 5, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB CaveOfOrigin_B3F_MapEvents:: @ 838D86C map_events CaveOfOrigin_B3F_MapObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc index 672604d3e..61bfe4eb9 100644 --- a/data/maps/events/CaveOfOrigin_B4F.inc +++ b/data/maps/events/CaveOfOrigin_B4F.inc @@ -6,8 +6,8 @@ CaveOfOrigin_B4F_MapWarps:: @ 838D898 CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 coord_event 9, 13, 3, 0, 0x409b, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 - coord_event 13, 9, 3, 0, 0x4005, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 - coord_event 5, 9, 3, 0, 0x4005, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 + 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 CaveOfOrigin_B4F_MapEvents:: @ 838D8D0 map_events CaveOfOrigin_B4F_MapObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0 diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc index 4c1058845..a04c7a3a9 100644 --- a/data/maps/events/DoubleBattleColosseum.inc +++ b/data/maps/events/DoubleBattleColosseum.inc @@ -5,10 +5,10 @@ DoubleBattleColosseum_MapWarps:: @ 8391428 warp_def 8, 8, 3, 127, MAP_NONE DoubleBattleColosseum_MapCoordEvents:: @ 8391448 - coord_event 3, 4, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A4383 - coord_event 3, 6, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A43B9 - coord_event 10, 4, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A439E - coord_event 10, 6, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A43D4 + coord_event 3, 4, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A4383 + coord_event 3, 6, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A43B9 + coord_event 10, 4, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A439E + coord_event 10, 6, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A43D4 DoubleBattleColosseum_MapEvents:: @ 8391488 map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/events/EverGrandeCity.inc index a4b62f583..0a619b93d 100644 --- a/data/maps/events/EverGrandeCity.inc +++ b/data/maps/events/EverGrandeCity.inc @@ -5,17 +5,17 @@ EverGrandeCity_MapWarps:: @ 83807DC warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F EverGrandeCity_MapCoordEvents:: @ 83807FC - coord_event 17, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 16, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 18, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 19, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 20, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 21, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 22, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 23, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 24, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 25, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 26, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 17, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 16, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 18, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 19, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 20, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 21, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 22, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 23, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 24, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 25, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 26, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 EverGrandeCity_MapBGEvents:: @ 83808AC bg_event 19, 43, 5, 0, 0, EverGrandeCity_EventScript_14D4E5 diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc index ec57d4ba8..63e3ff3be 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F LilycoveCity_CoveLilyMotel_1F_MapCoordEvents:: @ 8389494 - coord_event 10, 2, 3, 0, 0x4001, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D + coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 83894A4 map_events LilycoveCity_CoveLilyMotel_1F_MapObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/events/MagmaHideout_B2F.inc index 16ac562b5..e300078aa 100644 --- a/data/maps/events/MagmaHideout_B2F.inc +++ b/data/maps/events/MagmaHideout_B2F.inc @@ -16,10 +16,10 @@ MagmaHideout_B2F_MapWarps:: @ 838EC5C warp_def 31, 16, 3, 6, MAP_MAGMA_HIDEOUT_B2F MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C - coord_event 7, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 6, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 5, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 4, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 7, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 6, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 5, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 4, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD MagmaHideout_B2F_MapEvents:: @ 838ECDC map_events MagmaHideout_B2F_MapObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc index d30c6b275..a9bd2a057 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -11,9 +11,9 @@ MauvilleCity_Gym_MapWarps:: @ 83882AC warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY MauvilleCity_Gym_MapCoordEvents:: @ 83882BC - coord_event 0, 9, 3, 0, 0x4000, 0, 0, MauvilleCity_Gym_EventScript_15664B - coord_event 8, 11, 3, 0, 0x4000, 0, 0, MauvilleCity_Gym_EventScript_156670 - coord_event 4, 15, 3, 0, 0x4000, 0, 0, MauvilleCity_Gym_EventScript_156695 + coord_event 0, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_15664B + coord_event 8, 11, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156670 + coord_event 4, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156695 MauvilleCity_Gym_MapBGEvents:: @ 83882EC bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156761 diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index a5b4fa74a..957d91d5a 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -22,10 +22,10 @@ MossdeepCity_MapWarps:: @ 8380504 warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_MapCoordEvents:: @ 8380554 - coord_event 25, 25, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 26, 25, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 32, 27, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 33, 27, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 MossdeepCity_MapBGEvents:: @ 8380594 bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_14CFF6 diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc index 80812cc4d..21521df5f 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/events/MossdeepCity_Gym.inc @@ -14,7 +14,7 @@ MossdeepCity_Gym_MapWarps:: @ 838A738 warp_def 10, 29, 0, 1, MAP_MOSSDEEP_CITY MossdeepCity_Gym_MapCoordEvents:: @ 838A748 - coord_event 12, 3, 3, 0, 0x4001, 0, 0, MossdeepCity_Gym_EventScript_15A742 + coord_event 12, 3, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_15A742 MossdeepCity_Gym_MapBGEvents:: @ 838A758 bg_event 2, 7, 0, 0, 0, MossdeepCity_Gym_EventScript_15A5EA diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index a3b7ffbe2..cb7420edc 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -12,15 +12,15 @@ NewMauville_Inside_MapWarps:: @ 838DFC8 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE NewMauville_Inside_MapCoordEvents:: @ 838DFD0 - coord_event 30, 38, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 18, 36, 3, 0, 0x4002, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 4, 26, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 16, 22, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 25, 18, 3, 0, 0x4002, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 2, 11, 3, 0, 0x4002, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 6, 11, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 13, 10, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 17, 10, 3, 0, 0x4002, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 18, 36, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 4, 26, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 16, 22, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 25, 18, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 2, 11, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 + 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 NewMauville_Inside_MapBGEvents:: @ 838E070 diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index df26386b3..d46c252be 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -8,10 +8,10 @@ RecordCorner_MapWarps:: @ 83913B4 warp_def 10, 9, 3, 127, MAP_NONE RecordCorner_MapCoordEvents:: @ 83913D4 - coord_event 6, 4, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4418 - coord_event 6, 6, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4442 - coord_event 13, 4, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A442D - coord_event 13, 6, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4457 + coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4418 + coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4442 + coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A442D + coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4457 RecordCorner_MapEvents:: @ 8391414 map_events RecordCorner_MapObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc index 9051ad929..4be4faaf3 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4 warp_def 13, 5, 0, 3, MAP_ROUTE110 Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4 - coord_event 7, 4, 3, 0, 0x4001, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 - coord_event 5, 4, 3, 0, 0x4001, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A + coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 + coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 8392D04 map_events Route110_SeasideCyclingRoadNorthEntrance_MapObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc index 947cc714a..68d3e1f4c 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58 warp_def 13, 5, 0, 5, MAP_ROUTE110 Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78 - coord_event 7, 4, 3, 0, 0x4001, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B - coord_event 5, 4, 3, 0, 0x4001, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD + coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B + coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 8392C98 map_events Route110_SeasideCyclingRoadSouthEntrance_MapObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index 8c3cf7e11..e3b83d48f 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -6,7 +6,7 @@ Route110_TrickHouseEnd_MapWarps:: @ 83921E8 warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR Route110_TrickHouseEnd_MapCoordEvents:: @ 83921F8 - coord_event 2, 2, 3, 0, 0x4002, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 + coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 Route110_TrickHouseEnd_MapBGEvents:: @ 8392208 bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0 diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc index 264465641..7adf7b9d2 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -11,10 +11,10 @@ Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle2_MapCoordEvents:: @ 83924EC - coord_event 14, 21, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 - coord_event 8, 17, 3, 0, 0x4002, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DF3 - coord_event 4, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E06 - coord_event 5, 2, 0, 0, 0x4004, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E19 + coord_event 14, 21, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 + coord_event 8, 17, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DF3 + coord_event 4, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E06 + coord_event 5, 2, 0, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E19 Route110_TrickHousePuzzle2_MapBGEvents:: @ 839252C bg_event 14, 5, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DC3 diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index 5c360ac6c..25381fba6 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -17,13 +17,13 @@ Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle3_MapCoordEvents:: @ 839266C - coord_event 5, 20, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB - coord_event 4, 12, 3, 0, 0x4002, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625B7 - coord_event 11, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625C3 - coord_event 3, 8, 3, 0, 0x4004, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625CF - coord_event 13, 7, 3, 0, 0x4005, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625DB - coord_event 1, 3, 3, 0, 0x4006, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625E7 - coord_event 10, 2, 3, 0, 0x4007, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625F3 + coord_event 5, 20, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB + coord_event 4, 12, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625B7 + coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625C3 + coord_event 3, 8, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625CF + coord_event 13, 7, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625DB + coord_event 1, 3, 3, 0, VAR_TEMP_6, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625E7 + coord_event 10, 2, 3, 0, VAR_TEMP_7, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625F3 Route110_TrickHousePuzzle3_MapBGEvents:: @ 83926DC bg_event 0, 8, 3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1626EB diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc index ac40ffef4..3c628eabf 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/events/Route110_TrickHousePuzzle5.inc @@ -11,20 +11,20 @@ Route110_TrickHousePuzzle5_MapWarps:: @ 8392914 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle5_MapCoordEvents:: @ 839292C - coord_event 8, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897 - coord_event 7, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628A3 - coord_event 6, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628AF - coord_event 5, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628BB - coord_event 6, 14, 3, 0, 0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628C7 - coord_event 7, 14, 3, 0, 0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628D3 - coord_event 11, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628DF - coord_event 10, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628EB - coord_event 9, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628F7 - coord_event 11, 5, 3, 0, 0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_162903 - coord_event 10, 5, 3, 0, 0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_16290F - coord_event 2, 6, 3, 0, 0x4005, 0, 0, Route110_TrickHousePuzzle5_EventScript_16291B - coord_event 3, 6, 3, 0, 0x4005, 0, 0, Route110_TrickHousePuzzle5_EventScript_162927 - coord_event 4, 6, 3, 0, 0x4005, 0, 0, Route110_TrickHousePuzzle5_EventScript_162933 + coord_event 8, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897 + coord_event 7, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628A3 + coord_event 6, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628AF + coord_event 5, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628BB + coord_event 6, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628C7 + coord_event 7, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628D3 + coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628DF + coord_event 10, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628EB + coord_event 9, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628F7 + coord_event 11, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_162903 + coord_event 10, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_16290F + coord_event 2, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_16291B + coord_event 3, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162927 + coord_event 4, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162933 Route110_TrickHousePuzzle5_MapBGEvents:: @ 8392A0C bg_event 2, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627D5 diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc index 5beae5e18..9468d51bd 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -10,7 +10,7 @@ Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C - coord_event 9, 2, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 + coord_event 9, 2, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C bg_event 7, 2, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_16328B diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index b282c7a8d..e3ae3bb04 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -43,21 +43,21 @@ Route111_MapWarps:: @ 8382500 Route111_MapCoordEvents:: @ 8382518 coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 11, 61, 3, 0, 0x4003, 0, 0, Route111_EventScript_150116 - coord_event 12, 61, 3, 0, 0x4003, 0, 0, Route111_EventScript_150116 - coord_event 13, 61, 3, 0, 0x4003, 0, 0, Route111_EventScript_150116 + coord_event 11, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 + coord_event 12, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 + coord_event 13, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 12, 44, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 - coord_event 13, 43, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 - coord_event 14, 42, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 - coord_event 16, 40, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 - coord_event 14, 61, 3, 0, 0x4003, 0, 0, Route111_EventScript_150116 + coord_event 12, 44, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 13, 43, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 14, 42, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 16, 40, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 14, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1501BC coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1501BC coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1501BC coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 17, 39, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 - coord_event 18, 38, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 + coord_event 17, 39, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 18, 38, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1501BC coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc index 68ee79ca1..59b0a37d9 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/events/Route121_SafariZoneEntrance.inc @@ -10,7 +10,7 @@ Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C warp_def 15, 13, 0, 0, MAP_ROUTE121 Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C - coord_event 8, 4, 3, 0, 0x4001, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 + coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 Route121_SafariZoneEntrance_MapBGEvents:: @ 838BAAC bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C487 diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index 181195444..321653635 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -6,8 +6,8 @@ SingleBattleColosseum_MapWarps:: @ 83912FC warp_def 7, 8, 3, 127, MAP_NONE SingleBattleColosseum_MapCoordEvents:: @ 839130C - coord_event 3, 5, 3, 0, 0x4000, 0, 0, SingleBattleColosseum_EventScript_1A436F - coord_event 10, 5, 3, 0, 0x4000, 0, 0, SingleBattleColosseum_EventScript_1A4379 + coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A436F + coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A4379 SingleBattleColosseum_MapEvents:: @ 839132C map_events SingleBattleColosseum_MapObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index 8ecbb7e09..cae954321 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -6,8 +6,8 @@ TradeCenter_MapWarps:: @ 8391358 warp_def 6, 8, 3, 127, MAP_NONE TradeCenter_MapCoordEvents:: @ 8391368 - coord_event 4, 5, 3, 0, 0x4000, 0, 0, TradeCenter_EventScript_1A43F0 - coord_event 7, 5, 3, 0, 0x4000, 0, 0, TradeCenter_EventScript_1A43FA + coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43F0 + coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43FA TradeCenter_MapEvents:: @ 8391388 map_events TradeCenter_MapObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 0cedcd0d5..709c7e0f5 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -690,7 +690,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 setvar 0x8005, 0 special sub_80B929C waitstate - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -698,7 +698,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D setvar 0x8005, 1 special sub_80B929C waitstate - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -706,7 +706,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 setvar 0x8005, 2 special sub_80B929C waitstate - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -714,12 +714,12 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 setvar 0x8005, 3 special sub_80B929C waitstate - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A446C:: @ 81A446C - bufferitemname 1, 0x4001 + bufferitemname 1, VAR_TEMP_1 message RecordCorner_Text_1A4E3B waitmessage waitbuttonpress @@ -770,7 +770,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD end RecordCorner_EventScript_1A44BC:: @ 81A44BC - compare 0x4000, 0 + compare VAR_TEMP_0, 0 goto_if 5, RecordCorner_EventScript_1A44D6 special sub_8064EAC message RecordCorner_Text_1A4DD7 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 50202c7d6..9234acfdb 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -290,7 +290,7 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A compare 0x8006, 4 goto_if 5, LinkContestRoom1_EventScript_1A527A call LinkContestRoom1_EventScript_1A5377 - setvar 0x4001, 6 + setvar VAR_TEMP_1, 6 return LinkContestRoom1_EventScript_1A52AE:: @ 81A52AE @@ -441,24 +441,24 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455 call_if 1, LinkContestRoom1_EventScript_1A5674 compare 0x4088, 5 call_if 1, LinkContestRoom1_EventScript_1A56D2 - setvar 0x4001, 9 - setvar 0x4002, 9 - setvar 0x4003, 9 - setvar 0x4004, 9 - setvar 0x4005, 9 - setvar 0x4006, 9 - setvar 0x4007, 9 - setvar 0x4008, 9 - compare 0x4000, 0 + setvar VAR_TEMP_1, 9 + setvar VAR_TEMP_2, 9 + setvar VAR_TEMP_3, 9 + setvar VAR_TEMP_4, 9 + setvar VAR_TEMP_5, 9 + setvar VAR_TEMP_6, 9 + setvar VAR_TEMP_7, 9 + setvar VAR_TEMP_8, 9 + compare VAR_TEMP_0, 0 call_if 2, LinkContestRoom1_EventScript_1A54EB - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4006, 0 - setvar 0x4007, 0 - setvar 0x4008, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 return LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB @@ -480,7 +480,7 @@ LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB call_if 1, LinkContestRoom1_EventScript_1A5838 compare RESULT, 7 call_if 1, LinkContestRoom1_EventScript_1A585C - compare 0x4000, 0 + compare VAR_TEMP_0, 0 goto_if 2, LinkContestRoom1_EventScript_1A54EB waitmovement 0 return @@ -502,7 +502,7 @@ LinkContestRoom1_EventScript_1A555A:: @ 81A555A goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 10 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 @@ -522,7 +522,7 @@ LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 90 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5616:: @ 81A5616 @@ -542,7 +542,7 @@ LinkContestRoom1_EventScript_1A5616:: @ 81A5616 goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 170 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5674:: @ 81A5674 @@ -562,7 +562,7 @@ LinkContestRoom1_EventScript_1A5674:: @ 81A5674 goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 320 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 @@ -582,140 +582,140 @@ LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 100 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5730:: @ 81A5730 - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_1A5736:: @ 81A5736 - setvar 0x4000, 2 + setvar VAR_TEMP_0, 2 return LinkContestRoom1_EventScript_1A573C:: @ 81A573C - setvar 0x4000, 3 + setvar VAR_TEMP_0, 3 return LinkContestRoom1_EventScript_1A5742:: @ 81A5742 - setvar 0x4000, 4 + setvar VAR_TEMP_0, 4 return LinkContestRoom1_EventScript_1A5748:: @ 81A5748 - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 return LinkContestRoom1_EventScript_1A574E:: @ 81A574E - setvar 0x4000, 6 + setvar VAR_TEMP_0, 6 return LinkContestRoom1_EventScript_1A5754:: @ 81A5754 - setvar 0x4000, 7 + setvar VAR_TEMP_0, 7 return LinkContestRoom1_EventScript_1A575A:: @ 81A575A - setvar 0x4000, 8 + setvar VAR_TEMP_0, 8 return LinkContestRoom1_EventScript_1A5760:: @ 81A5760 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq LinkContestRoom1_EventScript_1A5783 applymovement 6, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4001, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_1, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A5783:: @ 81A5783 return LinkContestRoom1_EventScript_1A5784:: @ 81A5784 - compare 0x4002, 1 + compare VAR_TEMP_2, 1 goto_if_eq LinkContestRoom1_EventScript_1A57A7 applymovement 12, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4002, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_2, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A57A7:: @ 81A57A7 return LinkContestRoom1_EventScript_1A57A8:: @ 81A57A8 - compare 0x4003, 1 + compare VAR_TEMP_3, 1 goto_if_eq LinkContestRoom1_EventScript_1A57CB applymovement 7, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4003, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_3, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A57CB:: @ 81A57CB return LinkContestRoom1_EventScript_1A57CC:: @ 81A57CC - compare 0x4004, 1 + compare VAR_TEMP_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A57EF applymovement 8, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4004, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_4, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A57EF:: @ 81A57EF return LinkContestRoom1_EventScript_1A57F0:: @ 81A57F0 - compare 0x4005, 1 + compare VAR_TEMP_5, 1 goto_if_eq LinkContestRoom1_EventScript_1A5813 applymovement 9, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4005, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_5, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A5813:: @ 81A5813 return LinkContestRoom1_EventScript_1A5814:: @ 81A5814 - compare 0x4006, 1 + compare VAR_TEMP_6, 1 goto_if_eq LinkContestRoom1_EventScript_1A5837 applymovement 10, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4006, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_6, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A5837:: @ 81A5837 return LinkContestRoom1_EventScript_1A5838:: @ 81A5838 - compare 0x4007, 1 + compare VAR_TEMP_7, 1 goto_if_eq LinkContestRoom1_EventScript_1A585B applymovement 11, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4007, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_7, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A585B:: @ 81A585B return LinkContestRoom1_EventScript_1A585C:: @ 81A585C - compare 0x4008, 1 + compare VAR_TEMP_8, 1 goto_if_eq LinkContestRoom1_EventScript_1A587F applymovement 15, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4008, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_8, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A587F:: @ 81A587F @@ -771,9 +771,9 @@ LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE applymovement 2, LinkContestRoom1_Movement_1A5D95 waitmovement 0 releaseall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 startcontest - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 lockall applymovement 1, LinkContestRoom1_Movement_1A5D95 applymovement 2, LinkContestRoom1_Movement_1A5D91 @@ -802,9 +802,9 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A waitmovement 0 closemessage releaseall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 showcontestresults - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 playbgm 439, 0 return @@ -866,19 +866,19 @@ LinkContestRoom1_EventScript_1A59FC:: @ 81A59FC return LinkContestRoom1_EventScript_1A5A31:: @ 81A5A31 - setvar 0x4003, 3 + setvar VAR_TEMP_3, 3 return LinkContestRoom1_EventScript_1A5A37:: @ 81A5A37 - setvar 0x4003, 4 + setvar VAR_TEMP_3, 4 return LinkContestRoom1_EventScript_1A5A3D:: @ 81A5A3D - setvar 0x4003, 5 + setvar VAR_TEMP_3, 5 return LinkContestRoom1_EventScript_1A5A43:: @ 81A5A43 - setvar 0x4003, 14 + setvar VAR_TEMP_3, 14 return LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 @@ -888,10 +888,10 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 buffernumberstring 1, 0x8005 addvar 0x8005, -1 call LinkContestRoom1_EventScript_1A5A75 - applymovement 0x4003, LinkContestRoom1_Movement_1A5D99 + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5D99 waitmovement 0 playse 223 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 return LinkContestRoom1_EventScript_1A5A75:: @ 81A5A75 @@ -906,7 +906,7 @@ LinkContestRoom1_EventScript_1A5A89:: @ 81A5A89 return LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 - addvar 0x4001, 1 + addvar VAR_TEMP_1, 1 lockall compare 0x4088, 1 call_if 2, LinkContestRoom1_EventScript_1A5AE4 @@ -918,7 +918,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 applymovement 11, LinkContestRoom1_Movement_1A5DBB applymovement 6, LinkContestRoom1_Movement_1A5DB3 applymovement 8, LinkContestRoom1_Movement_1A5DAF - compare 0x4001, 4 + compare VAR_TEMP_1, 4 goto_if 5, LinkContestRoom1_EventScript_1A5A90 delay 30 return @@ -1003,7 +1003,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB call LinkContestRoom1_EventScript_1A5C7F call LinkContestRoom1_EventScript_1A5CE5 playse 223 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 call LinkContestRoom1_EventScript_1A5A90 delay 30 special sub_80C4CF8 @@ -1083,28 +1083,28 @@ LinkContestRoom1_EventScript_1A5C7F:: @ 81A5C7F LinkContestRoom1_EventScript_1A5CB1:: @ 81A5CB1 lockall - applymovement 0x4003, LinkContestRoom1_Movement_1A5DF6 + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5DF6 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A5CBE:: @ 81A5CBE lockall - applymovement 0x4003, LinkContestRoom1_Movement_1A5DFA + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5DFA waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A5CCB:: @ 81A5CCB lockall - applymovement 0x4003, LinkContestRoom1_Movement_1A5DA5 + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5DA5 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 lockall - applymovement 0x4003, LinkContestRoom1_Movement_1A5DA9 + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5DA9 waitmovement 0 releaseall return diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index c1e77a8c7..343ef4233 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -3,20 +3,20 @@ AbandonedShip_HiddenFloorRooms_MapScripts:: @ 815ED01 .byte 0 AbandonedShip_HiddenFloorRooms_MapScript2_15ED07:: @ 815ED07 - map_script_2 0x4001, 0, AbandonedShip_HiddenFloorRooms_EventScript_15ED11 + map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_15ED11 .2byte 0 AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 - setvar 0x4001, 1 - getplayerxy 0x4002, 0x4003 - setvar 0x4004, 1 - compare 0x4002, 21 + setvar VAR_TEMP_1, 1 + getplayerxy VAR_TEMP_2, VAR_TEMP_3 + setvar VAR_TEMP_4, 1 + compare VAR_TEMP_2, 21 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 - compare 0x4002, 36 + compare VAR_TEMP_2, 36 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F - compare 0x4003, 2 + compare VAR_TEMP_3, 2 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 - switch 0x4004 + switch VAR_TEMP_4 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4 case 3, AbandonedShip_HiddenFloorRooms_EventScript_15EDC5 @@ -26,15 +26,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 end AbandonedShip_HiddenFloorRooms_EventScript_15ED89:: @ 815ED89 - addvar 0x4004, 1 + addvar VAR_TEMP_4, 1 return AbandonedShip_HiddenFloorRooms_EventScript_15ED8F:: @ 815ED8F - addvar 0x4004, 2 + addvar VAR_TEMP_4, 2 return AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 - addvar 0x4004, 3 + addvar VAR_TEMP_4, 3 return AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index a587fcc92..0535af6f3 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -19,7 +19,7 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD applymovement 0x8008, AquaHideout_B2F_Movement_1A0841 .endif waitmovement 0 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 3065c0cbb..7259e8305 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -3,11 +3,11 @@ BattleTower_BattleRoom_MapScripts:: @ 81608DB .byte 0 BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1 - map_script_2 0x4000, 0, BattleTower_BattleRoom_EventScript_1608EB + map_script_2 VAR_TEMP_0, 0, BattleTower_BattleRoom_EventScript_1608EB .2byte 0 BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 255, BattleTower_BattleRoom_Movement_160AB7 waitmovement 0 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 828d975fc..b0e957e6b 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -16,11 +16,11 @@ BattleTower_Corridor_EventScript_16086E:: @ 816086E end BattleTower_Corridor_MapScript2_160881:: @ 8160881 - map_script_2 0x4000, 0, BattleTower_Corridor_EventScript_16088B + map_script_2 VAR_TEMP_0, 0, BattleTower_Corridor_EventScript_16088B .2byte 0 BattleTower_Corridor_EventScript_16088B:: @ 816088B - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 compare 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 applymovement 1, BattleTower_Corridor_Movement_1608D5 @@ -34,7 +34,7 @@ BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 waitmovement 0 BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 warp MAP_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate end diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index c006cdffe..fccfcdb2c 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -4,11 +4,11 @@ BattleTower_Elevator_MapScripts:: @ 81607CF .byte 0 BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA - map_script_2 0x4000, 0, BattleTower_Elevator_EventScript_1607E4 + map_script_2 VAR_TEMP_0, 0, BattleTower_Elevator_EventScript_1607E4 .2byte 0 BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 1, BattleTower_Elevator_Movement_160835 applymovement 255, BattleTower_Elevator_Movement_160839 waitmovement 0 @@ -18,17 +18,17 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 applymovement 1, BattleTower_Elevator_Movement_16083D applymovement 255, BattleTower_Elevator_Movement_160841 waitmovement 0 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1 waitstate end BattleTower_Elevator_MapScript2_160821:: @ 8160821 - map_script_2 0x4001, 0, BattleTower_Elevator_EventScript_16082B + map_script_2 VAR_TEMP_1, 0, BattleTower_Elevator_EventScript_16082B .2byte 0 BattleTower_Elevator_EventScript_16082B:: @ 816082B - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 69db45ede..ca90b8b28 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -41,20 +41,20 @@ BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8 end BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE - map_script_2 0x4001, 0, BattleTower_Lobby_EventScript_1602F8 + map_script_2 VAR_TEMP_1, 0, BattleTower_Lobby_EventScript_1602F8 .2byte 0 BattleTower_Lobby_EventScript_1602F8:: @ 81602F8 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end BattleTower_Lobby_MapScript2_160302:: @ 8160302 - map_script_2 0x4000, 0, BattleTower_Lobby_EventScript_16032C - map_script_2 0x4000, 1, BattleTower_Lobby_EventScript_160330 - map_script_2 0x4000, 2, BattleTower_Lobby_EventScript_160342 - map_script_2 0x4000, 3, BattleTower_Lobby_EventScript_160419 - map_script_2 0x4000, 4, BattleTower_Lobby_EventScript_16044B + map_script_2 VAR_TEMP_0, 0, BattleTower_Lobby_EventScript_16032C + map_script_2 VAR_TEMP_0, 1, BattleTower_Lobby_EventScript_160330 + map_script_2 VAR_TEMP_0, 2, BattleTower_Lobby_EventScript_160342 + map_script_2 VAR_TEMP_0, 3, BattleTower_Lobby_EventScript_160419 + map_script_2 VAR_TEMP_0, 4, BattleTower_Lobby_EventScript_16044B .2byte 0 BattleTower_Lobby_EventScript_16032C:: @ 816032C @@ -66,7 +66,7 @@ BattleTower_Lobby_EventScript_160330:: @ 8160330 faceplayer msgbox BattleTower_Lobby_Text_19A3FD, 4 closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -125,7 +125,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD BattleTower_Lobby_EventScript_1603F8:: @ 81603F8 msgbox BattleTower_Lobby_Text_199FA9, 4 closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -133,7 +133,7 @@ BattleTower_Lobby_EventScript_160408:: @ 8160408 msgbox BattleTower_Lobby_Text_19A520, 4 waitmessage closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -152,7 +152,7 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 waitse msgbox BattleTower_Lobby_Text_199FA9, 4 closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -171,14 +171,14 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B setvar 0x8004, 8 setvar 0x8005, 0 special sub_8135668 - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 special SavePlayerParty special sub_8135A14 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate BattleTower_Lobby_EventScript_16049E:: @ 816049E @@ -230,7 +230,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA BattleTower_Lobby_EventScript_160587:: @ 8160587 setvar 0x8004, 5 special sub_8135668 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 setvar 0x8004, 11 special sub_8135668 setvar 0x8004, 0 @@ -243,7 +243,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 closemessage delay 2 call S_DoSaveDialog - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 erasebox 0, 0, 15, 10 compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 @@ -255,7 +255,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 closemessage call BattleTower_Lobby_EventScript_160664 warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate BattleTower_Lobby_EventScript_160600:: @ 8160600 diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index b4fa64cae..9a1bd9fa7 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -21,5 +21,5 @@ EverGrandeCity_EventScript_14D4F7:: @ 814D4F7 EverGrandeCity_EventScript_14D500:: @ 814D500 setflag FLAG_VISITED_EVER_GRANDE_CITY - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 end diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index d59476417..1ca62b61c 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_ChampionsRoom_MapScript1_15B7BF:: @ 815B7BF end EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5 - map_script_2 0x4001, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF @@ -17,7 +17,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF end EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 - map_script_2 0x4001, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE @@ -27,7 +27,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE delay 40 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802 waitmovement 0 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto EverGrandeCity_ChampionsRoom_EventScript_15B805 releaseall end diff --git a/data/scripts/maps/EverGrandeCity_Corridor1.inc b/data/scripts/maps/EverGrandeCity_Corridor1.inc index 104504960..60d1f7253 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor1.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor1.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor1_MapScripts:: @ 815BA0C .byte 0 EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12 - map_script_2 0x4001, 0, EverGrandeCity_Corridor1_EventScript_15BA1C + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor1_EventScript_15BA1C .2byte 0 EverGrandeCity_Corridor1_EventScript_15BA1C:: @ 815BA1C diff --git a/data/scripts/maps/EverGrandeCity_Corridor2.inc b/data/scripts/maps/EverGrandeCity_Corridor2.inc index c7c049020..d74be91c4 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor2.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor2.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor2_MapScripts:: @ 815BA21 .byte 0 EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27 - map_script_2 0x4001, 0, EverGrandeCity_Corridor2_EventScript_15BA31 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor2_EventScript_15BA31 .2byte 0 EverGrandeCity_Corridor2_EventScript_15BA31:: @ 815BA31 diff --git a/data/scripts/maps/EverGrandeCity_Corridor3.inc b/data/scripts/maps/EverGrandeCity_Corridor3.inc index 1714db5cc..006e570ef 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor3.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor3.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor3_MapScripts:: @ 815BA36 .byte 0 EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C - map_script_2 0x4001, 0, EverGrandeCity_Corridor3_EventScript_15BA46 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor3_EventScript_15BA46 .2byte 0 EverGrandeCity_Corridor3_EventScript_15BA46:: @ 815BA46 diff --git a/data/scripts/maps/EverGrandeCity_Corridor4.inc b/data/scripts/maps/EverGrandeCity_Corridor4.inc index 64cc234eb..2ae857aa8 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor4.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor4.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor4_MapScripts:: @ 815BA4B .byte 0 EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51 - map_script_2 0x4001, 0, EverGrandeCity_Corridor4_EventScript_15BA5B + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor4_EventScript_15BA5B .2byte 0 EverGrandeCity_Corridor4_EventScript_15BA5B:: @ 815BA5B diff --git a/data/scripts/maps/EverGrandeCity_Corridor5.inc b/data/scripts/maps/EverGrandeCity_Corridor5.inc index 73c0b5a84..09ce304f6 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor5.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor5.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor5_MapScripts:: @ 815BA60 .byte 0 EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66 - map_script_2 0x4001, 0, EverGrandeCity_Corridor5_EventScript_15BA70 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor5_EventScript_15BA70 .2byte 0 EverGrandeCity_Corridor5_EventScript_15BA70:: @ 815BA70 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index f7088e821..ef86b1df2 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D .byte 0 @ 815B71D - map_script_2 0x4001, 0, EverGrandeCity_DrakesRoom_EventScript_15B727 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_15B727 .2byte 0 EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index be9e7a897..bffb94bc4 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_GlaciasRoom_MapScripts:: @ 815B673 .byte 0 EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683 - map_script_2 0x4001, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 904dc7531..501f1e51c 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -4,7 +4,7 @@ EverGrandeCity_HallOfFame_MapScripts:: @ 815BB84 .byte 0 EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F - map_script_2 0x4001, 0, EverGrandeCity_HallOfFame_EventScript_15BB99 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BB99 .2byte 0 EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 @@ -12,7 +12,7 @@ EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 end EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E - map_script_2 0x4001, 0, EverGrandeCity_HallOfFame_EventScript_15BBA8 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BBA8 .2byte 0 EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 @@ -41,7 +41,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 dofieldeffect 62 waitfieldeffect 62 delay 40 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkplayergender compare RESULT, 0 diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 5ffa16d37..8f0fe97f1 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_PhoebesRoom_MapScripts:: @ 815B5D9 .byte 0 EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9 - map_script_2 0x4001, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3 diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 4a8919b98..63bb4cac3 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -49,10 +49,10 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 lockall checkflag FLAG_ENTERED_ELITE_FOUR goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 - getplayerxy 0x4000, 0x4001 - compare 0x4000, 11 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 11 call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 - compare 0x4000, 8 + compare VAR_TEMP_0, 8 call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waitmessage diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 6e958aeed..50c951b17 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -21,7 +21,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570 EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570 - map_script_2 0x4001, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A .2byte 0 EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index a0eb6186a..5cacc8bf3 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -8,7 +8,7 @@ FortreeCity_Gym_MapScript1_157EDE:: @ 8157EDE end FortreeCity_Gym_MapScript2_157EE2:: @ 8157EE2 - map_script_2 0x4000, 16384, FortreeCity_Gym_EventScript_157EEC + map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_157EEC .2byte 0 FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 18cfb904d..e3cef5fcb 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -15,7 +15,7 @@ InsideOfTruck_MapScript1_15FC26:: @ 815FC26 InsideOfTruck_EventScript_15FC29:: @ 815FC29 lockall - setflag 0x4000 + setflag FLAG_SPECIAL_FLAG_0 checkplayergender compare RESULT, 0 goto_if_eq InsideOfTruck_EventScript_15FC45 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 9dd1ae59d..bbfe43bb6 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -8,34 +8,34 @@ LavaridgeTown_Gym_1F_MapScript1_153694:: @ 8153694 end LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F - setvar 0x400b, 0 - setvar 0x400c, 0 - setvar 0x400d, 0 - setvar 0x400e, 0 - setvar 0x400f, 0 + setvar VAR_TEMP_B, 0 + setvar VAR_TEMP_C, 0 + setvar VAR_TEMP_D, 0 + setvar VAR_TEMP_E, 0 + setvar VAR_TEMP_F, 0 checktrainerflag OPPONENT_COLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536C6 - setvar 0x400b, 1 + setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 checktrainerflag OPPONENT_ZANE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536D4 - setvar 0x400c, 1 + setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 checktrainerflag OPPONENT_AXLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536E2 - setvar 0x400d, 1 + setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 checktrainerflag OPPONENT_SADIE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536F0 - setvar 0x400e, 1 + setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 checktrainerflag OPPONENT_ANDY goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536FE - setvar 0x400f, 1 + setvar VAR_TEMP_F, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 2806b6125..ff7722f13 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -78,8 +78,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE multichoice 16, 0, 42, 0 - copyvar 0x4001, RESULT - switch 0x4001 + copyvar VAR_TEMP_1, RESULT + switch VAR_TEMP_1 case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A227 case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_15A232 @@ -88,17 +88,17 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE end LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C:: @ 815A21C - setvar 0x4000, 26 + setvar VAR_TEMP_0, 26 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A227:: @ 815A227 - setvar 0x4000, 27 + setvar VAR_TEMP_0, 27 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A232:: @ 815A232 - setvar 0x4000, 28 + setvar VAR_TEMP_0, 28 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end @@ -127,54 +127,54 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A - checkitemspace 0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoneybox 0, 0 nop - bufferitemname 0, 0x4000 + bufferitemname 0, VAR_TEMP_0 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 - giveitem 0x4000, 1 - bufferitemname 1, 0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E - checkitemspace 0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - giveitem 0x4000, 1 - bufferitemname 1, 0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E - checkitemspace 0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - giveitem 0x4000, 1 - bufferitemname 1, 0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index f700eed9d..03203ed47 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -4,7 +4,7 @@ LilycoveCity_House3_MapScripts:: @ 8159BE4 LilycoveCity_House3_MapScript1_159BEA:: @ 8159BEA random 4 - copyvar 0x4001, RESULT + copyvar VAR_TEMP_1, RESULT end LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 @@ -41,7 +41,7 @@ LilycoveCity_House3_EventScript_159C32:: @ 8159C32 LilycoveCity_House3_EventScript_159C49:: @ 8159C49 lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D @@ -51,7 +51,7 @@ LilycoveCity_House3_EventScript_159C49:: @ 8159C49 LilycoveCity_House3_EventScript_159C7D:: @ 8159C7D lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D @@ -61,7 +61,7 @@ LilycoveCity_House3_EventScript_159C7D:: @ 8159C7D LilycoveCity_House3_EventScript_159CB1:: @ 8159CB1 lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D @@ -71,7 +71,7 @@ LilycoveCity_House3_EventScript_159CB1:: @ 8159CB1 LilycoveCity_House3_EventScript_159CE5:: @ 8159CE5 lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 13c18d51e..17565f7e8 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -128,7 +128,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B closedoor 0x8004, 0x8005 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT - clearflag 0x4000 + clearflag FLAG_SPECIAL_FLAG_0 return LittlerootTown_Movement_14D6AC:: @ 814D6AC diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 8228238f3..5b6c47a86 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -32,8 +32,8 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 end MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE - checkcoins 16385 - compare 0x4001, 9950 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9950 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 compare RESULT, 0 @@ -51,8 +51,8 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE end MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 - checkcoins 16385 - compare 0x4001, 9500 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9500 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 compare RESULT, 0 @@ -109,7 +109,7 @@ MauvilleCity_GameCorner_EventScript_156B88:: @ 8156B88 message MauvilleCity_GameCorner_Text_181E17 waitmessage showcoinsbox 0, 0 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto MauvilleCity_GameCorner_EventScript_156BA6 MauvilleCity_GameCorner_EventScript_156B9B:: @ 8156B9B @@ -128,17 +128,17 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 end MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 bufferdecorationname 0, 88 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 bufferdecorationname 0, 89 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 bufferdecorationname 0, 90 goto MauvilleCity_GameCorner_EventScript_156C0C @@ -146,15 +146,15 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, 5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D - switch 0x4001 + switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156C46 case 2, MauvilleCity_GameCorner_EventScript_156C80 case 3, MauvilleCity_GameCorner_EventScript_156CBA end MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 - checkcoins 16386 - compare 0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, 88 checkdecorspace 88 @@ -169,8 +169,8 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 end MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 - checkcoins 16386 - compare 0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, 89 checkdecorspace 89 @@ -185,8 +185,8 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 end MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA - checkcoins 16386 - compare 0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, 90 checkdecorspace 90 @@ -230,7 +230,7 @@ MauvilleCity_GameCorner_EventScript_156D36:: @ 8156D36 message MauvilleCity_GameCorner_Text_181E17 waitmessage showcoinsbox 0, 0 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto MauvilleCity_GameCorner_EventScript_156D54 MauvilleCity_GameCorner_EventScript_156D49:: @ 8156D49 @@ -251,27 +251,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 end MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 bufferitemname 0, ITEM_TM32 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 bufferitemname 0, ITEM_TM29 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 bufferitemname 0, ITEM_TM35 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 - setvar 0x4001, 4 + setvar VAR_TEMP_1, 4 bufferitemname 0, ITEM_TM24 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE - setvar 0x4001, 5 + setvar VAR_TEMP_1, 5 bufferitemname 0, ITEM_TM13 goto MauvilleCity_GameCorner_EventScript_156DEC @@ -279,7 +279,7 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, 5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 - switch 0x4001 + switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156E3C case 2, MauvilleCity_GameCorner_EventScript_156E76 case 3, MauvilleCity_GameCorner_EventScript_156EB0 @@ -288,8 +288,8 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC end MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C - checkcoins 16386 - compare 0x4002, 1500 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 compare RESULT, 0 @@ -303,8 +303,8 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C end MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 - checkcoins 16386 - compare 0x4002, 3500 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 3500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 compare RESULT, 0 @@ -318,8 +318,8 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 end MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 - checkcoins 16386 - compare 0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 compare RESULT, 0 @@ -333,8 +333,8 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 end MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA - checkcoins 16386 - compare 0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 compare RESULT, 0 @@ -348,8 +348,8 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA end MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 - checkcoins 16386 - compare 0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 compare RESULT, 0 @@ -462,8 +462,8 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C checkflag FLAG_RECEIVED_20_COINS goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA - checkcoins 16385 - compare 0x4001, 1 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA setflag FLAG_RECEIVED_20_COINS givecoins 20 diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index f165bd3ef..fd4b8cfbf 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -53,7 +53,7 @@ MossdeepCity_EventScript_14CFFF:: @ 814CFFF MossdeepCity_EventScript_14D008:: @ 814D008 setflag FLAG_VISITED_MOSSDEEP_CITY - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 end MossdeepCity_EventScript_14D011:: @ 814D011 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 75fc3c6b8..527e29dd5 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -24,7 +24,7 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 end MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 setobjectmovementtype 1, 8 return @@ -84,7 +84,7 @@ MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock faceplayer - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4 release diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 12a94154b..b27965d61 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -8,7 +8,7 @@ MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60 end MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64 - map_script_2 0x4001, 0, MossdeepCity_GameCorner_B1F_EventScript_15AE6E + map_script_2 VAR_TEMP_1, 0, MossdeepCity_GameCorner_B1F_EventScript_15AE6E .2byte 0 MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E @@ -33,7 +33,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF waitmovement 0 special LoadPlayerParty - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 warp MAP_MOSSDEEP_CITY_GAME_CORNER_1F, 255, 3, 1 waitstate releaseall diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index 550f74d9a..76f1736c2 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -7,8 +7,8 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C end MtPyre_Exterior_EventScript_15D492:: @ 815D492 - getplayerxy 0x4000, 0x4001 - compare 0x4001, 12 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 12 goto_if 0, MtPyre_Exterior_EventScript_15D4A3 return diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index aefb23c61..ba991bcf2 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -5,9 +5,9 @@ NewMauville_Inside_MapScripts:: @ 815E55F .byte 0 NewMauville_Inside_MapScript1_15E56F:: @ 815E56F - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, NewMauville_Inside_EventScript_15E5DA - compare 0x4002, 1 + compare VAR_TEMP_2, 1 call_if 1, NewMauville_Inside_EventScript_15E728 checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, NewMauville_Inside_EventScript_15E58F @@ -18,8 +18,8 @@ NewMauville_Inside_EventScript_15E58F:: @ 815E58F return NewMauville_Inside_MapScript1_15E593:: @ 815E593 - setvar 0x4001, 0 - setvar 0x4002, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 end NewMauville_Inside_MapScript1_15E59E:: @ 815E59E @@ -29,8 +29,8 @@ NewMauville_Inside_MapScript1_15E59E:: @ 815E59E NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA lockall - setvar 0x4001, 1 - setvar 0x4002, 0 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 0 playse 21 call NewMauville_Inside_EventScript_15E5DA special DrawWholeMapView @@ -39,8 +39,8 @@ NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 lockall - setvar 0x4001, 0 - setvar 0x4002, 1 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 1 playse 21 call NewMauville_Inside_EventScript_15E728 special DrawWholeMapView diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 45cdce991..351b7ea85 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -25,7 +25,7 @@ PetalburgCity_MapScript2_14B73D:: @ 814B73D PetalburgCity_EventScript_14B747:: @ 814B747 lockall - setflag 0x4000 + setflag FLAG_SPECIAL_FLAG_0 special SavePlayerParty special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_14B7ED @@ -39,10 +39,10 @@ PetalburgCity_EventScript_14B747:: @ 814B747 waitmovement 0, 0, 2 msgbox PetalburgCity_Text_16D408, 4 closemessage - clearflag 0x4000 + clearflag FLAG_SPECIAL_FLAG_0 setvar 0x4057, 3 fadedefaultbgm - clearflag 0x4001 + clearflag FLAG_SPECIAL_FLAG_1 special LoadPlayerParty setvar 0x4085, 1 warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index add786bf0..0b6b3842f 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -194,7 +194,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage - setflag 0x4001 + setflag FLAG_SPECIAL_FLAG_1 playbgm 420, 0 compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 1810a6495..f03d7cc62 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -12,7 +12,7 @@ Route101_MapScript2_14E935:: @ 814E935 .2byte 0 Route101_EventScript_14E93F:: @ 814E93F - setflag 0x4000 + setflag FLAG_SPECIAL_FLAG_0 setvar 0x4060, 1 end @@ -235,7 +235,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag FLAG_HIDE_BIRCH_STARTERS_BAG setvar 0x4084, 2 setvar 0x4060, 3 - clearflag 0x4000 + clearflag FLAG_SPECIAL_FLAG_0 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 8e33517ca..6eedce42d 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -29,7 +29,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end @@ -56,6 +56,6 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A lockall setvar 0x40a9, 0 clearflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 51cab5ddd..2f54753ab 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -14,7 +14,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end @@ -33,6 +33,6 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD lockall clearflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 813cbb9e9..aa1345c7e 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -6,18 +6,18 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 .byte 0 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161994 end Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957 - setvar 0x4001, 0 - setvar 0x4002, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 special SetTrickHouseEndRoomFlag end Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 - map_script_2 0x4002, 0, Route110_TrickHouseEnd_EventScript_16196F + map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_16196F .2byte 0 Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F @@ -27,11 +27,11 @@ Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F end Route110_TrickHouseEnd_MapScript2_16197C:: @ 816197C - map_script_2 0x4001, 0, Route110_TrickHouseEnd_EventScript_161986 + map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_161986 .2byte 0 Route110_TrickHouseEnd_EventScript_161986:: @ 8161986 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 call Route110_TrickHouseEnd_EventScript_161994 special DrawWholeMapView end @@ -44,7 +44,7 @@ Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E lock faceplayer msgbox Route110_TrickHouseEnd_Text_19C281, 4 - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 switch 0x4044 case 0, Route110_TrickHouseEnd_EventScript_161A0B case 1, Route110_TrickHouseEnd_EventScript_161A47 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 6425d05cb..19ebfbf50 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -4,21 +4,21 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 .byte 0 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C - compare 0x4002, 1 + compare VAR_TEMP_2, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F - compare 0x4003, 1 + compare VAR_TEMP_3, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 - compare 0x4004, 1 + compare VAR_TEMP_4, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 end Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 end Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 @@ -35,7 +35,7 @@ Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E2C special DrawWholeMapView @@ -44,7 +44,7 @@ Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 lockall - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E3F special DrawWholeMapView @@ -53,7 +53,7 @@ Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 lockall - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E52 special DrawWholeMapView @@ -62,7 +62,7 @@ Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 lockall - setvar 0x4004, 1 + setvar VAR_TEMP_4, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E65 special DrawWholeMapView diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 54cea16c9..be1f84c63 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -5,22 +5,22 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 - compare 0x4009, 0 + compare VAR_TEMP_9, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 end Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4006, 0 - setvar 0x4007, 0 - setvar 0x4008, 0 - setvar 0x4009, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 + setvar VAR_TEMP_9, 0 end Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 @@ -31,19 +31,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmetatile 13, 7, 600, 0 setmetatile 1, 3, 600, 0 setmetatile 10, 2, 600, 0 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 - compare 0x4008, 6 + compare VAR_TEMP_8, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 - compare 0x4008, 7 + compare VAR_TEMP_8, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB return @@ -247,43 +247,43 @@ Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB lockall - setvar 0x4008, 1 + setvar VAR_TEMP_8, 1 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625B7:: @ 81625B7 lockall - setvar 0x4008, 2 + setvar VAR_TEMP_8, 2 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625C3:: @ 81625C3 lockall - setvar 0x4008, 3 + setvar VAR_TEMP_8, 3 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625CF:: @ 81625CF lockall - setvar 0x4008, 4 + setvar VAR_TEMP_8, 4 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625DB:: @ 81625DB lockall - setvar 0x4008, 5 + setvar VAR_TEMP_8, 5 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625E7:: @ 81625E7 lockall - setvar 0x4008, 6 + setvar VAR_TEMP_8, 6 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625F3:: @ 81625F3 lockall - setvar 0x4008, 7 + setvar VAR_TEMP_8, 7 goto Route110_TrickHousePuzzle3_EventScript_1625FF end @@ -295,76 +295,76 @@ Route110_TrickHousePuzzle3_EventScript_1625FF:: @ 81625FF end Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4006, 0 - setvar 0x4007, 0 - compare 0x4008, 1 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B - compare 0x4008, 6 + compare VAR_TEMP_8, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 - compare 0x4008, 7 + compare VAR_TEMP_8, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 return Route110_TrickHousePuzzle3_EventScript_162683:: @ 8162683 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 return Route110_TrickHousePuzzle3_EventScript_162689:: @ 8162689 - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 return Route110_TrickHousePuzzle3_EventScript_16268F:: @ 816268F - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 return Route110_TrickHousePuzzle3_EventScript_162695:: @ 8162695 - setvar 0x4004, 1 + setvar VAR_TEMP_4, 1 return Route110_TrickHousePuzzle3_EventScript_16269B:: @ 816269B - setvar 0x4005, 1 + setvar VAR_TEMP_5, 1 return Route110_TrickHousePuzzle3_EventScript_1626A1:: @ 81626A1 - setvar 0x4006, 1 + setvar VAR_TEMP_6, 1 return Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 - setvar 0x4007, 1 + setvar VAR_TEMP_7, 1 return Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare 0x4009, 0 + compare VAR_TEMP_9, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView - compare 0x4009, 1 + compare VAR_TEMP_9, 1 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD - compare 0x4009, 0 + compare VAR_TEMP_9, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626E4 end Route110_TrickHousePuzzle3_EventScript_1626DD:: @ 81626DD - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 releaseall end Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 4b9031715..695c532cf 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -3,12 +3,12 @@ Route110_TrickHousePuzzle5_MapScripts:: @ 81627B0 .byte 0 Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4008, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_8, 0 end Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 @@ -27,9 +27,9 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 lockall applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F end @@ -37,9 +37,9 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 lockall applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4002, 1 + compare VAR_TEMP_2, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end @@ -47,9 +47,9 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 lockall applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4003, 1 + compare VAR_TEMP_3, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 end @@ -57,9 +57,9 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 lockall applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4004, 1 + compare VAR_TEMP_4, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B end @@ -67,109 +67,109 @@ Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 lockall applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4005, 1 + compare VAR_TEMP_5, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162897:: @ 8162897 lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628A3:: @ 81628A3 lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628AF:: @ 81628AF lockall - setvar 0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628BB:: @ 81628BB lockall - setvar 0x4009, 3 + setvar VAR_TEMP_9, 3 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628C7:: @ 81628C7 lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_1628D3:: @ 81628D3 lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_1628DF:: @ 81628DF lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_1628EB:: @ 81628EB lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_1628F7:: @ 81628F7 lockall - setvar 0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_162903:: @ 8162903 lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_16290F:: @ 816290F lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_16291B:: @ 816291B lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162927:: @ 8162927 lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933 lockall - setvar 0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F - setvar 0x4001, 1 - setvar 0x4008, 1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_8, 1 playse 21 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 @@ -180,18 +180,18 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F end Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 - setvar 0x4002, 1 - setvar 0x4008, 2 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_8, 2 playse 21 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 @@ -202,18 +202,18 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 end Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 - setvar 0x4003, 1 - setvar 0x4008, 3 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_8, 3 playse 21 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 @@ -224,18 +224,18 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 end Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B - setvar 0x4004, 1 - setvar 0x4008, 4 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_8, 4 playse 21 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 @@ -246,18 +246,18 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B end Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F - setvar 0x4005, 1 - setvar 0x4008, 5 + setvar VAR_TEMP_5, 1 + setvar VAR_TEMP_8, 5 playse 21 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 @@ -418,80 +418,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 end Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 - compare 0x4009, 4 + compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 - compare 0x4009, 5 + compare VAR_TEMP_9, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index ddf845142..917b9483b 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle6_MapScript1_1630D8:: @ 81630D8 end Route110_TrickHousePuzzle6_MapScript2_1630DC:: @ 81630DC - map_script_2 0x4000, 16384, Route110_TrickHousePuzzle6_EventScript_1630E6 + map_script_2 VAR_TEMP_0, 16384, Route110_TrickHousePuzzle6_EventScript_1630E6 .2byte 0 Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 0a7e6befc..17d4f91c6 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -21,16 +21,16 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 end Route111_EventScript_14FFCD:: @ 814FFCD - getplayerxy 0x4000, 0x4001 - compare 0x4001, 34 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 34 goto_if 0, Route111_EventScript_15000C - compare 0x4001, 107 + compare VAR_TEMP_1, 107 goto_if 2, Route111_EventScript_15000C - compare 0x4001, 72 + compare VAR_TEMP_1, 72 goto_if 2, Route111_EventScript_150009 - compare 0x4000, 2000 + compare VAR_TEMP_0, 2000 goto_if 2, Route111_EventScript_15000C - compare 0x4000, 8 + compare VAR_TEMP_0, 8 goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 @@ -166,7 +166,7 @@ Route111_EventScript_15013A:: @ 815013A checkitem ITEM_GO_GOGGLES, 1 compare RESULT, 0 goto_if_eq Route111_EventScript_150151 - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 releaseall end @@ -224,7 +224,7 @@ Route111_EventScript_1501BC:: @ 81501BC setweather 2 fadenewbgm 360 doweather - setvar 0x4003, 0 + setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 37fd0ed3f..82f7855e1 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -13,10 +13,10 @@ Route113_MapScript1_1505DA:: @ 81505DA end Route113_EventScript_1505E5:: @ 81505E5 - getplayerxy 0x4000, 0x4001 - compare 0x4000, 19 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 19 goto_if 0, Route113_EventScript_150604 - compare 0x4000, 84 + compare VAR_TEMP_0, 84 goto_if 2, Route113_EventScript_150604 setweather 7 return diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index aff1254a9..954be6f21 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -39,12 +39,12 @@ Route119_EventScript_1511B9:: @ 81511B9 return Route119_EventScript_1511C5:: @ 81511C5 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto Route119_EventScript_1511DB end Route119_EventScript_1511D0:: @ 81511D0 - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto Route119_EventScript_1511DB end @@ -57,16 +57,16 @@ Route119_EventScript_1511DB:: @ 81511DB compare RESULT, 1 call_if 1, Route119_EventScript_151259 delay 65 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513A6 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513B1 applymovement 255, Route119_Movement_1A0845 waitmovement 0 delay 30 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513D2 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513E1 removeobject 25 addobject 16 @@ -154,16 +154,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closemessage - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513D2 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513E1 removeobject 16 addobject 25 delay 30 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513BC - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513C7 removeobject 25 setvar 0x4072, 1 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index cd84f95af..98c0cf20d 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -80,12 +80,12 @@ Route120_MapScript1_1516DF:: @ 81516DF end Route120_EventScript_1516EA:: @ 81516EA - getplayerxy 0x4000, 0x4001 - compare 0x4001, 14 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 14 goto_if 3, Route120_EventScript_151715 - compare 0x4001, 60 + compare VAR_TEMP_1, 60 goto_if 3, Route120_EventScript_151719 - compare 0x4001, 61 + compare VAR_TEMP_1, 61 goto_if 4, Route120_EventScript_151711 return @@ -98,9 +98,9 @@ Route120_EventScript_151715:: @ 8151715 return Route120_EventScript_151719:: @ 8151719 - compare 0x4000, 7 + compare VAR_TEMP_0, 7 goto_if 3, Route120_EventScript_151735 - compare 0x4000, 19 + compare VAR_TEMP_0, 19 goto_if 3, Route120_EventScript_151715 goto Route120_EventScript_151735 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 4902d9f08..04da2d9c7 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -23,13 +23,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164329 goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 end Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 checkitem ITEM_RED_SHARD, 1 compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A @@ -45,19 +45,19 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 return Route124_DivingTreasureHuntersHouse_EventScript_163E8A:: @ 8163E8A - addvar 0x4001, 1 + addvar VAR_TEMP_1, 1 return Route124_DivingTreasureHuntersHouse_EventScript_163E90:: @ 8163E90 - addvar 0x4001, 2 + addvar VAR_TEMP_1, 2 return Route124_DivingTreasureHuntersHouse_EventScript_163E96:: @ 8163E96 - addvar 0x4001, 4 + addvar VAR_TEMP_1, 4 return Route124_DivingTreasureHuntersHouse_EventScript_163E9C:: @ 8163E9C - addvar 0x4001, 8 + addvar VAR_TEMP_1, 8 return Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2 @@ -68,7 +68,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2 Route124_DivingTreasureHuntersHouse_EventScript_163EB0:: @ 8163EB0 message Route124_DivingTreasureHuntersHouse_Text_19F5C5 waitmessage - switch 0x4001 + switch VAR_TEMP_1 case 1, Route124_DivingTreasureHuntersHouse_EventScript_163F61 case 2, Route124_DivingTreasureHuntersHouse_EventScript_163F87 case 3, Route124_DivingTreasureHuntersHouse_EventScript_163FAD @@ -263,7 +263,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 giveitem_std 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 compare RESULT, 1 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index c45389b9f..831cffaea 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -334,42 +334,42 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF RustboroCity_EventScript_14C614:: @ 814C614 waitse - setvar 0x4001, 4 + setvar VAR_TEMP_1, 4 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C620:: @ 814C620 lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C62C:: @ 814C62C lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C638:: @ 814C638 lockall - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C644:: @ 814C644 lockall - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C650:: @ 814C650 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, RustboroCity_EventScript_14C691 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RustboroCity_EventScript_14C6BD - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RustboroCity_EventScript_14C6E9 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_14C715 setflag FLAG_UNKNOWN_9F setvar 0x405a, 3 @@ -434,38 +434,38 @@ RustboroCity_Movement_14C74B:: @ 814C74B RustboroCity_EventScript_14C74D:: @ 814C74D lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C759:: @ 814C759 lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C765:: @ 814C765 lockall - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C771:: @ 814C771 lockall - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C77D:: @ 814C77D - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, RustboroCity_EventScript_14C7FE - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RustboroCity_EventScript_14C82A - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RustboroCity_EventScript_14C856 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_14C882 - compare 0x4001, 4 + compare VAR_TEMP_1, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem_std ITEM_GREAT_BALL diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 64fce8118..0063564a3 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -52,35 +52,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_15C8CA - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C8DF - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C8EB - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C8EB giveitem_std ITEM_HM04 setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_15C880 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C892 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closemessage - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_15C8F7 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C909 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall @@ -266,15 +266,15 @@ RusturfTunnel_Movement_15C994:: @ 815C994 step_end RusturfTunnel_EventScript_15C999:: @ 815C999 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 end RusturfTunnel_EventScript_15C99F:: @ 815C99F - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 end RusturfTunnel_EventScript_15C9A5:: @ 815C9A5 - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 end RusturfTunnel_EventScript_15C9AB:: @ 815C9AB diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 6d31cf981..d11fc16d3 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -9,7 +9,7 @@ SafariZone_Southeast_MapScript2_160041:: @ 8160041 SafariZone_Southeast_EventScript_16004B:: @ 816004B lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 applymovement 255, SafariZone_Southeast_Movement_160087 waitmovement 0 applymovement 1, SafariZone_Southeast_Movement_160089 @@ -52,7 +52,7 @@ SafariZone_Southeast_EventScript_16009E:: @ 816009E SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 lock faceplayer - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if_eq SafariZone_Southeast_EventScript_1600D1 msgbox SafariZone_Southeast_Text_1C3A56, 5 compare RESULT, 1 @@ -62,7 +62,7 @@ SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 end SafariZone_Southeast_EventScript_1600D1:: @ 81600D1 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 msgbox SafariZone_Southeast_Text_1C3B2D, 4 release end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 304013b08..5d7a38401 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -4,7 +4,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 checkflag FLAG_SYS_GAME_CLEAR @@ -300,7 +300,7 @@ SlateportCity_Harbor_EventScript_156265:: @ 8156265 end SlateportCity_Harbor_EventScript_15626F:: @ 815626F - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq SlateportCity_Harbor_EventScript_156380 checkitem ITEM_SCANNER, 1 compare RESULT, 1 @@ -369,7 +369,7 @@ SlateportCity_Harbor_EventScript_156374:: @ 8156374 end SlateportCity_Harbor_EventScript_156380:: @ 8156380 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 msgbox SlateportCity_Harbor_Text_180491, 4 release end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 593e18fee..40b410f77 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -22,7 +22,7 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 end SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 - setvar 0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag FLAG_RECEIVED_GREEN_SCARF @@ -33,7 +33,7 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag FLAG_RECEIVED_RED_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - compare 0x4002, 5 + compare VAR_TEMP_2, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D compare 0x40b7, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE @@ -48,7 +48,7 @@ SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE checkflag FLAG_RECEIVED_GREEN_SCARF @@ -60,7 +60,7 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 checkflag FLAG_RECEIVED_RED_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 bufferleadmonspeciesname 0 - switch 0x4001 + switch VAR_TEMP_1 case 0, SlateportCity_PokemonFanClub_EventScript_155899 case 1, SlateportCity_PokemonFanClub_EventScript_1558A3 case 2, SlateportCity_PokemonFanClub_EventScript_1558D4 @@ -75,7 +75,7 @@ SlateportCity_PokemonFanClub_EventScript_15588D:: @ 815588D return SlateportCity_PokemonFanClub_EventScript_155893:: @ 8155893 - addvar 0x4002, 1 + addvar VAR_TEMP_2, 1 return SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 @@ -150,7 +150,7 @@ SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 return SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 return SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 @@ -160,7 +160,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 return SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 return SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 @@ -170,7 +170,7 @@ SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 return SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 return SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 @@ -180,7 +180,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 return SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 - setvar 0x4001, 4 + setvar VAR_TEMP_1, 4 return SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE @@ -190,7 +190,7 @@ SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE return SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F - setvar 0x4001, 5 + setvar VAR_TEMP_1, 5 return SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 1e0f14728..c31eef6ba 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -7,7 +7,7 @@ UnknownMap_25_34_MapScripts:: @ 815F580 LinkContestRoom1_MapScript1_15F595:: @ 815F595 call LinkContestRoom1_EventScript_15F5A5 - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 call LinkContestRoom1_EventScript_15F630 end @@ -46,7 +46,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, LinkContestRoom1_EventScript_15F600 end @@ -75,12 +75,12 @@ LinkContestRoom1_EventScript_15F625:: @ 815F625 LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 - compare 0x4000, 8 + compare VAR_TEMP_0, 8 goto_if 0, LinkContestRoom1_EventScript_15F630 return LinkContestRoom1_EventScript_15F646:: @ 815F646 - switch 0x4000 + switch VAR_TEMP_0 case 1, LinkContestRoom1_EventScript_15F699 case 2, LinkContestRoom1_EventScript_15F6A4 case 3, LinkContestRoom1_EventScript_15F6AF @@ -91,38 +91,38 @@ LinkContestRoom1_EventScript_15F646:: @ 815F646 end LinkContestRoom1_EventScript_15F699:: @ 815F699 - copyvar 0x4014, 0x4001 - addvar 0x4000, 1 + copyvar 0x4014, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6A4:: @ 815F6A4 - copyvar 0x4015, 0x4001 - addvar 0x4000, 1 + copyvar 0x4015, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6AF:: @ 815F6AF - copyvar 0x4016, 0x4001 - addvar 0x4000, 1 + copyvar 0x4016, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6BA:: @ 815F6BA - copyvar 0x4017, 0x4001 - addvar 0x4000, 1 + copyvar 0x4017, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6C5:: @ 815F6C5 - copyvar 0x4018, 0x4001 - addvar 0x4000, 1 + copyvar 0x4018, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6D0:: @ 815F6D0 - copyvar 0x4019, 0x4001 - addvar 0x4000, 1 + copyvar 0x4019, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB - copyvar 0x401a, 0x4001 - addvar 0x4000, 1 + copyvar 0x401a, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6 @@ -165,131 +165,131 @@ LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6 end LinkContestRoom1_EventScript_15F859:: @ 815F859 - setvar 0x4001, 5 + setvar VAR_TEMP_1, 5 return LinkContestRoom1_EventScript_15F85F:: @ 815F85F - setvar 0x4001, 6 + setvar VAR_TEMP_1, 6 return LinkContestRoom1_EventScript_15F865:: @ 815F865 - setvar 0x4001, 7 + setvar VAR_TEMP_1, 7 return LinkContestRoom1_EventScript_15F86B:: @ 815F86B - setvar 0x4001, 8 + setvar VAR_TEMP_1, 8 return LinkContestRoom1_EventScript_15F871:: @ 815F871 - setvar 0x4001, 10 + setvar VAR_TEMP_1, 10 return LinkContestRoom1_EventScript_15F877:: @ 815F877 - setvar 0x4001, 11 + setvar VAR_TEMP_1, 11 return LinkContestRoom1_EventScript_15F87D:: @ 815F87D - setvar 0x4001, 12 + setvar VAR_TEMP_1, 12 return LinkContestRoom1_EventScript_15F883:: @ 815F883 - setvar 0x4001, 13 + setvar VAR_TEMP_1, 13 return LinkContestRoom1_EventScript_15F889:: @ 815F889 - setvar 0x4001, 14 + setvar VAR_TEMP_1, 14 return LinkContestRoom1_EventScript_15F88F:: @ 815F88F - setvar 0x4001, 15 + setvar VAR_TEMP_1, 15 return LinkContestRoom1_EventScript_15F895:: @ 815F895 - setvar 0x4001, 17 + setvar VAR_TEMP_1, 17 return LinkContestRoom1_EventScript_15F89B:: @ 815F89B - setvar 0x4001, 18 + setvar VAR_TEMP_1, 18 return LinkContestRoom1_EventScript_15F8A1:: @ 815F8A1 - setvar 0x4001, 19 + setvar VAR_TEMP_1, 19 return LinkContestRoom1_EventScript_15F8A7:: @ 815F8A7 - setvar 0x4001, 20 + setvar VAR_TEMP_1, 20 return LinkContestRoom1_EventScript_15F8AD:: @ 815F8AD - setvar 0x4001, 21 + setvar VAR_TEMP_1, 21 return LinkContestRoom1_EventScript_15F8B3:: @ 815F8B3 - setvar 0x4001, 22 + setvar VAR_TEMP_1, 22 return LinkContestRoom1_EventScript_15F8B9:: @ 815F8B9 - setvar 0x4001, 25 + setvar VAR_TEMP_1, 25 return LinkContestRoom1_EventScript_15F8BF:: @ 815F8BF - setvar 0x4001, 26 + setvar VAR_TEMP_1, 26 return LinkContestRoom1_EventScript_15F8C5:: @ 815F8C5 - setvar 0x4001, 27 + setvar VAR_TEMP_1, 27 return LinkContestRoom1_EventScript_15F8CB:: @ 815F8CB - setvar 0x4001, 47 + setvar VAR_TEMP_1, 47 return LinkContestRoom1_EventScript_15F8D1:: @ 815F8D1 - setvar 0x4001, 30 + setvar VAR_TEMP_1, 30 return LinkContestRoom1_EventScript_15F8D7:: @ 815F8D7 - setvar 0x4001, 31 + setvar VAR_TEMP_1, 31 return LinkContestRoom1_EventScript_15F8DD:: @ 815F8DD - setvar 0x4001, 32 + setvar VAR_TEMP_1, 32 return LinkContestRoom1_EventScript_15F8E3:: @ 815F8E3 - setvar 0x4001, 33 + setvar VAR_TEMP_1, 33 return LinkContestRoom1_EventScript_15F8E9:: @ 815F8E9 - setvar 0x4001, 34 + setvar VAR_TEMP_1, 34 return LinkContestRoom1_EventScript_15F8EF:: @ 815F8EF - setvar 0x4001, 35 + setvar VAR_TEMP_1, 35 return LinkContestRoom1_EventScript_15F8F5:: @ 815F8F5 - setvar 0x4001, 36 + setvar VAR_TEMP_1, 36 return LinkContestRoom1_EventScript_15F8FB:: @ 815F8FB - setvar 0x4001, 37 + setvar VAR_TEMP_1, 37 return LinkContestRoom1_EventScript_15F901:: @ 815F901 - setvar 0x4001, 38 + setvar VAR_TEMP_1, 38 return LinkContestRoom1_EventScript_15F907:: @ 815F907 - setvar 0x4001, 44 + setvar VAR_TEMP_1, 44 return LinkContestRoom1_EventScript_15F90D:: @ 815F90D - setvar 0x4001, 45 + setvar VAR_TEMP_1, 45 return LinkContestRoom1_EventScript_15F913:: @ 815F913 - setvar 0x4001, 46 + setvar VAR_TEMP_1, 46 return LinkContestRoom1_EventScript_15F919:: @ 815F919 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index ea8128ee3..aa4c8fc0f 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -173,7 +173,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, 4 msgbox LittlerootTown_BrendansHouse_1F_Text_172644, 4 closemessage - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8 @@ -198,7 +198,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, 4 msgbox LittlerootTown_MaysHouse_1F_Text_172644, 4 closemessage - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B6AB8 @@ -260,7 +260,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 compare 0x4092, 7 goto_if 4, LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C diff --git a/include/constants/flags.h b/include/constants/flags.h index eff147fb8..40bac89a0 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -2,8 +2,8 @@ #define GUARD_CONSTANTS_FLAGS_H // temporary flags -// These temporary are are cleared every time a map is loaded. They are used for -// things like shortening an NPCs introduction text if the player already spoke +// These temporary flags are are cleared every time a map is loaded. They are used +// for things like shortening an NPCs introduction text if the player already spoke // to them once. #define FLAG_TEMP_1 0x1 #define FLAG_TEMP_2 0x2 @@ -799,6 +799,7 @@ // SPECIAL FLAGS (unknown purpose) +#define FLAG_SPECIAL_FLAG_0 0x4000 #define FLAG_SPECIAL_FLAG_1 0x4001 #endif // GUARD_CONSTANTS_FLAGS_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 21834879f..df265c551 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -3,17 +3,25 @@ #define VAR_0x3F20 0x3F20 -#define VAR_0x4000 0x4000 -#define VAR_0x4001 0x4001 -#define VAR_0x4002 0x4002 -#define VAR_0x4003 0x4003 -#define VAR_0x4004 0x4004 -#define VAR_0x4005 0x4005 -#define VAR_0x4006 0x4006 -#define VAR_0x4007 0x4007 -#define VAR_0x4008 0x4008 -#define VAR_0x4009 0x4009 -#define VAR_0x400A 0x400A +// temporary vars +// The first 0x10 vars are are temporary--they are cleared every time a map is loaded. +#define VAR_TEMP_0 0x4000 +#define VAR_TEMP_1 0x4001 +#define VAR_TEMP_2 0x4002 +#define VAR_TEMP_3 0x4003 +#define VAR_TEMP_4 0x4004 +#define VAR_TEMP_5 0x4005 +#define VAR_TEMP_6 0x4006 +#define VAR_TEMP_7 0x4007 +#define VAR_TEMP_8 0x4008 +#define VAR_TEMP_9 0x4009 +#define VAR_TEMP_A 0x400A +#define VAR_TEMP_B 0x400B +#define VAR_TEMP_C 0x400C +#define VAR_TEMP_D 0x400D +#define VAR_TEMP_E 0x400E +#define VAR_TEMP_F 0x400F + #define VAR_0x401F 0x401F #define VAR_RECYCLE_GOODS 0x4020 #define VAR_REPEL_STEP_COUNT 0x4021 diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c index 6cb1e54b2..997a257f5 100644 --- a/src/engine/record_mixing.c +++ b/src/engine/record_mixing.c @@ -119,7 +119,7 @@ void Task_RecordMixing_Main(u8 taskId) { case 0: // init sub_8007270(gSpecialVar_0x8005); - VarSet(VAR_0x4000, 1); + VarSet(VAR_TEMP_0, 1); gUnknown_03000718 = 0; RecordMixing_PrepareExchangePacket(); CreateRecordMixingSprite(); @@ -1016,26 +1016,26 @@ void sub_80B9F3C(u16 *a, u8 b) { if (!CheckBagHasItem(*a, 1) && !CheckPCHasItem(*a, 1) && AddBagItem(*a, 1)) { - VarSet(VAR_0x4001, *a); + VarSet(VAR_TEMP_1, *a); StringCopy(gStringVar1, gLinkPlayers[0].name); if (*a == ITEM_EON_TICKET) FlagSet(FLAG_SYS_HAS_EON_TICKET); } else { - VarSet(VAR_0x4001, ITEM_NONE); + VarSet(VAR_TEMP_1, ITEM_NONE); } } else { if (AddBagItem(*a, 1) == TRUE) { - VarSet(VAR_0x4001, *a); + VarSet(VAR_TEMP_1, *a); StringCopy(gStringVar1, gLinkPlayers[0].name); } else { - VarSet(VAR_0x4001, ITEM_NONE); + VarSet(VAR_TEMP_1, ITEM_NONE); } } } diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c index 6b6064c16..c4a94b172 100644 --- a/src/field/battle_tower.c +++ b/src/field/battle_tower.c @@ -294,24 +294,24 @@ void sub_8134548(void) ResetBattleTowerStreak(levelType); if (!var1) { - VarSet(VAR_0x4000, 5); + VarSet(VAR_TEMP_0, 5); } break; case 1: ResetBattleTowerStreak(levelType); - VarSet(VAR_0x4000, 1); + VarSet(VAR_TEMP_0, 1); var1++; break; case 4: - VarSet(VAR_0x4000, 2); + VarSet(VAR_TEMP_0, 2); var1++; break; case 5: - VarSet(VAR_0x4000, 3); + VarSet(VAR_TEMP_0, 3); var1++; break; case 2: - VarSet(VAR_0x4000, 4); + VarSet(VAR_TEMP_0, 4); var1++; break; case 3: @@ -323,7 +323,7 @@ void sub_8134548(void) if ((gSaveBlock2.battleTower.var_4AE[0] == 3 || gSaveBlock2.battleTower.var_4AE[0] == 6) && (gSaveBlock2.battleTower.var_4AE[1] == 3 || gSaveBlock2.battleTower.var_4AE[1] == 6)) { - VarSet(VAR_0x4000, 5); + VarSet(VAR_TEMP_0, 5); } ValidateBattleTowerRecordChecksums(); @@ -1976,7 +1976,7 @@ void sub_8135BA0(void) gSaveBlock2.battleTower.var_4AE[battleTowerLevelType] = gSpecialVar_0x8004; } - VarSet(VAR_0x4000, 0); + VarSet(VAR_TEMP_0, 0); gSaveBlock2.battleTower.unk_554 = 1; TrySavingData(EREADER_SAVE); } diff --git a/src/field/field_special_scene.c b/src/field/field_special_scene.c index 0b7fe336e..853234f32 100644 --- a/src/field/field_special_scene.c +++ b/src/field/field_special_scene.c @@ -337,8 +337,8 @@ void Task_HandlePorthole(u8 taskId) } break; case EXIT_PORTHOLE: // exit porthole. - FlagClear(0x4001); - FlagClear(0x4000); + FlagClear(FLAG_SPECIAL_FLAG_1); + FlagClear(FLAG_SPECIAL_FLAG_0); copy_saved_warp2_bank_and_enter_x_to_warp1(0); sp13E_warp_to_last_warp(); DestroyTask(taskId); @@ -374,8 +374,8 @@ void sub_80C791C(void) void sub_80C7958(void) { FlagSet(FLAG_SYS_CRUISE_MODE); - FlagSet(0x4001); - FlagSet(0x4000); + FlagSet(FLAG_SPECIAL_FLAG_1); + FlagSet(FLAG_SPECIAL_FLAG_0); saved_warp2_set(0, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1); sub_80C7754(); sub_8080F9C(); diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c index 108ba64ba..393c7d75a 100644 --- a/src/field/field_tasks.c +++ b/src/field/field_tasks.c @@ -554,20 +554,20 @@ const u16 gUnknown_083763E4[] = { 0, 0, 0, - VAR_0x4001, - VAR_0x4002, - VAR_0x4003, - VAR_0x4004, + VAR_TEMP_1, + VAR_TEMP_2, + VAR_TEMP_3, + VAR_TEMP_4, 0, 0, - VAR_0x4005, - VAR_0x4006, - VAR_0x4007, + VAR_TEMP_5, + VAR_TEMP_6, + VAR_TEMP_7, 0, 0, - VAR_0x4008, - VAR_0x4009, - VAR_0x400A, + VAR_TEMP_8, + VAR_TEMP_9, + VAR_TEMP_A, 0, 0, 0, diff --git a/src/field/map_name_popup.c b/src/field/map_name_popup.c index 01105d0db..2e2dfc72e 100644 --- a/src/field/map_name_popup.c +++ b/src/field/map_name_popup.c @@ -19,7 +19,7 @@ bool8 unref_sub_80A2F44(void) void ShowMapNamePopup(void) { - if (FlagGet(0x4000) != TRUE) + if (FlagGet(FLAG_SPECIAL_FLAG_0) != TRUE) { if (!FuncIsActiveTask(Task_MapNamePopup)) { diff --git a/src/field/tv.c b/src/field/tv.c index 1d5bf929c..e9c92335f 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -2149,7 +2149,7 @@ void GetMomOrDadStringForTVMessage(void) if (gSaveBlock1.location.mapNum == MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)) { StringCopy(gStringVar1, gOtherText_Mom); - VarSet(VAR_0x4003, 1); + VarSet(VAR_TEMP_3, 1); } } else @@ -2157,21 +2157,21 @@ void GetMomOrDadStringForTVMessage(void) if (gSaveBlock1.location.mapNum == MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_1F)) { StringCopy(gStringVar1, gOtherText_Mom); - VarSet(VAR_0x4003, 1); + VarSet(VAR_TEMP_3, 1); } } } - if (VarGet(VAR_0x4003) == 1) + if (VarGet(VAR_TEMP_3) == 1) { StringCopy(gStringVar1, gOtherText_Mom); } - else if (VarGet(VAR_0x4003) == 2) + else if (VarGet(VAR_TEMP_3) == 2) { StringCopy(gStringVar1, gOtherText_Dad); } - else if (VarGet(VAR_0x4003) > 2) + else if (VarGet(VAR_TEMP_3) > 2) { - if (VarGet(VAR_0x4003) % 2 == 0) + if (VarGet(VAR_TEMP_3) % 2 == 0) StringCopy(gStringVar1, gOtherText_Mom); else StringCopy(gStringVar1, gOtherText_Dad); @@ -2181,12 +2181,12 @@ void GetMomOrDadStringForTVMessage(void) if (Random() % 2 != 0) { StringCopy(gStringVar1, gOtherText_Mom); - VarSet(VAR_0x4003, 1); + VarSet(VAR_TEMP_3, 1); } else { StringCopy(gStringVar1, gOtherText_Dad); - VarSet(VAR_0x4003, 2); + VarSet(VAR_TEMP_3, 2); } } } |