[in progress] Harmonize more constant and data files with pokegold

engine/phone/scripts/alan.asm

@@ -1,6 +1,6 @@
 AlanPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
-	checkflag ENGINE_ALAN
+	checkflag ENGINE_ALAN_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
@@ -26,7 +26,7 @@ AlanPhoneCalleeScript:
 AlanPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
 	farscall PhoneScript_GreetPhone_Male
-	checkflag ENGINE_ALAN
+	checkflag ENGINE_ALAN_READY_FOR_REMATCH
 	iftrue .Generic
 	checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
 	iftrue .Generic
@@ -51,7 +51,7 @@ AlanWednesdayDay:
 
 AlanWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
-	setflag ENGINE_ALAN
+	setflag ENGINE_ALAN_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Male
 
 AlanHasFireStone:

engine/phone/scripts/anthony.asm

@@ -1,6 +1,6 @@
 AnthonyPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
-	checkflag ENGINE_ANTHONY
+	checkflag ENGINE_ANTHONY_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
@@ -28,7 +28,7 @@ AnthonyPhoneCallerScript:
 	farscall PhoneScript_GreetPhone_Male
 	checkflag ENGINE_FLYPOINT_GOLDENROD
 	iffalse .TriesSwarm
-	checkflag ENGINE_ANTHONY
+	checkflag ENGINE_ANTHONY_READY_FOR_REMATCH
 	iftrue .TriesSwarm
 	checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
 	iftrue .TriesSwarm
@@ -45,7 +45,7 @@ AnthonyFridayNight:
 
 AnthonyWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_33
-	setflag ENGINE_ANTHONY
+	setflag ENGINE_ANTHONY_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Male
 
 AnthonyTriesDunsparceSwarm:

engine/phone/scripts/arnie.asm

@@ -1,6 +1,6 @@
 ArniePhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
-	checkflag ENGINE_ARNIE
+	checkflag ENGINE_ARNIE_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_ARNIE_TUESDAY_MORNING
@@ -26,7 +26,7 @@ ArniePhoneCalleeScript:
 ArniePhoneCallerScript:
 	gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
 	farscall PhoneScript_GreetPhone_Male
-	checkflag ENGINE_ARNIE
+	checkflag ENGINE_ARNIE_READY_FOR_REMATCH
 	iftrue .Swarm
 	checkflag ENGINE_ARNIE_TUESDAY_MORNING
 	iftrue .Swarm
@@ -45,7 +45,7 @@ ArnieTuesdayMorning:
 
 ArnieWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35
-	setflag ENGINE_ARNIE
+	setflag ENGINE_ARNIE_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Male
 
 ArnieYanmaSwarm: ; start swarm

engine/phone/scripts/beth.asm

@@ -1,6 +1,6 @@
 BethPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
-	checkflag ENGINE_BETH
+	checkflag ENGINE_BETH_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Female
 	checkflag ENGINE_BETH_FRIDAY_AFTERNOON
@@ -20,7 +20,7 @@ BethPhoneCalleeScript:
 BethPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
 	farscall PhoneScript_GreetPhone_Female
-	checkflag ENGINE_BETH
+	checkflag ENGINE_BETH_READY_FOR_REMATCH
 	iftrue .Generic
 	checkflag ENGINE_BETH_FRIDAY_AFTERNOON
 	iftrue .Generic
@@ -35,5 +35,5 @@ BethFridayAfternoon:
 
 BethWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
-	setflag ENGINE_BETH
+	setflag ENGINE_BETH_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Female

engine/phone/scripts/brent.asm

@@ -1,6 +1,6 @@
 BrentPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1
-	checkflag ENGINE_BRENT
+	checkflag ENGINE_BRENT_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_BRENT_MONDAY_MORNING
@@ -22,7 +22,7 @@ BrentPhoneCallerScript:
 	farscall PhoneScript_GreetPhone_Male
 	farscall PhoneScript_Random2
 	ifequal 0, BrentBillTrivia
-	checkflag ENGINE_BRENT
+	checkflag ENGINE_BRENT_READY_FOR_REMATCH
 	iftrue .Generic
 	checkflag ENGINE_BRENT_MONDAY_MORNING
 	iftrue .Generic
@@ -37,7 +37,7 @@ BrentMondayMorning:
 
 BrentWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
-	setflag ENGINE_BRENT
+	setflag ENGINE_BRENT_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Male
 
 BrentBillTrivia:

engine/phone/scripts/chad.asm

@@ -1,6 +1,6 @@
 ChadPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1
-	checkflag ENGINE_CHAD
+	checkflag ENGINE_CHAD_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_CHAD_FRIDAY_MORNING
@@ -22,7 +22,7 @@ ChadPhoneCallerScript:
 	farscall PhoneScript_GreetPhone_Male
 	farscall PhoneScript_Random2
 	ifequal 0, ChadOakGossip
-	checkflag ENGINE_CHAD
+	checkflag ENGINE_CHAD_READY_FOR_REMATCH
 	iftrue .Generic
 	checkflag ENGINE_CHAD_FRIDAY_MORNING
 	iftrue .Generic
@@ -39,7 +39,7 @@ ChadFridayMorning:
 
 ChadWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
-	setflag ENGINE_CHAD
+	setflag ENGINE_CHAD_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Male
 
 ChadFoundRare:

engine/phone/scripts/dana.asm

@@ -1,6 +1,6 @@
 DanaPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, LASS, DANA1
-	checkflag ENGINE_DANA
+	checkflag ENGINE_DANA_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Female
 	checkflag ENGINE_DANA_THURSDAY_NIGHT
@@ -26,7 +26,7 @@ DanaPhoneCalleeScript:
 DanaPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, LASS, DANA1
 	farscall PhoneScript_GreetPhone_Female
-	checkflag ENGINE_DANA
+	checkflag ENGINE_DANA_READY_FOR_REMATCH
 	iftrue .Generic
 	checkflag ENGINE_DANA_THURSDAY_NIGHT
 	iftrue .Generic
@@ -53,7 +53,7 @@ DanaThursdayNight:
 
 DanaWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
-	setflag ENGINE_DANA
+	setflag ENGINE_DANA_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Female
 
 DanaFoundRare:

engine/phone/scripts/erin.asm

@@ -1,6 +1,6 @@
 ErinPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
-	checkflag ENGINE_ERIN
+	checkflag ENGINE_ERIN_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Female
 	checkflag ENGINE_ERIN_SATURDAY_NIGHT
@@ -20,7 +20,7 @@ ErinPhoneCalleeScript:
 ErinPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
 	farscall PhoneScript_GreetPhone_Female
-	checkflag ENGINE_ERIN
+	checkflag ENGINE_ERIN_READY_FOR_REMATCH
 	iftrue .GenericCall
 	checkflag ENGINE_ERIN_SATURDAY_NIGHT
 	iftrue .GenericCall
@@ -36,5 +36,5 @@ ErinSaturdayNight:
 
 ErinWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_46
-	setflag ENGINE_ERIN
+	setflag ENGINE_ERIN_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Female

engine/phone/scripts/gaven.asm

@@ -1,6 +1,6 @@
 GavenPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3
-	checkflag ENGINE_GAVEN
+	checkflag ENGINE_GAVEN_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_GAVEN_THURSDAY_MORNING
@@ -20,7 +20,7 @@ GavenPhoneCalleeScript:
 GavenPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3
 	farscall PhoneScript_GreetPhone_Male
-	checkflag ENGINE_GAVEN
+	checkflag ENGINE_GAVEN_READY_FOR_REMATCH
 	iftrue .WaitingForBattle
 	checkflag ENGINE_GAVEN_THURSDAY_MORNING
 	iftrue .WaitingForBattle
@@ -37,7 +37,7 @@ GavenThursdayMorningScript:
 
 GavenWantsRematch:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
-	setflag ENGINE_GAVEN
+	setflag ENGINE_GAVEN_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Male
 
 GavenFoundRare:

engine/phone/scripts/gina.asm

@@ -1,6 +1,6 @@
 GinaPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, PICNICKER, GINA1
-	checkflag ENGINE_GINA
+	checkflag ENGINE_GINA_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Female
 	checkflag ENGINE_GINA_SUNDAY_AFTERNOON
@@ -33,7 +33,7 @@ GinaPhoneCallerScript:
 	farscall PhoneScript_GreetPhone_Female
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
 	iftrue GinaRockets
-	checkflag ENGINE_GINA
+	checkflag ENGINE_GINA_READY_FOR_REMATCH
 	iftrue .Generic
 	checkflag ENGINE_GINA_SUNDAY_AFTERNOON
 	iftrue .Generic
@@ -60,7 +60,7 @@ GinaSundayDay:
 
 GinaWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
-	setflag ENGINE_GINA
+	setflag ENGINE_GINA_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Female
 
 GinaRockets:

engine/phone/scripts/huey.asm

@@ -1,6 +1,6 @@
 HueyPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, SAILOR, HUEY1
-	checkflag ENGINE_HUEY
+	checkflag ENGINE_HUEY_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_HUEY_WEDNESDAY_NIGHT
@@ -21,7 +21,7 @@ HueyPhoneCalleeScript:
 HueyPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, SAILOR, HUEY1
 	farscall PhoneScript_GreetPhone_Male
-	checkflag ENGINE_HUEY
+	checkflag ENGINE_HUEY_READY_FOR_REMATCH
 	iftrue .Flavor
 	checkflag ENGINE_HUEY_WEDNESDAY_NIGHT
 	iftrue .Flavor
@@ -37,5 +37,5 @@ HueyWednesdayNight:
 
 HueyWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_LIGHTHOUSE
-	setflag ENGINE_HUEY
+	setflag ENGINE_HUEY_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Male

engine/phone/scripts/jack.asm

@@ -1,6 +1,6 @@
 JackPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1
-	checkflag ENGINE_JACK
+	checkflag ENGINE_JACK_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_JACK_MONDAY_MORNING
@@ -22,7 +22,7 @@ JackPhoneCallerScript:
 	farscall PhoneScript_GreetPhone_Male
 	farscall PhoneScript_Random2
 	ifequal 0, JackBattleTrivia
-	checkflag ENGINE_JACK
+	checkflag ENGINE_JACK_READY_FOR_REMATCH
 	iftrue .WaitingForBattle
 	checkflag ENGINE_JACK_MONDAY_MORNING
 	iftrue .WaitingForBattle
@@ -39,7 +39,7 @@ JackMondayMorning:
 
 JackWantsToBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_NATIONAL_PARK
-	setflag ENGINE_JACK
+	setflag ENGINE_JACK_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Male
 
 JackFindsRare:

engine/phone/scripts/joey.asm

@@ -1,6 +1,6 @@
 JoeyPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1
-	checkflag ENGINE_JOEY
+	checkflag ENGINE_JOEY_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_JOEY_MONDAY_AFTERNOON
@@ -21,7 +21,7 @@ JoeyPhoneCalleeScript:
 JoeyPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1
 	farscall PhoneScript_GreetPhone_Male
-	checkflag ENGINE_JOEY
+	checkflag ENGINE_JOEY_READY_FOR_REMATCH
 	iftrue .Generic
 	checkflag ENGINE_JOEY_MONDAY_AFTERNOON
 	iftrue .Generic
@@ -37,5 +37,5 @@ JoeyMondayAfternoon:
 
 JoeyWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_30
-	setflag ENGINE_JOEY
+	setflag ENGINE_JOEY_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Male

engine/phone/scripts/jose.asm

@@ -1,6 +1,6 @@
 JosePhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2
-	checkflag ENGINE_JOSE
+	checkflag ENGINE_JOSE_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_JOSE_SATURDAY_NIGHT
@@ -26,7 +26,7 @@ JosePhoneCalleeScript:
 JosePhoneCallerScript:
 	gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2
 	farscall PhoneScript_GreetPhone_Male
-	checkflag ENGINE_JOSE
+	checkflag ENGINE_JOSE_READY_FOR_REMATCH
 	iftrue .Generic
 	checkflag ENGINE_JOSE_SATURDAY_NIGHT
 	iftrue .Generic
@@ -47,7 +47,7 @@ JoseSaturdayNight:
 
 JoseWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_27
-	setflag ENGINE_JOSE
+	setflag ENGINE_JOSE_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Male
 
 JoseFoundRare:

engine/phone/scripts/liz.asm

@@ -1,6 +1,6 @@
 LizPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, PICNICKER, LIZ1
-	checkflag ENGINE_LIZ
+	checkflag ENGINE_LIZ_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Female
 	checkflag ENGINE_LIZ_THURSDAY_AFTERNOON
@@ -23,7 +23,7 @@ LizPhoneCallerScript:
 	farscall PhoneScript_Random4
 	ifequal 0, LizWrongNumber
 	farscall PhoneScript_GreetPhone_Female
-	checkflag ENGINE_LIZ
+	checkflag ENGINE_LIZ_READY_FOR_REMATCH
 	iftrue .next
 	checkflag ENGINE_LIZ_THURSDAY_AFTERNOON
 	iftrue .next
@@ -44,7 +44,7 @@ LizThursdayAfternoon:
 
 LizWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32
-	setflag ENGINE_LIZ
+	setflag ENGINE_LIZ_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Female
 
 LizWrongNumber:

engine/phone/scripts/parry.asm

@@ -1,6 +1,6 @@
 ParryPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, HIKER, PARRY1
-	checkflag ENGINE_PARRY
+	checkflag ENGINE_PARRY_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_PARRY_FRIDAY_AFTERNOON
@@ -20,7 +20,7 @@ ParryPhoneCalleeScript:
 ParryPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, HIKER, PARRY1
 	farscall PhoneScript_GreetPhone_Male
-	checkflag ENGINE_PARRY
+	checkflag ENGINE_PARRY_READY_FOR_REMATCH
 	iftrue .GenericCall
 	checkflag ENGINE_PARRY_FRIDAY_AFTERNOON
 	iftrue .GenericCall
@@ -36,5 +36,5 @@ ParryFridayDay:
 
 ParryWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_45
-	setflag ENGINE_PARRY
+	setflag ENGINE_PARRY_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Male

engine/phone/scripts/ralph.asm

@@ -1,6 +1,6 @@
 RalphPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, FISHER, RALPH1
-	checkflag ENGINE_RALPH
+	checkflag ENGINE_RALPH_READY_FOR_REMATCH
 	iftrue .Rematch
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_RALPH_WEDNESDAY_MORNING
@@ -27,7 +27,7 @@ RalphPhoneCallerScript:
 	farscall PhoneScript_GreetPhone_Male
 	checkflag ENGINE_FLYPOINT_GOLDENROD
 	iffalse .CheckSwarm
-	checkflag ENGINE_RALPH
+	checkflag ENGINE_RALPH_READY_FOR_REMATCH
 	iftrue .CheckSwarm
 	checkflag ENGINE_RALPH_WEDNESDAY_MORNING
 	iftrue .CheckSwarm
@@ -42,7 +42,7 @@ Ralph_WednesdayMorning:
 	setflag ENGINE_RALPH_WEDNESDAY_MORNING
 Ralph_FightMe:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32
-	setflag ENGINE_RALPH
+	setflag ENGINE_RALPH_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Male
 
 Ralph_SetUpSwarm:

engine/phone/scripts/reena.asm

@@ -1,6 +1,6 @@
 ReenaPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1
-	checkflag ENGINE_REENA
+	checkflag ENGINE_REENA_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Female
 	checkflag ENGINE_REENA_SUNDAY_MORNING
@@ -20,7 +20,7 @@ ReenaPhoneCalleeScript:
 ReenaPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1
 	farscall PhoneScript_GreetPhone_Female
-	checkflag ENGINE_REENA
+	checkflag ENGINE_REENA_READY_FOR_REMATCH
 	iftrue .Generic
 	checkflag ENGINE_REENA_SUNDAY_MORNING
 	iftrue .Generic
@@ -35,5 +35,5 @@ ReenaSundayMorning:
 
 ReenaWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_27
-	setflag ENGINE_REENA
+	setflag ENGINE_REENA_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Female

engine/phone/scripts/tiffany.asm

@@ -1,6 +1,6 @@
 TiffanyPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3
-	checkflag ENGINE_TIFFANY
+	checkflag ENGINE_TIFFANY_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Female
 	checkflag ENGINE_TIFFANY_TUESDAY_AFTERNOON
@@ -28,7 +28,7 @@ TiffanyPhoneCallerScript:
 	farscall PhoneScript_Random4
 	ifequal 0, TiffanysFamilyMembers
 	farscall PhoneScript_GreetPhone_Female
-	checkflag ENGINE_TIFFANY
+	checkflag ENGINE_TIFFANY_READY_FOR_REMATCH
 	iftrue .Generic
 	checkflag ENGINE_TIFFANY_TUESDAY_AFTERNOON
 	iftrue .Generic
@@ -53,7 +53,7 @@ TiffanyTuesdayAfternoon:
 
 TiffanyWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
-	setflag ENGINE_TIFFANY
+	setflag ENGINE_TIFFANY_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Female
 
 TiffanysFamilyMembers:

engine/phone/scripts/todd.asm

@@ -1,6 +1,6 @@
 ToddPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, CAMPER, TODD1
-	checkflag ENGINE_TODD
+	checkflag ENGINE_TODD_READY_FOR_REMATCH
 	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_TODD_SATURDAY_MORNING
@@ -25,7 +25,7 @@ ToddPhoneCalleeScript:
 ToddPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, CAMPER, TODD1
 	farscall PhoneScript_GreetPhone_Male
-	checkflag ENGINE_TODD
+	checkflag ENGINE_TODD_READY_FOR_REMATCH
 	iftrue .TryForSale
 	checkflag ENGINE_TODD_SATURDAY_MORNING
 	iftrue .TryForSale
@@ -48,7 +48,7 @@ ToddSaturdayMorning:
 
 ToddWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
-	setflag ENGINE_TODD
+	setflag ENGINE_TODD_READY_FOR_REMATCH
 	farsjump PhoneScript_WantsToBattle_Male
 
 ToddFoundRare: