summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
Diffstat (limited to 'maps')
-rw-r--r--maps/NationalPark.asm12
-rw-r--r--maps/OlivineLighthouse2F.asm10
-rw-r--r--maps/Route26.asm16
-rw-r--r--maps/Route27.asm16
-rw-r--r--maps/Route30.asm12
-rw-r--r--maps/Route31.asm12
-rw-r--r--maps/Route32.asm24
-rw-r--r--maps/Route33.asm12
-rw-r--r--maps/Route34.asm24
-rw-r--r--maps/Route35.asm12
-rw-r--r--maps/Route36.asm12
-rw-r--r--maps/Route38.asm24
-rw-r--r--maps/Route42.asm10
-rw-r--r--maps/Route43.asm20
-rw-r--r--maps/Route44.asm16
-rw-r--r--maps/Route45.asm8
-rw-r--r--maps/Route46.asm8
17 files changed, 124 insertions, 124 deletions
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 2e0502037..3b3342950 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -76,7 +76,7 @@ TrainerSchoolboyJack1:
loadvar VAR_CALLERID, PHONE_SCHOOLBOY_JACK
endifjustbattled
opentext
- checkflag ENGINE_JACK
+ checkflag ENGINE_JACK_READY_FOR_REMATCH
iftrue .Rematch
checkcellnum PHONE_SCHOOLBOY_JACK
iftrue .NumberAccepted
@@ -124,7 +124,7 @@ TrainerSchoolboyJack1:
startbattle
reloadmapafterbattle
loadmem wJackFightCount, 1
- clearflag ENGINE_JACK
+ clearflag ENGINE_JACK_READY_FOR_REMATCH
end
.LoadFight1:
@@ -132,7 +132,7 @@ TrainerSchoolboyJack1:
startbattle
reloadmapafterbattle
loadmem wJackFightCount, 2
- clearflag ENGINE_JACK
+ clearflag ENGINE_JACK_READY_FOR_REMATCH
end
.LoadFight2:
@@ -140,7 +140,7 @@ TrainerSchoolboyJack1:
startbattle
reloadmapafterbattle
loadmem wJackFightCount, 3
- clearflag ENGINE_JACK
+ clearflag ENGINE_JACK_READY_FOR_REMATCH
end
.LoadFight3:
@@ -148,14 +148,14 @@ TrainerSchoolboyJack1:
startbattle
reloadmapafterbattle
loadmem wJackFightCount, 4
- clearflag ENGINE_JACK
+ clearflag ENGINE_JACK_READY_FOR_REMATCH
end
.LoadFight4:
loadtrainer SCHOOLBOY, JACK5
startbattle
reloadmapafterbattle
- clearflag ENGINE_JACK
+ clearflag ENGINE_JACK_READY_FOR_REMATCH
end
.AskNumber1:
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index dd0caad99..7ca44d323 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -25,7 +25,7 @@ TrainerSailorHuey:
loadvar VAR_CALLERID, PHONE_SAILOR_HUEY
endifjustbattled
opentext
- checkflag ENGINE_HUEY
+ checkflag ENGINE_HUEY_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_SAILOR_HUEY
iftrue .NumberAccepted
@@ -67,7 +67,7 @@ TrainerSailorHuey:
startbattle
reloadmapafterbattle
loadmem wHueyFightCount, 1
- clearflag ENGINE_HUEY
+ clearflag ENGINE_HUEY_READY_FOR_REMATCH
end
.LoadFight1:
@@ -75,7 +75,7 @@ TrainerSailorHuey:
startbattle
reloadmapafterbattle
loadmem wHueyFightCount, 2
- clearflag ENGINE_HUEY
+ clearflag ENGINE_HUEY_READY_FOR_REMATCH
end
.LoadFight2:
@@ -83,14 +83,14 @@ TrainerSailorHuey:
startbattle
reloadmapafterbattle
loadmem wHueyFightCount, 3
- clearflag ENGINE_HUEY
+ clearflag ENGINE_HUEY_READY_FOR_REMATCH
end
.LoadFight3:
loadtrainer SAILOR, HUEY4
startbattle
reloadmapafterbattle
- clearflag ENGINE_HUEY
+ clearflag ENGINE_HUEY_READY_FOR_REMATCH
checkevent EVENT_HUEY_PROTEIN
iftrue .HasProtein
checkevent EVENT_GOT_PROTEIN_FROM_HUEY
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 17720caa4..7bb3ff25b 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -31,7 +31,7 @@ TrainerCooltrainermGaven3:
loadvar VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN
endifjustbattled
opentext
- checkflag ENGINE_GAVEN
+ checkflag ENGINE_GAVEN_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_COOLTRAINERM_GAVEN
iftrue .NumberAccepted
@@ -71,7 +71,7 @@ TrainerCooltrainermGaven3:
startbattle
reloadmapafterbattle
loadmem wGavenFightCount, 1
- clearflag ENGINE_GAVEN
+ clearflag ENGINE_GAVEN_READY_FOR_REMATCH
end
.LoadFight1:
@@ -79,14 +79,14 @@ TrainerCooltrainermGaven3:
startbattle
reloadmapafterbattle
loadmem wGavenFightCount, 2
- clearflag ENGINE_GAVEN
+ clearflag ENGINE_GAVEN_READY_FOR_REMATCH
end
.LoadFight2:
loadtrainer COOLTRAINERM, GAVEN2
startbattle
reloadmapafterbattle
- clearflag ENGINE_GAVEN
+ clearflag ENGINE_GAVEN_READY_FOR_REMATCH
end
.AskNumber1:
@@ -135,7 +135,7 @@ TrainerCooltrainerfBeth1:
loadvar VAR_CALLERID, PHONE_COOLTRAINERF_BETH
endifjustbattled
opentext
- checkflag ENGINE_BETH
+ checkflag ENGINE_BETH_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_COOLTRAINERF_BETH
iftrue .NumberAccepted
@@ -175,7 +175,7 @@ TrainerCooltrainerfBeth1:
startbattle
reloadmapafterbattle
loadmem wBethFightCount, 1
- clearflag ENGINE_BETH
+ clearflag ENGINE_BETH_READY_FOR_REMATCH
end
.LoadFight1:
@@ -183,14 +183,14 @@ TrainerCooltrainerfBeth1:
startbattle
reloadmapafterbattle
loadmem wBethFightCount, 2
- clearflag ENGINE_BETH
+ clearflag ENGINE_BETH_READY_FOR_REMATCH
end
.LoadFight2:
loadtrainer COOLTRAINERF, BETH3
startbattle
reloadmapafterbattle
- clearflag ENGINE_BETH
+ clearflag ENGINE_BETH_READY_FOR_REMATCH
end
.AskNumber1:
diff --git a/maps/Route27.asm b/maps/Route27.asm
index cbc171238..f6298137d 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -64,7 +64,7 @@ TrainerBirdKeeperJose2:
loadvar VAR_CALLERID, PHONE_BIRDKEEPER_JOSE
endifjustbattled
opentext
- checkflag ENGINE_JOSE
+ checkflag ENGINE_JOSE_READY_FOR_REMATCH
iftrue .WantsBattle
checkflag ENGINE_JOSE_HAS_STAR_PIECE
iftrue .HasStarPiece
@@ -106,7 +106,7 @@ TrainerBirdKeeperJose2:
startbattle
reloadmapafterbattle
loadmem wJoseFightCount, 1
- clearflag ENGINE_JOSE
+ clearflag ENGINE_JOSE_READY_FOR_REMATCH
end
.LoadFight1:
@@ -114,14 +114,14 @@ TrainerBirdKeeperJose2:
startbattle
reloadmapafterbattle
loadmem wJoseFightCount, 2
- clearflag ENGINE_JOSE
+ clearflag ENGINE_JOSE_READY_FOR_REMATCH
end
.LoadFight2:
loadtrainer BIRD_KEEPER, JOSE3
startbattle
reloadmapafterbattle
- clearflag ENGINE_JOSE
+ clearflag ENGINE_JOSE_READY_FOR_REMATCH
end
.HasStarPiece:
@@ -199,7 +199,7 @@ TrainerCooltrainerfReena:
loadvar VAR_CALLERID, PHONE_COOLTRAINERF_REENA
endifjustbattled
opentext
- checkflag ENGINE_REENA
+ checkflag ENGINE_REENA_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_COOLTRAINERF_REENA
iftrue .NumberAccepted
@@ -239,7 +239,7 @@ TrainerCooltrainerfReena:
startbattle
reloadmapafterbattle
loadmem wReenaFightCount, 1
- clearflag ENGINE_REENA
+ clearflag ENGINE_REENA_READY_FOR_REMATCH
end
.LoadFight1:
@@ -247,14 +247,14 @@ TrainerCooltrainerfReena:
startbattle
reloadmapafterbattle
loadmem wReenaFightCount, 2
- clearflag ENGINE_REENA
+ clearflag ENGINE_REENA_READY_FOR_REMATCH
end
.LoadFight2:
loadtrainer COOLTRAINERF, REENA3
startbattle
reloadmapafterbattle
- clearflag ENGINE_REENA
+ clearflag ENGINE_REENA_READY_FOR_REMATCH
end
.AskNumber1:
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
diff --git a/maps/Route31.asm b/maps/Route31.asm
index 5e29ffc46..eec8c976c 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -29,7 +29,7 @@ TrainerBugCatcherWade1:
loadvar VAR_CALLERID, PHONE_BUG_CATCHER_WADE
endifjustbattled
opentext
- checkflag ENGINE_WADE
+ checkflag ENGINE_WADE_READY_FOR_REMATCH
iftrue .WadeRematch
checkflag ENGINE_WADE_HAS_ITEM
iftrue .WadeItem
@@ -79,7 +79,7 @@ TrainerBugCatcherWade1:
startbattle
reloadmapafterbattle
loadmem wWadeFightCount, 1
- clearflag ENGINE_WADE
+ clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.LoadFight1:
@@ -87,7 +87,7 @@ TrainerBugCatcherWade1:
startbattle
reloadmapafterbattle
loadmem wWadeFightCount, 2
- clearflag ENGINE_WADE
+ clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.LoadFight2:
@@ -95,7 +95,7 @@ TrainerBugCatcherWade1:
startbattle
reloadmapafterbattle
loadmem wWadeFightCount, 3
- clearflag ENGINE_WADE
+ clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.LoadFight3:
@@ -103,14 +103,14 @@ TrainerBugCatcherWade1:
startbattle
reloadmapafterbattle
loadmem wWadeFightCount, 4
- clearflag ENGINE_WADE
+ clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.LoadFight4:
loadtrainer BUG_CATCHER, WADE5
startbattle
reloadmapafterbattle
- clearflag ENGINE_WADE
+ clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.WadeItem:
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:
diff --git a/maps/Route33.asm b/maps/Route33.asm
index d9c234e89..daf4224d9 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -18,7 +18,7 @@ TrainerHikerAnthony:
loadvar VAR_CALLERID, PHONE_HIKER_ANTHONY
endifjustbattled
opentext
- checkflag ENGINE_ANTHONY
+ checkflag ENGINE_ANTHONY_READY_FOR_REMATCH
iftrue .Rematch
checkflag ENGINE_DUNSPARCE_SWARM
iftrue .Swarm
@@ -68,7 +68,7 @@ TrainerHikerAnthony:
startbattle
reloadmapafterbattle
loadmem wAnthonyFightCount, 1
- clearflag ENGINE_ANTHONY
+ clearflag ENGINE_ANTHONY_READY_FOR_REMATCH
end
.LoadFight1:
@@ -76,7 +76,7 @@ TrainerHikerAnthony:
startbattle
reloadmapafterbattle
loadmem wAnthonyFightCount, 2
- clearflag ENGINE_ANTHONY
+ clearflag ENGINE_ANTHONY_READY_FOR_REMATCH
end
.LoadFight2:
@@ -84,7 +84,7 @@ TrainerHikerAnthony:
startbattle
reloadmapafterbattle
loadmem wAnthonyFightCount, 3
- clearflag ENGINE_ANTHONY
+ clearflag ENGINE_ANTHONY_READY_FOR_REMATCH
end
.LoadFight3:
@@ -92,14 +92,14 @@ TrainerHikerAnthony:
startbattle
reloadmapafterbattle
loadmem wAnthonyFightCount, 4
- clearflag ENGINE_ANTHONY
+ clearflag ENGINE_ANTHONY_READY_FOR_REMATCH
end
.LoadFight4:
loadtrainer HIKER, ANTHONY5
startbattle
reloadmapafterbattle
- clearflag ENGINE_ANTHONY
+ clearflag ENGINE_ANTHONY_READY_FOR_REMATCH
end
.Swarm:
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:
diff --git a/maps/Route35.asm b/maps/Route35.asm
index 19ec416ef..b0caa4127 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -133,7 +133,7 @@ TrainerBugCatcherArnie:
loadvar VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE
endifjustbattled
opentext
- checkflag ENGINE_ARNIE
+ checkflag ENGINE_ARNIE_READY_FOR_REMATCH
iftrue .WantsBattle
checkflag ENGINE_YANMA_SWARM
iftrue .YanmaSwarming
@@ -183,7 +183,7 @@ TrainerBugCatcherArnie:
startbattle
reloadmapafterbattle
loadmem wArnieFightCount, 1
- clearflag ENGINE_ARNIE
+ clearflag ENGINE_ARNIE_READY_FOR_REMATCH
end
.LoadFight1:
@@ -191,7 +191,7 @@ TrainerBugCatcherArnie:
startbattle
reloadmapafterbattle
loadmem wArnieFightCount, 2
- clearflag ENGINE_ARNIE
+ clearflag ENGINE_ARNIE_READY_FOR_REMATCH
end
.LoadFight2:
@@ -199,7 +199,7 @@ TrainerBugCatcherArnie:
startbattle
reloadmapafterbattle
loadmem wArnieFightCount, 3
- clearflag ENGINE_ARNIE
+ clearflag ENGINE_ARNIE_READY_FOR_REMATCH
end
.LoadFight3:
@@ -207,14 +207,14 @@ TrainerBugCatcherArnie:
startbattle
reloadmapafterbattle
loadmem wArnieFightCount, 4
- clearflag ENGINE_ARNIE
+ clearflag ENGINE_ARNIE_READY_FOR_REMATCH
end
.LoadFight4:
loadtrainer BUG_CATCHER, ARNIE5
startbattle
reloadmapafterbattle
- clearflag ENGINE_ARNIE
+ clearflag ENGINE_ARNIE_READY_FOR_REMATCH
end
.YanmaSwarming:
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 11e144fee..d2be19fcd 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -171,7 +171,7 @@ TrainerSchoolboyAlan1:
loadvar VAR_CALLERID, PHONE_SCHOOLBOY_ALAN
endifjustbattled
opentext
- checkflag ENGINE_ALAN
+ checkflag ENGINE_ALAN_READY_FOR_REMATCH
iftrue .ChooseRematch
checkflag ENGINE_ALAN_HAS_FIRE_STONE
iftrue .GiveFireStone
@@ -221,7 +221,7 @@ TrainerSchoolboyAlan1:
startbattle
reloadmapafterbattle
loadmem wAlanFightCount, 1
- clearflag ENGINE_ALAN
+ clearflag ENGINE_ALAN_READY_FOR_REMATCH
end
.LoadFight1:
@@ -229,7 +229,7 @@ TrainerSchoolboyAlan1:
startbattle
reloadmapafterbattle
loadmem wAlanFightCount, 2
- clearflag ENGINE_ALAN
+ clearflag ENGINE_ALAN_READY_FOR_REMATCH
end
.LoadFight2:
@@ -237,7 +237,7 @@ TrainerSchoolboyAlan1:
startbattle
reloadmapafterbattle
loadmem wAlanFightCount, 3
- clearflag ENGINE_ALAN
+ clearflag ENGINE_ALAN_READY_FOR_REMATCH
end
.LoadFight3:
@@ -245,14 +245,14 @@ TrainerSchoolboyAlan1:
startbattle
reloadmapafterbattle
loadmem wAlanFightCount, 4
- clearflag ENGINE_ALAN
+ clearflag ENGINE_ALAN_READY_FOR_REMATCH
end
.LoadFight4:
loadtrainer SCHOOLBOY, ALAN5
startbattle
reloadmapafterbattle
- clearflag ENGINE_ALAN
+ clearflag ENGINE_ALAN_READY_FOR_REMATCH
end
.GiveFireStone:
diff --git a/maps/Route38.asm b/maps/Route38.asm
index 5303d0ccb..508c8684c 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -41,7 +41,7 @@ TrainerLassDana1:
loadvar VAR_CALLERID, PHONE_LASS_DANA
endifjustbattled
opentext
- checkflag ENGINE_DANA
+ checkflag ENGINE_DANA_READY_FOR_REMATCH
iftrue .DanaRematch
checkflag ENGINE_DANA_HAS_THUNDERSTONE
iftrue .TryGiveThunderstone
@@ -91,7 +91,7 @@ TrainerLassDana1:
startbattle
reloadmapafterbattle
loadmem wDanaFightCount, 1
- clearflag ENGINE_DANA
+ clearflag ENGINE_DANA_READY_FOR_REMATCH
end
.LoadFight1:
@@ -99,7 +99,7 @@ TrainerLassDana1:
startbattle
reloadmapafterbattle
loadmem wDanaFightCount, 2
- clearflag ENGINE_DANA
+ clearflag ENGINE_DANA_READY_FOR_REMATCH
end
.LoadFight2:
@@ -107,7 +107,7 @@ TrainerLassDana1:
startbattle
reloadmapafterbattle
loadmem wDanaFightCount, 3
- clearflag ENGINE_DANA
+ clearflag ENGINE_DANA_READY_FOR_REMATCH
end
.LoadFight3:
@@ -115,14 +115,14 @@ TrainerLassDana1:
startbattle
reloadmapafterbattle
loadmem wDanaFightCount, 4
- clearflag ENGINE_DANA
+ clearflag ENGINE_DANA_READY_FOR_REMATCH
end
.LoadFight4:
loadtrainer LASS, DANA5
startbattle
reloadmapafterbattle
- clearflag ENGINE_DANA
+ clearflag ENGINE_DANA_READY_FOR_REMATCH
end
.TryGiveThunderstone:
@@ -179,7 +179,7 @@ TrainerSchoolboyChad1:
loadvar VAR_CALLERID, PHONE_SCHOOLBOY_CHAD
endifjustbattled
opentext
- checkflag ENGINE_CHAD
+ checkflag ENGINE_CHAD_READY_FOR_REMATCH
iftrue .ChadRematch
checkcellnum PHONE_SCHOOLBOY_CHAD
iftrue .HaveChadsNumber
@@ -227,7 +227,7 @@ TrainerSchoolboyChad1:
startbattle
reloadmapafterbattle
loadmem wChadFightCount, 1
- clearflag ENGINE_CHAD
+ clearflag ENGINE_CHAD_READY_FOR_REMATCH
end
.LoadFight1:
@@ -235,7 +235,7 @@ TrainerSchoolboyChad1:
startbattle
reloadmapafterbattle
loadmem wChadFightCount, 2
- clearflag ENGINE_CHAD
+ clearflag ENGINE_CHAD_READY_FOR_REMATCH
end
.LoadFight2:
@@ -243,7 +243,7 @@ TrainerSchoolboyChad1:
startbattle
reloadmapafterbattle
loadmem wChadFightCount, 3
- clearflag ENGINE_CHAD
+ clearflag ENGINE_CHAD_READY_FOR_REMATCH
end
.LoadFight3:
@@ -251,14 +251,14 @@ TrainerSchoolboyChad1:
startbattle
reloadmapafterbattle
loadmem wChadFightCount, 4
- clearflag ENGINE_CHAD
+ clearflag ENGINE_CHAD_READY_FOR_REMATCH
end
.LoadFight4:
loadtrainer SCHOOLBOY, CHAD5
startbattle
reloadmapafterbattle
- clearflag ENGINE_CHAD
+ clearflag ENGINE_CHAD_READY_FOR_REMATCH
end
.AskPhoneNumber1:
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 1627a12a3..c988209d9 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -41,7 +41,7 @@ TrainerFisherTully:
loadvar VAR_CALLERID, PHONE_FISHER_TULLY
endifjustbattled
opentext
- checkflag ENGINE_TULLY
+ checkflag ENGINE_TULLY_READY_FOR_REMATCH
iftrue .WantsBattle
checkflag ENGINE_TULLY_HAS_WATER_STONE
iftrue .HasWaterStone
@@ -87,7 +87,7 @@ TrainerFisherTully:
startbattle
reloadmapafterbattle
loadmem wTullyFightCount, 1
- clearflag ENGINE_TULLY
+ clearflag ENGINE_TULLY_READY_FOR_REMATCH
end
.LoadFight1:
@@ -95,7 +95,7 @@ TrainerFisherTully:
startbattle
reloadmapafterbattle
loadmem wTullyFightCount, 2
- clearflag ENGINE_TULLY
+ clearflag ENGINE_TULLY_READY_FOR_REMATCH
end
.LoadFight2:
@@ -103,14 +103,14 @@ TrainerFisherTully:
startbattle
reloadmapafterbattle
loadmem wTullyFightCount, 3
- clearflag ENGINE_TULLY
+ clearflag ENGINE_TULLY_READY_FOR_REMATCH
end
.LoadFight3:
loadtrainer FISHER, TULLY4
startbattle
reloadmapafterbattle
- clearflag ENGINE_TULLY
+ clearflag ENGINE_TULLY_READY_FOR_REMATCH
end
.HasWaterStone:
diff --git a/maps/Route43.asm b/maps/Route43.asm
index d4b670e72..ae4dd5176 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -53,7 +53,7 @@ TrainerPokemaniacBrent:
loadvar VAR_CALLERID, PHONE_POKEMANIAC_BRENT
endifjustbattled
opentext
- checkflag ENGINE_BRENT
+ checkflag ENGINE_BRENT_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_POKEMANIAC_BRENT
iftrue .NumberAccepted
@@ -97,7 +97,7 @@ TrainerPokemaniacBrent:
startbattle
reloadmapafterbattle
loadmem wBrentFightCount, 1
- clearflag ENGINE_BRENT
+ clearflag ENGINE_BRENT_READY_FOR_REMATCH
end
.LoadFight1:
@@ -105,7 +105,7 @@ TrainerPokemaniacBrent:
startbattle
reloadmapafterbattle
loadmem wBrentFightCount, 2
- clearflag ENGINE_BRENT
+ clearflag ENGINE_BRENT_READY_FOR_REMATCH
end
.LoadFight2:
@@ -113,14 +113,14 @@ TrainerPokemaniacBrent:
startbattle
reloadmapafterbattle
loadmem wBrentFightCount, 3
- clearflag ENGINE_BRENT
+ clearflag ENGINE_BRENT_READY_FOR_REMATCH
end
.LoadFight3:
loadtrainer POKEMANIAC, BRENT4
startbattle
reloadmapafterbattle
- clearflag ENGINE_BRENT
+ clearflag ENGINE_BRENT_READY_FOR_REMATCH
end
.AskNumber1:
@@ -180,7 +180,7 @@ TrainerPicnickerTiffany:
loadvar VAR_CALLERID, PHONE_PICNICKER_TIFFANY
endifjustbattled
opentext
- checkflag ENGINE_TIFFANY
+ checkflag ENGINE_TIFFANY_READY_FOR_REMATCH
iftrue .WantsBattle
checkflag ENGINE_TIFFANY_HAS_PINK_BOW
iftrue .HasPinkBow
@@ -228,7 +228,7 @@ TrainerPicnickerTiffany:
startbattle
reloadmapafterbattle
loadmem wTiffanyFightCount, 1
- clearflag ENGINE_TIFFANY
+ clearflag ENGINE_TIFFANY_READY_FOR_REMATCH
end
.LoadFight1:
@@ -236,7 +236,7 @@ TrainerPicnickerTiffany:
startbattle
reloadmapafterbattle
loadmem wTiffanyFightCount, 2
- clearflag ENGINE_TIFFANY
+ clearflag ENGINE_TIFFANY_READY_FOR_REMATCH
end
.LoadFight2:
@@ -244,14 +244,14 @@ TrainerPicnickerTiffany:
startbattle
reloadmapafterbattle
loadmem wTiffanyFightCount, 3
- clearflag ENGINE_TIFFANY
+ clearflag ENGINE_TIFFANY_READY_FOR_REMATCH
end
.LoadFight3:
loadtrainer PICNICKER, TIFFANY4
startbattle
reloadmapafterbattle
- clearflag ENGINE_TIFFANY
+ clearflag ENGINE_TIFFANY_READY_FOR_REMATCH
end
.HasPinkBow:
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:
diff --git a/maps/Route45.asm b/maps/Route45.asm
index a4a962608..23ec17bde 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -151,7 +151,7 @@ TrainerHikerParry:
loadvar VAR_CALLERID, PHONE_HIKER_PARRY
endifjustbattled
opentext
- checkflag ENGINE_PARRY
+ checkflag ENGINE_PARRY_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_HIKER_PARRY
iftrue Route45NumberAcceptedM
@@ -191,7 +191,7 @@ TrainerHikerParry:
startbattle
reloadmapafterbattle
loadmem wParryFightCount, 1
- clearflag ENGINE_PARRY
+ clearflag ENGINE_PARRY_READY_FOR_REMATCH
end
.LoadFight1:
@@ -199,14 +199,14 @@ TrainerHikerParry:
startbattle
reloadmapafterbattle
loadmem wParryFightCount, 2
- clearflag ENGINE_PARRY
+ clearflag ENGINE_PARRY_READY_FOR_REMATCH
end
.LoadFight2:
loadtrainer HIKER, PARRY2
startbattle
reloadmapafterbattle
- clearflag ENGINE_PARRY
+ clearflag ENGINE_PARRY_READY_FOR_REMATCH
checkevent EVENT_PARRY_IRON
iftrue .HasIron
checkevent EVENT_GOT_IRON_FROM_PARRY
diff --git a/maps/Route46.asm b/maps/Route46.asm
index 3aac707a5..27f1180e0 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -29,7 +29,7 @@ TrainerPicnickerErin1:
loadvar VAR_CALLERID, PHONE_PICNICKER_ERIN
endifjustbattled
opentext
- checkflag ENGINE_ERIN
+ checkflag ENGINE_ERIN_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_PICNICKER_ERIN
iftrue Route46NumberAcceptedF
@@ -69,7 +69,7 @@ TrainerPicnickerErin1:
startbattle
reloadmapafterbattle
loadmem wErinFightCount, 1
- clearflag ENGINE_ERIN
+ clearflag ENGINE_ERIN_READY_FOR_REMATCH
end
.LoadFight1:
@@ -77,14 +77,14 @@ TrainerPicnickerErin1:
startbattle
reloadmapafterbattle
loadmem wErinFightCount, 2
- clearflag ENGINE_ERIN
+ clearflag ENGINE_ERIN_READY_FOR_REMATCH
end
.LoadFight2:
loadtrainer PICNICKER, ERIN3
startbattle
reloadmapafterbattle
- clearflag ENGINE_ERIN
+ clearflag ENGINE_ERIN_READY_FOR_REMATCH
checkevent EVENT_ERIN_CALCIUM
iftrue .HasCalcium
checkevent EVENT_GOT_CALCIUM_FROM_ERIN
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 12:58:17 +0000