summaryrefslogtreecommitdiff
path: root/data/maps/Route118
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-07-11 11:12:26 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-07-11 11:12:26 -0500
commit7d375972ba0e5a8a17fecbd223dd6de6e87b6090 (patch)
treedd9dc3d2c03bd3f2cb512189dfba57f315298a45 /data/maps/Route118
parent8ffd7a70fc6d059f04a0588d2956d4f02f7eeb5d (diff)
Sync bg_event macros with pokeruby
Diffstat (limited to 'data/maps/Route118')
-rw-r--r--data/maps/Route118/events.inc24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc
index f49f07faa..b24e21f44 100644
--- a/data/maps/Route118/events.inc
+++ b/data/maps/Route118/events.inc
@@ -26,20 +26,20 @@ Route118_MapWarps: @ 852ACAC
warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE
Route118_MapCoordEvents: @ 852ACBC
- coord_event 43, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3E8E
- coord_event 44, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EAE
- coord_event 45, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EC4
+ coord_event 43, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3E8E
+ coord_event 44, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EAE
+ coord_event 45, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EC4
Route118_MapBGEvents: @ 852ACEC
- bg_event 47, 14, 0, 8, 0, ITEM_MASTER_BALL, 0, 0
- bg_event 13, 6, 0, 0, 0, Route118_EventScript_1F3E7C
- bg_event 56, 8, 0, 0, 0, Route118_EventScript_1F3E85
- bg_event 67, 6, 0, 8, 0, ITEM_LUXURY_BALL, 0, 0
- bg_event 29, 5, 0, 8, 0, ITEM_HARBOR_MAIL, 0, 0
- bg_event 47, 5, 0, 8, 0, ITEM_SPELON_BERRY, 0, 0
- bg_event 46, 5, 0, 8, 0, ITEM_PETAYA_BERRY, 0, 0
- bg_event 31, 13, 3, 7, 0, ITEM_IRON, 67, 0
- bg_event 12, 14, 3, 7, 0, ITEM_HEART_SCALE, 66, 0
+ bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1
+ bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E7C
+ bg_event 56, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E85
+ bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2_1
+ bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2
+ bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3
+ bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1
+ bg_hidden_item_event 31, 13, 3, ITEM_IRON, 67
+ bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, 66
Route118_MapEvents:: @ 852AD58
map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents