summaryrefslogtreecommitdiff
path: root/maps/Route34.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route34.asm')
-rw-r--r--maps/Route34.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 327772748..b8639a91a 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -92,7 +92,7 @@ TrainerCamperTodd1:
loadvar VAR_CALLERID, PHONE_CAMPER_TODD
endifjustbattled
opentext
- checkflag ENGINE_TODD
+ checkflag ENGINE_TODD_READY_FOR_REMATCH
iftrue .Rematch
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
iftrue .SaleIsOn
@@ -142,7 +142,7 @@ TrainerCamperTodd1:
startbattle
reloadmapafterbattle
loadmem wToddFightCount, 1
- clearflag ENGINE_TODD
+ clearflag ENGINE_TODD_READY_FOR_REMATCH
end
.LoadFight1:
@@ -150,7 +150,7 @@ TrainerCamperTodd1:
startbattle
reloadmapafterbattle
loadmem wToddFightCount, 2
- clearflag ENGINE_TODD
+ clearflag ENGINE_TODD_READY_FOR_REMATCH
end
.LoadFight2:
@@ -158,7 +158,7 @@ TrainerCamperTodd1:
startbattle
reloadmapafterbattle
loadmem wToddFightCount, 3
- clearflag ENGINE_TODD
+ clearflag ENGINE_TODD_READY_FOR_REMATCH
end
.LoadFight3:
@@ -166,14 +166,14 @@ TrainerCamperTodd1:
startbattle
reloadmapafterbattle
loadmem wToddFightCount, 4
- clearflag ENGINE_TODD
+ clearflag ENGINE_TODD_READY_FOR_REMATCH
end
.LoadFight4:
loadtrainer CAMPER, TODD5
startbattle
reloadmapafterbattle
- clearflag ENGINE_TODD
+ clearflag ENGINE_TODD_READY_FOR_REMATCH
end
.SaleIsOn:
@@ -217,7 +217,7 @@ TrainerPicnickerGina1:
loadvar VAR_CALLERID, PHONE_PICNICKER_GINA
endifjustbattled
opentext
- checkflag ENGINE_GINA
+ checkflag ENGINE_GINA_READY_FOR_REMATCH
iftrue .Rematch
checkflag ENGINE_GINA_HAS_LEAF_STONE
iftrue .LeafStone
@@ -267,7 +267,7 @@ TrainerPicnickerGina1:
startbattle
reloadmapafterbattle
loadmem wGinaFightCount, 1
- clearflag ENGINE_GINA
+ clearflag ENGINE_GINA_READY_FOR_REMATCH
end
.LoadFight1:
@@ -275,7 +275,7 @@ TrainerPicnickerGina1:
startbattle
reloadmapafterbattle
loadmem wGinaFightCount, 2
- clearflag ENGINE_GINA
+ clearflag ENGINE_GINA_READY_FOR_REMATCH
end
.LoadFight2:
@@ -283,7 +283,7 @@ TrainerPicnickerGina1:
startbattle
reloadmapafterbattle
loadmem wGinaFightCount, 3
- clearflag ENGINE_GINA
+ clearflag ENGINE_GINA_READY_FOR_REMATCH
end
.LoadFight3:
@@ -291,14 +291,14 @@ TrainerPicnickerGina1:
startbattle
reloadmapafterbattle
loadmem wGinaFightCount, 4
- clearflag ENGINE_GINA
+ clearflag ENGINE_GINA_READY_FOR_REMATCH
end
.LoadFight4:
loadtrainer PICNICKER, GINA5
startbattle
reloadmapafterbattle
- clearflag ENGINE_GINA
+ clearflag ENGINE_GINA_READY_FOR_REMATCH
end
.LeafStone: