summaryrefslogtreecommitdiff
path: root/engine/phone/scripts/jack.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/jack.asm
parent2354c41a96bdf80861338add2f0b3a67b18f160e (diff)
[in progress] Harmonize more constant and data files with pokegold
Diffstat (limited to 'engine/phone/scripts/jack.asm')
-rw-r--r--engine/phone/scripts/jack.asm6
1 files changed, 3 insertions, 3 deletions
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: