summaryrefslogtreecommitdiff
path: root/data/maps/JaggedPass
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2018-10-17 22:07:23 -0400
committergarak <garakmon@gmail.com>2018-10-17 22:07:23 -0400
commitd1b7f32b0ae88e3f2c4d9ed03513cbd30f8f4a74 (patch)
tree71524c7f2409f54816a9a6cbbaa2c409e5c3724e /data/maps/JaggedPass
parent7d88b9647f92d099177fc734f32e94fc472f2cbf (diff)
begin event flag names, add temporary hidden item macro
Diffstat (limited to 'data/maps/JaggedPass')
-rw-r--r--data/maps/JaggedPass/events.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc
index 17d205627..f45d500a9 100644
--- a/data/maps/JaggedPass/events.inc
+++ b/data/maps/JaggedPass/events.inc
@@ -1,9 +1,9 @@
JaggedPass_EventObjects: @ 8534AE4
object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0
object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0
- object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, FLAG_0x42E
+ object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, FLAG_ITEM_JAGGED_PASS_BURN_HEAL
object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0
- object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, FLAG_0x34F
+ object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD
object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0
object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0
@@ -27,8 +27,8 @@ JaggedPass_MapCoordEvents: @ 8534BB4
coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB
JaggedPass_MapBGEvents: @ 8534C54
- bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_0x04D
- bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_0x04C
+ bg_hidden_item_event_new 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL
+ bg_hidden_item_event_new 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL
JaggedPass_MapEvents:: @ 8534C6C
map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents