diff options
53 files changed, 234 insertions, 229 deletions
diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc index fed8e6da9..ac44e95b8 100644 --- a/data/maps/AquaHideout_B2F/events.inc +++ b/data/maps/AquaHideout_B2F/events.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, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD - coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD + coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_15D8BD + coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_15D8BD AquaHideout_B2F_MapEvents:: @ 838D004 map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc index b0d77795c..5fe7e2c39 100644 --- a/data/maps/CaveOfOrigin_1F/events.inc +++ b/data/maps/CaveOfOrigin_1F/events.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, 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 + coord_event 7, 11, 3, VAR_TEMP_1, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 6, 11, 3, VAR_TEMP_1, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 5, 11, 3, VAR_TEMP_1, 0, CaveOfOrigin_1F_EventScript_1A04AF CaveOfOrigin_1F_MapEvents:: @ 838D758 map_events 0x0, CaveOfOrigin_1F_MapWarps, CaveOfOrigin_1F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc index a91ee50e4..4f9864804 100644 --- a/data/maps/CaveOfOrigin_B1F/events.inc +++ b/data/maps/CaveOfOrigin_B1F/events.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, 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 + coord_event 12, 15, 3, VAR_TEMP_1, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 16, 3, VAR_TEMP_1, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 17, 3, VAR_TEMP_1, 0, CaveOfOrigin_B1F_EventScript_1A04AF CaveOfOrigin_B1F_MapEvents:: @ 838D7AC map_events 0x0, CaveOfOrigin_B1F_MapWarps, CaveOfOrigin_B1F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B2F/events.inc b/data/maps/CaveOfOrigin_B2F/events.inc index 5d03aaaa2..03889799e 100644 --- a/data/maps/CaveOfOrigin_B2F/events.inc +++ b/data/maps/CaveOfOrigin_B2F/events.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, 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 + coord_event 10, 6, 3, VAR_TEMP_1, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 10, 5, 3, VAR_TEMP_1, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 14, 13, 3, VAR_TEMP_2, 0, CaveOfOrigin_B2F_EventScript_1A04BB CaveOfOrigin_B2F_MapEvents:: @ 838D800 map_events 0x0, CaveOfOrigin_B2F_MapWarps, CaveOfOrigin_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B3F/events.inc b/data/maps/CaveOfOrigin_B3F/events.inc index 9a1c7540d..fb8737421 100644 --- a/data/maps/CaveOfOrigin_B3F/events.inc +++ b/data/maps/CaveOfOrigin_B3F/events.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, 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 + coord_event 5, 11, 3, VAR_TEMP_1, 0, CaveOfOrigin_B3F_EventScript_1A04AF + coord_event 8, 6, 3, VAR_TEMP_2, 0, CaveOfOrigin_B3F_EventScript_1A04BB + coord_event 8, 5, 3, VAR_TEMP_2, 0, CaveOfOrigin_B3F_EventScript_1A04BB CaveOfOrigin_B3F_MapEvents:: @ 838D86C map_events CaveOfOrigin_B3F_EventObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B4F/events.inc b/data/maps/CaveOfOrigin_B4F/events.inc index 2e603b827..4679edb0e 100644 --- a/data/maps/CaveOfOrigin_B4F/events.inc +++ b/data/maps/CaveOfOrigin_B4F/events.inc @@ -5,9 +5,9 @@ CaveOfOrigin_B4F_MapWarps:: @ 838D898 warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 - coord_event 9, 13, 3, 0, VAR_CAVE_OF_ORIGIN_B4F_STATE, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 - coord_event 13, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 - coord_event 5, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 + coord_event 9, 13, 3, VAR_CAVE_OF_ORIGIN_B4F_STATE, 0, CaveOfOrigin_B4F_EventScript_15DDD7 + coord_event 13, 9, 3, VAR_TEMP_5, 0, CaveOfOrigin_B4F_EventScript_1A04A0 + coord_event 5, 9, 3, VAR_TEMP_5, 0, CaveOfOrigin_B4F_EventScript_1A04A0 CaveOfOrigin_B4F_MapEvents:: @ 838D8D0 map_events CaveOfOrigin_B4F_EventObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0 diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc index a04c7a3a9..1c6f9e983 100644 --- a/data/maps/DoubleBattleColosseum/events.inc +++ b/data/maps/DoubleBattleColosseum/events.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, 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 + coord_event 3, 4, 3, VAR_TEMP_0, 0, DoubleBattleColosseum_EventScript_1A4383 + coord_event 3, 6, 3, VAR_TEMP_0, 0, DoubleBattleColosseum_EventScript_1A43B9 + coord_event 10, 4, 3, VAR_TEMP_0, 0, DoubleBattleColosseum_EventScript_1A439E + coord_event 10, 6, 3, VAR_TEMP_0, 0, DoubleBattleColosseum_EventScript_1A43D4 DoubleBattleColosseum_MapEvents:: @ 8391488 map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc index 39f72e713..757f33b6c 100644 --- a/data/maps/EverGrandeCity/events.inc +++ b/data/maps/EverGrandeCity/events.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, 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 + coord_event 17, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 16, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 18, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 19, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 20, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 21, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 22, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 23, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 24, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 25, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 26, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 EverGrandeCity_MapBGEvents:: @ 83808AC bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_14D4E5 diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc index c29631ae4..7000e2927 100644 --- a/data/maps/InsideOfTruck/events.inc +++ b/data/maps/InsideOfTruck/events.inc @@ -9,9 +9,9 @@ InsideOfTruck_MapWarps:: @ 8391660 warp_def 4, 3, 0, 127, MAP_NONE InsideOfTruck_MapCoordEvents:: @ 8391678 - coord_event 3, 1, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 - coord_event 3, 2, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 - coord_event 3, 3, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 1, 3, VAR_LITTLEROOT_INTRO_STATE, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 2, 3, VAR_LITTLEROOT_INTRO_STATE, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 3, 3, VAR_LITTLEROOT_INTRO_STATE, 0, InsideOfTruck_EventScript_15FC29 InsideOfTruck_MapBGEvents:: @ 83916A8 bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index 6afd86a20..90dfa5417 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -18,7 +18,7 @@ LavaridgeTown_MapWarps:: @ 8380D50 warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F LavaridgeTown_MapCoordEvents:: @ 8380D80 - coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_14E710 + coord_event 6, 3, 3, 0, 0, LavaridgeTown_EventScript_14E710 LavaridgeTown_MapBGEvents:: @ 8380D90 bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_14E7D7 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc index 89eff2309..d823696f2 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.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, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D + coord_event 10, 2, 3, VAR_TEMP_1, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 83894A4 map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index 45a8ee503..a12324334 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -12,15 +12,15 @@ LittlerootTown_MapWarps:: @ 838098C warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB LittlerootTown_MapCoordEvents:: @ 83809A4 - coord_event 10, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D739 - coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D797 - coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 1, 0, LittlerootTown_EventScript_14D7C7 - coord_event 8, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D89E - coord_event 9, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D8AA - coord_event 10, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D886 - coord_event 11, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D892 - coord_event 10, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D860 - coord_event 11, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D873 + coord_event 10, 1, 3, VAR_LITTLEROOT_STATE, 0, LittlerootTown_EventScript_14D739 + coord_event 11, 1, 3, VAR_LITTLEROOT_STATE, 0, LittlerootTown_EventScript_14D797 + coord_event 11, 1, 3, VAR_LITTLEROOT_STATE, 1, LittlerootTown_EventScript_14D7C7 + coord_event 8, 9, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D89E + coord_event 9, 9, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D8AA + coord_event 10, 9, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D886 + coord_event 11, 9, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D892 + coord_event 10, 2, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D860 + coord_event 11, 2, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D873 LittlerootTown_MapBGEvents:: @ 8380A34 bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D7F6 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc index 2da4c5748..00ebc746f 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -11,7 +11,7 @@ LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704 - coord_event 8, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789 + coord_event 8, 8, 0, VAR_LITTLEROOT_INTRO_STATE, 4, LittlerootTown_BrendansHouse_1F_EventScript_152789 LittlerootTown_BrendansHouse_1F_MapEvents:: @ 8385714 map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc index f5fe93e03..e31790eb9 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -11,7 +11,7 @@ LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954 - coord_event 2, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35 + coord_event 2, 8, 0, VAR_LITTLEROOT_INTRO_STATE, 4, LittlerootTown_MaysHouse_1F_EventScript_152A35 LittlerootTown_MaysHouse_1F_MapEvents:: @ 8385964 map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/MagmaHideout_B2F/events.inc b/data/maps/MagmaHideout_B2F/events.inc index 7b547f68c..f4d2b459e 100644 --- a/data/maps/MagmaHideout_B2F/events.inc +++ b/data/maps/MagmaHideout_B2F/events.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, 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 + coord_event 7, 16, 3, VAR_TEMP_1, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 6, 16, 3, VAR_TEMP_1, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 5, 16, 3, VAR_TEMP_1, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 4, 16, 3, VAR_TEMP_1, 0, MagmaHideout_B2F_EventScript_15D8BD MagmaHideout_B2F_MapEvents:: @ 838ECDC map_events MagmaHideout_B2F_EventObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index 29784deec..0d0104cf6 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.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, 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 + coord_event 0, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_15664B + coord_event 8, 11, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_156670 + coord_event 4, 15, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_156695 MauvilleCity_Gym_MapBGEvents:: @ 83882EC bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_156761 diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index 5af472b66..b3f3db1b0 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -18,7 +18,7 @@ MeteorFalls_1F_1R_MapWarps:: @ 838BBBC warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4 - coord_event 14, 18, 4, 0, VAR_METEOR_FALLS_STATE, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C + coord_event 14, 18, 4, VAR_METEOR_FALLS_STATE, 0, MeteorFalls_1F_1R_EventScript_15C49C MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4 bg_event 38, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, MeteorFalls_1F_1R_EventScript_14E842 diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index 376ef71ce..9880bbf87 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.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, 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 + coord_event 25, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_14D008 + coord_event 26, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_14D008 + coord_event 32, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_14D008 + coord_event 33, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_14D008 MossdeepCity_MapBGEvents:: @ 8380594 bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFF6 diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc index 554985b3c..96ff7b032 100644 --- a/data/maps/MossdeepCity_Gym/events.inc +++ b/data/maps/MossdeepCity_Gym/events.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, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_15A742 + coord_event 12, 3, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_15A742 MossdeepCity_Gym_MapBGEvents:: @ 838A758 bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A5EA diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc index 2e69de9d2..9eb337714 100644 --- a/data/maps/MtPyre_Exterior/events.inc +++ b/data/maps/MtPyre_Exterior/events.inc @@ -8,11 +8,11 @@ MtPyre_Exterior_MapWarps:: @ 838CB44 warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT MtPyre_Exterior_MapCoordEvents:: @ 838CB5C - coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 - coord_event 25, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 - coord_event 22, 27, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC - coord_event 23, 28, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC - coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + coord_event 24, 21, 3, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + coord_event 25, 21, 3, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + coord_event 22, 27, 3, 0, 0, MtPyre_Exterior_EventScript_15D4AC + coord_event 23, 28, 3, 0, 0, MtPyre_Exterior_EventScript_15D4AC + coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_15D4A7 MtPyre_Exterior_MapBGEvents:: @ 838CBAC bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_1D diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index b04e9fb48..9b7a08e62 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -12,12 +12,12 @@ MtPyre_Summit_MapWarps:: @ 838CC68 warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR MtPyre_Summit_MapCoordEvents:: @ 838CC80 - coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4BD - coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4C9 - coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4D5 - coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6CE - coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6DA - coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6E6 + coord_event 22, 7, 3, VAR_MT_PYRE_STATE, 0, MtPyre_Summit_EventScript_15D4BD + coord_event 23, 7, 3, VAR_MT_PYRE_STATE, 0, MtPyre_Summit_EventScript_15D4C9 + coord_event 24, 7, 3, VAR_MT_PYRE_STATE, 0, MtPyre_Summit_EventScript_15D4D5 + coord_event 22, 7, 3, VAR_MT_PYRE_STATE, 2, MtPyre_Summit_EventScript_15D6CE + coord_event 23, 7, 3, VAR_MT_PYRE_STATE, 2, MtPyre_Summit_EventScript_15D6DA + coord_event 24, 7, 3, VAR_MT_PYRE_STATE, 2, MtPyre_Summit_EventScript_15D6E6 MtPyre_Summit_MapBGEvents:: @ 838CCE0 bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_4F diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc index 8967a1df0..71628459c 100644 --- a/data/maps/NewMauville_Entrance/events.inc +++ b/data/maps/NewMauville_Entrance/events.inc @@ -3,7 +3,7 @@ NewMauville_Entrance_MapWarps:: @ 838DED4 warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE NewMauville_Entrance_MapCoordEvents:: @ 838DEE4 - coord_event 4, 2, 3, 0, VAR_NEW_MAUVILLE_STATE, 0, 0, NewMauville_Entrance_EventScript_15E4DC + coord_event 4, 2, 3, VAR_NEW_MAUVILLE_STATE, 0, NewMauville_Entrance_EventScript_15E4DC NewMauville_Entrance_MapEvents:: @ 838DEF4 map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index fcea0498e..bd1e79656 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -12,16 +12,16 @@ NewMauville_Inside_MapWarps:: @ 838DFC8 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE NewMauville_Inside_MapCoordEvents:: @ 838DFD0 - 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, VAR_NEW_MAUVILLE_STATE, 1, 0, NewMauville_Inside_EventScript_15E876 + coord_event 30, 38, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 18, 36, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 4, 26, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 16, 22, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 25, 18, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 2, 11, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 6, 11, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 13, 10, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 17, 10, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 33, 6, 3, VAR_NEW_MAUVILLE_STATE, 1, NewMauville_Inside_EventScript_15E876 NewMauville_Inside_MapBGEvents:: @ 838E070 bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index b9530f0e1..dd1833d00 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -11,10 +11,10 @@ OldaleTown_MapWarps:: @ 8380AD8 warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART OldaleTown_MapCoordEvents:: @ 8380AF8 - coord_event 0, 10, 3, 0, VAR_ROUTE102_ACCESSIBLE, 0, 0, OldaleTown_EventScript_14DEFF - coord_event 8, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF41 - coord_event 9, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF5C - coord_event 10, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF77 + coord_event 0, 10, 3, VAR_ROUTE102_ACCESSIBLE, 0, OldaleTown_EventScript_14DEFF + coord_event 8, 19, 3, VAR_OLDALE_STATE, 1, OldaleTown_EventScript_14DF41 + coord_event 9, 19, 3, VAR_OLDALE_STATE, 1, OldaleTown_EventScript_14DF5C + coord_event 10, 19, 3, VAR_OLDALE_STATE, 1, OldaleTown_EventScript_14DF77 OldaleTown_MapBGEvents:: @ 8380B38 bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_14DDAA diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index 718794df1..bb1df04d7 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -18,10 +18,10 @@ PetalburgCity_MapWarps:: @ 837F6C8 warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART PetalburgCity_MapCoordEvents:: @ 837F6F8 - coord_event 8, 10, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B836 - coord_event 8, 11, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B842 - coord_event 8, 12, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B84E - coord_event 8, 13, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B85A + coord_event 8, 10, 3, VAR_PETALBURG_STATE, 0, PetalburgCity_EventScript_14B836 + coord_event 8, 11, 3, VAR_PETALBURG_STATE, 0, PetalburgCity_EventScript_14B842 + coord_event 8, 12, 3, VAR_PETALBURG_STATE, 0, PetalburgCity_EventScript_14B84E + coord_event 8, 13, 3, VAR_PETALBURG_STATE, 0, PetalburgCity_EventScript_14B85A PetalburgCity_MapBGEvents:: @ 837F738 bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_14B812 diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index dd0ae1bc1..95e4a00ef 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -22,8 +22,8 @@ PetalburgWoods_MapWarps:: @ 838C284 warp_def 37, 38, 0, 7, MAP_ROUTE104 PetalburgWoods_MapCoordEvents:: @ 838C2B4 - coord_event 26, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CCA8 - coord_event 27, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CD42 + coord_event 26, 23, 3, VAR_PETALBURG_WOODS_STATE, 0, PetalburgWoods_EventScript_15CCA8 + coord_event 27, 23, 3, VAR_PETALBURG_WOODS_STATE, 0, PetalburgWoods_EventScript_15CD42 PetalburgWoods_MapBGEvents:: @ 838C2D4 bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_15CF15 diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc index 8d1fd9309..6d6b02339 100644 --- a/data/maps/RecordCorner/events.inc +++ b/data/maps/RecordCorner/events.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, 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 + coord_event 6, 4, 3, VAR_TEMP_0, 0, RecordCorner_EventScript_1A4418 + coord_event 6, 6, 3, VAR_TEMP_0, 0, RecordCorner_EventScript_1A4442 + coord_event 13, 4, 3, VAR_TEMP_0, 0, RecordCorner_EventScript_1A442D + coord_event 13, 6, 3, VAR_TEMP_0, 0, RecordCorner_EventScript_1A4457 RecordCorner_MapEvents:: @ 8391414 map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index 39a40e414..9299c484a 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -7,15 +7,15 @@ Route101_EventObjects:: @ 83810BC object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101 Route101_MapCoordEvents:: @ 838114C - coord_event 10, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 - coord_event 11, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 - coord_event 10, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 - coord_event 11, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 - coord_event 6, 16, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 15, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 17, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 7, 13, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9E4 + coord_event 10, 19, 3, VAR_ROUTE101_STATE, 1, Route101_EventScript_14E948 + coord_event 11, 19, 3, VAR_ROUTE101_STATE, 1, Route101_EventScript_14E948 + coord_event 10, 18, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9B8 + coord_event 11, 18, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9B8 + coord_event 6, 16, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9CE + coord_event 6, 15, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9CE + coord_event 6, 17, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9CE + coord_event 6, 18, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9CE + coord_event 7, 13, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9E4 Route101_MapBGEvents:: @ 83811DC bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_14EA76 diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index 6df7b8276..f164df80b 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -40,11 +40,11 @@ Route110_MapWarps:: @ 8382040 warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE Route110_MapCoordEvents:: @ 8382070 - coord_event 28, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 - coord_event 29, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 - coord_event 33, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD13 - coord_event 34, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD1E - coord_event 35, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD29 + coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_14FC27 + coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_14FC27 + coord_event 33, 56, 3, VAR_ROUTE110_STATE, 0, Route110_EventScript_14FD13 + coord_event 34, 56, 3, VAR_ROUTE110_STATE, 0, Route110_EventScript_14FD1E + coord_event 35, 56, 3, VAR_ROUTE110_STATE, 0, Route110_EventScript_14FD29 Route110_MapBGEvents:: @ 83820C0 bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9EF diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc index 680a1884d..1eb0e9c40 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.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, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A + coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 + coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 8392D04 map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc index bba2d583d..998927469 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.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, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD + coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B + coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 8392C98 map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc index d794cfd35..21e894a34 100644 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ b/data/maps/Route110_TrickHouseEnd/events.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, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 + coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_161CA0 Route110_TrickHouseEnd_MapBGEvents:: @ 8392208 bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1 diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index e24acb4b7..64679678f 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -7,10 +7,10 @@ Route110_TrickHouseEntrance_MapWarps:: @ 8392158 warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 Route110_TrickHouseEntrance_MapCoordEvents:: @ 8392170 - coord_event 4, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 5, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 6, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 7, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 4, 7, 3, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 5, 6, 3, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 6, 6, 3, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 7, 7, 3, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_1618B0 Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0 bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_16158A diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index 2eb41f50d..7fecac70a 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.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, 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 + coord_event 14, 21, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 + coord_event 8, 17, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle2_EventScript_161DF3 + coord_event 4, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle2_EventScript_161E06 + coord_event 5, 2, 0, VAR_TEMP_4, 0, Route110_TrickHousePuzzle2_EventScript_161E19 Route110_TrickHousePuzzle2_MapBGEvents:: @ 839252C bg_event 14, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_161DC3 diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index 1f74281a1..54b8bc708 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.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, 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 + coord_event 5, 20, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle3_EventScript_1625AB + coord_event 4, 12, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle3_EventScript_1625B7 + coord_event 11, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle3_EventScript_1625C3 + coord_event 3, 8, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle3_EventScript_1625CF + coord_event 13, 7, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle3_EventScript_1625DB + coord_event 1, 3, 3, VAR_TEMP_6, 0, Route110_TrickHousePuzzle3_EventScript_1625E7 + coord_event 10, 2, 3, VAR_TEMP_7, 0, Route110_TrickHousePuzzle3_EventScript_1625F3 Route110_TrickHousePuzzle3_MapBGEvents:: @ 83926DC bg_event 0, 8, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_1626EB diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index 82138284a..5a553d8b3 100644 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.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, 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 + coord_event 8, 19, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_162897 + coord_event 7, 19, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_1628A3 + coord_event 6, 19, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_1628AF + coord_event 5, 19, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_1628BB + coord_event 6, 14, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_1628C7 + coord_event 7, 14, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_1628D3 + coord_event 11, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_1628DF + coord_event 10, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_1628EB + coord_event 9, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_1628F7 + coord_event 11, 5, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_162903 + coord_event 10, 5, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_16290F + coord_event 2, 6, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_16291B + coord_event 3, 6, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_162927 + coord_event 4, 6, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_162933 Route110_TrickHousePuzzle5_MapBGEvents:: @ 8392A0C bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_1627D5 diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index b9ab8aaf1..38823faa4 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.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, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 + coord_event 9, 2, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C bg_event 7, 2, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_16328B diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index c245097c1..e79548b9c 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -42,40 +42,40 @@ Route111_MapWarps:: @ 8382500 warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP Route111_MapCoordEvents:: @ 8382518 - coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - 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, 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, 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 - coord_event 11, 66, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 12, 67, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 13, 68, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 14, 69, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 10, 61, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 11, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 13, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 14, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 17, 38, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 16, 39, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 15, 40, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 14, 41, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 13, 42, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 12, 43, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 12, 62, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_150116 + coord_event 12, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_150116 + coord_event 13, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_150116 + coord_event 7, 63, 3, 0, 0, Route111_EventScript_1501BC + coord_event 12, 44, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 13, 43, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 14, 42, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 16, 40, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 14, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_150116 + coord_event 18, 32, 3, 0, 0, Route111_EventScript_1501BC + coord_event 17, 31, 3, 0, 0, Route111_EventScript_1501BC + coord_event 9, 37, 3, 0, 0, Route111_EventScript_1501BC + coord_event 10, 36, 3, 0, 0, Route111_EventScript_1501BC + coord_event 17, 39, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 18, 38, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 8, 64, 3, 0, 0, Route111_EventScript_1501BC + coord_event 9, 65, 3, 0, 0, Route111_EventScript_1501BC + coord_event 10, 65, 3, 0, 0, Route111_EventScript_1501BC + coord_event 11, 66, 3, 0, 0, Route111_EventScript_1501BC + coord_event 12, 67, 3, 0, 0, Route111_EventScript_1501BC + coord_event 13, 68, 3, 0, 0, Route111_EventScript_1501BC + coord_event 14, 69, 3, 0, 0, Route111_EventScript_1501BC + coord_event 10, 61, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 62, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 13, 62, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 14, 62, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 17, 38, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 16, 39, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 15, 40, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 14, 41, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 13, 42, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 12, 43, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 44, 3, 0, 0, Route111_EventScript_1501C9 Route111_MapBGEvents:: @ 8382738 bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_150368 diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index 12dfa495f..b6f6b3be9 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -28,7 +28,7 @@ Route116_MapWarps:: @ 8383380 warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL Route116_MapCoordEvents:: @ 8383398 - coord_event 47, 9, 3, 0, VAR_ROUTE116_STATE, 1, 0, Route116_EventScript_150B6E + coord_event 47, 9, 3, VAR_ROUTE116_STATE, 1, Route116_EventScript_150B6E Route116_MapBGEvents:: @ 83833A8 bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B30 diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index 4c9aa47cb..96b52a7eb 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -21,9 +21,9 @@ Route118_EventObjects:: @ 8383684 object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1 Route118_MapCoordEvents:: @ 8383864 - coord_event 43, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FAE - coord_event 44, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FCE - coord_event 45, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FE4 + coord_event 43, 11, 3, VAR_ROUTE118_STATE, 0, Route118_EventScript_150FAE + coord_event 44, 11, 3, VAR_ROUTE118_STATE, 0, Route118_EventScript_150FCE + coord_event 45, 11, 3, VAR_ROUTE118_STATE, 0, Route118_EventScript_150FE4 Route118_MapBGEvents:: @ 8383894 bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index 8e895e9ba..0ced918ab 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -42,8 +42,8 @@ Route119_MapWarps:: @ 8383C8C warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE Route119_MapCoordEvents:: @ 8383C9C - coord_event 25, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511C5 - coord_event 26, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511D0 + coord_event 25, 31, 0, VAR_ROUTE119_STATE, 0, Route119_EventScript_1511C5 + coord_event 26, 31, 0, VAR_ROUTE119_STATE, 0, Route119_EventScript_1511D0 coord_weather_event 28, 13, 0, COORD_EVENT_WEATHER_ROUTE119_CYCLE coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE coord_weather_event 30, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index dbd311f31..e4fbbb8ca 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -26,10 +26,10 @@ Route121_MapWarps:: @ 8384714 warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE Route121_MapCoordEvents:: @ 838471C - coord_event 25, 5, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 - coord_event 25, 6, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 - coord_event 25, 7, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 - coord_event 25, 8, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 + coord_event 25, 5, 3, VAR_ROUTE121_STATE, 0, Route121_EventScript_151B25 + coord_event 25, 6, 3, VAR_ROUTE121_STATE, 0, Route121_EventScript_151B25 + coord_event 25, 7, 3, VAR_ROUTE121_STATE, 0, Route121_EventScript_151B25 + coord_event 25, 8, 3, VAR_ROUTE121_STATE, 0, Route121_EventScript_151B25 Route121_MapBGEvents:: @ 838475C bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_151B13 diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index b10cfecab..8d1f350c0 100644 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.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, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 + coord_event 8, 4, 3, VAR_TEMP_1, 0, Route121_SafariZoneEntrance_EventScript_15C383 Route121_SafariZoneEntrance_MapBGEvents:: @ 838BAAC bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_15C487 diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index 041eeaebb..f8d2fa1ef 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -29,19 +29,19 @@ RustboroCity_MapWarps:: @ 837FE64 warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 RustboroCity_MapCoordEvents:: @ 837FEC4 - coord_event 23, 20, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C481 - coord_event 23, 21, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C498 - coord_event 23, 22, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4AF - coord_event 23, 23, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4C6 - coord_event 23, 24, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4DD - coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C620 - coord_event 29, 10, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C62C - coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C638 - coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C644 - coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C74D - coord_event 31, 10, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C759 - coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C765 - coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C771 + coord_event 23, 20, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C481 + coord_event 23, 21, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C498 + coord_event 23, 22, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C4AF + coord_event 23, 23, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C4C6 + coord_event 23, 24, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C4DD + coord_event 30, 9, 3, VAR_RUSTBORO_STATE, 2, RustboroCity_EventScript_14C620 + coord_event 29, 10, 3, VAR_RUSTBORO_STATE, 2, RustboroCity_EventScript_14C62C + coord_event 30, 11, 3, VAR_RUSTBORO_STATE, 2, RustboroCity_EventScript_14C638 + coord_event 30, 12, 3, VAR_RUSTBORO_STATE, 2, RustboroCity_EventScript_14C644 + coord_event 30, 9, 3, VAR_RUSTBORO_STATE, 4, RustboroCity_EventScript_14C74D + coord_event 31, 10, 3, VAR_RUSTBORO_STATE, 4, RustboroCity_EventScript_14C759 + coord_event 30, 11, 3, VAR_RUSTBORO_STATE, 4, RustboroCity_EventScript_14C765 + coord_event 30, 12, 3, VAR_RUSTBORO_STATE, 4, RustboroCity_EventScript_14C771 RustboroCity_MapBGEvents:: @ 837FF94 bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C41C diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc index 5af870e72..71aeb5943 100644 --- a/data/maps/RusturfTunnel/events.inc +++ b/data/maps/RusturfTunnel/events.inc @@ -16,11 +16,11 @@ RusturfTunnel_MapWarps:: @ 838BE1C warp_def 18, 20, 3, 2, MAP_ROUTE116 RusturfTunnel_MapCoordEvents:: @ 838BE34 - coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999 - coord_event 9, 4, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB - coord_event 9, 5, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB - coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C99F - coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9A5 + coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_15C999 + coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_15C9AB + coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_15C9AB + coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_15C99F + coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_15C9A5 RusturfTunnel_MapEvents:: @ 838BE84 map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc index 2da610c24..b68acc7da 100644 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -11,7 +11,7 @@ SeafloorCavern_Room9_MapWarps:: @ 838D6C8 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0 - coord_event 17, 42, 3, 0, VAR_SEAFLOOR_CAVERN_STATE, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA + coord_event 17, 42, 3, VAR_SEAFLOOR_CAVERN_STATE, 0, SeafloorCavern_Room9_EventScript_15DAFA SeafloorCavern_Room9_MapEvents:: @ 838D6E0 map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc index e9857075c..6984485ea 100644 --- a/data/maps/SingleBattleColosseum/events.inc +++ b/data/maps/SingleBattleColosseum/events.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, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A436F - coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A4379 + coord_event 3, 5, 3, VAR_TEMP_0, 0, SingleBattleColosseum_EventScript_1A436F + coord_event 10, 5, 3, VAR_TEMP_0, 0, SingleBattleColosseum_EventScript_1A4379 SingleBattleColosseum_MapEvents:: @ 839132C map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc index 85da00123..1f5cb2936 100644 --- a/data/maps/SlateportCity_Harbor/events.inc +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -15,10 +15,10 @@ SlateportCity_Harbor_MapWarps:: @ 8387FF0 warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY SlateportCity_Harbor_MapCoordEvents:: @ 8388010 - coord_event 8, 11, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155F9B - coord_event 8, 12, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FA7 - coord_event 8, 13, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FB3 - coord_event 8, 14, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FBF + coord_event 8, 11, 3, VAR_SLATEPORT_HARBOR_STATE, 1, SlateportCity_Harbor_EventScript_155F9B + coord_event 8, 12, 3, VAR_SLATEPORT_HARBOR_STATE, 1, SlateportCity_Harbor_EventScript_155FA7 + coord_event 8, 13, 3, VAR_SLATEPORT_HARBOR_STATE, 1, SlateportCity_Harbor_EventScript_155FB3 + coord_event 8, 14, 3, VAR_SLATEPORT_HARBOR_STATE, 1, SlateportCity_Harbor_EventScript_155FBF SlateportCity_Harbor_MapEvents:: @ 8388050 map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index feb7bbdd8..2b65dc440 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -20,8 +20,8 @@ SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F SlateportCity_OceanicMuseum_1F_MapCoordEvents:: @ 8387CA0 - coord_event 9, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 - coord_event 10, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 + coord_event 9, 7, 3, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 + coord_event 10, 7, 3, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0 bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BC5 diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index 7da75af04..4d3ae2462 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -26,7 +26,7 @@ SootopolisCity_MapWarps:: @ 8380710 warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE8 SootopolisCity_MapCoordEvents:: @ 8380770 - coord_event 25, 6, 3, 0, VAR_SOOTOPOLIS_STATE, 1, 0, SootopolisCity_EventScript_14D308 + coord_event 25, 6, 3, VAR_SOOTOPOLIS_STATE, 1, SootopolisCity_EventScript_14D308 SootopolisCity_MapBGEvents:: @ 8380780 bg_event 32, 34, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_14D2ED diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index 121518f90..dbeb2c20b 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.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, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43F0 - coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43FA + coord_event 4, 5, 3, VAR_TEMP_0, 0, TradeCenter_EventScript_1A43F0 + coord_event 7, 5, 3, VAR_TEMP_0, 0, TradeCenter_EventScript_1A43FA TradeCenter_MapEvents:: @ 8391388 map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc index 1b3fc3e1c..54bed846b 100644 --- a/data/maps/VictoryRoad_1F/events.inc +++ b/data/maps/VictoryRoad_1F/events.inc @@ -15,9 +15,9 @@ VictoryRoad_1F_MapWarps:: @ 838D98C warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F VictoryRoad_1F_MapCoordEvents:: @ 838D9B4 - coord_event 34, 3, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DE97 - coord_event 34, 4, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEAB - coord_event 34, 5, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEBF + coord_event 34, 3, 3, VAR_VICTORY_ROAD_1F_STATE, 0, VictoryRoad_1F_EventScript_15DE97 + coord_event 34, 4, 3, VAR_VICTORY_ROAD_1F_STATE, 0, VictoryRoad_1F_EventScript_15DEAB + coord_event 34, 5, 3, VAR_VICTORY_ROAD_1F_STATE, 0, VictoryRoad_1F_EventScript_15DEBF VictoryRoad_1F_MapBGEvents:: @ 838D9E4 bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_51 diff --git a/include/macros/map.inc b/include/macros/map.inc index 5a4b550b0..f5f09dea9 100644 --- a/include/macros/map.inc +++ b/include/macros/map.inc @@ -34,16 +34,21 @@ inc _num_warps .endm - .macro coord_event x, y, byte1, byte2, word1, word2, word3, script + .macro coord_event x, y, elevation, trigger, index, script .2byte \x, \y - .byte \byte1, \byte2 - .2byte \word1, \word2, \word3 + .byte \elevation, 0 + .2byte \trigger, \index, 0 .4byte \script inc _num_traps .endm - .macro coord_weather_event x, y, height, weather - coord_event \x, \y, \height, 0, \weather, 0, 0, 0x0 + .macro coord_weather_event x, y, elevation, weather + .2byte \x, \y + .byte \elevation, 0 + .2byte \weather + .2byte 0, 0 + .4byte 0 + inc _num_traps .endm .macro bg_event x, y, elevation, kind, arg6, arg7, arg8 |