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/RustboroCity_DevonCorp_2F | |
| parent | abc1905caba10eadcbcb271d8188e5d16444a655 (diff) | |
| parent | 94650495c669f673c59f4912b805b51360c0797a (diff) | |
Merge pull request #274 from huderlem/movement_constants
Move and use movement constants
Diffstat (limited to 'data/maps/RustboroCity_DevonCorp_2F')
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_2F/events.inc | 12 | ||||
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_2F/header.inc | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc index 31a3d1de6..f10c94780 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc @@ -1,10 +1,10 @@ RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, 7, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 RustboroCity_DevonCorp_2F_MapWarps: @ 8530498 warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index f3954aed0..b0da75514 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -5,11 +5,11 @@ RustboroCity_DevonCorp_2F: @ 8483360 .4byte 0x0 .2byte MUS_GOTOWN .2byte 93 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL |