Bugfix - Rematches do not always trigger

SoupPotato · Jan 29, 2024 · de6c289 · de6c289
1 parent d7d50a4
commit de6c289
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/engine/phone/scripts/brent.asm b/engine/phone/scripts/brent.asm
@@ -8,7 +8,7 @@ BrentPhoneCalleeScript:
 	readvar VAR_WEEKDAY
 	ifnotequal MONDAY, .NotMonday
 	checktime MORN
-	iftrue BrentMondayMorning
+	iftrue BrentWantsBattle
 
 .NotMonday:
 	farsjump BrentHangUpScript
@@ -32,9 +32,6 @@ BrentPhoneCallerScript:
 .Generic:
 	farsjump Phone_GenericCall_Male
 
-BrentMondayMorning:
-	setflag ENGINE_BRENT_MONDAY_MORNING
-
 BrentWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
 	setflag ENGINE_BRENT_READY_FOR_REMATCH

diff --git a/engine/phone/scripts/joey.asm b/engine/phone/scripts/joey.asm
@@ -8,7 +8,7 @@ JoeyPhoneCalleeScript:
 	readvar VAR_WEEKDAY
 	ifnotequal MONDAY, .NotMonday
 	checktime DAY
-	iftrue JoeyMondayAfternoon
+	iftrue JoeyWantsBattle
 
 .NotMonday:
 	special RandomPhoneMon
@@ -32,9 +32,6 @@ JoeyPhoneCallerScript:
 .Generic:
 	farsjump Phone_GenericCall_Male
 
-JoeyMondayAfternoon:
-	setflag ENGINE_JOEY_MONDAY_AFTERNOON
-
 JoeyWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_30
 	setflag ENGINE_JOEY_READY_FOR_REMATCH