Sync bg_event macros with pokeruby

1 files changed, 26 insertions, 26 deletions

diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc
index 4cb99b121..6e6d17d9a 100644
--- a/data/maps/Route110/events.inc
+++ b/data/maps/Route110/events.inc
@@ -45,34 +45,34 @@ Route110_MapWarps: @ 8529050
 	warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
 
 Route110_MapCoordEvents: @ 8529080
-	coord_event 28, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661
-	coord_event 29, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661
-	coord_event 33, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF74D
-	coord_event 34, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF758
-	coord_event 35, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF763
-	coord_event 7, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9CB
-	coord_event 8, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9D6
-	coord_event 9, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9E1
-	coord_event 10, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9EC
+	coord_event 28, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661
+	coord_event 29, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661
+	coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D
+	coord_event 34, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF758
+	coord_event 35, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF763
+	coord_event 7, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9CB
+	coord_event 8, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9D6
+	coord_event 9, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9E1
+	coord_event 10, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9EC
 
 Route110_MapBGEvents: @ 8529110
-	bg_event 15, 25, 0, 0, 0, Route110_EventScript_1EF353
-	bg_event 9, 51, 0, 0, 0, Route110_EventScript_1EF365
-	bg_event 14, 88, 0, 0, 0, Route110_EventScript_1EF34A
-	bg_event 20, 94, 0, 0, 0, Route110_EventScript_1EF341
-	bg_event 7, 79, 0, 0, 0, Route110_EventScript_1EF35C
-	bg_event 3, 17, 0, 0, 0, Route110_EventScript_1EF36E
-	bg_event 16, 25, 0, 8, 0, ITEM_MACHO_BRACE, 0, 0
-	bg_event 17, 25, 0, 8, 0, ITEM_SOUL_DEW, 0, 0
-	bg_event 33, 39, 3, 0, 0, Route110_EventScript_1EF377
-	bg_event 37, 70, 3, 0, 0, Route110_EventScript_1EF380
-	bg_event 8, 67, 0, 0, 0, Route110_EventScript_1EF389
-	bg_event 32, 93, 0, 0, 0, Route110_EventScript_1EF392
-	bg_event 35, 39, 3, 7, 0, ITEM_REVIVE, 54, 0
-	bg_event 33, 45, 3, 7, 0, ITEM_GREAT_BALL, 53, 0
-	bg_event 4, 35, 3, 7, 0, ITEM_POKE_BALL, 65, 0
-	bg_event 37, 67, 3, 7, 0, ITEM_FULL_HEAL, 55, 0
-	bg_event 13, 16, 0, 0, 0, Route110_EventScript_1EF34A
+	bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF353
+	bg_event 9, 51, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF365
+	bg_event 14, 88, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A
+	bg_event 20, 94, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF341
+	bg_event 7, 79, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF35C
+	bg_event 3, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF36E
+	bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1
+	bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1
+	bg_event 33, 39, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF377
+	bg_event 37, 70, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF380
+	bg_event 8, 67, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF389
+	bg_event 32, 93, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF392
+	bg_hidden_item_event 35, 39, 3, ITEM_REVIVE, 54
+	bg_hidden_item_event 33, 45, 3, ITEM_GREAT_BALL, 53
+	bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, 65
+	bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, 55
+	bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A
 
 Route110_MapEvents:: @ 85291DC
 	map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents