diff --git a/engine/phone/scripts/alan.asm b/engine/phone/scripts/alan.asm index f627c6b14..1b4ec96d4 100644 --- a/engine/phone/scripts/alan.asm +++ b/engine/phone/scripts/alan.asm @@ -10,7 +10,9 @@ AlanPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal WEDNESDAY, .NotWednesday checktime DAY - iftrue AlanWednesdayDay + iftrue AlanWantsBattle + checktime EVE + iftrue AlanWantsBattle .NotWednesday: farsjump AlanHangUpScript @@ -46,9 +48,6 @@ AlanPhoneCallerScript: .Generic: farsjump Phone_GenericCall_Male -AlanWednesdayDay: - setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON - AlanWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36 setflag ENGINE_ALAN_READY_FOR_REMATCH diff --git a/engine/phone/scripts/anthony.asm b/engine/phone/scripts/anthony.asm index 859afdad7..59465e9fb 100644 --- a/engine/phone/scripts/anthony.asm +++ b/engine/phone/scripts/anthony.asm @@ -4,7 +4,7 @@ AnthonyPhoneCalleeScript: iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checktime NITE - iftrue AnthonyFridayNight + iftrue AnthonyWantsBattle farsjump AnthonyHangUpScript @@ -19,9 +19,6 @@ AnthonyPhoneCallerScript: ifequal 0, AnthonyWantsBattle farsjump Phone_GenericCall_Male -AnthonyFridayNight: - setflag ENGINE_ANTHONY_FRIDAY_NIGHT - AnthonyWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_33 setflag ENGINE_ANTHONY_READY_FOR_REMATCH diff --git a/engine/phone/scripts/arnie.asm b/engine/phone/scripts/arnie.asm index 4207ddbba..8b05a8052 100644 --- a/engine/phone/scripts/arnie.asm +++ b/engine/phone/scripts/arnie.asm @@ -4,7 +4,7 @@ ArniePhoneCalleeScript: iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checktime MORN - iftrue ArnieTuesdayMorning + iftrue ArnieWantsBattle farsjump ArnieHangUpScript .WantsBattle: @@ -18,9 +18,6 @@ ArniePhoneCallerScript: ifequal 0, ArnieWantsBattle farsjump Phone_GenericCall_Male -ArnieTuesdayMorning: - setflag ENGINE_ARNIE_TUESDAY_MORNING - ArnieWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35 setflag ENGINE_ARNIE_READY_FOR_REMATCH diff --git a/engine/phone/scripts/beth.asm b/engine/phone/scripts/beth.asm index 1c78dfd68..22c883f0c 100644 --- a/engine/phone/scripts/beth.asm +++ b/engine/phone/scripts/beth.asm @@ -8,7 +8,9 @@ BethPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal FRIDAY, .NotFriday checktime DAY - iftrue BethFridayAfternoon + iftrue BethWantsBattle + checktime EVE + iftrue BethWantsBattle .NotFriday: farsjump BethHangUpScript @@ -30,9 +32,6 @@ BethPhoneCallerScript: .Generic: farsjump Phone_GenericCall_Female -BethFridayAfternoon: - setflag ENGINE_BETH_FRIDAY_AFTERNOON - BethWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26 setflag ENGINE_BETH_READY_FOR_REMATCH diff --git a/engine/phone/scripts/chad.asm b/engine/phone/scripts/chad.asm index 8e3384fdc..dea423f76 100644 --- a/engine/phone/scripts/chad.asm +++ b/engine/phone/scripts/chad.asm @@ -8,7 +8,7 @@ ChadPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal FRIDAY, .NotFriday checktime MORN - iftrue ChadFridayMorning + iftrue ChadWantsBattle .NotFriday: farsjump ChadHangUpScript @@ -34,9 +34,6 @@ ChadPhoneCallerScript: ifequal 0, ChadFoundRare farsjump Phone_GenericCall_Male -ChadFridayMorning: - setflag ENGINE_CHAD_FRIDAY_MORNING - ChadWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38 setflag ENGINE_CHAD_READY_FOR_REMATCH diff --git a/engine/phone/scripts/dana.asm b/engine/phone/scripts/dana.asm index 936ed46ec..b8cf4d37c 100644 --- a/engine/phone/scripts/dana.asm +++ b/engine/phone/scripts/dana.asm @@ -10,7 +10,7 @@ DanaPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal THURSDAY, .NotThursday checktime NITE - iftrue DanaThursdayNight + iftrue DanaWantsBattle .NotThursday: farsjump DanaHangUpScript @@ -48,9 +48,6 @@ DanaPhoneCallerScript: ifequal 0, DanaFoundRare farsjump Phone_GenericCall_Female -DanaThursdayNight: - setflag ENGINE_DANA_THURSDAY_NIGHT - DanaWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38 setflag ENGINE_DANA_READY_FOR_REMATCH diff --git a/engine/phone/scripts/erin.asm b/engine/phone/scripts/erin.asm index 4d15f83ea..21d01f4a8 100644 --- a/engine/phone/scripts/erin.asm +++ b/engine/phone/scripts/erin.asm @@ -8,7 +8,7 @@ ErinPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal SATURDAY, .NotSaturday checktime NITE - iftrue ErinSaturdayNight + iftrue ErinWantsBattle .NotSaturday: farsjump ErinWorkingHardScript @@ -31,9 +31,6 @@ ErinPhoneCallerScript: .GenericCall: farsjump Phone_GenericCall_Female -ErinSaturdayNight: - setflag ENGINE_ERIN_SATURDAY_NIGHT - ErinWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_46 setflag ENGINE_ERIN_READY_FOR_REMATCH diff --git a/engine/phone/scripts/gaven.asm b/engine/phone/scripts/gaven.asm index 1c9004efe..40f4930f8 100644 --- a/engine/phone/scripts/gaven.asm +++ b/engine/phone/scripts/gaven.asm @@ -8,7 +8,7 @@ GavenPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal THURSDAY, .NotThursday checktime MORN - iftrue GavenThursdayMorningScript + iftrue GavenWantsRematch .NotThursday: farsjump GavenHangUpNotThursdayScript @@ -32,9 +32,6 @@ GavenPhoneCallerScript: ifequal 0, GavenFoundRare farsjump Phone_GenericCall_Male -GavenThursdayMorningScript: - setflag ENGINE_GAVEN_THURSDAY_MORNING - GavenWantsRematch: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26 setflag ENGINE_GAVEN_READY_FOR_REMATCH diff --git a/engine/phone/scripts/gina.asm b/engine/phone/scripts/gina.asm index 48ad3b0d4..e5977256f 100644 --- a/engine/phone/scripts/gina.asm +++ b/engine/phone/scripts/gina.asm @@ -10,7 +10,9 @@ GinaPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal SUNDAY, .NotSunday checktime DAY - iftrue GinaSundayDay + iftrue GinaWantsBattle + checktime EVE + iftrue GinaWantsBattle .NotSunday: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER @@ -55,9 +57,6 @@ GinaPhoneCallerScript: .Generic: farsjump Phone_GenericCall_Female -GinaSundayDay: - setflag ENGINE_GINA_SUNDAY_AFTERNOON - GinaWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34 setflag ENGINE_GINA_READY_FOR_REMATCH diff --git a/engine/phone/scripts/huey.asm b/engine/phone/scripts/huey.asm index 4e5f2dccf..4b6c43b31 100644 --- a/engine/phone/scripts/huey.asm +++ b/engine/phone/scripts/huey.asm @@ -8,7 +8,7 @@ HueyPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal WEDNESDAY, .NotWednesday checktime NITE - iftrue HueyWednesdayNight + iftrue HueyWantsBattle .NotWednesday: special RandomPhoneMon @@ -32,9 +32,6 @@ HueyPhoneCallerScript: .Flavor: farsjump PhoneScript_MonFlavorText -HueyWednesdayNight: - setflag ENGINE_HUEY_WEDNESDAY_NIGHT - HueyWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_LIGHTHOUSE setflag ENGINE_HUEY_READY_FOR_REMATCH diff --git a/engine/phone/scripts/joey.asm b/engine/phone/scripts/joey.asm index d03276877..07d5db43f 100644 --- a/engine/phone/scripts/joey.asm +++ b/engine/phone/scripts/joey.asm @@ -9,6 +9,8 @@ JoeyPhoneCalleeScript: ifnotequal MONDAY, .NotMonday checktime DAY iftrue JoeyWantsBattle + checktime EVE + iftrue JoeyWantsBattle .NotMonday: special RandomPhoneMon diff --git a/engine/phone/scripts/jose.asm b/engine/phone/scripts/jose.asm index 742ddcdae..664d5d361 100644 --- a/engine/phone/scripts/jose.asm +++ b/engine/phone/scripts/jose.asm @@ -10,7 +10,7 @@ JosePhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal SATURDAY, .NotSaturday checktime NITE - iftrue JoseSaturdayNight + iftrue JoseWantsBattle .NotSaturday: farsjump JoseHangUpScript @@ -42,9 +42,6 @@ JosePhoneCallerScript: ifequal 0, JoseFoundRare farsjump Phone_GenericCall_Male -JoseSaturdayNight: - setflag ENGINE_JOSE_SATURDAY_NIGHT - JoseWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_27 setflag ENGINE_JOSE_READY_FOR_REMATCH diff --git a/engine/phone/scripts/liz.asm b/engine/phone/scripts/liz.asm index b4aacd4ee..1d4ae27ef 100644 --- a/engine/phone/scripts/liz.asm +++ b/engine/phone/scripts/liz.asm @@ -8,7 +8,9 @@ LizPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal THURSDAY, .NotThursday checktime DAY - iftrue LizThursdayAfternoon + iftrue LizWantsBattle + checktime EVE + iftrue LizWantsBattle .NotThursday: special RandomPhoneMon @@ -39,9 +41,6 @@ LizPhoneCallerScript: .Generic: farsjump Phone_GenericCall_Female -LizThursdayAfternoon: - setflag ENGINE_LIZ_THURSDAY_AFTERNOON - LizWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32 setflag ENGINE_LIZ_READY_FOR_REMATCH diff --git a/engine/phone/scripts/parry.asm b/engine/phone/scripts/parry.asm index b001a8e73..4ab59fa5f 100644 --- a/engine/phone/scripts/parry.asm +++ b/engine/phone/scripts/parry.asm @@ -8,7 +8,9 @@ ParryPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal FRIDAY, .WantsRematch checktime DAY - iftrue ParryFridayDay + iftrue ParryWantsBattle + checktime EVE + iftrue ParryWantsBattle .WantsRematch: farsjump ParryBattleWithMeScript @@ -31,9 +33,6 @@ ParryPhoneCallerScript: .GenericCall: farsjump Phone_GenericCall_Male -ParryFridayDay: - setflag ENGINE_PARRY_FRIDAY_AFTERNOON - ParryWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_45 setflag ENGINE_PARRY_READY_FOR_REMATCH diff --git a/engine/phone/scripts/ralph.asm b/engine/phone/scripts/ralph.asm index 6b7341a59..24756e169 100644 --- a/engine/phone/scripts/ralph.asm +++ b/engine/phone/scripts/ralph.asm @@ -4,7 +4,7 @@ RalphPhoneCalleeScript: iftrue .Rematch farscall PhoneScript_AnswerPhone_Male checktime MORN - iftrue Ralph_WednesdayMorning + iftrue Ralph_FightMe farsjump RalphNoItemScript .Rematch: @@ -18,8 +18,6 @@ RalphPhoneCallerScript: ifequal 0, Ralph_FightMe farsjump Phone_GenericCall_Male -Ralph_WednesdayMorning: - setflag ENGINE_RALPH_WEDNESDAY_MORNING Ralph_FightMe: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32 setflag ENGINE_RALPH_READY_FOR_REMATCH diff --git a/engine/phone/scripts/reena.asm b/engine/phone/scripts/reena.asm index aaf5e3d64..f5fb424c9 100644 --- a/engine/phone/scripts/reena.asm +++ b/engine/phone/scripts/reena.asm @@ -8,7 +8,7 @@ ReenaPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal SUNDAY, .NotSunday checktime MORN - iftrue ReenaSundayMorning + iftrue ReenaWantsBattle .NotSunday: farsjump ReenaForwardScript @@ -30,9 +30,6 @@ ReenaPhoneCallerScript: .Generic: farsjump Phone_GenericCall_Female -ReenaSundayMorning: - setflag ENGINE_REENA_SUNDAY_MORNING - ReenaWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_27 setflag ENGINE_REENA_READY_FOR_REMATCH diff --git a/engine/phone/scripts/tiffany.asm b/engine/phone/scripts/tiffany.asm index 9a7f280fc..ee0822ad4 100644 --- a/engine/phone/scripts/tiffany.asm +++ b/engine/phone/scripts/tiffany.asm @@ -10,7 +10,9 @@ TiffanyPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal TUESDAY, .NotTuesday checktime DAY - iftrue TiffanyTuesdayAfternoon + iftrue TiffanyWantsBattle + checktime EVE + iftrue TiffanyWantsBattle .NotTuesday: farsjump TiffanyNoItemScript @@ -48,9 +50,6 @@ TiffanyPhoneCallerScript: .Generic: farsjump Phone_GenericCall_Female -TiffanyTuesdayAfternoon: - setflag ENGINE_TIFFANY_TUESDAY_AFTERNOON - TiffanyWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43 setflag ENGINE_TIFFANY_READY_FOR_REMATCH diff --git a/engine/phone/scripts/todd.asm b/engine/phone/scripts/todd.asm index c8fb9b697..347e1f0d2 100644 --- a/engine/phone/scripts/todd.asm +++ b/engine/phone/scripts/todd.asm @@ -8,7 +8,7 @@ ToddPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal SATURDAY, .NotSaturday checktime MORN - iftrue ToddSaturdayMorning + iftrue ToddWantsBattle .NotSaturday: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON @@ -43,9 +43,6 @@ ToddPhoneCallerScript: ifequal 0, ToddFoundRare farsjump Phone_GenericCall_Male -ToddSaturdayMorning: - setflag ENGINE_TODD_SATURDAY_MORNING - ToddWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34 setflag ENGINE_TODD_READY_FOR_REMATCH diff --git a/engine/phone/scripts/tully.asm b/engine/phone/scripts/tully.asm index 2e958ec21..13893a4dc 100644 --- a/engine/phone/scripts/tully.asm +++ b/engine/phone/scripts/tully.asm @@ -10,7 +10,7 @@ TullyPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal SUNDAY, .NotSunday checktime NITE - iftrue TullySundayNight + iftrue TullyWantsBattle .NotSunday: farsjump TullyNoItemScript @@ -46,9 +46,6 @@ TullyPhoneCallerScript: .Generic: farsjump Phone_GenericCall_Male -TullySundayNight: - setflag ENGINE_TULLY_SUNDAY_NIGHT - TullyWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_42 setflag ENGINE_TULLY_READY_FOR_REMATCH diff --git a/engine/phone/scripts/vance.asm b/engine/phone/scripts/vance.asm index 07f8f2551..c6ea72152 100644 --- a/engine/phone/scripts/vance.asm +++ b/engine/phone/scripts/vance.asm @@ -8,7 +8,7 @@ VancePhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal WEDNESDAY, .NotWednesday checktime NITE - iftrue VanceWednesdayNight + iftrue VanceWantsRematch .NotWednesday: farsjump VanceLookingForwardScript @@ -31,9 +31,6 @@ VancePhoneCallerScript: .WantsBattle: farsjump Phone_GenericCall_Male -VanceWednesdayNight: - setflag ENGINE_VANCE_WEDNESDAY_NIGHT - VanceWantsRematch: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_44 setflag ENGINE_VANCE_READY_FOR_REMATCH diff --git a/engine/phone/scripts/wade.asm b/engine/phone/scripts/wade.asm index 507ef88a5..2074655d2 100644 --- a/engine/phone/scripts/wade.asm +++ b/engine/phone/scripts/wade.asm @@ -10,7 +10,7 @@ WadePhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal TUESDAY, .NotTuesday checktime NITE - iftrue WadeTuesdayNight + iftrue WadeWantsBattle2 .NotTuesday: farscall PhoneScript_Random2 @@ -70,9 +70,6 @@ WadePhoneCallerScript: .ContestToday: farsjump PhoneScript_BugCatchingContest -WadeTuesdayNight: - setflag ENGINE_WADE_TUESDAY_NIGHT - WadeWantsBattle2: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_31 setflag ENGINE_WADE_READY_FOR_REMATCH diff --git a/engine/phone/scripts/wilton.asm b/engine/phone/scripts/wilton.asm index bc73af238..373ed5c24 100644 --- a/engine/phone/scripts/wilton.asm +++ b/engine/phone/scripts/wilton.asm @@ -10,7 +10,7 @@ WiltonPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal THURSDAY, .NotThursday checktime MORN - iftrue WiltonThursdayMorning + iftrue WiltonWantsBattle .NotThursday: farsjump WiltonHaventFoundAnythingScript @@ -40,9 +40,6 @@ WiltonPhoneCallerScript: .GenericCall: farsjump Phone_GenericCall_Male -WiltonThursdayMorning: - setflag ENGINE_WILTON_THURSDAY_MORNING - WiltonWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_44 setflag ENGINE_WILTON_READY_FOR_REMATCH