diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-17 09:24:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 09:24:30 -0400 |
| commit | 5e46a0fcc57d421879c1f65b40b4692bbe65a813 (patch) | |
| tree | 398b53f56158397a04e0e8de8159e00eeba9acc3 /data/maps/ScorchedSlab | |
| parent | e06b63efc9ea39875b17f00e5ff20c2e0fcb0415 (diff) | |
| parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) | |
Merge pull request #2 from pret/master
sync with source repo
Diffstat (limited to 'data/maps/ScorchedSlab')
| -rw-r--r-- | data/maps/ScorchedSlab/events.inc | 2 | ||||
| -rw-r--r-- | data/maps/ScorchedSlab/header.inc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc index 588b7a9ae..5bbe88c20 100644 --- a/data/maps/ScorchedSlab/events.inc +++ b/data/maps/ScorchedSlab/events.inc @@ -1,5 +1,5 @@ ScorchedSlab_EventObjects: @ 8536F88 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079 ScorchedSlab_MapWarps: @ 8536FA0 warp_def 7, 16, 1, 1, MAP_ROUTE120 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 543f83ebb..1de3fd413 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -5,11 +5,11 @@ ScorchedSlab: @ 84846BC .4byte 0x0 .2byte MUS_DAN01 .2byte 311 - .byte 80 + .byte MAPSEC_SCORCHED_SLAB .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL |