diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-07-24 21:18:36 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-07-24 21:18:36 -0700 |
| commit | e92e2cb0aa31adf9872b147a1b6deb9d9844b7e8 (patch) | |
| tree | b3e357be8cec0c64a84773a7b63f54f97825cbaf /data/maps/MtPyre_3F | |
| parent | 156fb472e10c10751268d2339b2526c8bd07e34f (diff) | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/MtPyre_3F')
| -rw-r--r-- | data/maps/MtPyre_3F/events.inc | 8 | ||||
| -rw-r--r-- | data/maps/MtPyre_3F/header.inc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc index bf0d1af77..ed9caf9f3 100644 --- a/data/maps/MtPyre_3F/events.inc +++ b/data/maps/MtPyre_3F/events.inc @@ -1,8 +1,8 @@ MtPyre_3F_EventObjects: @ 8534EEC - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, 17, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, 1120 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 14, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, 1120 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 MtPyre_3F_MapWarps: @ 8534F4C warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 8bf9f015a..b09729f81 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -5,11 +5,11 @@ MtPyre_3F: @ 848409C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 139 - .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 |