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/MtPyre_2F.inc | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/maps/MtPyre_2F.inc')
| -rw-r--r-- | data/scripts/maps/MtPyre_2F.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc index c44251af7..1d2368597 100644 --- a/data/scripts/maps/MtPyre_2F.inc +++ b/data/scripts/maps/MtPyre_2F.inc @@ -5,8 +5,8 @@ MtPyre_2F_MapScripts:: @ 815D36E .byte 0 MtPyre_2F_MapScript1_15D37E:: @ 815D37E - tileeffect 7 - warp5 MtPyre_1F, 255, 0, 0 + setstepcallback 7 + setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end MtPyre_2F_EventScript_15D389:: @ 815D389 |