diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-13 18:53:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-13 18:53:27 -0700 |
| commit | 24f6484643ed3d7115fd4ebd92f254f224f1ca97 (patch) | |
| tree | fab2a2a4bf5a338be050b24e59994d47d1d89e9d /data/maps/MeteorFalls_StevensCave | |
| parent | abc1905caba10eadcbcb271d8188e5d16444a655 (diff) | |
| parent | 94650495c669f673c59f4912b805b51360c0797a (diff) | |
Merge pull request #274 from huderlem/movement_constants
Move and use movement constants
Diffstat (limited to 'data/maps/MeteorFalls_StevensCave')
| -rw-r--r-- | data/maps/MeteorFalls_StevensCave/events.inc | 2 | ||||
| -rw-r--r-- | data/maps/MeteorFalls_StevensCave/header.inc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/MeteorFalls_StevensCave/events.inc b/data/maps/MeteorFalls_StevensCave/events.inc index ff920f86d..09225365d 100644 --- a/data/maps/MeteorFalls_StevensCave/events.inc +++ b/data/maps/MeteorFalls_StevensCave/events.inc @@ -1,5 +1,5 @@ MeteorFalls_StevensCave_EventObjects: @ 85378B0 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, 7, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 MeteorFalls_StevensCave_MapWarps: @ 85378C8 warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index 22b3aaeb6..7236159f3 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -5,11 +5,11 @@ MeteorFalls_StevensCave: @ 8484A74 .4byte 0x0 .2byte MUS_DAN03 .2byte 431 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL |