summaryrefslogtreecommitdiff
path: root/engine/phone/scripts/joey.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-06-16 14:11:49 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-06-16 14:32:57 -0400
commit7b2515d1e47198322407081dfe57c7ca49f22c5f (patch)
tree05e8978aa4d0fee85b7b31678253b34ccc950a44 /engine/phone/scripts/joey.asm
parent2354c41a96bdf80861338add2f0b3a67b18f160e (diff)
[in progress] Harmonize more constant and data files with pokegold
Diffstat (limited to 'engine/phone/scripts/joey.asm')
-rw-r--r--engine/phone/scripts/joey.asm6
1 files changed, 3 insertions, 3 deletions
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