summaryrefslogtreecommitdiff
path: root/maps/Route44.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route44.asm')
-rw-r--r--maps/Route44.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 624709e5d..54fc0bbbe 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -23,7 +23,7 @@ TrainerBirdKeeperVance1:
loadvar VAR_CALLERID, PHONE_BIRDKEEPER_VANCE
endifjustbattled
opentext
- checkflag ENGINE_VANCE
+ checkflag ENGINE_VANCE_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_BIRDKEEPER_VANCE
iftrue Route44NumberAcceptedM
@@ -63,7 +63,7 @@ TrainerBirdKeeperVance1:
startbattle
reloadmapafterbattle
loadmem wVanceFightCount, 1
- clearflag ENGINE_VANCE
+ clearflag ENGINE_VANCE_READY_FOR_REMATCH
end
.LoadFight1:
@@ -71,14 +71,14 @@ TrainerBirdKeeperVance1:
startbattle
reloadmapafterbattle
loadmem wVanceFightCount, 2
- clearflag ENGINE_VANCE
+ clearflag ENGINE_VANCE_READY_FOR_REMATCH
end
.LoadFight2:
loadtrainer BIRD_KEEPER, VANCE3
startbattle
reloadmapafterbattle
- clearflag ENGINE_VANCE
+ clearflag ENGINE_VANCE_READY_FOR_REMATCH
checkevent EVENT_VANCE_CARBOS
iftrue .Carbos
checkevent EVENT_GOT_CARBOS_FROM_VANCE
@@ -165,7 +165,7 @@ TrainerFisherWilton1:
loadvar VAR_CALLERID, PHONE_FISHER_WILTON
endifjustbattled
opentext
- checkflag ENGINE_WILTON
+ checkflag ENGINE_WILTON_READY_FOR_REMATCH
iftrue .WantsBattle
checkflag ENGINE_WILTON_HAS_ITEM
iftrue .HasItem
@@ -207,7 +207,7 @@ TrainerFisherWilton1:
startbattle
reloadmapafterbattle
loadmem wWiltonFightCount, 1
- clearflag ENGINE_WILTON
+ clearflag ENGINE_WILTON_READY_FOR_REMATCH
end
.LoadFight1:
@@ -215,14 +215,14 @@ TrainerFisherWilton1:
startbattle
reloadmapafterbattle
loadmem wWiltonFightCount, 2
- clearflag ENGINE_WILTON
+ clearflag ENGINE_WILTON_READY_FOR_REMATCH
end
.LoadFight2:
loadtrainer FISHER, WILTON3
startbattle
reloadmapafterbattle
- clearflag ENGINE_WILTON
+ clearflag ENGINE_WILTON_READY_FOR_REMATCH
end
.HasItem: