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/SSTidalRooms.inc | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/maps/SSTidalRooms.inc')
| -rw-r--r-- | data/scripts/maps/SSTidalRooms.inc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 4d588cd46..58e7c3235 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -4,13 +4,12 @@ SSTidalRooms_MapScripts:: @ 815FF05 SSTidalRooms_EventScript_15FF06:: @ 815FF06 lock faceplayer - checkflag 260 - jumpeq SSTidalRooms_EventScript_15FF3D + goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 - giveitem ITEM_TM49 + giveitem_std ITEM_TM49 compare RESULT, 0 - jumpeq SSTidalRooms_EventScript_1A029B - setflag 260 + goto_if_eq SSTidalRooms_EventScript_1A029B + setflag FLAG_RECEIVED_TM49 msgbox SSTidalRooms_Text_199C1A, 4 release end @@ -23,7 +22,7 @@ SSTidalRooms_EventScript_15FF3D:: @ 815FF3D SSTidalRooms_EventScript_15FF47:: @ 815FF47 lockall msgbox SSTidalRooms_Text_19956B, 4 - closebutton + closemessage call SSTidalRooms_EventScript_1A02CA call SSTidalRooms_EventScript_15FD64 releaseall |