diff options
| author | scnorton <scnorton@biociphers.org> | 2017-10-16 14:12:59 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-10-16 14:12:59 -0400 |
| commit | a6d2bfaebd16940fc0ac1be3ca29caf0888296ca (patch) | |
| tree | 7ec979bc8481b2c2d55874aef3e9004ddb715781 /data/scripts/maps/SSTidalRooms.inc | |
| parent | 96ebc5d46287e33df7bda74a6fb340281cdaa4c5 (diff) | |
| parent | 7d657ef56716fd01bacf4a47df50ad0ec3d03b10 (diff) | |
Merge branch 'master' into secret_base
Diffstat (limited to 'data/scripts/maps/SSTidalRooms.inc')
| -rw-r--r-- | data/scripts/maps/SSTidalRooms.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 4d588cd46..c7cd4447d 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -5,11 +5,11 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 lock faceplayer checkflag 260 - jumpeq SSTidalRooms_EventScript_15FF3D + goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem ITEM_TM49 compare RESULT, 0 - jumpeq SSTidalRooms_EventScript_1A029B + goto_if_eq SSTidalRooms_EventScript_1A029B setflag 260 msgbox SSTidalRooms_Text_199C1A, 4 release @@ -23,7 +23,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 |