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 /data/maps | |
| parent | 30c77aa4ca5502b07a9ccdf2012a7da265e8bffa (diff) | |
Name and use temp var constants
Diffstat (limited to 'data/maps')
26 files changed, 103 insertions, 103 deletions
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 |