summaryrefslogtreecommitdiff
path: root/data/maps/Route121
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/Route121
parent8ffd7a70fc6d059f04a0588d2956d4f02f7eeb5d (diff)
Sync bg_event macros with pokeruby
Diffstat (limited to 'data/maps/Route121')
-rw-r--r--data/maps/Route121/events.inc28
1 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc
index 7cafdc402..03f86df42 100644
--- a/data/maps/Route121/events.inc
+++ b/data/maps/Route121/events.inc
@@ -33,22 +33,22 @@ Route121_MapWarps: @ 852BCCC
warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
Route121_MapCoordEvents: @ 852BCD4
- coord_event 25, 5, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
- coord_event 25, 6, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
- coord_event 25, 7, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
- coord_event 25, 8, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
+ coord_event 25, 5, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18
+ coord_event 25, 6, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18
+ coord_event 25, 7, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18
+ coord_event 25, 8, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18
Route121_MapBGEvents: @ 852BD14
- bg_event 32, 14, 0, 0, 0, Route121_EventScript_1F5E06
- bg_event 40, 11, 0, 8, 0, ITEM_PREMIER_BALL, 0, 0
- bg_event 18, 13, 0, 8, 0, ITEM_SUPER_POTION, 0, 0
- bg_event 43, 7, 0, 8, 0, ITEM_NOMEL_BERRY, 0, 0
- bg_event 42, 7, 0, 8, 0, ITEM_APICOT_BERRY, 0, 0
- bg_event 39, 6, 0, 0, 0, Route121_EventScript_1F5E0F
- bg_event 23, 10, 3, 7, 0, ITEM_HP_UP, 39, 0
- bg_event 58, 3, 3, 7, 0, ITEM_NUGGET, 40, 0
- bg_event 72, 5, 3, 7, 0, ITEM_FULL_HEAL, 73, 0
- bg_event 68, 8, 3, 7, 0, ITEM_MAX_REVIVE, 100, 0
+ bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E06
+ bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2
+ bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2
+ bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2
+ bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2
+ bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E0F
+ bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, 39
+ bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, 40
+ bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, 73
+ bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, 100
Route121_MapEvents:: @ 852BD8C
map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents