summaryrefslogtreecommitdiff
path: root/data/maps/Route104
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/Route104
parent8ffd7a70fc6d059f04a0588d2956d4f02f7eeb5d (diff)
Sync bg_event macros with pokeruby
Diffstat (limited to 'data/maps/Route104')
-rw-r--r--data/maps/Route104/events.inc22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc
index 52a60261a..497ec2dec 100644
--- a/data/maps/Route104/events.inc
+++ b/data/maps/Route104/events.inc
@@ -45,19 +45,19 @@ Route104_MapWarps: @ 8528614
warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS
Route104_MapCoordEvents: @ 8528654
- coord_event 17, 51, 3, 0, VAR_0x4063, 1, 0, Route104_EventScript_1ECCB3
+ coord_event 17, 51, 3, VAR_0x4063, 1, Route104_EventScript_1ECCB3
Route104_MapBGEvents: @ 8528664
- bg_event 20, 50, 0, 0, 0, Route104_EventScript_1ED018
- bg_event 27, 66, 0, 0, 0, Route104_EventScript_1ED021
- bg_event 23, 5, 0, 0, 0, Route104_EventScript_1ED02A
- bg_event 7, 20, 0, 0, 0, Route104_EventScript_1ED033
- bg_event 17, 23, 3, 0, 0, Route104_EventScript_1ED03C
- bg_event 7, 6, 3, 7, 0, ITEM_SUPER_POTION, 44, 0
- bg_event 3, 9, 3, 7, 0, ITEM_POKE_BALL, 62, 0
- bg_event 14, 55, 3, 7, 0, ITEM_POTION, 37, 0
- bg_event 16, 72, 3, 7, 0, ITEM_ANTIDOTE, 85, 0
- bg_event 16, 64, 3, 7, 0, ITEM_HEART_SCALE, 88, 0
+ bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED018
+ bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED021
+ bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A
+ bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED033
+ bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED03C
+ bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, 44
+ bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, 62
+ bg_hidden_item_event 14, 55, 3, ITEM_POTION, 37
+ bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, 85
+ bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, 88
Route104_MapEvents:: @ 85286DC
map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents