diff options
146 files changed, 1058 insertions, 534 deletions
diff --git a/data/map_events.s b/data/map_events.s index 62bd63b2e..9255e3396 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,4 +1,4 @@ -@#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/flags.h" @@ -6,10 +6,8 @@ #include "constants/map_scripts.h" #include "constants/layouts.h" #include "constants/maps.h" -@#include "constants/secret_bases.h" #include "constants/vars.h" #include "constants/weather.h" -@#include "constants/trainer_hill.h" .include "asm/macros.inc" .include "constants/constants.inc" .include "constants/item_data_constants.inc" diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index f635220e1..d4d0122ca 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -319,59 +319,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 45, "y": 23, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 38, "y": 23, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_PrizeExchangeSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 33, "y": 23, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_GameCornerSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 18, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_CitySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 26, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_MansionSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 33, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_TrainerTips1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 14, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_DeptStoreSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_EventScript_GymSign" }, { diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index 6887e5d59..0d4d0c599 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -115,17 +115,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign" } ] diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index f2d2e8de6..60931f16b 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -75,17 +75,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign" } ] diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 90cded248..303754f6b 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -101,59 +101,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 1, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_Condominiums_3F_EventScript_Computer1" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_Condominiums_3F_EventScript_Computer2" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 1, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_Condominiums_3F_EventScript_Computer3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 0, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_Condominiums_3F_EventScript_Computer3" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 0, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_Condominiums_3F_EventScript_Computer1" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 4, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_Condominiums_3F_EventScript_Computer2" } ] diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index 428acdf99..c5d43e4ef 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -41,17 +41,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_Roof_EventScript_Sign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_Roof_EventScript_Sign" } ] diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index a8aa69f77..edb1ec528 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -68,24 +68,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index fa5630be8..6cff44808 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -90,17 +90,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_1F_EventScript_LayoutSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_1F_EventScript_FloorSign" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index 39b0f530b..589eda654 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -94,10 +94,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_2F_EventScript_FloorSign" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index ac47d8ac5..e97292c6c 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -107,80 +107,91 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_3F_EventScript_FloorSign" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_DepartmentStore_3F_EventScript_TV1" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_DepartmentStore_3F_EventScript_TV2" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_DepartmentStore_3F_EventScript_TV3" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_DepartmentStore_3F_EventScript_TV4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 0, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 5d6cdb416..f32fa8c70 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -81,10 +81,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_4F_EventScript_FloorSign" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 5746f8363..8d1ba57ae 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -94,10 +94,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_5F_EventScript_FloorSign" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index 2a1af1699..d2ad4fa76 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -34,17 +34,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 0, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect" } ] diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 7fed112f3..132b04af5 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -54,31 +54,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_Roof_EventScript_FloorSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" } ] diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 063e7e74a..fa69f8dc8 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -312,171 +312,195 @@ "underfoot": false }, { - "type": "bg_event_type_4", + "type": "sign", "x": 0, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine0" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 0, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine1" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 0, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine2" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 5, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine3" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 5, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine1" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 5, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine5" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 5, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine6" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 6, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine7" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 6, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine8" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 6, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine9" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 11, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine10" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 11, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine11" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 11, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine12" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 11, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine13" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 12, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine14" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 12, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine2" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 12, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine16" }, { - "type": "bg_event_type_4", + "type": "sign", "x": 12, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine17" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 17, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine3" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 17, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine19" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 17, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine20" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 17, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_SlotMachine21" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_GameCorner_EventScript_Poster" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 17, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "CeladonCity_GameCorner_EventScript_PhotoPrinter" } ] diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 230a033bb..d9f291300 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -185,17 +185,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeladonCity_Gym_EventScript_GymStatue" } ] diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index b9e7f6106..885c7207a 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -343,31 +343,35 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 25, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_EventScript_CitySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 27, "y": 21, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 28, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_EventScript_BikeShopSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 19, "y": 32, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_EventScript_TrainerTips" }, { @@ -381,24 +385,27 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 25, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 27, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 26, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" } ] diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index 1db90cc0f..fe379e48d 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -81,59 +81,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_BikeShop_EventScript_Bicycle" } ] diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index 551bc0d9a..f31474399 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -94,17 +94,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_Gym_EventScript_GymStatue" } ] diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index 8a36a82d3..2cdf99d67 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -75,10 +75,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_House2_EventScript_WallHole" } ] diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index a1b7d870d..c9c5edc09 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -41,10 +41,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CeruleanCity_House5_EventScript_BerryCrushRankings" } ] diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index bd9c57435..6dabd0e47 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -129,31 +129,35 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_EventScript_IslandSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_EventScript_PokemonLabSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_EventScript_PokemonLabSign" } ] diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index efa247390..086a470bc 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -159,108 +159,123 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 23, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 27, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 22, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quz1Left" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 23, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quz1Right" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 15, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz2Left" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 16, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz2Right" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 13, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz3Left" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 14, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz3Right" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 13, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz4Left" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 14, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz4Right" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 1, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz5Left" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz5Right" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 1, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz6Left" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_Quiz6Right" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 3, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "CinnabarIsland_Gym_EventScript_BlaineFujiPhoto" } ] diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index cd8a2df15..5822a716e 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -76,31 +76,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_DrFujiPhoto" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_MeetingRoomSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_RAndDRoomSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 24, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_TestingRoomSign" } ] diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 38688647e..d9b98752d 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -54,17 +54,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_AmberPipe" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Computer" } ] diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index f91680715..4922eb063 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -100,10 +100,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_EventScript_IslandSign" } ] diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 6c1caf054..30195a833 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -130,10 +130,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 21, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_Meadow_EventScript_WarehouseDoor" } ] diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 11719d89b..ace36826f 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -91,10 +91,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 43, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "FiveIsland_MemorialPillar_EventScript_Memorial" }, { diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 8b5b3afd4..7e69fc3fc 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -185,10 +185,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 42, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_ResortGorgeous_EventScript_SelphysHouseSign" } ] diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 82cf27051..5c696d0d5 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -54,17 +54,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C" } ] diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 6d6f5b7bc..3c87c10d3 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -186,17 +186,19 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_3", + "type": "sign", "x": 26, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", "script": "FiveIsland_RocketWarehouse_EventScript_Computer" }, { @@ -220,150 +222,171 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FiveIsland_RocketWarehouse_EventScript_Cage" } ] diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 35dd24e8c..b7b3da95a 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -233,10 +233,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FourIsland_EventScript_IslandSign" }, { @@ -260,10 +261,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 31, "y": 23, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FourIsland_EventScript_LoreleisHouseSign" } ] diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index 7757c904e..8b1d8bc4b 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -87,17 +87,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 3, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal" } ] diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index da9946432..6ed4ef5a5 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -322,80 +322,91 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 31, "y": 18, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_CitySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 26, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_SafariZoneSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 32, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 31, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_WardensHomeSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 35, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_VoltorbSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 38, "y": 16, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_SlowpokeSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 41, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_ChanseySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_KangaskhanSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_FossilMonSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 18, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_LaprasSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_EventScript_SafariGameSign" }, { diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index c14782953..a7a63cf15 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -146,17 +146,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_Gym_EventScript_GymStatue" } ] diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index bf130d7e2..92a3165d1 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -94,31 +94,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_WardensHouse_EventScript_DisplaySign2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_WardensHouse_EventScript_DisplaySign1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_WardensHouse_EventScript_DisplaySign1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "FuchsiaCity_WardensHouse_EventScript_DisplaySign2" } ] diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index 5205e43e0..1edbe2867 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -118,31 +118,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_EventScript_SilphScopeNotice" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_EventScript_TownSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_EventScript_PokemonTowerSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_EventScript_VolunteerHouseSign" } ] diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 14781ded3..7be052760 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -120,24 +120,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_VolunteerPokemonHouse_EventScript_PokemonFanMagazine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_VolunteerPokemonHouse_EventScript_Bookshelf" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "LavenderTown_VolunteerPokemonHouse_EventScript_Bookshelf" } ] diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json index c10c21ff9..5d4da8a7a 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -34,185 +34,211 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 3, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 4, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 4, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 3, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 3, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 4, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 3, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 4, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 7, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 7, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 7, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 11, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BraillePeriod" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 11, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleComma" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 7, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ" } ] diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index ccd53263e..1fd9bd290 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -41,10 +41,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 7, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "MtEmber_RubyPath_B5F_EventScript_BrailleMessage" } ] diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 4bfd935f9..a35db089c 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -231,10 +231,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 19, "y": 26, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "MtMoon_1F_EventScript_ZubatSign" } ] diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index cc27f84cb..344798602 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -99,17 +99,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_EventScript_IslandSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_EventScript_PokemonNetCenterSign" } ] diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 99dc16ac3..972dbc2e7 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -425,17 +425,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 59, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_KindleRoad_EventScript_EmberSpaSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 115, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_KindleRoad_EventScript_RouteSign" } ] diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 8ffa34c57..849cdca08 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -150,66 +150,75 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "OneIsland_PokemonCenter_1F_EventScript_NetworkMachine" } ] diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 32d501c67..97b0ac74a 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -120,38 +120,43 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_EventScript_OaksLabSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_EventScript_PlayersHouseSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_EventScript_RivalsHouseSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_EventScript_TownSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_EventScript_TrainerTips" } ] diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 48822f5bb..b4ac2c780 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -68,24 +68,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_GarysHouse_EventScript_Bookshelf" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_GarysHouse_EventScript_Bookshelf" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_GarysHouse_EventScript_Picture" } ] diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index b6d8afc36..f32d6b102 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -62,10 +62,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_PlayersHouse_1F_EventScript_TV" } ] diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index 8d6f9fa57..bd2aec42f 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -27,24 +27,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 5, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_PlayersHouse_2F_EventScript_NES" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_PlayersHouse_2F_EventScript_PC" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_PlayersHouse_2F_EventScript_Sign" } ] diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index ce27f53a8..fa7c23e9b 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -227,31 +227,35 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_ProfessorOaksLab_EventScript_Computer" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_ProfessorOaksLab_EventScript_Computer" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_ProfessorOaksLab_EventScript_LeftSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PalletTown_ProfessorOaksLab_EventScript_RightSign" } ] diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 63d974e60..070637f7f 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -236,38 +236,43 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 19, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_EventScript_MuseumSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 39, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_EventScript_PoliceNotice" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 30, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_EventScript_TrainerTips" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 31, "y": 25, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_EventScript_CitySign" }, { diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index c5009c369..0457d1dea 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -81,17 +81,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Gym_EventScript_GymStatue" } ] diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index ab2389c02..df70c9344 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -169,31 +169,35 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_1F_EventScript_AerodactylFossil" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_1F_EventScript_KabutopsFossil" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 27, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PewterCity_Museum_1F_EventScript_PokemonJournalBrock" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 26, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PewterCity_Museum_1F_EventScript_PokemonJournalBrock" } ] diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index cce062e6d..25076ca69 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -93,59 +93,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_MoonStone" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_SpaceShuttle" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PewterCity_Museum_2F_EventScript_MoonStone" } ] diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index f3d8d7d17..37594ad42 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -156,10 +156,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 5, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PokemonMansion_1F_EventScript_Statue" }, { diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 17f1847ed..1ae8106db 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -108,24 +108,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 2, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PokemonMansion_2F_EventScript_Statue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PokemonMansion_2F_EventScript_DiaryJuly10th" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PokemonMansion_2F_EventScript_DiaryJuly5th" } ] diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 368d261db..5d6a8c3a1 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -129,17 +129,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PokemonMansion_3F_EventScript_DiaryFeb6th" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 12, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PokemonMansion_3F_EventScript_Statue" }, { diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 37cd7c276..8e281f772 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -106,24 +106,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 27, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "PokemonMansion_B1F_EventScript_DiarySep1st" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 24, "y": 29, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PokemonMansion_B1F_EventScript_Statue" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 27, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "PokemonMansion_B1F_EventScript_Statue" }, { diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 52ae9407e..32938e61c 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -193,10 +193,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 33, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "RockTunnel_1F_EventScript_RouteSign" } ] diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index 8e2d35889..746d61db2 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -34,10 +34,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 0, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "RocketHideout_Elevator_EventScript_FloorSelect" } ] diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index fab0ef1f1..e400dc366 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -57,10 +57,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route1_EventScript_RouteSign" } ] diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 7c44db6d9..b2127adf5 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -197,24 +197,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 59, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route10_EventScript_SouthRockTunnelSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 42, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route10_EventScript_PowerPlantSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 21, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route10_EventScript_NorthRockTunnelSign" }, { diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index f7d261a8e..f3a2798a4 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -222,10 +222,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 7, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route11_EventScript_DiglettsCaveSign" }, { diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index 5ac6eb2d3..3b621be31 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -54,17 +54,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route11_EastEntrance_2F_EventScript_LeftBinoculars" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route11_EastEntrance_2F_EventScript_RightBinoculars" } ] diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index c46c45f2f..ee56fb220 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -247,17 +247,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route12_EventScript_RouteSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 69, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route12_EventScript_FishingSign" }, { diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 557dcb00c..ae79e4465 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -55,10 +55,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route12_FishingHouse_EventScript_MagikarpRecordSign" } ] diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 220589706..0bfea2720 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -41,17 +41,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route12_NorthEntrance_2F_EventScript_LeftBinoculars" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route12_NorthEntrance_2F_EventScript_RightBinoculars" } ] diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index cd56c9244..923408ff2 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -174,24 +174,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 41, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route13_EventScript_RouteSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 37, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route13_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route13_EventScript_TrainerTips1" }, { diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 76c96e56c..69e679b74 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -226,10 +226,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route14_EventScript_RouteSign" }, { diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index ef6dee02a..38d12303a 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -229,10 +229,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 41, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route15_EventScript_RouteSign" } ] diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index 8317b4d84..bff054b37 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -41,17 +41,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route15_WestEntrance_2F_EventScript_LeftBinoculars" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route15_WestEntrance_2F_EventScript_RightBinoculars" } ] diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index b88cbe12c..f6f26ac5f 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -197,17 +197,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route16_EventScript_RouteSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 33, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route16_EventScript_CyclingRoadSign" }, { diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 103929172..2b7e87446 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -67,17 +67,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route16_NorthEntrance_2F_EventScript_LeftBinoculars" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route16_NorthEntrance_2F_EventScript_RightBinoculars" } ] diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 43ec14e88..216da4c48 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -161,45 +161,51 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 97, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route17_EventScript_RouteSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 83, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route17_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 68, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route17_EventScript_TrainerTips1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 53, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route17_EventScript_ItemsNotice" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 125, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route17_EventScript_BallsNotice" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 157, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route17_EventScript_CyclingRoadSign" }, { diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 6976a7570..427e6347b 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -85,17 +85,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 37, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route18_EventScript_CyclingRoadSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 52, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route18_EventScript_RouteSign" } ] diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index c5c7b0853..d42dea652 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -41,17 +41,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route18_EastEntrance_2F_EventScript_LeftBinoculars" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route18_EastEntrance_2F_EventScript_RightBinoculars" } ] diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index d8f35ad21..da02ab12c 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -187,10 +187,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route19_EventScript_RouteSign" } ] diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 720b484d8..e02cbd20e 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -194,17 +194,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route2_EventScript_DiglettsCaveSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 73, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route2_EventScript_RouteSign" } ] diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 04f110847..fb5da2a10 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -189,17 +189,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 68, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route20_EventScript_SeafoamIslandsSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 64, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route20_EventScript_SeafoamIslandsSign" }, { diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index b4da63654..d3f74056c 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -114,10 +114,11 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route22_EventScript_LeagueGateSign" } ] diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index aeaa87f85..6fc781eea 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -610,10 +610,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route23_EventScript_VictoryRoadGateSign" } ] diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index eee743a54..c20a76f4a 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -203,10 +203,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 48, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route25_EventScript_SeaCottageSign" }, { diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index e8ac1df8d..a24337e79 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -68,10 +68,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 4, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "Route25_SeaCottage_EventScript_Computer" } ] diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 1dbccf3ac..c137d9f48 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -148,10 +148,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 72, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route3_EventScript_RouteSign" }, { diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index fc4c4b53c..af04e21a8 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -145,17 +145,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route4_EventScript_MtMoonSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 34, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route4_EventScript_RouteSign" }, { diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index 08ec22387..a178efdc2 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -59,10 +59,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 32, "y": 32, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route5_EventScript_UndergroundPathSign" } ] diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 349f35369..fd7a985b5 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -131,10 +131,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route6_EventScript_UndergroundPathSign" }, { diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 09de5c2b8..52e630274 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -60,10 +60,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route7_EventScript_UndergroundPathSign" }, { diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 6da585949..70f83ee31 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -241,10 +241,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route8_EventScript_UndergroundPathSign" }, { diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 7fbff394d..e8cedc59c 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -187,10 +187,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route9_EventScript_RouteSign" }, { diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index a514df616..97fa4067c 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -41,24 +41,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SSAnne_CaptainsOffice_EventScript_Book" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SSAnne_CaptainsOffice_EventScript_TrashCan" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SSAnne_CaptainsOffice_EventScript_Book" } ] diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 2b14d57d6..248a277c0 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -125,17 +125,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 30, "y": 26, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_Center_EventScript_RestHouseSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 27, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_Center_EventScript_TrainerTips" }, { @@ -149,10 +151,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 33, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_Center_EventScript_AreaSign" } ] diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index a36d24a0e..c28626f63 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -122,24 +122,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 27, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_East_EventScript_AreaSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 43, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_East_EventScript_RestHouseSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_East_EventScript_TrainerTips" } ] diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 4c1a7049b..ef8631c8f 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -151,38 +151,43 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 27, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_North_EventScript_TrainerTips1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 23, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_North_EventScript_AreaSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 32, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_North_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 34, "y": 28, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_North_EventScript_TrainerTips3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 44, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_North_EventScript_RestHouseSign" } ] diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index d7b77f4bc..e56830150 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -150,31 +150,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 27, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_West_EventScript_LostTeethNotice" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 36, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_West_EventScript_TrainerTips" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 35, "y": 26, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_West_EventScript_AreaSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SafariZone_West_EventScript_RestHouseSign" }, { diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 5b61ffdd0..383be8d28 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -343,66 +343,75 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_CitySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 42, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_DojoSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 25, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_SilphProductSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 30, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_SilphCoSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 54, "y": 25, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_TrainerTips1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 50, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 40, "y": 38, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_MrPsychicsHouseSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 49, "y": 22, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_EventScript_TrainerFanClubSign" } ] diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index 77b75f09d..f5f6daa56 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -80,17 +80,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_CopycatsHouse_2F_EventScript_Computer" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_CopycatsHouse_2F_EventScript_Game" }, { diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 1d2e8e575..f0f8641ff 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -152,31 +152,35 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_Dojo_EventScript_Statue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_Dojo_EventScript_Statue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_Dojo_EventScript_LeftScroll" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_Dojo_EventScript_RightScroll" } ] diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index d29379fc3..7d99f45c0 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -369,17 +369,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_Gym_EventScript_GymStatue" } ] diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index 02cef3897..17690ea89 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -94,10 +94,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 4, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SaffronCity_House_EventScript_Letter" } ] diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index b1f1f6908..edd0e5d3f 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -139,17 +139,19 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 30, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SeafoamIslands_B4F_EventScript_FastCurrentSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SeafoamIslands_B4F_EventScript_BoulderHintSign" } ] diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index e55ba193a..829698bf9 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -99,10 +99,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SevenIsland_EventScript_IslandSign" } ] diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index b2f5611b1..6e4b51e2a 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -48,10 +48,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SevenIsland_House_Room1_EventScript_Box" } ] diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index a3d196ac3..6096e0c49 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -316,10 +316,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 16, "y": 71, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SevenIsland_SevaultCanyon_EventScript_RouteSign" } ] diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 6939e8dfc..f05f55394 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -133,10 +133,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 26, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_RouteSign" } ] diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index f7a3a7402..67319b37d 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -90,17 +90,19 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 56, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SevenIsland_TrainerTower_EventScript_TrainerTowerSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 50, "y": 30, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SevenIsland_TrainerTower_EventScript_TrainerTowerAheadSign" } ] diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 0e04a2f1c..8c0f5ed97 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -141,31 +141,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_10F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_10F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_10F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_10F_EventScript_Door" }, { @@ -179,10 +183,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_10F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 458446a43..22b72e3ee 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -139,31 +139,35 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 16, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_11F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 17, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_11F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 16, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_11F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 17, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_11F_EventScript_Door" }, { @@ -177,10 +181,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_11F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index 59c9bf374..e4cfd2927 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -69,10 +69,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 30, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_1F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index e3fb80764..61c40ac7b 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -135,59 +135,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_Door2" }, { @@ -201,10 +209,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_2F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index ffe70afbf..954808b4b 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -143,59 +143,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 12, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 13, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 12, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 13, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 12, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 13, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 12, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 13, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_Door2" }, { @@ -209,10 +217,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_3F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 080e2649c..19b3822f2 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -174,59 +174,67 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_Door2" }, { @@ -240,10 +248,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_4F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 0da89c2b1..d258396df 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -197,108 +197,123 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 19, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 19, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 19, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 18, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 28, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_PokemonReport3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 30, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_PokemonReport2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_PokemonReport1" }, { @@ -312,10 +327,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_5F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index c895f1d4b..60200d7e3 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -186,31 +186,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_6F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_6F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 15, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_6F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_6F_EventScript_Door" }, { @@ -224,10 +228,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_6F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 261335452..0c1a78b97 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -225,87 +225,99 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 11, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 24, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 24, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 26, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 25, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 26, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_Door3" }, { @@ -319,10 +331,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_7F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 1f5ed77ca..da5fb3f35 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -148,31 +148,35 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_8F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_8F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_8F_EventScript_Door" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_8F_EventScript_Door" }, { @@ -186,10 +190,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 27, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_8F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index 7cbb1c15d..d242f5d78 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -118,115 +118,131 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 13, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 21, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 22, "y": 13, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_Door2" }, { @@ -240,10 +256,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 17, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_9F_EventScript_FloorSign" } ] diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index 446e891f2..491ca323c 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -27,10 +27,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 0, "y": 2, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SilphCo_Elevator_EventScript_FloorSelect" } ] diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index bc04c47d8..0ce841063 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -81,10 +81,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_EventScript_IslandSign" }, { diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 5f4ded240..1fcfc933d 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -55,10 +55,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 6, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "SixIsland_DottedHole_B1F_EventScript_BrailleUp" } ] diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 3106f7d83..8458d04be 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -55,10 +55,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 6, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "SixIsland_DottedHole_B2F_EventScript_BrailleLeft" } ] diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index 300c46114..154c12c9e 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -55,10 +55,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 6, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "SixIsland_DottedHole_B3F_EventScript_BrailleRight" } ] diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 95e9c10b4..92633086e 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -55,10 +55,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 6, "y": 5, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "SixIsland_DottedHole_B4F_EventScript_BrailleDown" } ] diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 5ae17361a..df977d9c0 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -61,10 +61,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 7, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage" } ] diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index f9955cfd2..269a8da2d 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -73,17 +73,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 40, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_GreenPath_EventScript_LeftRouteSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 69, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_GreenPath_EventScript_RightRouteSign" }, { diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index bb63d3db3..8d2d508fb 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -255,10 +255,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 24, "y": 24, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_RuinValley_EventScript_DottedHoleDoor" } ] diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 0aefb4478..acd74ce8d 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -168,10 +168,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_WaterPath_EventScript_HornWantedSign" }, { @@ -205,10 +206,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 54, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_WaterPath_EventScript_RouteSign" } ] diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index cb9a39991..8ebfb4adf 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -41,10 +41,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "SixIsland_WaterPath_House1_EventScript_SizeRecord" } ] diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 94e4ec4bf..77ca11bf1 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -354,10 +354,11 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 12, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ThreeIsland_EventScript_IslandSign" }, { diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index db32d0122..989079f14 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -224,17 +224,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 27, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ThreeIsland_BerryForest_EventScript_BewareSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 39, "y": 35, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ThreeIsland_BerryForest_EventScript_WelcomeSign" }, { diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index d9041df2d..104b2684a 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -158,10 +158,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 14, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ThreeIsland_BondBridge_EventScript_BerryForestSign" }, { @@ -195,10 +196,11 @@ "underfoot": false }, { - "type": "bg_event_type_0", + "type": "sign", "x": 91, "y": 9, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ThreeIsland_BondBridge_EventScript_BondBridgeSign" } ] diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index c06ba0e44..558cbdd21 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -41,10 +41,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ThreeIsland_House1_EventScript_DisplayCase" } ] diff --git a/data/maps/TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json index ce626e2cf..869b50f82 100644 --- a/data/maps/TrainerTower_Elevator/map.json +++ b/data/maps/TrainerTower_Elevator/map.json @@ -27,10 +27,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 0, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TrainerTower_Elevator_EventScript_FloorSelect" } ] diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index e0ee44722..9bf4c9397 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -117,10 +117,11 @@ ], "bg_events": [ { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "TrainerTower_Lobby_EventScript_ShowRecords" } ] diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 8a258b635..295cb3844 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -172,24 +172,27 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 8, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TwoIsland_EventScript_IslandSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 40, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TwoIsland_EventScript_JoyfulGameCornerSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 8, "y": 3, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TwoIsland_EventScript_FastCurrentSign" } ] diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index baf6a8db0..f56eabea4 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -80,17 +80,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 0, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords" } ] diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 52e167ea7..292d223d8 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -243,38 +243,43 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 33, "y": 6, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_EventScript_CitySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 17, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_EventScript_PokemonFanClubSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 10, "y": 24, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 34, "y": 18, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_EventScript_HarborSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 45, "y": 17, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_EventScript_SnorlaxNotice" }, { diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index eab43a7f5..fdfd60a22 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -107,122 +107,139 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 17, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan5" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan6" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan7" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan8" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan9" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan10" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 1, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan11" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 3, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan12" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan13" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan14" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_Gym_EventScript_TrashCan15" } ] diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index 2c12e663c..0edea264f 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -94,10 +94,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 4, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_House3_EventScript_Letter" } ] diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 4bf91321f..81275379b 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -120,17 +120,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 2, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_PokemonFanClub_EventScript_RulesSign1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "VermilionCity_PokemonFanClub_EventScript_RulesSign2" } ] diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 616e511ee..93237caec 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -226,38 +226,43 @@ ], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 23, "y": 1, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_EventScript_TrainerTips1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 32, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_EventScript_GymSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 31, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 20, "y": 16, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_EventScript_CitySign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 36, "y": 10, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_EventScript_GymDoor" } ] diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 0cc83f420..18f8031af 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -172,17 +172,19 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 15, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_Gym_EventScript_GymStatue" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 19, "y": 20, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_Gym_EventScript_GymStatue" }, { diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index 0b6247f93..68d6bcd2d 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -81,10 +81,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 7, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_House1_EventScript_NicknameSign" } ] diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index c770669e5..26e28f038 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -68,38 +68,43 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 4, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_House2_EventScript_Notebook" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_House2_EventScript_Blackboard" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 4, "y": 1, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianCity_House2_EventScript_Blackboard" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 9, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "ViridianCity_House2_EventScript_PokemonJournal" }, { - "type": "bg_event_type_1", + "type": "sign", "x": 8, "y": 2, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "script": "ViridianCity_House2_EventScript_PokemonJournal" } ] diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index a11b85a94..ba78294fa 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -206,45 +206,51 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 39, "y": 59, "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianForest_EventScript_TrainerTips1" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 43, "y": 26, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianForest_EventScript_TrainerTips3" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 9, "y": 29, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianForest_EventScript_TrainerTips4" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 6, "y": 12, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianForest_EventScript_ExitSign" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 28, "y": 44, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianForest_EventScript_TrainerTips2" }, { - "type": "bg_event_type_0", + "type": "sign", "x": 31, "y": 60, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "ViridianForest_EventScript_TrainerTips5" }, { diff --git a/include/constants/event_bg.h b/include/constants/event_bg.h new file mode 100644 index 000000000..b106a74ef --- /dev/null +++ b/include/constants/event_bg.h @@ -0,0 +1,10 @@ +#ifndef GUARD_CONSTANTS_EVENT_BG_H +#define GUARD_CONSTANTS_EVENT_BG_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 + +#endif // GUARD_CONSTANTS_EVENT_BG_H diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 563ed6352..ad3aa3769 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -337,7 +337,15 @@ string generate_firered_map_events_text(Json map_data) { bgs_label = map_data["name"].string_value() + "_MapBGEvents"; text << bgs_label << "::\n"; for (auto &bg_event : map_data["bg_events"].array_items()) { - if (bg_event["type"] == "hidden_item") { + if (bg_event["type"] == "sign") { + text << "\tbg_event " + << bg_event["x"].int_value() << ", " + << bg_event["y"].int_value() << ", " + << bg_event["elevation"].int_value() << ", " + << bg_event["player_facing_dir"].string_value() << ", 0," + << bg_event["script"].string_value() << "\n"; + } + else if (bg_event["type"] == "hidden_item") { text << "\tbg_hidden_item_event " << bg_event["x"].int_value() << ", " << bg_event["y"].int_value() << ", " @@ -347,17 +355,6 @@ string generate_firered_map_events_text(Json map_data) { << bg_event["quantity"].int_value() << ", " << bg_event["underfoot"].bool_value() << "\n"; } - else { - string type_string = bg_event["type"].string_value(); - type_string.erase(0, 14); - int type = std::stoi(type_string); - text << "\tbg_event " - << bg_event["x"].int_value() << ", " - << bg_event["y"].int_value() << ", " - << bg_event["elevation"].int_value() << ", " - << type << ", 0, " - << bg_event["script"].string_value() << "\n"; - } } text << "\n"; } else { |