diff options
Diffstat (limited to 'data/maps/FallarborTown')
| -rw-r--r-- | data/maps/FallarborTown/connections.inc | 6 | ||||
| -rw-r--r-- | data/maps/FallarborTown/events.inc | 8 | ||||
| -rw-r--r-- | data/maps/FallarborTown/header.inc | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc index 3808099d8..d5955c9e6 100644 --- a/data/maps/FallarborTown/connections.inc +++ b/data/maps/FallarborTown/connections.inc @@ -1,8 +1,8 @@ -FallarborTown_MapConnectionsList: @ 8486674 +FallarborTown_MapConnectionsList: connection left, 0, MAP_ROUTE114 connection right, 0, MAP_ROUTE113 -FallarborTown_MapConnections: @ 848668C - .4byte 0x2 +FallarborTown_MapConnections: + .4byte 2 .4byte FallarborTown_MapConnectionsList diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index 9b2f0a2de..b3c451595 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -1,17 +1,17 @@ -FallarborTown_EventObjects: @ 8527BE0 +FallarborTown_EventObjects: 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_EXPERT_M, 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, FLAG_HIDE_FALLARBOR_AZURILL -FallarborTown_MapWarps: @ 8527C40 +FallarborTown_MapWarps: warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1 warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 -FallarborTown_MapBGEvents: @ 8527C68 +FallarborTown_MapBGEvents: 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 @@ -21,6 +21,6 @@ FallarborTown_MapBGEvents: @ 8527C68 bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262 bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET -FallarborTown_MapEvents:: @ 8527CC8 +FallarborTown_MapEvents:: map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index f32f0c30b..2e74cee38 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -1,10 +1,10 @@ -FallarborTown: @ 8482624 +FallarborTown: .4byte FallarborTown_Layout .4byte FallarborTown_MapEvents .4byte FallarborTown_MapScripts .4byte FallarborTown_MapConnections .2byte MUS_TONEKUSA - .2byte 14 + .2byte LAYOUT_FALLARBOR_TOWN .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_SUNNY |