diff options
Diffstat (limited to 'data/maps/FieryPath')
| -rw-r--r-- | data/maps/FieryPath/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/FieryPath/header.inc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc index 0ea132989..7fd7e44ad 100644 --- a/data/maps/FieryPath/events.inc +++ b/data/maps/FieryPath/events.inc @@ -1,4 +1,4 @@ -FieryPath_EventObjects: @ 8534C80 +FieryPath_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, FLAG_ITEM_FIERY_PATH_TM06 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_11 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_12 @@ -8,10 +8,10 @@ FieryPath_EventObjects: @ 8534C80 object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_16 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, FLAG_ITEM_FIERY_PATH_FIRE_STONE -FieryPath_MapWarps: @ 8534D40 +FieryPath_MapWarps: warp_def 26, 36, 3, 4, MAP_ROUTE112 warp_def 26, 4, 3, 5, MAP_ROUTE112 -FieryPath_MapEvents:: @ 8534D50 +FieryPath_MapEvents:: map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 20278028f..83e339adb 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -1,10 +1,10 @@ -FieryPath: @ 8484048 +FieryPath: .4byte FieryPath_Layout .4byte FieryPath_MapEvents .4byte FieryPath_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 293 + .2byte LAYOUT_FIERY_PATH .byte MAPSEC_FIERY_PATH .byte 0 .byte WEATHER_NONE |