diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-11 09:45:06 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-07-11 09:45:06 -0500 |
| commit | 4fbad04ec2de7ca2529620f292356f1916b4d59d (patch) | |
| tree | 5b625fd6c86d633d87e7a2363fac690aa12365d2 | |
| parent | f96749deb674a2ae784708ee95c778585330b6ce (diff) | |
Use bg event type constants and remove unneeded bg_event argument
115 files changed, 543 insertions, 527 deletions
diff --git a/data/map_events.s b/data/map_events.s index 1b8faaf4d..27ff67eb5 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,5 +1,6 @@ #include "constants/flags.h" #include "constants/items.h" +#include "constants/bg_event_constants.h" #include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" #include "constants/maps.h" diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc index 043160b69..cd8c266b1 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc @@ -13,7 +13,7 @@ AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268 warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Corridors_B1F_MapBGEvents:: @ 838E2A8 - bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9D3 + bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_15E9D3 AbandonedShip_Corridors_B1F_MapEvents:: @ 838E2B4 map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc index 97bdf37c5..b227d8813 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc @@ -7,10 +7,10 @@ AbandonedShip_HiddenFloorCorridors_MapWarps:: @ 838E4CC warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS AbandonedShip_HiddenFloorCorridors_MapBGEvents:: @ 838E4FC - bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3 - bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A - bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC61 - bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC98 + bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3 + bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A + bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_15EC61 + bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_15EC98 AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 838E52C map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index 8e15a7d6b..c6c094edd 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -20,12 +20,12 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents:: @ 838E5E8 bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_20 bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_21 bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_22 - bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 16, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB AbandonedShip_HiddenFloorRooms_MapEvents:: @ 838E660 map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc index c7cfd76ba..7e3d33c70 100644 --- a/data/maps/AncientTomb/events.inc +++ b/data/maps/AncientTomb/events.inc @@ -7,9 +7,9 @@ AncientTomb_MapWarps:: @ 838E6F4 warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB AncientTomb_MapBGEvents:: @ 838E70C - bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_15F021 - bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_15F042 - bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_15F042 + bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_15F021 + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_15F042 + bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_15F042 AncientTomb_MapEvents:: @ 838E730 map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents diff --git a/data/maps/BattleTower_Lobby/events.inc b/data/maps/BattleTower_Lobby/events.inc index 12bb17e2d..a07d608ed 100644 --- a/data/maps/BattleTower_Lobby/events.inc +++ b/data/maps/BattleTower_Lobby/events.inc @@ -12,7 +12,7 @@ BattleTower_Lobby_MapWarps:: @ 8391D1C warp_def 6, 1, 0, 0, MAP_BATTLE_TOWER_BATTLE_ROOM BattleTower_Lobby_MapBGEvents:: @ 8391D34 - bg_event 3, 5, 3, 1, 0, BattleTower_Lobby_EventScript_160727 + bg_event 3, 5, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleTower_Lobby_EventScript_160727 BattleTower_Lobby_MapEvents:: @ 8391D40 map_events BattleTower_Lobby_EventObjects, BattleTower_Lobby_MapWarps, 0x0, BattleTower_Lobby_MapBGEvents diff --git a/data/maps/BattleTower_Outside/events.inc b/data/maps/BattleTower_Outside/events.inc index 2fd7ac6bc..f7eaa89f9 100644 --- a/data/maps/BattleTower_Outside/events.inc +++ b/data/maps/BattleTower_Outside/events.inc @@ -9,7 +9,7 @@ BattleTower_Outside_MapWarps:: @ 8391C64 warp_def 14, 8, 0, 0, MAP_BATTLE_TOWER_LOBBY BattleTower_Outside_MapBGEvents:: @ 8391C6C - bg_event 16, 13, 0, 0, 0, BattleTower_Outside_EventScript_16025A + bg_event 16, 13, 0, BG_EVENT_PLAYER_FACING_ANY, BattleTower_Outside_EventScript_16025A BattleTower_Outside_MapEvents:: @ 8391C78 map_events BattleTower_Outside_EventObjects, BattleTower_Outside_MapWarps, 0x0, BattleTower_Outside_MapBGEvents diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc index 803dd4b5b..b3070e794 100644 --- a/data/maps/DesertRuins/events.inc +++ b/data/maps/DesertRuins/events.inc @@ -7,9 +7,9 @@ DesertRuins_MapWarps:: @ 838BED4 warp_def 8, 11, 3, 1, MAP_DESERT_RUINS DesertRuins_MapBGEvents:: @ 838BEEC - bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_15CB56 - bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_15CB77 - bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_15CB77 + bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_15CB56 + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_15CB77 + bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_15CB77 DesertRuins_MapEvents:: @ 838BF10 map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc index b2acd0c1a..c034ab5ab 100644 --- a/data/maps/DewfordTown/events.inc +++ b/data/maps/DewfordTown/events.inc @@ -13,11 +13,11 @@ DewfordTown_MapWarps:: @ 8380C00 warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 DewfordTown_MapBGEvents:: @ 8380C28 - bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_14E0AB - bg_event 11, 16, 0, 0, 0, DewfordTown_EventScript_14E0B4 - bg_event 4, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA - bg_event 3, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA - bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_14E0BD + bg_event 10, 10, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_14E0AB + bg_event 11, 16, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_14E0B4 + bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_1A00EA + bg_event 3, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_1A00EA + bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_14E0BD DewfordTown_MapEvents:: @ 8380C64 map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc index 4caadd80d..ce6cc9c37 100644 --- a/data/maps/DewfordTown_Gym/events.inc +++ b/data/maps/DewfordTown_Gym/events.inc @@ -10,10 +10,10 @@ DewfordTown_Gym_MapWarps:: @ 8386034 warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN DewfordTown_Gym_MapBGEvents:: @ 8386044 - bg_event 7, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15325E - bg_event 10, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15326E - bg_event 4, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15325E - bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15326E + bg_event 7, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_15325E + bg_event 10, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_15326E + bg_event 4, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_15325E + bg_event 7, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_15326E DewfordTown_Gym_MapEvents:: @ 8386074 map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc index 16503c5ac..d0753ecff 100644 --- a/data/maps/DewfordTown_Hall/events.inc +++ b/data/maps/DewfordTown_Hall/events.inc @@ -14,8 +14,8 @@ DewfordTown_Hall_MapWarps:: @ 8386160 warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN DewfordTown_Hall_MapBGEvents:: @ 8386170 - bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153353 - bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153363 + bg_event 0, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_153353 + bg_event 7, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_153363 DewfordTown_Hall_MapEvents:: @ 8386188 map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc index 0a619b93d..39f72e713 100644 --- a/data/maps/EverGrandeCity/events.inc +++ b/data/maps/EverGrandeCity/events.inc @@ -18,11 +18,11 @@ EverGrandeCity_MapCoordEvents:: @ 83807FC 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 - bg_event 29, 48, 0, 1, 0, EverGrandeCity_EventScript_1A00EA - bg_event 18, 52, 5, 0, 0, EverGrandeCity_EventScript_14D4EE - bg_event 23, 15, 0, 0, 0, EverGrandeCity_EventScript_14D4F7 - bg_event 28, 48, 0, 1, 0, EverGrandeCity_EventScript_1A00EA + bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_14D4E5 + bg_event 29, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_1A00EA + bg_event 18, 52, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_14D4EE + bg_event 23, 15, 0, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_14D4F7 + bg_event 28, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_1A00EA EverGrandeCity_MapEvents:: @ 83808E8 map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index 64149231d..dec80a540 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -12,13 +12,13 @@ FallarborTown_MapWarps:: @ 8380E64 warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 FallarborTown_MapBGEvents:: @ 8380E8C - bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 - bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA - bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_14E839 - bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA - bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_14E842 - bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 - bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_14E84B + bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_1A00E1 + bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_1A00EA + bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_14E839 + bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_1A00EA + bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_14E842 + bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_1A00E1 + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_14E84B bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1C FallarborTown_MapEvents:: @ 8380EEC diff --git a/data/maps/FallarborTown_ContestHall/events.inc b/data/maps/FallarborTown_ContestHall/events.inc index b57f1bf86..d8c4eee55 100644 --- a/data/maps/FallarborTown_ContestHall/events.inc +++ b/data/maps/FallarborTown_ContestHall/events.inc @@ -8,8 +8,8 @@ FallarborTown_ContestHall_MapWarps:: @ 8386824 warp_def 11, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY FallarborTown_ContestHall_MapBGEvents:: @ 8386834 - bg_event 12, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA - bg_event 8, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA + bg_event 12, 14, 3, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestHall_EventScript_153AEA + bg_event 8, 14, 3, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestHall_EventScript_153AEA FallarborTown_ContestHall_MapEvents:: @ 838684C map_events FallarborTown_ContestHall_EventObjects, FallarborTown_ContestHall_MapWarps, 0x0, FallarborTown_ContestHall_MapBGEvents diff --git a/data/maps/FallarborTown_ContestLobby/events.inc b/data/maps/FallarborTown_ContestLobby/events.inc index 35237f148..0c5d3ca23 100644 --- a/data/maps/FallarborTown_ContestLobby/events.inc +++ b/data/maps/FallarborTown_ContestLobby/events.inc @@ -12,10 +12,10 @@ FallarborTown_ContestLobby_MapWarps:: @ 8386780 warp_def 1, 1, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_HALL FallarborTown_ContestLobby_MapBGEvents:: @ 8386798 - bg_event 10, 3, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7823 - bg_event 12, 5, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7604 - bg_event 11, 1, 3, 0, 0, FallarborTown_ContestLobby_EventScript_153ABB - bg_event 13, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AC2 + bg_event 10, 3, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestLobby_EventScript_1B7823 + bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestLobby_EventScript_1B7604 + bg_event 11, 1, 3, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestLobby_EventScript_153ABB + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestLobby_EventScript_153AC2 FallarborTown_ContestLobby_MapEvents:: @ 83867C8 map_events FallarborTown_ContestLobby_EventObjects, FallarborTown_ContestLobby_MapWarps, 0x0, FallarborTown_ContestLobby_MapBGEvents diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc index 5d7cfea6d..e289f7a88 100644 --- a/data/maps/FortreeCity/events.inc +++ b/data/maps/FortreeCity/events.inc @@ -19,12 +19,12 @@ FortreeCity_MapWarps:: @ 83800C8 warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP FortreeCity_MapBGEvents:: @ 8380110 - bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_14C9A1 - bg_event 7, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA - bg_event 5, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1 - bg_event 26, 10, 0, 0, 0, FortreeCity_EventScript_14C9AA - bg_event 6, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA - bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1 + bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_14C9A1 + bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_1A00EA + bg_event 5, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_1A00E1 + bg_event 26, 10, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_14C9AA + bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_1A00EA + bg_event 6, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_1A00E1 FortreeCity_MapEvents:: @ 8380158 map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc index 27d70a810..d6728885d 100644 --- a/data/maps/FortreeCity_Gym/events.inc +++ b/data/maps/FortreeCity_Gym/events.inc @@ -11,8 +11,8 @@ FortreeCity_Gym_MapWarps:: @ 83890A8 warp_def 3, 24, 0, 2, MAP_FORTREE_CITY FortreeCity_Gym_MapBGEvents:: @ 83890B8 - bg_event 1, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FDD - bg_event 4, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FED + bg_event 1, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_157FDD + bg_event 4, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_157FED FortreeCity_Gym_MapEvents:: @ 83890D0 map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc index cde317788..c29631ae4 100644 --- a/data/maps/InsideOfTruck/events.inc +++ b/data/maps/InsideOfTruck/events.inc @@ -14,11 +14,11 @@ InsideOfTruck_MapCoordEvents:: @ 8391678 coord_event 3, 3, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 InsideOfTruck_MapBGEvents:: @ 83916A8 - bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 3, 4, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 2, 3, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 0, 1, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_15FC8B + bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B + bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B + bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B + bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B InsideOfTruck_MapEvents:: @ 83916E4 map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc index 81c834a22..6ef74d72d 100644 --- a/data/maps/IslandCave/events.inc +++ b/data/maps/IslandCave/events.inc @@ -7,9 +7,9 @@ IslandCave_MapWarps:: @ 838E68C warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE IslandCave_MapBGEvents:: @ 838E6A4 - bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_15EF59 - bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_15EF7C - bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_15EF7C + bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_15EF59 + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_15EF7C + bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_15EF7C IslandCave_MapEvents:: @ 838E6C8 map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index 4897197a0..6afd86a20 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -21,13 +21,13 @@ LavaridgeTown_MapCoordEvents:: @ 8380D80 coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_14E710 LavaridgeTown_MapBGEvents:: @ 8380D90 - bg_event 14, 16, 0, 0, 0, LavaridgeTown_EventScript_14E7D7 - bg_event 7, 15, 0, 0, 0, LavaridgeTown_EventScript_14E7C5 - bg_event 17, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1 - bg_event 13, 8, 0, 0, 0, LavaridgeTown_EventScript_14E7BC - bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA - bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1 - bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA + bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_14E7D7 + bg_event 7, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_14E7C5 + bg_event 17, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_1A00E1 + bg_event 13, 8, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_14E7BC + bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_1A00EA + bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_1A00E1 + bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_1A00EA bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_0 LavaridgeTown_MapEvents:: @ 8380DF0 diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc index d89e670d2..697fae482 100644 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc @@ -32,8 +32,8 @@ LavaridgeTown_Gym_1F_MapWarps:: @ 8386304 warp_def 10, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4 - bg_event 6, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153878 - bg_event 10, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153888 + bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_153878 + bg_event 10, 17, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_153888 LavaridgeTown_Gym_1F_MapEvents:: @ 83863CC map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc index 8dbfff3b3..fe3bd0516 100644 --- a/data/maps/LilycoveCity/events.inc +++ b/data/maps/LilycoveCity/events.inc @@ -35,16 +35,16 @@ LilycoveCity_MapWarps:: @ 8380304 warp_def 71, 5, 1, 0, MAP_MAGMA_HIDEOUT_1F LilycoveCity_MapBGEvents:: @ 838037C - bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_14CC82 - bg_event 25, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA - bg_event 29, 7, 0, 0, 0, LilycoveCity_EventScript_14CCD3 - bg_event 26, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA - bg_event 6, 15, 0, 0, 0, LilycoveCity_EventScript_14CC67 - bg_event 29, 24, 0, 0, 0, LilycoveCity_EventScript_14CC70 - bg_event 35, 24, 0, 0, 0, LilycoveCity_EventScript_14CC79 - bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_14CCAC - bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_14CCCA - bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_14CCDC + bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CC82 + bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_1A00EA + bg_event 29, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CCD3 + bg_event 26, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_1A00EA + bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CC67 + bg_event 29, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CC70 + bg_event 35, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CC79 + bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CCAC + bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CCCA + bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CCDC bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_1B bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_2B bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_4B diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc index cfb6349d5..a7c58d274 100644 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ b/data/maps/LilycoveCity_ContestHall/events.inc @@ -39,12 +39,12 @@ LilycoveCity_ContestHall_MapWarps:: @ 8389D18 warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY LilycoveCity_ContestHall_MapBGEvents:: @ 8389D38 - bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C - bg_event 39, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315 - bg_event 11, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E - bg_event 15, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E - bg_event 23, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C - bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315 + bg_event 27, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_15930C + bg_event 39, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_159315 + bg_event 11, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_15931E + bg_event 15, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_15931E + bg_event 23, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_15930C + bg_event 35, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_159315 LilycoveCity_ContestHall_MapEvents:: @ 8389D80 map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index 710d5e661..5e0bc7c7d 100644 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -21,12 +21,12 @@ LilycoveCity_ContestLobby_MapWarps:: @ 838999C warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC - bg_event 18, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7835 - bg_event 18, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7659 - bg_event 15, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159066 - bg_event 17, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15906D - bg_event 19, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159074 - bg_event 22, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15908D + bg_event 18, 5, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_1B7835 + bg_event 18, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_1B7659 + bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_159066 + bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_15906D + bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_159074 + bg_event 22, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_15908D LilycoveCity_ContestLobby_MapEvents:: @ 8389A04 map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc index da8ad5342..fbe7205e2 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -7,8 +7,8 @@ LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0 warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8 - bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD - bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD + bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 838A610 map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc index da2bea5ab..a7bb9a356 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc @@ -13,7 +13,7 @@ LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8 warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_1F_MapBGEvents:: @ 838A2C8 - bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_159F05 + bg_event 0, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_DepartmentStore_1F_EventScript_159F05 LilycoveCity_DepartmentStore_1F_MapEvents:: @ 838A2D4 map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc index 93952d8e2..f9fc9231e 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -16,22 +16,22 @@ LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F LilycoveCity_LilycoveMuseum_1F_MapBGEvents:: @ 838966C - bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 - bg_event 2, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 - bg_event 5, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 - bg_event 6, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 - bg_event 9, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 - bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 - bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 - bg_event 15, 12, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15853D - bg_event 11, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 - bg_event 6, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15852B - bg_event 17, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F - bg_event 19, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 - bg_event 20, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 - bg_event 18, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F - bg_event 18, 11, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158546 - bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 + bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 + bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 + bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 + bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15853D + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 + bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15852B + bg_event 17, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 + bg_event 20, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 + bg_event 18, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + bg_event 18, 11, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158546 + bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 838972C map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc index e3123c678..ae0a59a89 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -8,18 +8,18 @@ LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8 - bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D - bg_event 15, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D - bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 - bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 - bg_event 10, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 - bg_event 11, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 - bg_event 19, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 - bg_event 18, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 - bg_event 6, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 - bg_event 7, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 - bg_event 11, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D - bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D + bg_event 14, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D + bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D + bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 + bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 + bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 + bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 + bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 + bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 + bg_event 6, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 + bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 + bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D + bg_event 15, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8389838 map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index 0f439d9bb..45a8ee503 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -23,10 +23,10 @@ LittlerootTown_MapCoordEvents:: @ 83809A4 coord_event 11, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D873 LittlerootTown_MapBGEvents:: @ 8380A34 - bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_14D7F6 - bg_event 6, 17, 0, 0, 0, LittlerootTown_EventScript_14D7FF - bg_event 7, 8, 3, 0, 0, LittlerootTown_EventScript_14D808 - bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_14D834 + bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D7F6 + bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D7FF + bg_event 7, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D808 + bg_event 12, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D834 LittlerootTown_MapEvents:: @ 8380A64 map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc index 882f54534..82215977c 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -18,10 +18,10 @@ LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880 - bg_event 0, 1, 0, 1, 0, LittlerootTown_BrendansHouse_2F_EventScript_15281E - bg_event 1, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152867 - bg_event 5, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1B69D3 - bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152870 + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_BrendansHouse_2F_EventScript_15281E + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_152867 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1B69D3 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_152870 LittlerootTown_BrendansHouse_2F_MapEvents:: @ 83858B0 map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc index 98c1f9660..b0c88e6b7 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -19,10 +19,10 @@ LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8 - bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152870 - bg_event 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152867 - bg_event 3, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1B69DF - bg_event 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152C39 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_152870 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_152867 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1B69DF + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_152C39 LittlerootTown_MaysHouse_2F_MapEvents:: @ 8385B18 map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc index 54d74f9ac..e7cdfad32 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -8,21 +8,21 @@ LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84 - bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A - bg_event 11, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A - bg_event 7, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 - bg_event 8, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 - bg_event 1, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 0, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 1, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 2, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 3, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 4, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 3, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 1, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 1, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 11, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 10, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A + bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 0, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 1, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 1, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 11, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 8385C38 map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc index 7fda28c46..cd0d99bbf 100644 --- a/data/maps/MauvilleCity/events.inc +++ b/data/maps/MauvilleCity/events.inc @@ -19,14 +19,14 @@ MauvilleCity_MapWarps:: @ 837FC68 warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 MauvilleCity_MapBGEvents:: @ 837FCA0 - bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA - bg_event 11, 6, 3, 0, 0, MauvilleCity_EventScript_14C087 - bg_event 24, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1 - bg_event 25, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1 - bg_event 24, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA - bg_event 19, 7, 0, 0, 0, MauvilleCity_EventScript_14C07E - bg_event 33, 6, 0, 0, 0, MauvilleCity_EventScript_14C090 - bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_14C099 + bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_1A00EA + bg_event 11, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_14C087 + bg_event 24, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_1A00E1 + bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_1A00E1 + bg_event 24, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_1A00EA + bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_14C07E + bg_event 33, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_14C090 + bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_14C099 MauvilleCity_MapEvents:: @ 837FD00 map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc index 0d9a0e735..242db7632 100644 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ b/data/maps/MauvilleCity_BikeShop/events.inc @@ -7,8 +7,8 @@ MauvilleCity_BikeShop_MapWarps:: @ 8388348 warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY MauvilleCity_BikeShop_MapBGEvents:: @ 8388358 - bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156914 - bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156988 + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_156914 + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_156988 MauvilleCity_BikeShop_MapEvents:: @ 8388370 map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc index d1ad5e4e9..521074d8e 100644 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ b/data/maps/MauvilleCity_GameCorner/events.inc @@ -17,30 +17,30 @@ MauvilleCity_GameCorner_MapWarps:: @ 83884E0 warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0 - bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157135 - bg_event 2, 8, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157155 - bg_event 2, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157175 - bg_event 3, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157195 - bg_event 3, 8, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571B5 - bg_event 3, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571D5 - bg_event 7, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_1571F5 - bg_event 7, 7, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157215 - bg_event 7, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157235 - bg_event 8, 6, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157255 - bg_event 8, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157275 - bg_event 8, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157295 - bg_event 14, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 15, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 14, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 15, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 14, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 15, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 18, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 19, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 18, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 19, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 18, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157135 + bg_event 2, 8, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157155 + bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157175 + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_157195 + bg_event 3, 8, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_1571B5 + bg_event 3, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_1571D5 + bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_1571F5 + bg_event 7, 7, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157215 + bg_event 7, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157235 + bg_event 8, 6, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_157255 + bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_157275 + bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_157295 + bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 14, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC MauvilleCity_GameCorner_MapEvents:: @ 8388610 map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index cfc798095..29784deec 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -16,8 +16,8 @@ MauvilleCity_Gym_MapCoordEvents:: @ 83882BC 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 - bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156771 + bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_156761 + bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_156771 MauvilleCity_Gym_MapEvents:: @ 8388304 map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index c21b5928e..5af472b66 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -21,8 +21,8 @@ MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4 coord_event 14, 18, 4, 0, VAR_METEOR_FALLS_STATE, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4 - bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_1R_EventScript_14E842 - bg_event 9, 58, 0, 0, 0, 0x0 + bg_event 38, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, MeteorFalls_1F_1R_EventScript_14E842 + bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 MeteorFalls_1F_1R_MapEvents:: @ 838BC0C map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc index cee79720c..b65223677 100644 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ b/data/maps/MeteorFalls_1F_2R/events.inc @@ -10,8 +10,8 @@ MeteorFalls_1F_2R_MapWarps:: @ 838BC68 warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_2R_MapBGEvents:: @ 838BC88 - bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_2R_EventScript_14E842 - bg_event 9, 58, 0, 0, 0, 0x0 + bg_event 38, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, MeteorFalls_1F_2R_EventScript_14E842 + bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 MeteorFalls_1F_2R_MapEvents:: @ 838BCA0 map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index 743b8c876..376ef71ce 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.inc @@ -28,14 +28,14 @@ MossdeepCity_MapCoordEvents:: @ 8380554 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 - bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_14CFED - bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA - bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1 - bg_event 66, 14, 0, 0, 0, MossdeepCity_EventScript_14CFFF - bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA - bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1 - bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_14CFE4 + bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFF6 + bg_event 34, 9, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFED + bg_event 29, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_1A00EA + bg_event 38, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_1A00E1 + bg_event 66, 14, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFFF + bg_event 30, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_1A00EA + bg_event 39, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_1A00E1 + bg_event 57, 21, 7, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFE4 MossdeepCity_MapEvents:: @ 83805F4 map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc index b721fccca..9aa705e0e 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84 warp_def 3, 1, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F MossdeepCity_GameCorner_1F_MapBGEvents:: @ 838AC9C - bg_event 3, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AE4C + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_15AE4C MossdeepCity_GameCorner_1F_MapEvents:: @ 838ACA8 map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc index 8c6afaff4..554985b3c 100644 --- a/data/maps/MossdeepCity_Gym/events.inc +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -17,12 +17,12 @@ MossdeepCity_Gym_MapCoordEvents:: @ 838A748 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 - bg_event 8, 10, 0, 0, 0, MossdeepCity_Gym_EventScript_15A646 - bg_event 17, 15, 0, 0, 0, MossdeepCity_Gym_EventScript_15A69A - bg_event 5, 24, 0, 0, 0, MossdeepCity_Gym_EventScript_15A6EE - bg_event 7, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7FA - bg_event 11, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A80A + bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A5EA + bg_event 8, 10, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A646 + bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A69A + bg_event 5, 24, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A6EE + bg_event 7, 27, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_15A7FA + bg_event 11, 27, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_15A80A MossdeepCity_Gym_MapEvents:: @ 838A7A0 map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc index a2859732d..c08546238 100644 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -9,10 +9,10 @@ MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4 warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4 - bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 - bg_event 1, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 - bg_event 10, 4, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 - bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 10, 4, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 10, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_15AAF0 MossdeepCity_StevensHouse_MapEvents:: @ 838AAE4 map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc index 833feb45d..bc071c7b1 100644 --- a/data/maps/MtChimney/events.inc +++ b/data/maps/MtChimney/events.inc @@ -35,8 +35,8 @@ MtChimney_MapWarps:: @ 838C5D0 warp_def 21, 41, 3, 3, MAP_JAGGED_PASS MtChimney_MapBGEvents:: @ 838C5F0 - bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_15D17D - bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_15D1DA + bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_15D17D + bg_event 24, 37, 3, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_15D1DA MtChimney_MapEvents:: @ 838C608 map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index f94178046..fcea0498e 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -24,14 +24,14 @@ NewMauville_Inside_MapCoordEvents:: @ 838DFD0 coord_event 33, 6, 3, 0, VAR_NEW_MAUVILLE_STATE, 1, 0, NewMauville_Inside_EventScript_15E876 NewMauville_Inside_MapBGEvents:: @ 838E070 - bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 32, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 32, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 33, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 34, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 35, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 35, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 32, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 32, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 33, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 34, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 NewMauville_Inside_MapEvents:: @ 838E0D0 map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index b1479a947..b9530f0e1 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -17,11 +17,11 @@ OldaleTown_MapCoordEvents:: @ 8380AF8 coord_event 10, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF77 OldaleTown_MapBGEvents:: @ 8380B38 - bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_14DDAA - bg_event 7, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA - bg_event 15, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1 - bg_event 8, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA - bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1 + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_14DDAA + bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_1A00EA + bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_1A00E1 + bg_event 8, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_1A00EA + bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_1A00E1 OldaleTown_MapEvents:: @ 8380B74 map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc index c27d356b3..b96b701c1 100644 --- a/data/maps/PacifidlogTown/events.inc +++ b/data/maps/PacifidlogTown/events.inc @@ -12,9 +12,9 @@ PacifidlogTown_MapWarps:: @ 8381054 warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 PacifidlogTown_MapBGEvents:: @ 8381084 - bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA - bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_14E91B - bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA + bg_event 9, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_1A00EA + bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PacifidlogTown_EventScript_14E91B + bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_1A00EA PacifidlogTown_MapEvents:: @ 83810A8 map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index 66bedb893..718794df1 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -24,13 +24,13 @@ PetalburgCity_MapCoordEvents:: @ 837F6F8 coord_event 8, 13, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B85A PetalburgCity_MapBGEvents:: @ 837F738 - bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_14B812 - bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1 - bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA - bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_14B81B - bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA - bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1 - bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_14B82D + bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_14B812 + bg_event 26, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_1A00E1 + bg_event 21, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_1A00EA + bg_event 17, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_14B81B + bg_event 22, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_1A00EA + bg_event 27, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_1A00E1 + bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_14B82D bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_5F PetalburgCity_MapEvents:: @ 837F798 diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc index d4ea2bf06..002eb56ad 100644 --- a/data/maps/PetalburgCity_Gym/events.inc +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -51,20 +51,20 @@ PetalburgCity_Gym_MapWarps:: @ 8387258 warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM PetalburgCity_Gym_MapBGEvents:: @ 8387388 - bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154B73 - bg_event 7, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154BC3 - bg_event 1, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154BF8 - bg_event 7, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154C2B - bg_event 1, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C5E - bg_event 7, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C91 - bg_event 7, 40, 3, 0, 0, PetalburgCity_Gym_EventScript_154CC4 - bg_event 1, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154CF7 - bg_event 7, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154D2A - bg_event 1, 66, 3, 0, 0, PetalburgCity_Gym_EventScript_154D5D - bg_event 7, 14, 3, 0, 0, PetalburgCity_Gym_EventScript_154D90 - bg_event 1, 27, 3, 0, 0, PetalburgCity_Gym_EventScript_154DC3 - bg_event 1, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551AA - bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551BA + bg_event 1, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154B73 + bg_event 7, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154BC3 + bg_event 1, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154BF8 + bg_event 7, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154C2B + bg_event 1, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154C5E + bg_event 7, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154C91 + bg_event 7, 40, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154CC4 + bg_event 1, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154CF7 + bg_event 7, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154D2A + bg_event 1, 66, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154D5D + bg_event 7, 14, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154D90 + bg_event 1, 27, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154DC3 + bg_event 1, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_1551AA + bg_event 7, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_1551BA PetalburgCity_Gym_MapEvents:: @ 8387430 map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index de7cdf95b..dd0ae1bc1 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -26,12 +26,12 @@ PetalburgWoods_MapCoordEvents:: @ 838C2B4 coord_event 27, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CD42 PetalburgWoods_MapBGEvents:: @ 838C2D4 - bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_15CF15 + bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_15CF15 bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_3A bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3B bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3C bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3D - bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_15CF1E + bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_15CF1E PetalburgWoods_MapEvents:: @ 838C31C map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index f991b75b8..39a40e414 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -18,7 +18,7 @@ Route101_MapCoordEvents:: @ 838114C coord_event 7, 13, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9E4 Route101_MapBGEvents:: @ 83811DC - bg_event 5, 9, 0, 0, 0, Route101_EventScript_14EA76 + bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_14EA76 Route101_MapEvents:: @ 83811E8 map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index 72345ef0e..9ba4b1ecd 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -10,8 +10,8 @@ Route102_EventObjects:: @ 83811FC object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_14EB6A, 0 Route102_MapBGEvents:: @ 83812D4 - bg_event 17, 2, 0, 0, 0, Route102_EventScript_14EAEC - bg_event 40, 9, 0, 0, 0, Route102_EventScript_14EAE3 + bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_14EAEC + bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_14EAE3 Route102_MapEvents:: @ 83812EC map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc index 386d68dd9..1c180dcdc 100644 --- a/data/maps/Route103/events.inc +++ b/data/maps/Route103/events.inc @@ -16,7 +16,7 @@ Route103_EventObjects:: @ 8381300 object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 Route103_MapBGEvents:: @ 8381468 - bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_14ED8B Route103_MapEvents:: @ 8381474 map_events Route103_EventObjects, 0x0, 0x0, Route103_MapBGEvents diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 33fe912fa..221fe7536 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -43,11 +43,11 @@ Route104_MapWarps:: @ 8381788 warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS Route104_MapBGEvents:: @ 83817C8 - bg_event 20, 50, 0, 0, 0, Route104_EventScript_14EF54 - bg_event 27, 66, 0, 0, 0, Route104_EventScript_14EF5D - bg_event 23, 5, 0, 0, 0, Route104_EventScript_14EF66 - bg_event 7, 20, 0, 0, 0, Route104_EventScript_14EF6F - bg_event 17, 23, 3, 0, 0, Route104_EventScript_14EF78 + bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF54 + bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF5D + bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF66 + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF6F + bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF78 bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2C bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3E bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_25 diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc index d08288c3c..ba5b77572 100644 --- a/data/maps/Route104_Prototype/events.inc +++ b/data/maps/Route104_Prototype/events.inc @@ -16,8 +16,8 @@ Route104_Prototype_MapWarps:: @ 839204C warp_def 5, 24, 0, 0, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP Route104_Prototype_MapBGEvents:: @ 8392054 - bg_event 7, 26, 0, 0, 0, Route104_Prototype_EventScript_160D1C - bg_event 18, 8, 0, 0, 0, Route104_Prototype_EventScript_160D25 + bg_event 7, 26, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_Prototype_EventScript_160D1C + bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_Prototype_EventScript_160D25 Route104_Prototype_MapEvents:: @ 839206C map_events Route104_Prototype_EventObjects, Route104_Prototype_MapWarps, 0x0, Route104_Prototype_MapBGEvents diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 14629157b..bac423c22 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -12,7 +12,7 @@ Route106_MapBGEvents:: @ 838198C bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3F bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2E bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_2F - bg_event 59, 13, 3, 0, 0, Route106_EventScript_14F32F + bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_14F32F Route106_MapEvents:: @ 83819BC map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 8178651c3..8bc876f7f 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -24,8 +24,8 @@ Route109_MapWarps:: @ 8381CDC warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE Route109_MapBGEvents:: @ 8381CE4 - bg_event 15, 5, 0, 0, 0, Route109_EventScript_14F79B - bg_event 29, 10, 3, 0, 0, Route109_EventScript_14F7A4 + bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_14F79B + bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_14F7A4 bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_32 bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_34 bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_33 diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index 1602413f0..6df7b8276 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -47,23 +47,23 @@ Route110_MapCoordEvents:: @ 8382070 coord_event 35, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD29 Route110_MapBGEvents:: @ 83820C0 - bg_event 15, 25, 0, 0, 0, Route110_EventScript_14F9EF - bg_event 9, 51, 0, 0, 0, Route110_EventScript_14FA01 - bg_event 14, 88, 0, 0, 0, Route110_EventScript_14F9E6 - bg_event 20, 94, 0, 0, 0, Route110_EventScript_14F9DD - bg_event 7, 75, 0, 0, 0, Route110_EventScript_14F9F8 - bg_event 3, 17, 0, 0, 0, Route110_EventScript_14FA0A + bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9EF + bg_event 9, 51, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA01 + bg_event 14, 88, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9E6 + bg_event 20, 94, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9DD + bg_event 7, 75, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9F8 + bg_event 3, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA0A bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1 bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1 - bg_event 35, 39, 3, 0, 0, Route110_EventScript_14FA13 - bg_event 37, 70, 3, 0, 0, Route110_EventScript_14FA1C - bg_event 8, 67, 0, 0, 0, Route110_EventScript_14FA25 - bg_event 32, 93, 0, 0, 0, Route110_EventScript_14FA2E + bg_event 35, 39, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA13 + bg_event 37, 70, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA1C + bg_event 8, 67, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA25 + bg_event 32, 93, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA2E bg_hidden_item_event 26, 40, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_36 bg_hidden_item_event 34, 42, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_35 bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_41 bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_37 - bg_event 13, 16, 0, 0, 0, Route110_EventScript_14F9E6 + bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9E6 Route110_MapEvents:: @ 838218C map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index 44a86bd6f..e24acb4b7 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -13,7 +13,7 @@ Route110_TrickHouseEntrance_MapCoordEvents:: @ 8392170 coord_event 7, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0 - bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_16158A + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_16158A Route110_TrickHouseEntrance_MapEvents:: @ 83921BC map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc index 1de294b5a..c7e93f221 100644 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -25,7 +25,7 @@ Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle1_MapBGEvents:: @ 839243C - bg_event 14, 8, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_161D14 + bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle1_EventScript_161D14 Route110_TrickHousePuzzle1_MapEvents:: @ 8392448 map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index bc1bef2d6..2eb41f50d 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -17,7 +17,7 @@ Route110_TrickHousePuzzle2_MapCoordEvents:: @ 83924EC 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 + bg_event 14, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_161DC3 Route110_TrickHousePuzzle2_MapEvents:: @ 8392538 map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index 1b4bbabcb..1f74281a1 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -26,7 +26,7 @@ Route110_TrickHousePuzzle3_MapCoordEvents:: @ 839266C 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 + bg_event 0, 8, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_1626EB Route110_TrickHousePuzzle3_MapEvents:: @ 83926E8 map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc index a46e6d9e5..1b4fa2e1a 100644 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -21,7 +21,7 @@ Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle4_MapBGEvents:: @ 839287C - bg_event 0, 5, 3, 0, 0, Route110_TrickHousePuzzle4_EventScript_16274E + bg_event 0, 5, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle4_EventScript_16274E Route110_TrickHousePuzzle4_MapEvents:: @ 8392888 map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index c46d6f8b7..82138284a 100644 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -27,7 +27,7 @@ Route110_TrickHousePuzzle5_MapCoordEvents:: @ 839292C 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 + bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_1627D5 Route110_TrickHousePuzzle5_MapEvents:: @ 8392A18 map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc index 7e2cce846..065a18579 100644 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -10,7 +10,7 @@ Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle6_MapBGEvents:: @ 8392AA4 - bg_event 13, 9, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_1630EA + bg_event 13, 9, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle6_EventScript_1630EA Route110_TrickHousePuzzle6_MapEvents:: @ 8392AB0 map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index 221c4b035..b9ab8aaf1 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -13,12 +13,12 @@ Route110_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C 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 - bg_event 12, 16, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632B9 - bg_event 5, 10, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163317 - bg_event 12, 11, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632E8 - bg_event 4, 4, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163346 - bg_event 7, 5, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163375 + bg_event 7, 2, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_16328B + bg_event 12, 16, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_1632B9 + bg_event 5, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_163317 + bg_event 12, 11, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_1632E8 + bg_event 4, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_163346 + bg_event 7, 5, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_163375 Route110_TrickHousePuzzle7_MapEvents:: @ 8392B94 map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc index a92cffc31..b7cdab48f 100644 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -10,7 +10,7 @@ Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08 warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle8_MapBGEvents:: @ 8392C20 - bg_event 7, 11, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_16341C + bg_event 7, 11, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle8_EventScript_16341C Route110_TrickHousePuzzle8_MapEvents:: @ 8392C2C map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index 10af8dcd4..c245097c1 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -78,19 +78,19 @@ Route111_MapCoordEvents:: @ 8382518 coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 Route111_MapBGEvents:: @ 8382738 - bg_event 16, 114, 0, 0, 0, Route111_EventScript_150368 - bg_event 24, 126, 0, 0, 0, Route111_EventScript_15035F - bg_event 7, 66, 0, 0, 0, Route111_EventScript_150371 - bg_event 13, 6, 0, 0, 0, Route111_EventScript_15037A + bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_150368 + bg_event 24, 126, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_15035F + bg_event 7, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_150371 + bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_15037A bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2_1 bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3_1 bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1_1 - bg_event 25, 19, 0, 0, 0, Route111_EventScript_150383 + bg_event 25, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_150383 bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3 bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3 bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2 bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3 - bg_event 7, 84, 3, 0, 0, Route111_EventScript_15038C + bg_event 7, 84, 3, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_15038C bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4 bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1 bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_38 diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index 51c0e1154..ef6d227b8 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -21,9 +21,9 @@ Route112_MapWarps:: @ 8382938 warp_def 22, 10, 0, 1, MAP_FIERY_PATH Route112_MapBGEvents:: @ 8382968 - bg_event 19, 44, 3, 0, 0, Route112_EventScript_15052E - bg_event 22, 37, 0, 0, 0, Route112_EventScript_150525 - bg_event 4, 49, 0, 0, 0, Route112_EventScript_150537 + bg_event 19, 44, 3, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_15052E + bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_150525 + bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_150537 Route112_MapEvents:: @ 838298C map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index 9c0122345..81f0c48c9 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -36,10 +36,10 @@ Route113_MapCoordEvents:: @ 8382AB0 coord_weather_event 88, 7, 3, COORD_EVENT_WEATHER_ASH Route113_MapBGEvents:: @ 8382BE0 - bg_event 85, 6, 0, 0, 0, Route113_EventScript_150617 - bg_event 11, 9, 0, 0, 0, Route113_EventScript_150620 - bg_event 58, 4, 3, 0, 0, Route113_EventScript_150632 - bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629 + bg_event 85, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_150617 + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_150620 + bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_150632 + bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_150629 bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1_3 bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3 bg_hidden_item_event 22, 5, 3, ITEM_TM32_DOUBLE_TEAM, FLAG_HIDDEN_ITEM_1E diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc index 6a6eeade6..a4edc3489 100644 --- a/data/maps/Route114/events.inc +++ b/data/maps/Route114/events.inc @@ -29,15 +29,15 @@ Route114_MapWarps:: @ 8382E70 warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE Route114_MapBGEvents:: @ 8382E88 - bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6 - bg_event 31, 7, 0, 0, 0, Route114_EventScript_1507DF + bg_event 7, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1507D6 + bg_event 31, 7, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1507DF bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1 bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2_1 bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3_1 bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4_1 bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2 bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2 - bg_event 25, 38, 3, 0, 0, Route114_EventScript_1507E8 + bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1507E8 bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_4 bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_2A diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc index 86c7dd7c9..1396fe276 100644 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ b/data/maps/Route114_FossilManiacsHouse/events.inc @@ -7,10 +7,10 @@ Route114_FossilManiacsHouse_MapWarps:: @ 838B894 warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL Route114_FossilManiacsHouse_MapBGEvents:: @ 838B8AC - bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC - bg_event 6, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC - bg_event 7, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205 - bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205 + bg_event 5, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_15C1FC + bg_event 6, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_15C1FC + bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_15C205 + bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_15C205 Route114_FossilManiacsHouse_MapEvents:: @ 838B8DC map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc index ee91acbe2..f79c9be44 100644 --- a/data/maps/Route114_LanettesHouse/events.inc +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -6,9 +6,9 @@ Route114_LanettesHouse_MapWarps:: @ 838B944 warp_def 6, 7, 0, 2, MAP_ROUTE114 Route114_LanettesHouse_MapBGEvents:: @ 838B954 - bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C299 - bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5 - bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_15C299 + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_15C2D5 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_15C2D5 Route114_LanettesHouse_MapEvents:: @ 838B978 map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc index 8c40e7ae9..0888896ac 100644 --- a/data/maps/Route115/events.inc +++ b/data/maps/Route115/events.inc @@ -22,8 +22,8 @@ Route115_MapWarps:: @ 83830AC Route115_MapBGEvents:: @ 83830B4 bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2 bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2 - bg_event 16, 64, 0, 0, 0, Route115_EventScript_150937 - bg_event 25, 38, 3, 0, 0, Route115_EventScript_150940 + bg_event 16, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_150937 + bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_150940 bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2_3 bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1_2 bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2_2 diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index 01eb269c4..12dfa495f 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -31,13 +31,13 @@ Route116_MapCoordEvents:: @ 8383398 coord_event 47, 9, 3, 0, VAR_ROUTE116_STATE, 1, 0, Route116_EventScript_150B6E Route116_MapBGEvents:: @ 83833A8 - bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30 - bg_event 48, 9, 0, 0, 0, Route116_EventScript_150B39 - bg_event 40, 9, 0, 0, 0, Route116_EventScript_150B42 + bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B30 + bg_event 48, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B39 + bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B42 bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1_1 bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2_1 - bg_event 16, 12, 0, 0, 0, Route116_EventScript_150B4B - bg_event 29, 10, 0, 0, 0, Route116_EventScript_150B54 + bg_event 16, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B4B + bg_event 29, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B54 bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2 bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2 bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2D diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index 8b09d7b2c..555ca1c08 100644 --- a/data/maps/Route117/events.inc +++ b/data/maps/Route117/events.inc @@ -25,9 +25,9 @@ Route117_MapWarps:: @ 8383638 warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE Route117_MapBGEvents:: @ 8383640 - bg_event 16, 6, 0, 0, 0, Route117_EventScript_150D72 - bg_event 49, 12, 0, 0, 0, Route117_EventScript_150D7B - bg_event 49, 5, 0, 0, 0, Route117_EventScript_150D84 + bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_150D72 + bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_150D7B + bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_150D84 bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_48 Route117_MapEvents:: @ 8383670 diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index faeb837e5..4c9aa47cb 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -27,8 +27,8 @@ Route118_MapCoordEvents:: @ 8383864 Route118_MapBGEvents:: @ 8383894 bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 - bg_event 13, 6, 0, 0, 0, Route118_EventScript_150F9C - bg_event 56, 8, 0, 0, 0, Route118_EventScript_150FA5 + bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_150F9C + bg_event 56, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_150FA5 bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2_1 bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2 bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3 diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index 16bb236d2..8e895e9ba 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -69,8 +69,8 @@ Route119_MapCoordEvents:: @ 8383C9C coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY Route119_MapBGEvents:: @ 8383E2C - bg_event 9, 33, 0, 0, 0, Route119_EventScript_15142C - bg_event 27, 19, 0, 0, 0, Route119_EventScript_151423 + bg_event 9, 33, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_15142C + bg_event 27, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_151423 bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1 bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1_2 bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2_1 @@ -88,7 +88,7 @@ Route119_MapBGEvents:: @ 8383E2C bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3 bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_44 bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_57 - bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605 + bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_151605 Route119_MapEvents:: @ 8383F1C map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc index 5b30ff21d..91d0568dc 100644 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -11,10 +11,10 @@ Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38 warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F Route119_WeatherInstitute_1F_MapBGEvents:: @ 8392E50 - bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 - bg_event 1, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 - bg_event 0, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 - bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 1, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 0, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_163C83 Route119_WeatherInstitute_1F_MapEvents:: @ 8392E80 map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index 2e86c9e8c..e4372712e 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -67,8 +67,8 @@ Route120_MapCoordEvents:: @ 8384318 coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS Route120_MapBGEvents:: @ 8384448 - bg_event 27, 3, 3, 0, 0, Route120_EventScript_1519A1 - bg_event 38, 88, 3, 0, 0, Route120_EventScript_1519AA + bg_event 27, 3, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1519A1 + bg_event 38, 88, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1519AA bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1 bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4_1 bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3_2 diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 3aee16842..dbd311f31 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -32,12 +32,12 @@ Route121_MapCoordEvents:: @ 838471C coord_event 25, 8, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 Route121_MapBGEvents:: @ 838475C - bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13 + bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_151B13 bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2 bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2 bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2 bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2 - bg_event 39, 6, 0, 0, 0, Route121_EventScript_151B1C + bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_151B1C bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_27 bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_28 bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_49 diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index c915c5265..b10cfecab 100644 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -13,7 +13,7 @@ Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C 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 + bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_15C487 Route121_SafariZoneEntrance_MapEvents:: @ 838BAB8 map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc index bcf8e820a..8485020e3 100644 --- a/data/maps/Route123/events.inc +++ b/data/maps/Route123/events.inc @@ -62,12 +62,12 @@ Route123_MapCoordEvents:: @ 8384B30 coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE Route123_MapBGEvents:: @ 8384C90 - bg_event 117, 10, 0, 0, 0, Route123_EventScript_151CBF + bg_event 117, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_151CBF bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2 bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2 - bg_event 10, 12, 3, 0, 0, Route123_EventScript_151CB6 + bg_event 10, 12, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_151CB6 bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_7 - bg_event 20, 7, 3, 0, 0, Route123_EventScript_151CC8 + bg_event 20, 7, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_151CC8 bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3 bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_29 bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_4A diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 0d43521c4..4106bf390 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -14,7 +14,7 @@ Route124_MapWarps:: @ 8384E00 warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE Route124_MapBGEvents:: @ 8384E08 - bg_event 73, 48, 3, 0, 0, Route124_EventScript_151DEF + bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_151DEF Route124_MapEvents:: @ 8384E14 map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc index c696e0bf9..2fa178b70 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc @@ -6,7 +6,7 @@ Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 warp_def 4, 8, 0, 0, MAP_ROUTE124 Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034 - bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route124_DivingTreasureHuntersHouse_EventScript_164335 Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040 map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index 4f88e7dd4..041eeaebb 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -44,16 +44,16 @@ RustboroCity_MapCoordEvents:: @ 837FEC4 coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C771 RustboroCity_MapBGEvents:: @ 837FF94 - bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_14C41C - bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_14C437 - bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1 - bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA - bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_14C42E - bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1 - bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA - bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_14C413 - bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_14C40A - bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_14C440 + bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C41C + bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C437 + bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_1A00E1 + bg_event 18, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_1A00EA + bg_event 19, 49, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C42E + bg_event 18, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_1A00E1 + bg_event 17, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_1A00EA + bg_event 17, 20, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C413 + bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C40A + bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C440 RustboroCity_MapEvents:: @ 838000C map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index 84b7f23bc..f8f3033ba 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -7,8 +7,8 @@ RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964 warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C - bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF - bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF + bg_event 1, 5, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_1578CF + bg_event 1, 7, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_1578CF RustboroCity_DevonCorp_3F_MapEvents:: @ 8388984 map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc index 2bb04f3be..c78fb9799 100644 --- a/data/maps/RustboroCity_Gym/events.inc +++ b/data/maps/RustboroCity_Gym/events.inc @@ -9,8 +9,8 @@ RustboroCity_Gym_MapWarps:: @ 83889F8 warp_def 6, 18, 0, 0, MAP_RUSTBORO_CITY RustboroCity_Gym_MapBGEvents:: @ 8388A08 - bg_event 2, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579AD - bg_event 8, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579BD + bg_event 2, 17, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_1579AD + bg_event 8, 17, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_1579BD RustboroCity_Gym_MapEvents:: @ 8388A20 map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index 7089d2803..6c4485f9a 100644 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -11,11 +11,11 @@ RustboroCity_PokemonSchool_MapWarps:: @ 8388AC4 warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4 - bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 4, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 6, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 7, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AC5 + bg_event 5, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 4, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 6, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 3, 5, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_157AC5 RustboroCity_PokemonSchool_MapEvents:: @ 8388B10 map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index e94d506d8..ba5a350d6 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -16,18 +16,18 @@ SSTidalCorridor_MapWarps:: @ 8391758 warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK SSTidalCorridor_MapBGEvents:: @ 83917A0 - bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 4, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 6, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 8, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 10, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 12, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 14, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 16, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 5, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDB2 - bg_event 8, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDBB - bg_event 11, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDC4 - bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDCD + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 14, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_15FDB2 + bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_15FDBB + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_15FDC4 + bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_15FDCD SSTidalCorridor_MapEvents:: @ 8391830 map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc index 6c24c610b..5de9aa019 100644 --- a/data/maps/SSTidalRooms/events.inc +++ b/data/maps/SSTidalRooms/events.inc @@ -23,8 +23,8 @@ SSTidalRooms_MapWarps:: @ 839195C warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR SSTidalRooms_MapBGEvents:: @ 83919BC - bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_15FF47 - bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_15FF47 + bg_event 15, 11, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_15FF47 + bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_15FF47 SSTidalRooms_MapEvents:: @ 83919D4 map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc index 22960b860..7ac33182f 100644 --- a/data/maps/SafariZone_Southwest/events.inc +++ b/data/maps/SafariZone_Southwest/events.inc @@ -6,7 +6,7 @@ SafariZone_Southwest_MapWarps:: @ 8391B48 warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE SafariZone_Southwest_MapBGEvents:: @ 8391B50 - bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_16002D + bg_event 32, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SafariZone_Southwest_EventScript_16002D SafariZone_Southwest_MapEvents:: @ 8391B5C map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc index a457a4e03..e84f52269 100644 --- a/data/maps/SealedChamber_InnerRoom/events.inc +++ b/data/maps/SealedChamber_InnerRoom/events.inc @@ -2,15 +2,15 @@ SealedChamber_InnerRoom_MapWarps:: @ 838E900 warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM SealedChamber_InnerRoom_MapBGEvents:: @ 838E908 - bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 - bg_event 6, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F249 - bg_event 14, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F257 - bg_event 4, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F265 - bg_event 16, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F273 - bg_event 6, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F281 - bg_event 14, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F28F - bg_event 9, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 - bg_event 11, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 + bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F1E8 + bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F249 + bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F257 + bg_event 4, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F265 + bg_event 16, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F273 + bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F281 + bg_event 14, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F28F + bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F1E8 + bg_event 11, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F1E8 SealedChamber_InnerRoom_MapEvents:: @ 838E974 map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc index 634f41f60..c102f86d8 100644 --- a/data/maps/SealedChamber_OuterRoom/events.inc +++ b/data/maps/SealedChamber_OuterRoom/events.inc @@ -2,35 +2,35 @@ SealedChamber_OuterRoom_MapWarps:: @ 838E788 warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM SealedChamber_OuterRoom_MapBGEvents:: @ 838E790 - bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C - bg_event 5, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A - bg_event 5, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 - bg_event 5, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 - bg_event 11, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 - bg_event 11, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 - bg_event 11, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 - bg_event 11, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C - bg_event 16, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F18E - bg_event 16, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1AA - bg_event 10, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1B8 - bg_event 6, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C - bg_event 4, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C - bg_event 4, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A - bg_event 6, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A - bg_event 4, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 - bg_event 6, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 - bg_event 4, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 - bg_event 6, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 - bg_event 10, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 - bg_event 12, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 - bg_event 10, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 - bg_event 12, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 - bg_event 10, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 - bg_event 12, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 - bg_event 10, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C - bg_event 12, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C - bg_event 9, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1D9 - bg_event 11, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1D9 + bg_event 5, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 5, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 11, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F18E + bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F1AA + bg_event 10, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F1B8 + bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 4, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 4, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 6, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 4, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 12, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 10, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 12, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 12, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 9, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F1D9 + bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F1D9 SealedChamber_OuterRoom_MapEvents:: @ 838E8EC map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc index 660544863..07d6e60dc 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -12,12 +12,12 @@ ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58 warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM ShoalCave_LowTideInnerRoom_MapBGEvents:: @ 838DD98 - bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E329 - bg_event 14, 26, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E365 - bg_event 41, 20, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E257 - bg_event 41, 10, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E293 - bg_event 6, 9, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2C5 - bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2F7 + bg_event 31, 8, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E329 + bg_event 14, 26, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E365 + bg_event 41, 20, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E257 + bg_event 41, 10, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E293 + bg_event 6, 9, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E2C5 + bg_event 16, 13, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E2F7 ShoalCave_LowTideInnerRoom_MapEvents:: @ 838DDE0 map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc index c70c0291c..9159098e6 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -9,7 +9,7 @@ ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM ShoalCave_LowTideLowerRoom_MapBGEvents:: @ 838DE8C - bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E413 + bg_event 18, 2, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideLowerRoom_EventScript_15E413 ShoalCave_LowTideLowerRoom_MapEvents:: @ 838DE98 map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc index ab5727820..63b0f279c 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -6,7 +6,7 @@ ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideStairsRoom_MapBGEvents:: @ 838DE1C - bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_15E3B7 + bg_event 11, 11, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideStairsRoom_EventScript_15E3B7 ShoalCave_LowTideStairsRoom_MapEvents:: @ 838DE28 map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc index 426b87ac5..af197d461 100644 --- a/data/maps/SlateportCity/events.inc +++ b/data/maps/SlateportCity/events.inc @@ -45,18 +45,18 @@ SlateportCity_MapWarps:: @ 837FA94 warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 SlateportCity_MapBGEvents:: @ 837FAEC - bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_14BCAF - bg_event 20, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA - bg_event 21, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA - bg_event 14, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1 - bg_event 24, 12, 0, 0, 0, SlateportCity_EventScript_14BC91 - bg_event 15, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1 - bg_event 14, 51, 0, 0, 0, SlateportCity_EventScript_14BC88 - bg_event 26, 26, 0, 0, 0, SlateportCity_EventScript_14BC76 - bg_event 16, 22, 0, 0, 0, SlateportCity_EventScript_14BC7F - bg_event 8, 26, 0, 0, 0, SlateportCity_EventScript_14BC6D - bg_event 7, 13, 0, 0, 0, SlateportCity_EventScript_14BC33 - bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_14BC3C + bg_event 8, 19, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BCAF + bg_event 20, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1A00EA + bg_event 21, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1A00EA + bg_event 14, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1A00E1 + bg_event 24, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC91 + bg_event 15, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1A00E1 + bg_event 14, 51, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC88 + bg_event 26, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC76 + bg_event 16, 22, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC7F + bg_event 8, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC6D + bg_event 7, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC33 + bg_event 23, 38, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC3C SlateportCity_MapEvents:: @ 837FB7C map_events SlateportCity_EventObjects, SlateportCity_MapWarps, 0x0, SlateportCity_MapBGEvents diff --git a/data/maps/SlateportCity_ContestHall/events.inc b/data/maps/SlateportCity_ContestHall/events.inc index 4be7d9159..1dfff2ffd 100644 --- a/data/maps/SlateportCity_ContestHall/events.inc +++ b/data/maps/SlateportCity_ContestHall/events.inc @@ -18,8 +18,8 @@ SlateportCity_ContestHall_MapWarps:: @ 83879DC warp_def 11, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY SlateportCity_ContestHall_MapBGEvents:: @ 83879EC - bg_event 12, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 - bg_event 8, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 + bg_event 12, 14, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestHall_EventScript_155671 + bg_event 8, 14, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestHall_EventScript_155671 SlateportCity_ContestHall_MapEvents:: @ 8387A04 map_events SlateportCity_ContestHall_EventObjects, SlateportCity_ContestHall_MapWarps, 0x0, SlateportCity_ContestHall_MapBGEvents diff --git a/data/maps/SlateportCity_ContestLobby/events.inc b/data/maps/SlateportCity_ContestLobby/events.inc index 8da6e62ad..cb437b8d9 100644 --- a/data/maps/SlateportCity_ContestLobby/events.inc +++ b/data/maps/SlateportCity_ContestLobby/events.inc @@ -14,10 +14,10 @@ SlateportCity_ContestLobby_MapWarps:: @ 8387848 warp_def 1, 1, 0, 0, MAP_SLATEPORT_CITY_CONTEST_HALL SlateportCity_ContestLobby_MapBGEvents:: @ 8387860 - bg_event 10, 3, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7829 - bg_event 12, 5, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B761E - bg_event 11, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15552F - bg_event 13, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15908D + bg_event 10, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestLobby_EventScript_1B7829 + bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestLobby_EventScript_1B761E + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestLobby_EventScript_15552F + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestLobby_EventScript_15908D SlateportCity_ContestLobby_MapEvents:: @ 8387890 map_events SlateportCity_ContestLobby_EventObjects, SlateportCity_ContestLobby_MapWarps, 0x0, SlateportCity_ContestLobby_MapBGEvents diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index ba7c570f3..feb7bbdd8 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -24,19 +24,19 @@ SlateportCity_OceanicMuseum_1F_MapCoordEvents:: @ 8387CA0 coord_event 10, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0 - bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BC5 - bg_event 2, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BCE - bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 - bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 - bg_event 10, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 - bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 - bg_event 15, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE9 - bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BF2 - bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BFB - bg_event 2, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04 - bg_event 3, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04 - bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D - bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D + bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BC5 + bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BCE + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 + bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 + bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 + bg_event 15, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BE9 + bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BF2 + bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BFB + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155C04 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155C04 + bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155C0D + bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155C0D SlateportCity_OceanicMuseum_1F_MapEvents:: @ 8387D5C map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc index 2b4760f78..cb3945e7a 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -11,27 +11,27 @@ SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18 warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20 - bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EDA - bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EE3 - bg_event 4, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22 - bg_event 4, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22 - bg_event 3, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 - bg_event 2, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 - bg_event 3, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 - bg_event 3, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 - bg_event 4, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 - bg_event 13, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B - bg_event 14, 7, 3, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B - bg_event 18, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07 - bg_event 19, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07 - bg_event 15, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE - bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE - bg_event 8, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 - bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 - bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC - bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC - bg_event 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 - bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EDA + bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EE3 + bg_event 4, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F22 + bg_event 4, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F22 + bg_event 3, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 13, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F2B + bg_event 14, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F2B + bg_event 18, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F07 + bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F07 + bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EFE + bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EFE + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 + bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EEC + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EEC + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 4, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F10 SlateportCity_OceanicMuseum_2F_MapEvents:: @ 8387F1C map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index 955cadb60..7da75af04 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -29,12 +29,12 @@ SootopolisCity_MapCoordEvents:: @ 8380770 coord_event 25, 6, 3, 0, VAR_SOOTOPOLIS_STATE, 1, 0, SootopolisCity_EventScript_14D308 SootopolisCity_MapBGEvents:: @ 8380780 - bg_event 32, 34, 0, 0, 0, SootopolisCity_EventScript_14D2ED - bg_event 19, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1 - bg_event 44, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA - bg_event 45, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA - bg_event 18, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1 - bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_14D2F6 + bg_event 32, 34, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_14D2ED + bg_event 19, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_1A00E1 + bg_event 44, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_1A00EA + bg_event 45, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_1A00EA + bg_event 18, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_1A00E1 + bg_event 41, 37, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_14D2F6 SootopolisCity_MapEvents:: @ 83807C8 map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, SootopolisCity_MapCoordEvents, SootopolisCity_MapBGEvents diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc index bb178f9b9..8922b5920 100644 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ b/data/maps/SootopolisCity_Gym_1F/events.inc @@ -8,8 +8,8 @@ SootopolisCity_Gym_1F_MapWarps:: @ 838AD20 warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F SootopolisCity_Gym_1F_MapBGEvents:: @ 838AD38 - bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B0A3 - bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_15B0B3 + bg_event 6, 24, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_Gym_1F_EventScript_15B0A3 + bg_event 10, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_Gym_1F_EventScript_15B0B3 SootopolisCity_Gym_1F_MapEvents:: @ 838AD50 map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents diff --git a/data/maps/SootopolisCity_House8/events.inc b/data/maps/SootopolisCity_House8/events.inc index e05198354..8cf607f25 100644 --- a/data/maps/SootopolisCity_House8/events.inc +++ b/data/maps/SootopolisCity_House8/events.inc @@ -7,8 +7,8 @@ SootopolisCity_House8_MapWarps:: @ 838B208 warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY SootopolisCity_House8_MapBGEvents:: @ 838B218 - bg_event 5, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B523 - bg_event 2, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B531 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_House8_EventScript_15B523 + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_House8_EventScript_15B531 SootopolisCity_House8_MapEvents:: @ 838B230 map_events SootopolisCity_House8_EventObjects, SootopolisCity_House8_MapWarps, 0x0, SootopolisCity_House8_MapBGEvents diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc index 4b934883b..42b61bdd8 100644 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ b/data/maps/SouthernIsland_Exterior/events.inc @@ -7,7 +7,7 @@ SouthernIsland_Exterior_MapWarps:: @ 8391E30 warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR SouthernIsland_Exterior_MapBGEvents:: @ 8391E40 - bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_160B4A + bg_event 16, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SouthernIsland_Exterior_EventScript_160B4A SouthernIsland_Exterior_MapEvents:: @ 8391E4C map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc index 8e7405bfb..6ad29dd5f 100644 --- a/data/maps/SouthernIsland_Interior/events.inc +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -7,7 +7,7 @@ SouthernIsland_Interior_MapWarps:: @ 8391E90 warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR SouthernIsland_Interior_MapBGEvents:: @ 8391EA0 - bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_160B9B + bg_event 13, 11, 3, BG_EVENT_PLAYER_FACING_NORTH, SouthernIsland_Interior_EventScript_160B9B SouthernIsland_Interior_MapEvents:: @ 8391EAC map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc index ede501142..b7794a9ce 100644 --- a/data/maps/Underwater_SealedChamber/events.inc +++ b/data/maps/Underwater_SealedChamber/events.inc @@ -2,7 +2,7 @@ Underwater_SealedChamber_MapWarps:: @ 838E760 warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 Underwater_SealedChamber_MapBGEvents:: @ 838E768 - bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_15F0B8 + bg_event 12, 43, 0, BG_EVENT_PLAYER_FACING_ANY, Underwater_SealedChamber_EventScript_15F0B8 Underwater_SealedChamber_MapEvents:: @ 838E774 map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc index 1608835ca..8438ff430 100644 --- a/data/maps/VerdanturfTown/events.inc +++ b/data/maps/VerdanturfTown/events.inc @@ -14,14 +14,14 @@ VerdanturfTown_MapWarps:: @ 8380F60 warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE VerdanturfTown_MapBGEvents:: @ 8380F98 - bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 - bg_event 14, 6, 0, 0, 0, VerdanturfTown_EventScript_14E8CA - bg_event 17, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA - bg_event 7, 14, 0, 0, 0, VerdanturfTown_EventScript_14E8D3 - bg_event 13, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 - bg_event 18, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA - bg_event 3, 8, 0, 0, 0, VerdanturfTown_EventScript_14E8DC - bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_14E8E5 + bg_event 14, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_1A00E1 + bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_14E8CA + bg_event 17, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_1A00EA + bg_event 7, 14, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_14E8D3 + bg_event 13, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_1A00E1 + bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_1A00EA + bg_event 3, 8, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_14E8DC + bg_event 7, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_14E8E5 VerdanturfTown_MapEvents:: @ 8380FF8 map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents diff --git a/data/maps/VerdanturfTown_ContestHall/events.inc b/data/maps/VerdanturfTown_ContestHall/events.inc index c524c05ee..50a0fcf27 100644 --- a/data/maps/VerdanturfTown_ContestHall/events.inc +++ b/data/maps/VerdanturfTown_ContestHall/events.inc @@ -8,8 +8,8 @@ VerdanturfTown_ContestHall_MapWarps:: @ 8386B34 warp_def 10, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44 - bg_event 12, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 - bg_event 8, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 + bg_event 12, 14, 3, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestHall_EventScript_153EB2 + bg_event 8, 14, 3, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestHall_EventScript_153EB2 VerdanturfTown_ContestHall_MapEvents:: @ 8386B5C map_events VerdanturfTown_ContestHall_EventObjects, VerdanturfTown_ContestHall_MapWarps, 0x0, VerdanturfTown_ContestHall_MapBGEvents diff --git a/data/maps/VerdanturfTown_ContestLobby/events.inc b/data/maps/VerdanturfTown_ContestLobby/events.inc index 7a4027fbb..bcb7d9328 100644 --- a/data/maps/VerdanturfTown_ContestLobby/events.inc +++ b/data/maps/VerdanturfTown_ContestLobby/events.inc @@ -12,10 +12,10 @@ VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90 warp_def 1, 1, 0, 1, MAP_VERDANTURF_TOWN_CONTEST_HALL VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8 - bg_event 10, 3, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B782F - bg_event 12, 5, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B763F - bg_event 11, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E37 - bg_event 13, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E89 + bg_event 10, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestLobby_EventScript_1B782F + bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestLobby_EventScript_1B763F + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestLobby_EventScript_153E37 + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestLobby_EventScript_153E89 VerdanturfTown_ContestLobby_MapEvents:: @ 8386AD8 map_events VerdanturfTown_ContestLobby_EventObjects, VerdanturfTown_ContestLobby_MapWarps, 0x0, VerdanturfTown_ContestLobby_MapBGEvents diff --git a/include/constants/bg_event_constants.h b/include/constants/bg_event_constants.h new file mode 100755 index 000000000..a915bc509 --- /dev/null +++ b/include/constants/bg_event_constants.h @@ -0,0 +1,13 @@ +#ifndef GUARD_CONSTANTS_BG_EVENT_H +#define GUARD_CONSTANTS_BG_EVENT_H + +#define BG_EVENT_PLAYER_FACING_ANY 0 +#define BG_EVENT_PLAYER_FACING_NORTH 1 +#define BG_EVENT_PLAYER_FACING_SOUTH 2 +#define BG_EVENT_PLAYER_FACING_EAST 3 +#define BG_EVENT_PLAYER_FACING_WEST 4 + +#define BG_EVENT_HIDDEN_ITEM 7 +#define BG_EVENT_SECRET_BASE 8 + +#endif // GUARD_CONSTANTS_BG_EVENT_H diff --git a/include/macros/map.inc b/include/macros/map.inc index bc54271d4..5a4b550b0 100644 --- a/include/macros/map.inc +++ b/include/macros/map.inc @@ -46,10 +46,10 @@ coord_event \x, \y, \height, 0, \weather, 0, 0, 0x0 .endm - .macro bg_event x, y, byte, kind, word, arg6, arg7, arg8 + .macro bg_event x, y, elevation, kind, arg6, arg7, arg8 .2byte \x, \y - .byte \byte, \kind - .2byte \word + .byte \elevation, \kind + .2byte 0 .if \kind < 5 .4byte \arg6 .else @@ -60,11 +60,11 @@ .endm .macro bg_hidden_item_event x, y, height, item, flag - bg_event \x, \y, \height, 7, 0, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0 + bg_event \x, \y, \height, 7, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0 .endm .macro bg_secret_base_event x, y, height, secret_base_id - bg_event \x, \y, \height, 8, 0, \secret_base_id, 0, 0 + bg_event \x, \y, \height, 8, \secret_base_id, 0, 0 .endm .macro map_events npcs, warps, traps, signs diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index ffdf926f5..296d9ef63 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -24,6 +24,7 @@ #include "trainer_see.h" #include "constants/vars.h" #include "wild_encounter.h" +#include "constants/bg_event_constants.h" struct Coords32 { @@ -409,34 +410,34 @@ static u8 *GetInteractedBackgroundEventScript(struct MapPosition *position, u8 m switch (bgEvent->kind) { - case 0: + case BG_EVENT_PLAYER_FACING_ANY: default: return bgEvent->bgUnion.script; - case 1: + case BG_EVENT_PLAYER_FACING_NORTH: if (direction != DIR_NORTH) return NULL; break; - case 2: + case BG_EVENT_PLAYER_FACING_SOUTH: if (direction != DIR_SOUTH) return NULL; break; - case 3: + case BG_EVENT_PLAYER_FACING_EAST: if (direction != DIR_EAST) return NULL; break; - case 4: + case BG_EVENT_PLAYER_FACING_WEST: if (direction != DIR_WEST) return NULL; break; case 5: case 6: - case 7: + case BG_EVENT_HIDDEN_ITEM: gSpecialVar_0x8004 = ((u32)bgEvent->bgUnion.script >> 16) + FLAG_HIDDEN_ITEMS_START; gSpecialVar_0x8005 = (u32)bgEvent->bgUnion.script; if (FlagGet(gSpecialVar_0x8004) == TRUE) return NULL; return HiddenItemScript; - case 8: + case BG_EVENT_SECRET_BASE: if (direction == DIR_NORTH) { gSpecialVar_0x8004 = bgEvent->bgUnion.secretBaseId; diff --git a/src/item_use.c b/src/item_use.c index 4e76ea434..91c17399f 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -34,6 +34,7 @@ #include "string_util.h" #include "strings.h" #include "task.h" +#include "constants/bg_event_constants.h" #include "constants/species.h" #include "constants/vars.h" @@ -335,12 +336,12 @@ bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, u8 taskId) for (i = 0; i < events->bgEventCount; i++) { - if ((events -> bgEvents[i].kind == 7) && !FlagGet(events -> bgEvents[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START)) + if ((events->bgEvents[i].kind == BG_EVENT_HIDDEN_ITEM) && !FlagGet(events->bgEvents[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START)) { // do a distance lookup of each item so long as the index remains less than the objects on the current map. - distanceX = (u16)events -> bgEvents[i].x + 7; + distanceX = (u16)events->bgEvents[i].x + 7; newDistanceX = distanceX - x; - distanceY = (u16)events -> bgEvents[i].y + 7; + distanceY = (u16)events->bgEvents[i].y + 7; newDistanceY = distanceY - y; // is item in range? @@ -365,7 +366,7 @@ bool8 HiddenItemAtPos(struct MapEvents *events, s16 x, s16 y) for (i = 0; i < bgEventCount; i++) { - if (bgEvent[i].kind == 7 && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed? + if (bgEvent[i].kind == BG_EVENT_HIDDEN_ITEM && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed? { if (!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START)) return TRUE; diff --git a/src/secret_base.c b/src/secret_base.c index 5bec7a06d..d155bda0c 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1,10 +1,6 @@ #include "global.h" -#include "constants/decorations.h" #include "secret_base.h" #include "decoration.h" -#include "constants/species.h" -#include "constants/items.h" -#include "constants/moves.h" #include "event_data.h" #include "field_camera.h" #include "field_effect.h" @@ -29,11 +25,15 @@ #include "overworld.h" #include "script.h" #include "sound.h" -#include "constants/species.h" #include "string_util.h" #include "strings.h" #include "task.h" #include "text.h" +#include "constants/bg_event_constants.h" +#include "constants/decorations.h" +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/species.h" #include "constants/vars.h" @@ -317,7 +317,7 @@ void sub_80BB970(struct MapEvents *events) for (bgevidx = 0; bgevidx < events->bgEventCount; bgevidx++) { - if (events->bgEvents[bgevidx].kind == 8) + if (events->bgEvents[bgevidx].kind == BG_EVENT_SECRET_BASE) { for (jdx = 0; jdx < MAX_SECRET_BASES; jdx++) { @@ -538,7 +538,7 @@ void SetCurrentSecretBaseFromPosition(struct MapPosition *position, struct MapEv for (i = 0; i < events->bgEventCount; i++) { - if (events->bgEvents[i].kind == 8 && position->x == events->bgEvents[i].x + 7 + if (events->bgEvents[i].kind == BG_EVENT_SECRET_BASE && position->x == events->bgEvents[i].x + 7 && position->y == events->bgEvents[i].y + 7) { gCurrentSecretBaseId = events->bgEvents[i].bgUnion.secretBaseId; @@ -871,7 +871,7 @@ void sub_80BC474(void) for (eventId = 0; eventId < mapEvents->bgEventCount; eventId++) { - if (mapEvents->bgEvents[eventId].kind == 8 + if (mapEvents->bgEvents[eventId].kind == BG_EVENT_SECRET_BASE && gSaveBlock1.secretBases[0].secretBaseId == mapEvents->bgEvents[eventId].bgUnion.secretBaseId) { u16 i; |