summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_2F
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-10-19 14:24:34 -0500
committerGitHub <noreply@github.com>2018-10-19 14:24:34 -0500
commitbf8fa23462990b36ff40ac4a863380a9d979bfdd (patch)
tree51f3a9e269bf974880dbae6ba5cbb1fd7949db0b /data/maps/MtPyre_2F
parent95d8815721321f08714b97c59a97de3a59f1e0c7 (diff)
parent113a8d1efd45ed387a0ede7b7aa8744b622c662f (diff)
Merge pull request #365 from garakmon/event-flags
[WIP] Event flags
Diffstat (limited to 'data/maps/MtPyre_2F')
-rw-r--r--data/maps/MtPyre_2F/events.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc
index c025089e3..f9fad9f46 100644
--- a/data/maps/MtPyre_2F/events.inc
+++ b/data/maps/MtPyre_2F/events.inc
@@ -1,6 +1,6 @@
MtPyre_2F_EventObjects: @ 8534DF0
object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0
- object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, 1129
+ object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL
object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0
object_event 4, EVENT_OBJ_GFX_POKEFAN_M, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0
object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0