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/TradeCenter | |
| parent | abc1905caba10eadcbcb271d8188e5d16444a655 (diff) | |
| parent | 94650495c669f673c59f4912b805b51360c0797a (diff) | |
Merge pull request #274 from huderlem/movement_constants
Move and use movement constants
Diffstat (limited to 'data/maps/TradeCenter')
| -rw-r--r-- | data/maps/TradeCenter/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/TradeCenter/header.inc | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index 89e5eac90..e1f2e2bea 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.inc @@ -1,13 +1,13 @@ TradeCenter_EventObjects: @ 8539DA0 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 TradeCenter_MapWarps: @ 8539DB8 warp_def 5, 8, 3, 127, MAP_NONE warp_def 6, 8, 3, 127, MAP_NONE TradeCenter_MapCoordEvents: @ 8539DC8 - coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773F5 - coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773FF + coord_event 4, 5, 3, VAR_TEMP_0, 0, gUnknown_082773F5 + coord_event 7, 5, 3, VAR_TEMP_0, 0, gUnknown_082773FF TradeCenter_MapEvents:: @ 8539DE8 map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 55afa79f3..947cdbde2 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -5,11 +5,11 @@ TradeCenter: @ 8484D4C .4byte 0x0 .2byte MUS_RAINBOW .2byte 222 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL |