summaryrefslogtreecommitdiff
path: root/maps/Route32.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route32.asm')
-rw-r--r--maps/Route32.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/Route32.asm b/maps/Route32.asm
index 43c15d9fe..fe57225eb 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -170,7 +170,7 @@ TrainerFisherRalph1:
loadvar VAR_CALLERID, PHONE_FISHER_RALPH
endifjustbattled
opentext
- checkflag ENGINE_RALPH
+ checkflag ENGINE_RALPH_READY_FOR_REMATCH
iftrue .Rematch
checkflag ENGINE_FISH_SWARM
iftrue .Swarm
@@ -220,7 +220,7 @@ TrainerFisherRalph1:
startbattle
reloadmapafterbattle
loadmem wRalphFightCount, 1
- clearflag ENGINE_RALPH
+ clearflag ENGINE_RALPH_READY_FOR_REMATCH
end
.LoadFight1:
@@ -228,7 +228,7 @@ TrainerFisherRalph1:
startbattle
reloadmapafterbattle
loadmem wRalphFightCount, 2
- clearflag ENGINE_RALPH
+ clearflag ENGINE_RALPH_READY_FOR_REMATCH
end
.LoadFight2:
@@ -236,7 +236,7 @@ TrainerFisherRalph1:
startbattle
reloadmapafterbattle
loadmem wRalphFightCount, 3
- clearflag ENGINE_RALPH
+ clearflag ENGINE_RALPH_READY_FOR_REMATCH
end
.LoadFight3:
@@ -244,14 +244,14 @@ TrainerFisherRalph1:
startbattle
reloadmapafterbattle
loadmem wRalphFightCount, 4
- clearflag ENGINE_RALPH
+ clearflag ENGINE_RALPH_READY_FOR_REMATCH
end
.LoadFight4:
loadtrainer FISHER, RALPH5
startbattle
reloadmapafterbattle
- clearflag ENGINE_RALPH
+ clearflag ENGINE_RALPH_READY_FOR_REMATCH
end
.Swarm:
@@ -306,7 +306,7 @@ TrainerPicnickerLiz1:
loadvar VAR_CALLERID, PHONE_PICNICKER_LIZ
endifjustbattled
opentext
- checkflag ENGINE_LIZ
+ checkflag ENGINE_LIZ_READY_FOR_REMATCH
iftrue .Rematch
checkcellnum PHONE_PICNICKER_LIZ
iftrue .NumberAccepted
@@ -354,7 +354,7 @@ TrainerPicnickerLiz1:
startbattle
reloadmapafterbattle
loadmem wLizFightCount, 1
- clearflag ENGINE_LIZ
+ clearflag ENGINE_LIZ_READY_FOR_REMATCH
end
.LoadFight1:
@@ -362,7 +362,7 @@ TrainerPicnickerLiz1:
startbattle
reloadmapafterbattle
loadmem wLizFightCount, 2
- clearflag ENGINE_LIZ
+ clearflag ENGINE_LIZ_READY_FOR_REMATCH
end
.LoadFight2:
@@ -370,7 +370,7 @@ TrainerPicnickerLiz1:
startbattle
reloadmapafterbattle
loadmem wLizFightCount, 3
- clearflag ENGINE_LIZ
+ clearflag ENGINE_LIZ_READY_FOR_REMATCH
end
.LoadFight3:
@@ -378,14 +378,14 @@ TrainerPicnickerLiz1:
startbattle
reloadmapafterbattle
loadmem wLizFightCount, 4
- clearflag ENGINE_LIZ
+ clearflag ENGINE_LIZ_READY_FOR_REMATCH
end
.LoadFight4:
loadtrainer PICNICKER, LIZ5
startbattle
reloadmapafterbattle
- clearflag ENGINE_LIZ
+ clearflag ENGINE_LIZ_READY_FOR_REMATCH
end
.AskNumber1: