Merge branch 'master' into unk_text_8095904

1 files changed, 18 insertions, 29 deletions

diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc
index fc018a7b9..7bc5a7fdd 100644
--- a/data/scripts/maps/SSTidalCorridor.inc
+++ b/data/scripts/maps/SSTidalCorridor.inc
@@ -13,7 +13,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC
 	special SetSSTidalFlag
 	setvar VAR_PORTHOLE_STATE, 2
 	lockall
-	playse 73
+	playse SE_PINPON
 	msgbox SSTidalCorridor_Text_199007, 4
 	releaseall
 	end
@@ -21,7 +21,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC
 SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2
 	setvar VAR_PORTHOLE_STATE, 6
 	lockall
-	playse 73
+	playse SE_PINPON
 	msgbox SSTidalCorridor_Text_199088, 4
 	releaseall
 	end
@@ -29,14 +29,14 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2
 SSTidalRooms_EventScript_15FCE5:: @ 815FCE5
 	special SetSSTidalFlag
 	setvar VAR_PORTHOLE_STATE, 7
-	playse 73
+	playse SE_PINPON
 	msgbox SSTidalRooms_Text_199007, 4
 	return
 
 SSTidalRooms_EventScript_15FCF9:: @ 815FCF9
 	special ResetSSTidalFlag
 	setvar VAR_PORTHOLE_STATE, 4
-	playse 73
+	playse SE_PINPON
 	msgbox SSTidalRooms_Text_1990F8, 4
 	return
 
@@ -51,7 +51,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24
 	special ResetSSTidalFlag
 	setvar VAR_PORTHOLE_STATE, 3
 	lockall
-	playse 73
+	playse SE_PINPON
 	msgbox SSTidalCorridor_Text_199088, 4
 	releaseall
 	end
@@ -60,7 +60,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A
 	special ResetSSTidalFlag
 	setvar VAR_PORTHOLE_STATE, 8
 	lockall
-	playse 73
+	playse SE_PINPON
 	msgbox SSTidalCorridor_Text_1990B4, 4
 	releaseall
 	end
@@ -68,7 +68,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A
 SSTidalRooms_EventScript_15FD50:: @ 815FD50
 	special ResetSSTidalFlag
 	setvar VAR_PORTHOLE_STATE, 8
-	playse 73
+	playse SE_PINPON
 	msgbox SSTidalRooms_Text_1990B4, 4
 	return
 
@@ -124,8 +124,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6
 SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8
 	setrespawn 8
 	msgbox SSTidalCorridor_Text_1991F4, 4
-	checkflag FLAG_RECEIVED_TM49
-	call_if 1, SSTidalCorridor_EventScript_15FE36
+	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
@@ -134,8 +133,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8
 SSTidalCorridor_EventScript_15FE17:: @ 815FE17
 	setrespawn 4
 	msgbox SSTidalCorridor_Text_1991F4, 4
-	checkflag FLAG_RECEIVED_TM49
-	call_if 1, SSTidalCorridor_EventScript_15FE36
+	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
@@ -163,8 +161,7 @@ SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B
 SSTidalCorridor_EventScript_15FE60:: @ 815FE60
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
-	goto_if_eq SSTidalCorridor_EventScript_15FE7A
+	goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_15FE7A
 	call SSTidalCorridor_EventScript_15FE84
 	msgbox SSTidalCorridor_Text_199203, 4
 	release
@@ -176,22 +173,14 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A
 	end
 
 SSTidalCorridor_EventScript_15FE84:: @ 815FE84
-	checktrainerflag OPPONENT_PHILLIP
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_LEONARD
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_COLTON
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_TUCKER
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_THOMAS
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_LEA_AND_JED
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_GARRET
-	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	checktrainerflag OPPONENT_ANETTE
-	goto_if 0, 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