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/FallarborTown | |
| parent | abc1905caba10eadcbcb271d8188e5d16444a655 (diff) | |
| parent | 94650495c669f673c59f4912b805b51360c0797a (diff) | |
Merge pull request #274 from huderlem/movement_constants
Move and use movement constants
Diffstat (limited to 'data/maps/FallarborTown')
| -rw-r--r-- | data/maps/FallarborTown/events.inc | 24 | ||||
| -rw-r--r-- | data/maps/FallarborTown/header.inc | 8 |
2 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index 91a98cc28..fae6f714e 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -1,8 +1,8 @@ FallarborTown_EventObjects: @ 8527BE0 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, 8, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, 3, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 - object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 + object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907 FallarborTown_MapWarps: @ 8527C40 warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART @@ -12,14 +12,14 @@ FallarborTown_MapWarps: @ 8527C40 warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 FallarborTown_MapBGEvents: @ 8527C68 - bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_271E6A - bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_271E73 - bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_1EB250 - bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_271E73 - bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_1EB259 - bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_271E6A - bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_1EB262 - bg_event 2, 15, 3, 7, 0, ITEM_NUGGET, 28, 0 + bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A + bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73 + bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB250 + bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73 + bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259 + bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262 + bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, 28 FallarborTown_MapEvents:: @ 8527CC8 map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index c26b91f29..0c2053b8b 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -5,11 +5,11 @@ FallarborTown: @ 8482624 .4byte FallarborTown_MapConnections .2byte MUS_TONEKUSA .2byte 14 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 2 - .byte 1 + .byte WEATHER_SUNNY + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL |