summaryrefslogtreecommitdiff
path: root/data/maps/SSTidalRooms/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SSTidalRooms/scripts.inc')
-rw-r--r--data/maps/SSTidalRooms/scripts.inc42
1 files changed, 21 insertions, 21 deletions
diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc
index fd7854875..99431543b 100644
--- a/data/maps/SSTidalRooms/scripts.inc
+++ b/data/maps/SSTidalRooms/scripts.inc
@@ -5,60 +5,60 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06
lock
faceplayer
goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D
- msgbox SSTidalRooms_Text_199B65, 4
- giveitem_std ITEM_TM49_SNATCH
+ msgbox SSTidalRooms_Text_199B65, MSGBOX_DEFAULT
+ giveitem ITEM_TM49_SNATCH
compare VAR_RESULT, 0
- goto_if_eq SSTidalRooms_EventScript_1A029B
+ goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_TM49
- msgbox SSTidalRooms_Text_199C1A, 4
+ msgbox SSTidalRooms_Text_199C1A, MSGBOX_DEFAULT
release
end
SSTidalRooms_EventScript_15FF3D:: @ 815FF3D
- msgbox SSTidalRooms_Text_199C1A, 4
+ msgbox SSTidalRooms_Text_199C1A, MSGBOX_DEFAULT
release
end
SSTidalRooms_EventScript_15FF47:: @ 815FF47
lockall
- msgbox SSTidalRooms_Text_19956B, 4
+ msgbox SSTidalRooms_Text_19956B, MSGBOX_DEFAULT
closemessage
- call SSTidalRooms_EventScript_1A02CA
+ call Common_EventScript_OutOfCenterPartyHeal
call SSTidalRooms_EventScript_15FD64
releaseall
end
SSTidalRooms_EventScript_15FF5D:: @ 815FF5D
- trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613
- msgbox SSTidalRooms_Text_199630, 6
+ trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613
+ msgbox SSTidalRooms_Text_199630, MSGBOX_AUTOCLOSE
end
SSTidalRooms_EventScript_15FF74:: @ 815FF74
- trainerbattle 0, TRAINER_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF
- msgbox SSTidalRooms_Text_1996E1, 6
+ trainerbattle_single TRAINER_TUCKER, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF
+ msgbox SSTidalRooms_Text_1996E1, MSGBOX_AUTOCLOSE
end
SSTidalRooms_EventScript_15FF8B:: @ 815FF8B
- trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747
- msgbox SSTidalRooms_Text_199778, 6
+ trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747
+ msgbox SSTidalRooms_Text_199778, MSGBOX_AUTOCLOSE
end
SSTidalRooms_EventScript_15FFA2:: @ 815FFA2
- trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887
- msgbox SSTidalRooms_Text_199820, 6
+ trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887
+ msgbox SSTidalRooms_Text_199820, MSGBOX_AUTOCLOSE
end
SSTidalRooms_EventScript_15FFBD:: @ 815FFBD
- trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975
- msgbox SSTidalRooms_Text_19991C, 6
+ trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975
+ msgbox SSTidalRooms_Text_19991C, MSGBOX_AUTOCLOSE
end
SSTidalRooms_EventScript_15FFD8:: @ 815FFD8
- trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF
- msgbox SSTidalRooms_Text_199A10, 6
+ trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF
+ msgbox SSTidalRooms_Text_199A10, MSGBOX_AUTOCLOSE
end
SSTidalRooms_EventScript_15FFEF:: @ 815FFEF
- trainerbattle 0, TRAINER_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF
- msgbox SSTidalRooms_Text_199ADE, 6
+ trainerbattle_single TRAINER_ANETTE, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF
+ msgbox SSTidalRooms_Text_199ADE, MSGBOX_AUTOCLOSE
end