summaryrefslogtreecommitdiff
path: root/data/maps/SSTidalRooms
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-04-23 17:20:34 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-04-23 17:59:25 -0400
commit71094356313801bf20191f3db1efa0decd3c3dcb (patch)
tree18c501d04a21f88c5f4d59f764883e326710ca39 /data/maps/SSTidalRooms
parent3bd2094141da60be175f237fa34889469f77f187 (diff)
Sync event macros
Diffstat (limited to 'data/maps/SSTidalRooms')
-rw-r--r--data/maps/SSTidalRooms/scripts.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc
index fd7854875..68bbe86ee 100644
--- a/data/maps/SSTidalRooms/scripts.inc
+++ b/data/maps/SSTidalRooms/scripts.inc
@@ -6,7 +6,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06
faceplayer
goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D
msgbox SSTidalRooms_Text_199B65, 4
- giveitem_std ITEM_TM49_SNATCH
+ giveitem ITEM_TM49_SNATCH
compare VAR_RESULT, 0
goto_if_eq SSTidalRooms_EventScript_1A029B
setflag FLAG_RECEIVED_TM49
@@ -29,36 +29,36 @@ SSTidalRooms_EventScript_15FF47:: @ 815FF47
end
SSTidalRooms_EventScript_15FF5D:: @ 815FF5D
- trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613
+ trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613
msgbox SSTidalRooms_Text_199630, 6
end
SSTidalRooms_EventScript_15FF74:: @ 815FF74
- trainerbattle 0, TRAINER_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF
+ trainerbattle_single TRAINER_TUCKER, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF
msgbox SSTidalRooms_Text_1996E1, 6
end
SSTidalRooms_EventScript_15FF8B:: @ 815FF8B
- trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747
+ trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747
msgbox SSTidalRooms_Text_199778, 6
end
SSTidalRooms_EventScript_15FFA2:: @ 815FFA2
- trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887
+ trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887
msgbox SSTidalRooms_Text_199820, 6
end
SSTidalRooms_EventScript_15FFBD:: @ 815FFBD
- trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975
+ trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975
msgbox SSTidalRooms_Text_19991C, 6
end
SSTidalRooms_EventScript_15FFD8:: @ 815FFD8
- trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF
+ trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF
msgbox SSTidalRooms_Text_199A10, 6
end
SSTidalRooms_EventScript_15FFEF:: @ 815FFEF
- trainerbattle 0, TRAINER_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF
+ trainerbattle_single TRAINER_ANETTE, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF
msgbox SSTidalRooms_Text_199ADE, 6
end