diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-01-29 16:55:25 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-01-29 16:55:25 -0600 |
| commit | 5c1667b41a7d31df6d405d272833895bf8472cf6 (patch) | |
| tree | dcee557154cc86398b9815838fc61fbe01837ddc /data/maps/RustboroCity_DevonCorp_2F | |
| parent | 14641e916e94cfce9f70f9a16843a8e4a31b065f (diff) | |
Define layout constants
Diffstat (limited to 'data/maps/RustboroCity_DevonCorp_2F')
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_2F/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_2F/header.inc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc index f10c94780..fdf2e319e 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc @@ -1,4 +1,4 @@ -RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 +RustboroCity_DevonCorp_2F_EventObjects: 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 @@ -6,10 +6,10 @@ RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 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 +RustboroCity_DevonCorp_2F_MapWarps: warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F -RustboroCity_DevonCorp_2F_MapEvents:: @ 85304A8 +RustboroCity_DevonCorp_2F_MapEvents:: map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index bb548c44e..dea4bb1b4 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_DevonCorp_2F: @ 8483360 +RustboroCity_DevonCorp_2F: .4byte RustboroCity_DevonCorp_2F_Layout .4byte RustboroCity_DevonCorp_2F_MapEvents .4byte RustboroCity_DevonCorp_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 93 + .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE |