diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-17 09:24:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 09:24:30 -0400 |
| commit | 5e46a0fcc57d421879c1f65b40b4692bbe65a813 (patch) | |
| tree | 398b53f56158397a04e0e8de8159e00eeba9acc3 /data/maps/MtPyre_6F | |
| parent | e06b63efc9ea39875b17f00e5ff20c2e0fcb0415 (diff) | |
| parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) | |
Merge pull request #2 from pret/master
sync with source repo
Diffstat (limited to 'data/maps/MtPyre_6F')
| -rw-r--r-- | data/maps/MtPyre_6F/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/MtPyre_6F/header.inc | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc index 1f00209b2..607c0902a 100644 --- a/data/maps/MtPyre_6F/events.inc +++ b/data/maps/MtPyre_6F/events.inc @@ -1,7 +1,7 @@ MtPyre_6F_EventObjects: @ 8535070 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, 23, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, 1, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, 1089 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, 24, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, 1089 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0 MtPyre_6F_MapWarps: @ 85350B8 warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 3c390f962..a783fc7c3 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -5,11 +5,11 @@ MtPyre_6F: @ 84840F0 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 142 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL |