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/Route105.inc | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/maps/Route105.inc')
| -rw-r--r-- | data/scripts/maps/Route105.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index c71e2ce05..305a2e9af 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -3,13 +3,12 @@ Route105_MapScripts:: @ 814F298 .byte 0 Route105_MapScript1_14F29E:: @ 814F29E - checkflag 228 - callif 0, Route105_EventScript_14F2A8 + call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_14F2A8 end Route105_EventScript_14F2A8:: @ 814F2A8 - setmaptile 9, 19, 124, 1 - setmaptile 9, 20, 145, 1 + setmetatile 9, 19, 124, 1 + setmetatile 9, 20, 145, 1 return Route105_EventScript_14F2BB:: @ 814F2BB |