diff options
Diffstat (limited to 'engine')
26 files changed, 75 insertions, 75 deletions
diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm index b410377df..54752029c 100644 --- a/engine/gfx/sprite_anims.asm +++ b/engine/gfx/sprite_anims.asm @@ -38,7 +38,7 @@ DoAnimFrame: dw .FlyFrom dw .FlyLeaf dw .FlyTo - dw .GSIntroHoOh + dw .GSIntroHoOhLugia dw .EZChatCursor dw .MobileTradeSentPulse dw .MobileTradeOTPulse @@ -198,7 +198,7 @@ DoAnimFrame: call DeinitializeSprite ret -.GSIntroHoOh +.GSIntroHoOhLugia ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 650e056b7..bb35c96e4 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -275,7 +275,7 @@ ParseCredits: push af ld e, a ld d, 0 - ld hl, CreditsStrings + ld hl, CreditsStringsPointers add hl, de add hl, de ld a, [hli] diff --git a/engine/phone/scripts/alan.asm b/engine/phone/scripts/alan.asm index 6699d086f..cd98ee6ea 100644 --- a/engine/phone/scripts/alan.asm +++ b/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: diff --git a/engine/phone/scripts/anthony.asm b/engine/phone/scripts/anthony.asm index a4c2c95ee..06abcd844 100644 --- a/engine/phone/scripts/anthony.asm +++ b/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: diff --git a/engine/phone/scripts/arnie.asm b/engine/phone/scripts/arnie.asm index e21de9e04..4a673fb12 100644 --- a/engine/phone/scripts/arnie.asm +++ b/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 diff --git a/engine/phone/scripts/beth.asm b/engine/phone/scripts/beth.asm index 2549160c8..58a4b2fc6 100644 --- a/engine/phone/scripts/beth.asm +++ b/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 diff --git a/engine/phone/scripts/brent.asm b/engine/phone/scripts/brent.asm index 1a4d954f9..f687e983a 100644 --- a/engine/phone/scripts/brent.asm +++ b/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: diff --git a/engine/phone/scripts/chad.asm b/engine/phone/scripts/chad.asm index db24e0aa5..8e3384fdc 100644 --- a/engine/phone/scripts/chad.asm +++ b/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: diff --git a/engine/phone/scripts/dana.asm b/engine/phone/scripts/dana.asm index 4582db0c4..068b19afd 100644 --- a/engine/phone/scripts/dana.asm +++ b/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: diff --git a/engine/phone/scripts/erin.asm b/engine/phone/scripts/erin.asm index 70efc38b4..ffaa9827b 100644 --- a/engine/phone/scripts/erin.asm +++ b/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 diff --git a/engine/phone/scripts/gaven.asm b/engine/phone/scripts/gaven.asm index 5006f3067..1c9004efe 100644 --- a/engine/phone/scripts/gaven.asm +++ b/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: diff --git a/engine/phone/scripts/gina.asm b/engine/phone/scripts/gina.asm index b001c94ae..40ae3fa67 100644 --- a/engine/phone/scripts/gina.asm +++ b/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: diff --git a/engine/phone/scripts/huey.asm b/engine/phone/scripts/huey.asm index 483ff6640..d30079218 100644 --- a/engine/phone/scripts/huey.asm +++ b/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 diff --git a/engine/phone/scripts/jack.asm b/engine/phone/scripts/jack.asm index 5fb9e048c..1521af654 100644 --- a/engine/phone/scripts/jack.asm +++ b/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: diff --git a/engine/phone/scripts/joey.asm b/engine/phone/scripts/joey.asm index 63dc1cdc3..0d6f37299 100644 --- a/engine/phone/scripts/joey.asm +++ b/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 diff --git a/engine/phone/scripts/jose.asm b/engine/phone/scripts/jose.asm index 135403ab3..742ddcdae 100644 --- a/engine/phone/scripts/jose.asm +++ b/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: diff --git a/engine/phone/scripts/liz.asm b/engine/phone/scripts/liz.asm index 10ea1734e..b4aacd4ee 100644 --- a/engine/phone/scripts/liz.asm +++ b/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: diff --git a/engine/phone/scripts/parry.asm b/engine/phone/scripts/parry.asm index eba6fbd23..bcb9f4dc0 100644 --- a/engine/phone/scripts/parry.asm +++ b/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 diff --git a/engine/phone/scripts/ralph.asm b/engine/phone/scripts/ralph.asm index ef0714de1..3bf9f70f9 100644 --- a/engine/phone/scripts/ralph.asm +++ b/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: diff --git a/engine/phone/scripts/reena.asm b/engine/phone/scripts/reena.asm index 9425d4379..efdfe05c1 100644 --- a/engine/phone/scripts/reena.asm +++ b/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 diff --git a/engine/phone/scripts/tiffany.asm b/engine/phone/scripts/tiffany.asm index c088a5345..a30649bd9 100644 --- a/engine/phone/scripts/tiffany.asm +++ b/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: diff --git a/engine/phone/scripts/todd.asm b/engine/phone/scripts/todd.asm index b5b83cb05..8515153b8 100644 --- a/engine/phone/scripts/todd.asm +++ b/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: diff --git a/engine/phone/scripts/tully.asm b/engine/phone/scripts/tully.asm index 995355485..b0b66fdb6 100644 --- a/engine/phone/scripts/tully.asm +++ b/engine/phone/scripts/tully.asm @@ -1,6 +1,6 @@ TullyPhoneCalleeScript: gettrainername STRING_BUFFER_3, FISHER, TULLY1 - checkflag ENGINE_TULLY + checkflag ENGINE_TULLY_READY_FOR_REMATCH iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_TULLY_SUNDAY_NIGHT @@ -26,7 +26,7 @@ TullyPhoneCalleeScript: TullyPhoneCallerScript: gettrainername STRING_BUFFER_3, FISHER, TULLY1 farscall PhoneScript_GreetPhone_Male - checkflag ENGINE_TULLY + checkflag ENGINE_TULLY_READY_FOR_REMATCH iftrue .Generic checkflag ENGINE_TULLY_SUNDAY_NIGHT iftrue .Generic @@ -51,7 +51,7 @@ TullySundayNight: TullyWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_42 - setflag ENGINE_TULLY + setflag ENGINE_TULLY_READY_FOR_REMATCH farsjump PhoneScript_WantsToBattle_Male TullyFoundWaterStone: diff --git a/engine/phone/scripts/vance.asm b/engine/phone/scripts/vance.asm index 39cd333eb..c41408e1f 100644 --- a/engine/phone/scripts/vance.asm +++ b/engine/phone/scripts/vance.asm @@ -1,6 +1,6 @@ VancePhoneCalleeScript: gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1 - checkflag ENGINE_VANCE + checkflag ENGINE_VANCE_READY_FOR_REMATCH iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_VANCE_WEDNESDAY_NIGHT @@ -20,7 +20,7 @@ VancePhoneCalleeScript: VancePhoneCallerScript: gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1 farscall PhoneScript_GreetPhone_Male - checkflag ENGINE_VANCE + checkflag ENGINE_VANCE_READY_FOR_REMATCH iftrue .WantsBattle checkflag ENGINE_VANCE_WEDNESDAY_NIGHT iftrue .WantsBattle @@ -36,5 +36,5 @@ VanceWednesdayNight: VanceWantsRematch: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_44 - setflag ENGINE_VANCE + setflag ENGINE_VANCE_READY_FOR_REMATCH farsjump PhoneScript_WantsToBattle_Male diff --git a/engine/phone/scripts/wade.asm b/engine/phone/scripts/wade.asm index 9d044d38b..bfb9e9d0f 100644 --- a/engine/phone/scripts/wade.asm +++ b/engine/phone/scripts/wade.asm @@ -1,6 +1,6 @@ WadePhoneCalleeScript: gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1 - checkflag ENGINE_WADE + checkflag ENGINE_WADE_READY_FOR_REMATCH iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_WADE_TUESDAY_NIGHT @@ -49,7 +49,7 @@ WadePhoneCallerScript: ifequal SATURDAY, .ContestToday .NoContest: - checkflag ENGINE_WADE + checkflag ENGINE_WADE_READY_FOR_REMATCH iftrue .next checkflag ENGINE_WADE_TUESDAY_NIGHT iftrue .next @@ -75,7 +75,7 @@ WadeTuesdayNight: WadeWantsBattle2: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_31 - setflag ENGINE_WADE + setflag ENGINE_WADE_READY_FOR_REMATCH farsjump PhoneScript_WantsToBattle_Male WadeFoundRare: diff --git a/engine/phone/scripts/wilton.asm b/engine/phone/scripts/wilton.asm index bf7849011..51f8e24fe 100644 --- a/engine/phone/scripts/wilton.asm +++ b/engine/phone/scripts/wilton.asm @@ -1,6 +1,6 @@ WiltonPhoneCalleeScript: gettrainername STRING_BUFFER_3, FISHER, WILTON1 - checkflag ENGINE_WILTON + checkflag ENGINE_WILTON_READY_FOR_REMATCH iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_WILTON_THURSDAY_MORNING @@ -26,7 +26,7 @@ WiltonPhoneCalleeScript: WiltonPhoneCallerScript: gettrainername STRING_BUFFER_3, FISHER, WILTON1 farscall PhoneScript_GreetPhone_Male - checkflag ENGINE_WILTON + checkflag ENGINE_WILTON_READY_FOR_REMATCH iftrue .GenericCall checkflag ENGINE_WILTON_THURSDAY_MORNING iftrue .GenericCall @@ -45,7 +45,7 @@ WiltonThursdayMorning: WiltonWantsBattle: getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_44 - setflag ENGINE_WILTON + setflag ENGINE_WILTON_READY_FOR_REMATCH farsjump PhoneScript_WantsToBattle_Male WiltonHasItem: |