diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /data/scripts/maps/ScorchedSlab.inc | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/maps/ScorchedSlab.inc')
| -rw-r--r-- | data/scripts/maps/ScorchedSlab.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/scripts/maps/ScorchedSlab.inc index 112289083..f0ed9c005 100644 --- a/data/scripts/maps/ScorchedSlab.inc +++ b/data/scripts/maps/ScorchedSlab.inc @@ -3,5 +3,5 @@ ScorchedSlab_MapScripts:: @ 815F29D .byte 0 ScorchedSlab_MapScript1_15F2A3:: @ 815F2A3 - setflag 2136 + setflag FLAG_LANDMARK_SCORCHED_SLAB end |