summaryrefslogtreecommitdiff
path: root/maps/Route30.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route30.asm')
-rw-r--r--maps/Route30.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 58b8d4118..a0e5195f3 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -43,7 +43,7 @@ TrainerYoungsterJoey:
loadvar VAR_CALLERID, PHONE_YOUNGSTER_JOEY
endifjustbattled
opentext
- checkflag ENGINE_JOEY
+ checkflag ENGINE_JOEY_READY_FOR_REMATCH
iftrue .Rematch
checkcellnum PHONE_YOUNGSTER_JOEY
iftrue .NumberAccepted
@@ -91,7 +91,7 @@ TrainerYoungsterJoey:
startbattle
reloadmapafterbattle
loadmem wJoeyFightCount, 1
- clearflag ENGINE_JOEY
+ clearflag ENGINE_JOEY_READY_FOR_REMATCH
end
.LoadFight1:
@@ -99,7 +99,7 @@ TrainerYoungsterJoey:
startbattle
reloadmapafterbattle
loadmem wJoeyFightCount, 2
- clearflag ENGINE_JOEY
+ clearflag ENGINE_JOEY_READY_FOR_REMATCH
end
.LoadFight2:
@@ -107,7 +107,7 @@ TrainerYoungsterJoey:
startbattle
reloadmapafterbattle
loadmem wJoeyFightCount, 3
- clearflag ENGINE_JOEY
+ clearflag ENGINE_JOEY_READY_FOR_REMATCH
end
.LoadFight3:
@@ -115,14 +115,14 @@ TrainerYoungsterJoey:
startbattle
reloadmapafterbattle
loadmem wJoeyFightCount, 4
- clearflag ENGINE_JOEY
+ clearflag ENGINE_JOEY_READY_FOR_REMATCH
end
.LoadFight4:
loadtrainer YOUNGSTER, JOEY5
startbattle
reloadmapafterbattle
- clearflag ENGINE_JOEY
+ clearflag ENGINE_JOEY_READY_FOR_REMATCH
checkevent EVENT_JOEY_HP_UP
iftrue .GiveHPUp
checkevent EVENT_GOT_HP_UP_FROM_JOEY