summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/macros/event.inc20
-rw-r--r--data/scripts/maps/DewfordTown_Gym.inc12
-rw-r--r--data/scripts/maps/LavaridgeTown_Gym_1F.inc30
-rw-r--r--data/scripts/maps/PetalburgCity_Gym.inc51
-rw-r--r--data/scripts/maps/Route104_Prototype.inc36
-rw-r--r--data/scripts/maps/Route109_SeashoreHouse.inc9
-rw-r--r--data/scripts/maps/Route111.inc3
-rw-r--r--data/scripts/maps/SSTidalCorridor.inc24
8 files changed, 75 insertions, 110 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index b29af7a04..fcbd3a055 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -1361,6 +1361,26 @@
@ Supplementary
+ .macro goto_if_trainer_not_defeated opponent, dest
+ checktrainerflag \opponent
+ goto_if 0, \dest
+ .endm
+
+ .macro goto_if_trainer_defeated opponent, dest
+ checktrainerflag \opponent
+ goto_if 1, \dest
+ .endm
+
+ .macro call_if_trainer_not_defeated opponent, dest
+ checktrainerflag \opponent
+ call_if 0, \dest
+ .endm
+
+ .macro call_if_trainer_defeated opponent, dest
+ checktrainerflag \opponent
+ call_if 1, \dest
+ .endm
+
.macro goto_if_unset flag, dest
checkflag \flag
goto_if 0, \dest
diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc
index 2dc15d92c..7cdf3dd6a 100644
--- a/data/scripts/maps/DewfordTown_Gym.inc
+++ b/data/scripts/maps/DewfordTown_Gym.inc
@@ -7,8 +7,7 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B
end
DewfordTown_Gym_EventScript_153071:: @ 8153071
- checktrainerflag OPPONENT_BRAWLY
- goto_if_eq DewfordTown_Gym_EventScript_1530AA
+ goto_if_trainer_defeated OPPONENT_BRAWLY, DewfordTown_Gym_EventScript_1530AA
call DewfordTown_Gym_EventScript_153122
copyvar VAR_SPECIAL_1, VAR_SPECIAL_0
compare VAR_SPECIAL_0, 0
@@ -81,18 +80,15 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117
DewfordTown_Gym_EventScript_153122:: @ 8153122
setvar VAR_SPECIAL_0, 0
- checktrainerflag OPPONENT_HIDEKI
- goto_if_lt DewfordTown_Gym_EventScript_153135
+ goto_if_trainer_not_defeated OPPONENT_HIDEKI, DewfordTown_Gym_EventScript_153135
addvar VAR_SPECIAL_0, 1
DewfordTown_Gym_EventScript_153135:: @ 8153135
- checktrainerflag OPPONENT_TESSA
- goto_if_lt DewfordTown_Gym_EventScript_153143
+ goto_if_trainer_not_defeated OPPONENT_TESSA, DewfordTown_Gym_EventScript_153143
addvar VAR_SPECIAL_0, 1
DewfordTown_Gym_EventScript_153143:: @ 8153143
- checktrainerflag OPPONENT_LAURA
- goto_if_lt DewfordTown_Gym_EventScript_153151
+ goto_if_trainer_not_defeated OPPONENT_LAURA, DewfordTown_Gym_EventScript_153151
addvar VAR_SPECIAL_0, 1
DewfordTown_Gym_EventScript_153151:: @ 8153151
diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
index 52d614436..c0604400e 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
@@ -13,56 +13,46 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F
setvar VAR_TEMP_D, 0
setvar VAR_TEMP_E, 0
setvar VAR_TEMP_F, 0
- checktrainerflag OPPONENT_COLE
- goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536C6
+ goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6
setvar VAR_TEMP_B, 1
LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6
- checktrainerflag OPPONENT_ZANE
- goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536D4
+ goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4
setvar VAR_TEMP_C, 1
LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4
- checktrainerflag OPPONENT_AXLE
- goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536E2
+ goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2
setvar VAR_TEMP_D, 1
LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2
- checktrainerflag OPPONENT_SADIE
- goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536F0
+ goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0
setvar VAR_TEMP_E, 1
LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0
- checktrainerflag OPPONENT_ANDY
- goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536FE
+ goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE
setvar VAR_TEMP_F, 1
LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE
return
LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF
- checktrainerflag OPPONENT_COLE
- goto_if_eq LavaridgeTown_Gym_1F_EventScript_15370C
+ goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_15370C
setobjectmovementtype 2, 63
LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C
- checktrainerflag OPPONENT_ZANE
- goto_if_eq LavaridgeTown_Gym_1F_EventScript_153719
+ goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_153719
setobjectmovementtype 3, 63
LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719
- checktrainerflag OPPONENT_AXLE
- goto_if_eq LavaridgeTown_Gym_1F_EventScript_153726
+ goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_153726
setobjectmovementtype 4, 63
LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726
- checktrainerflag OPPONENT_SADIE
- goto_if_eq LavaridgeTown_Gym_1F_EventScript_153733
+ goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_153733
setobjectmovementtype 5, 63
LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733
- checktrainerflag OPPONENT_ANDY
- goto_if_eq LavaridgeTown_Gym_1F_EventScript_153740
+ goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_153740
setobjectmovementtype 7, 63
LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 54c0e89f6..1199b3571 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -15,20 +15,13 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C
PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3
setvar VAR_SPECIAL_5, 1
call PetalburgCity_Gym_EventScript_154F9A
- checktrainerflag OPPONENT_RANDALL
- call_if_eq PetalburgCity_Gym_EventScript_154FBB
- checktrainerflag OPPONENT_MARY
- call_if_eq PetalburgCity_Gym_EventScript_154FDC
- checktrainerflag OPPONENT_PARKER
- call_if_eq PetalburgCity_Gym_EventScript_154FFD
- checktrainerflag OPPONENT_LORI
- call_if_eq PetalburgCity_Gym_EventScript_15501E
- checktrainerflag OPPONENT_GEORGE
- call_if_eq PetalburgCity_Gym_EventScript_15503F
- checktrainerflag OPPONENT_JODY
- call_if_eq PetalburgCity_Gym_EventScript_155060
- checktrainerflag OPPONENT_BERKE
- call_if_eq PetalburgCity_Gym_EventScript_155081
+ call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB
+ call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC
+ call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD
+ call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E
+ call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F
+ call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060
+ call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081
end
PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED
@@ -632,8 +625,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3
PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8
lockall
- checktrainerflag OPPONENT_RANDALL
- goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+ goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9
setvar VAR_SPECIAL_8, 7
setvar VAR_SPECIAL_9, 46
msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO
@@ -645,8 +637,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8
PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B
lockall
- checktrainerflag OPPONENT_RANDALL
- goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+ goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9
setvar VAR_SPECIAL_8, 1
setvar VAR_SPECIAL_9, 59
msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
@@ -658,8 +649,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B
PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E
lockall
- checktrainerflag OPPONENT_MARY
- goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+ goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9
setvar VAR_SPECIAL_8, 7
setvar VAR_SPECIAL_9, 59
msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
@@ -671,8 +661,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E
PetalburgCity_Gym_EventScript_154C91:: @ 8154C91
lockall
- checktrainerflag OPPONENT_MARY
- goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+ goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9
setvar VAR_SPECIAL_8, 1
setvar VAR_SPECIAL_9, 72
msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO
@@ -684,8 +673,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91
PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4
lockall
- checktrainerflag OPPONENT_PARKER
- goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+ goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9
setvar VAR_SPECIAL_8, 1
setvar VAR_SPECIAL_9, 20
msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
@@ -697,8 +685,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4
PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7
lockall
- checktrainerflag OPPONENT_LORI
- goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+ goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9
setvar VAR_SPECIAL_8, 7
setvar VAR_SPECIAL_9, 20
msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
@@ -710,8 +697,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7
PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A
lockall
- checktrainerflag OPPONENT_LORI
- goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+ goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9
setvar VAR_SPECIAL_8, 1
setvar VAR_SPECIAL_9, 33
msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
@@ -723,8 +709,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A
PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D
lockall
- checktrainerflag OPPONENT_GEORGE
- goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+ goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9
setvar VAR_SPECIAL_8, 7
setvar VAR_SPECIAL_9, 33
msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
@@ -736,8 +721,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D
PetalburgCity_Gym_EventScript_154D90:: @ 8154D90
lockall
- checktrainerflag OPPONENT_JODY
- goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+ goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9
setvar VAR_SPECIAL_8, 1
setvar VAR_SPECIAL_9, 7
msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
@@ -749,8 +733,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90
PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3
lockall
- checktrainerflag OPPONENT_BERKE
- goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+ goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9
setvar VAR_SPECIAL_8, 7
setvar VAR_SPECIAL_9, 7
msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc
index 7f1c4ca75..e0aba01c9 100644
--- a/data/scripts/maps/Route104_Prototype.inc
+++ b/data/scripts/maps/Route104_Prototype.inc
@@ -4,18 +4,12 @@ Route104_Prototype_MapScripts:: @ 8160C4A
Route104_Prototype_EventScript_160C4B:: @ 8160C4B
lock
faceplayer
- checktrainerflag OPPONENT_BRIANNA_1
- goto_if_lt Route104_Prototype_EventScript_160C99
- checktrainerflag OPPONENT_CINDY_2
- goto_if_lt Route104_Prototype_EventScript_160C99
- checktrainerflag OPPONENT_AMY_AND_LIV_3
- goto_if_lt Route104_Prototype_EventScript_160C99
- checktrainerflag OPPONENT_GINA_AND_MIA_2
- goto_if_lt Route104_Prototype_EventScript_160C99
- checktrainerflag OPPONENT_LUCAS_2
- goto_if_lt Route104_Prototype_EventScript_160C99
- checktrainerflag OPPONENT_MIKE_1
- goto_if_lt Route104_Prototype_EventScript_160C99
+ goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160C99
+ goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160C99
+ goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99
+ goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99
+ goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160C99
+ goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160C99
setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1
msgbox Route104_Prototype_Text_19B267, 4
goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB
@@ -30,18 +24,12 @@ Route104_Prototype_EventScript_160C99:: @ 8160C99
Route104_Prototype_EventScript_160CA3:: @ 8160CA3
lock
faceplayer
- checktrainerflag OPPONENT_BRIANNA_1
- goto_if_lt Route104_Prototype_EventScript_160CF1
- checktrainerflag OPPONENT_CINDY_2
- goto_if_lt Route104_Prototype_EventScript_160CF1
- checktrainerflag OPPONENT_AMY_AND_LIV_3
- goto_if_lt Route104_Prototype_EventScript_160CF1
- checktrainerflag OPPONENT_GINA_AND_MIA_2
- goto_if_lt Route104_Prototype_EventScript_160CF1
- checktrainerflag OPPONENT_LUCAS_2
- goto_if_lt Route104_Prototype_EventScript_160CF1
- checktrainerflag OPPONENT_MIKE_1
- goto_if_lt Route104_Prototype_EventScript_160CF1
+ goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160CF1
+ goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160CF1
+ goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1
+ goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1
+ goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160CF1
+ goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160CF1
setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2
msgbox Route104_Prototype_Text_19B2E9, 4
goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB
diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc
index e52958c50..13d37e7bd 100644
--- a/data/scripts/maps/Route109_SeashoreHouse.inc
+++ b/data/scripts/maps/Route109_SeashoreHouse.inc
@@ -91,12 +91,9 @@ Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE
end
Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09
- checktrainerflag OPPONENT_DWAYNE
- goto_if_lt Route109_SeashoreHouse_EventScript_160F29
- checktrainerflag OPPONENT_JOHANNA
- goto_if_lt Route109_SeashoreHouse_EventScript_160F29
- checktrainerflag OPPONENT_SIMON
- goto_if_lt Route109_SeashoreHouse_EventScript_160F29
+ goto_if_trainer_not_defeated OPPONENT_DWAYNE, Route109_SeashoreHouse_EventScript_160F29
+ goto_if_trainer_not_defeated OPPONENT_JOHANNA, Route109_SeashoreHouse_EventScript_160F29
+ goto_if_trainer_not_defeated OPPONENT_SIMON, Route109_SeashoreHouse_EventScript_160F29
setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS
release
end
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
index 11af07dce..99fa29efb 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -15,8 +15,7 @@ Route111_EventScript_14FFA6:: @ 814FFA6
Route111_MapScript1_14FFB9:: @ 814FFB9
call Route111_EventScript_14FFCD
call Route111_EventScript_1AE313
- checktrainerflag OPPONENT_VICKY
- goto_if_lt Route111_EventScript_15000D
+ goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D
end
Route111_EventScript_14FFCD:: @ 814FFCD
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc
index cd830f2b0..7bc5a7fdd 100644
--- a/data/scripts/maps/SSTidalCorridor.inc
+++ b/data/scripts/maps/SSTidalCorridor.inc
@@ -173,22 +173,14 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A
end
SSTidalCorridor_EventScript_15FE84:: @ 815FE84
- checktrainerflag OPPONENT_PHILLIP
- goto_if_lt SSTidalCorridor_EventScript_15FED5
- checktrainerflag OPPONENT_LEONARD
- goto_if_lt SSTidalCorridor_EventScript_15FED5
- checktrainerflag OPPONENT_COLTON
- goto_if_lt SSTidalCorridor_EventScript_15FED5
- checktrainerflag OPPONENT_TUCKER
- goto_if_lt SSTidalCorridor_EventScript_15FED5
- checktrainerflag OPPONENT_THOMAS
- goto_if_lt SSTidalCorridor_EventScript_15FED5
- checktrainerflag OPPONENT_LEA_AND_JED
- goto_if_lt SSTidalCorridor_EventScript_15FED5
- checktrainerflag OPPONENT_GARRET
- goto_if_lt SSTidalCorridor_EventScript_15FED5
- checktrainerflag OPPONENT_ANETTE
- goto_if_lt SSTidalCorridor_EventScript_15FED5
+ goto_if_trainer_not_defeated OPPONENT_PHILLIP, SSTidalCorridor_EventScript_15FED5
+ goto_if_trainer_not_defeated OPPONENT_LEONARD, SSTidalCorridor_EventScript_15FED5
+ goto_if_trainer_not_defeated OPPONENT_COLTON, SSTidalCorridor_EventScript_15FED5
+ goto_if_trainer_not_defeated OPPONENT_TUCKER, SSTidalCorridor_EventScript_15FED5
+ goto_if_trainer_not_defeated OPPONENT_THOMAS, SSTidalCorridor_EventScript_15FED5
+ goto_if_trainer_not_defeated OPPONENT_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5
+ goto_if_trainer_not_defeated OPPONENT_GARRET, SSTidalCorridor_EventScript_15FED5
+ goto_if_trainer_not_defeated OPPONENT_ANETTE, SSTidalCorridor_EventScript_15FED5
setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
goto SSTidalCorridor_EventScript_15FE7A
return
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 12:07:49 +0000