summaryrefslogtreecommitdiff
path: root/data/maps/ScorchedSlab
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/ScorchedSlab')
-rw-r--r--data/maps/ScorchedSlab/events.inc6
-rw-r--r--data/maps/ScorchedSlab/header.inc4
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc
index 20a5fc145..f43240a78 100644
--- a/data/maps/ScorchedSlab/events.inc
+++ b/data/maps/ScorchedSlab/events.inc
@@ -1,9 +1,9 @@
-ScorchedSlab_EventObjects: @ 8536F88
+ScorchedSlab_EventObjects:
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, FLAG_ITEM_SCORCHED_SLAB_TM_11
-ScorchedSlab_MapWarps: @ 8536FA0
+ScorchedSlab_MapWarps:
warp_def 7, 16, 1, 1, MAP_ROUTE120
-ScorchedSlab_MapEvents:: @ 8536FA8
+ScorchedSlab_MapEvents::
map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0
diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc
index 84c09df3f..ec09efb0f 100644
--- a/data/maps/ScorchedSlab/header.inc
+++ b/data/maps/ScorchedSlab/header.inc
@@ -1,10 +1,10 @@
-ScorchedSlab: @ 84846BC
+ScorchedSlab:
.4byte ScorchedSlab_Layout
.4byte ScorchedSlab_MapEvents
.4byte ScorchedSlab_MapScripts
.4byte 0x0
.2byte MUS_DAN01
- .2byte 311
+ .2byte LAYOUT_SCORCHED_SLAB
.byte MAPSEC_SCORCHED_SLAB
.byte 0
.byte WEATHER_NONE