diff options
Diffstat (limited to 'data/maps/Route121')
| -rw-r--r-- | data/maps/Route121/connections.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route121/events.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route121/header.inc | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc index 94116a03e..6d9bd9ae4 100644 --- a/data/maps/Route121/connections.inc +++ b/data/maps/Route121/connections.inc @@ -1,9 +1,9 @@ -Route121_MapConnectionsList: @ 8486AE0 +Route121_MapConnectionsList: connection down, 20, MAP_ROUTE122 connection left, -80, MAP_ROUTE120 connection right, -10, MAP_LILYCOVE_CITY -Route121_MapConnections: @ 8486B04 - .4byte 0x3 +Route121_MapConnections: + .4byte 3 .4byte Route121_MapConnectionsList diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 432071ed1..5e637bb7e 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -1,4 +1,4 @@ -Route121_EventObjects: @ 852BA14 +Route121_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, BerryTreeScript, 0 @@ -29,16 +29,16 @@ Route121_EventObjects: @ 852BA14 object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, FLAG_ITEM_ROUTE_121_REVIVE object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, FLAG_ITEM_ROUTE_121_ZINC -Route121_MapWarps: @ 852BCCC +Route121_MapWarps: warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE -Route121_MapCoordEvents: @ 852BCD4 +Route121_MapCoordEvents: coord_event 25, 5, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 coord_event 25, 6, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 coord_event 25, 7, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 coord_event 25, 8, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 -Route121_MapBGEvents: @ 852BD14 +Route121_MapBGEvents: bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E06 bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2 bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2 @@ -50,6 +50,6 @@ Route121_MapBGEvents: @ 852BD14 bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE -Route121_MapEvents:: @ 852BD8C +Route121_MapEvents:: map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 3f070c2ec..04cee6942 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -1,10 +1,10 @@ -Route121: @ 84828A8 +Route121: .4byte Route121_Layout .4byte Route121_MapEvents .4byte Route121_MapScripts .4byte Route121_MapConnections .2byte MUS_DOORO_X3 - .2byte 37 + .2byte LAYOUT_ROUTE121 .byte MAPSEC_ROUTE_121 .byte 0 .byte WEATHER_SUNNY |