diff options
| author | garak <garakmon@gmail.com> | 2018-10-16 14:31:45 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-16 14:31:45 -0400 |
| commit | 0051947414df4656826a5ba0b252fdbb5fb0e065 (patch) | |
| tree | 4ac69544094baaa620b1e8556ddf79715db4fde3 /data/maps/MtPyre_1F | |
| parent | 72f9afcbf4a81909019f21acad0484b72ed217f6 (diff) | |
| parent | ed1bb3030bae8b0d00a1fbb68ebd50f6376938ac (diff) | |
Merge remote-tracking branch 'upstream/master' into event-flags
Diffstat (limited to 'data/maps/MtPyre_1F')
| -rw-r--r-- | data/maps/MtPyre_1F/events.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc index 179a6a538..5fd821541 100644 --- a/data/maps/MtPyre_1F/events.inc +++ b/data/maps/MtPyre_1F/events.inc @@ -1,7 +1,7 @@ MtPyre_1F_EventObjects: @ 8534D64 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 + object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 MtPyre_1F_MapWarps: @ 8534DAC warp_def 17, 18, 3, 0, MAP_ROUTE122 |