pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

prefix wram varables with w.

Browse Source
This commit is contained in:
IIMarckus
2015-07-10 14:04:00 -06:00
parent 388336353d
commit 63cc4daae2
18 changed files with 127 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maps/NationalPark.asm
View File

@@ -103,7 +103,7 @@ UnknownScript_0x5c074:
UnknownScript_0x5c088: UnknownScript_0x5c088:
scall UnknownScript_0x5c114 scall UnknownScript_0x5c114
winlosstext SchoolboyJack1BeatenText, $0000 winlosstext SchoolboyJack1BeatenText, $0000
copybytetovar JackFightCount copybytetovar wJackFightCount
if_equal 4, .Fight4 if_equal 4, .Fight4
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
@@ -125,7 +125,7 @@ UnknownScript_0x5c088:
loadtrainer SCHOOLBOY, JACK1 loadtrainer SCHOOLBOY, JACK1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar JackFightCount, 1 loadvar wJackFightCount, 1
clearflag ENGINE_JACK clearflag ENGINE_JACK
end end
@@ -133,7 +133,7 @@ UnknownScript_0x5c088:
loadtrainer SCHOOLBOY, JACK2 loadtrainer SCHOOLBOY, JACK2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar JackFightCount, 2 loadvar wJackFightCount, 2
clearflag ENGINE_JACK clearflag ENGINE_JACK
end end
@@ -141,7 +141,7 @@ UnknownScript_0x5c088:
loadtrainer SCHOOLBOY, JACK3 loadtrainer SCHOOLBOY, JACK3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar JackFightCount, 3 loadvar wJackFightCount, 3
clearflag ENGINE_JACK clearflag ENGINE_JACK
end end
@@ -149,7 +149,7 @@ UnknownScript_0x5c088:
loadtrainer SCHOOLBOY, JACK4 loadtrainer SCHOOLBOY, JACK4
startbattle startbattle
returnafterbattle returnafterbattle
loadvar JackFightCount, 4 loadvar wJackFightCount, 4
clearflag ENGINE_JACK clearflag ENGINE_JACK
end end

8
maps/OlivineLighthouse2F.asm
View File

@@ -78,7 +78,7 @@ UnknownScript_0x5afb3:
UnknownScript_0x5afc7: UnknownScript_0x5afc7:
scall UnknownScript_0x5b06b scall UnknownScript_0x5b06b
winlosstext SailorHuey1BeatenText, $0000 winlosstext SailorHuey1BeatenText, $0000
copybytetovar HueyFightCount copybytetovar wHueyFightCount
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
if_equal 1, .Fight1 if_equal 1, .Fight1
@@ -96,7 +96,7 @@ UnknownScript_0x5afc7:
loadtrainer SAILOR, HUEY1 loadtrainer SAILOR, HUEY1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar HueyFightCount, 1 loadvar wHueyFightCount, 1
clearflag ENGINE_HUEY clearflag ENGINE_HUEY
end end
@@ -104,7 +104,7 @@ UnknownScript_0x5afc7:
loadtrainer SAILOR, HUEY2 loadtrainer SAILOR, HUEY2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar HueyFightCount, 2 loadvar wHueyFightCount, 2
clearflag ENGINE_HUEY clearflag ENGINE_HUEY
end end
@@ -112,7 +112,7 @@ UnknownScript_0x5afc7:
loadtrainer SAILOR, HUEY3 loadtrainer SAILOR, HUEY3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar HueyFightCount, 3 loadvar wHueyFightCount, 3
clearflag ENGINE_HUEY clearflag ENGINE_HUEY
end end

12
maps/Route26.asm
View File

@@ -80,7 +80,7 @@ UnknownScript_0x1a4d65:
UnknownScript_0x1a4d79: UnknownScript_0x1a4d79:
scall UnknownScript_0x1a4dd7 scall UnknownScript_0x1a4dd7
winlosstext CooltrainermGaven3BeatenText, $0000 winlosstext CooltrainermGaven3BeatenText, $0000
copybytetovar GavenFightCount copybytetovar wGavenFightCount
if_equal 2, .Fight2 if_equal 2, .Fight2
if_equal 1, .Fight1 if_equal 1, .Fight1
if_equal 0, .LoadFight0 if_equal 0, .LoadFight0
@@ -94,7 +94,7 @@ UnknownScript_0x1a4d79:
loadtrainer COOLTRAINERM, GAVEN3 loadtrainer COOLTRAINERM, GAVEN3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar GavenFightCount, 1 loadvar wGavenFightCount, 1
clearflag ENGINE_GAVEN clearflag ENGINE_GAVEN
end end
@@ -102,7 +102,7 @@ UnknownScript_0x1a4d79:
loadtrainer COOLTRAINERM, GAVEN1 loadtrainer COOLTRAINERM, GAVEN1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar GavenFightCount, 2 loadvar wGavenFightCount, 2
clearflag ENGINE_GAVEN clearflag ENGINE_GAVEN
end end
@@ -216,7 +216,7 @@ UnknownScript_0x1a4e21:
UnknownScript_0x1a4e35: UnknownScript_0x1a4e35:
scall UnknownScript_0x1a4e93 scall UnknownScript_0x1a4e93
winlosstext CooltrainerfBeth1BeatenText, $0000 winlosstext CooltrainerfBeth1BeatenText, $0000
copybytetovar BethFightCount copybytetovar wBethFightCount
if_equal 2, .Fight2 if_equal 2, .Fight2
if_equal 1, .Fight1 if_equal 1, .Fight1
if_equal 0, .LoadFight0 if_equal 0, .LoadFight0
@@ -230,7 +230,7 @@ UnknownScript_0x1a4e35:
loadtrainer COOLTRAINERF, BETH1 loadtrainer COOLTRAINERF, BETH1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar BethFightCount, 1 loadvar wBethFightCount, 1
clearflag ENGINE_BETH clearflag ENGINE_BETH
end end
@@ -238,7 +238,7 @@ UnknownScript_0x1a4e35:
loadtrainer COOLTRAINERF, BETH2 loadtrainer COOLTRAINERF, BETH2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar BethFightCount, 2 loadvar wBethFightCount, 2
clearflag ENGINE_BETH clearflag ENGINE_BETH
end end

12
maps/Route27.asm
View File

@@ -116,7 +116,7 @@ UnknownScript_0x1a08eb:
UnknownScript_0x1a08ff: UnknownScript_0x1a08ff:
scall UnknownScript_0x1a096f scall UnknownScript_0x1a096f
winlosstext Bird_keeperJose2BeatenText, $0000 winlosstext Bird_keeperJose2BeatenText, $0000
copybytetovar JoseFightCount copybytetovar wJoseFightCount
if_equal 2, .Fight2 if_equal 2, .Fight2
if_equal 1, .Fight1 if_equal 1, .Fight1
if_equal 0, .LoadFight0 if_equal 0, .LoadFight0
@@ -130,7 +130,7 @@ UnknownScript_0x1a08ff:
loadtrainer BIRD_KEEPER, JOSE2 loadtrainer BIRD_KEEPER, JOSE2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar JoseFightCount, 1 loadvar wJoseFightCount, 1
clearflag ENGINE_JOSE clearflag ENGINE_JOSE
end end
@@ -138,7 +138,7 @@ UnknownScript_0x1a08ff:
loadtrainer BIRD_KEEPER, JOSE1 loadtrainer BIRD_KEEPER, JOSE1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar JoseFightCount, 2 loadvar wJoseFightCount, 2
clearflag ENGINE_JOSE clearflag ENGINE_JOSE
end end
@@ -297,7 +297,7 @@ UnknownScript_0x1a09d5:
UnknownScript_0x1a09e9: UnknownScript_0x1a09e9:
scall UnknownScript_0x1a0a47 scall UnknownScript_0x1a0a47
winlosstext CooltrainerfReena1BeatenText, $0000 winlosstext CooltrainerfReena1BeatenText, $0000
copybytetovar ReenaFightCount copybytetovar wReenaFightCount
if_equal 2, .Fight2 if_equal 2, .Fight2
if_equal 1, .Fight1 if_equal 1, .Fight1
if_equal 0, .LoadFight0 if_equal 0, .LoadFight0
@@ -311,7 +311,7 @@ UnknownScript_0x1a09e9:
loadtrainer COOLTRAINERF, REENA1 loadtrainer COOLTRAINERF, REENA1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ReenaFightCount, 1 loadvar wReenaFightCount, 1
clearflag ENGINE_REENA clearflag ENGINE_REENA
end end
@@ -319,7 +319,7 @@ UnknownScript_0x1a09e9:
loadtrainer COOLTRAINERF, REENA2 loadtrainer COOLTRAINERF, REENA2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ReenaFightCount, 2 loadvar wReenaFightCount, 2
clearflag ENGINE_REENA clearflag ENGINE_REENA
end end

10
maps/Route30.asm
View File

@@ -73,7 +73,7 @@ UnknownScript_0x1a16cc:
UnknownScript_0x1a16e0: UnknownScript_0x1a16e0:
scall UnknownScript_0x1a179b scall UnknownScript_0x1a179b
winlosstext YoungsterJoey1BeatenText, $0000 winlosstext YoungsterJoey1BeatenText, $0000
copybytetovar JoeyFightCount copybytetovar wJoeyFightCount
if_equal 4, .Fight4 if_equal 4, .Fight4
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
@@ -95,7 +95,7 @@ UnknownScript_0x1a16e0:
loadtrainer YOUNGSTER, JOEY1 loadtrainer YOUNGSTER, JOEY1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar JoeyFightCount, 1 loadvar wJoeyFightCount, 1
clearflag ENGINE_JOEY clearflag ENGINE_JOEY
end end
@@ -103,7 +103,7 @@ UnknownScript_0x1a16e0:
loadtrainer YOUNGSTER, JOEY2 loadtrainer YOUNGSTER, JOEY2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar JoeyFightCount, 2 loadvar wJoeyFightCount, 2
clearflag ENGINE_JOEY clearflag ENGINE_JOEY
end end
@@ -111,7 +111,7 @@ UnknownScript_0x1a16e0:
loadtrainer YOUNGSTER, JOEY3 loadtrainer YOUNGSTER, JOEY3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar JoeyFightCount, 3 loadvar wJoeyFightCount, 3
clearflag ENGINE_JOEY clearflag ENGINE_JOEY
end end
@@ -119,7 +119,7 @@ UnknownScript_0x1a16e0:
loadtrainer YOUNGSTER, JOEY4 loadtrainer YOUNGSTER, JOEY4
startbattle startbattle
returnafterbattle returnafterbattle
loadvar JoeyFightCount, 4 loadvar wJoeyFightCount, 4
clearflag ENGINE_JOEY clearflag ENGINE_JOEY
end end

10
maps/Route31.asm
View File

@@ -68,7 +68,7 @@ UnknownScript_0x1a547f:
UnknownScript_0x1a5493: UnknownScript_0x1a5493:
scall UnknownScript_0x1a5564 scall UnknownScript_0x1a5564
winlosstext Bug_catcherWade1BeatenText, $0000 winlosstext Bug_catcherWade1BeatenText, $0000
copybytetovar WadeFightCount copybytetovar wWadeFightCount
if_equal 4, .Fight4 if_equal 4, .Fight4
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
@@ -90,7 +90,7 @@ UnknownScript_0x1a5493:
loadtrainer BUG_CATCHER, WADE1 loadtrainer BUG_CATCHER, WADE1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar WadeFightCount, 1 loadvar wWadeFightCount, 1
clearflag ENGINE_WADE clearflag ENGINE_WADE
end end
@@ -98,7 +98,7 @@ UnknownScript_0x1a5493:
loadtrainer BUG_CATCHER, WADE2 loadtrainer BUG_CATCHER, WADE2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar WadeFightCount, 2 loadvar wWadeFightCount, 2
clearflag ENGINE_WADE clearflag ENGINE_WADE
end end
@@ -106,7 +106,7 @@ UnknownScript_0x1a5493:
loadtrainer BUG_CATCHER, WADE3 loadtrainer BUG_CATCHER, WADE3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar WadeFightCount, 3 loadvar wWadeFightCount, 3
clearflag ENGINE_WADE clearflag ENGINE_WADE
end end
@@ -114,7 +114,7 @@ UnknownScript_0x1a5493:
loadtrainer BUG_CATCHER, WADE4 loadtrainer BUG_CATCHER, WADE4
startbattle startbattle
returnafterbattle returnafterbattle
loadvar WadeFightCount, 4 loadvar wWadeFightCount, 4
clearflag ENGINE_WADE clearflag ENGINE_WADE
end end

20
maps/Route32.asm
View File

@@ -236,7 +236,7 @@ UnknownScript_0x190569:
UnknownScript_0x19057d: UnknownScript_0x19057d:
scall UnknownScript_0x19060f scall UnknownScript_0x19060f
winlosstext FisherRalph1BeatenText, $0000 winlosstext FisherRalph1BeatenText, $0000
copybytetovar RalphFightCount copybytetovar wRalphFightCount
if_equal 4, .Fight4 if_equal 4, .Fight4
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
@@ -258,7 +258,7 @@ UnknownScript_0x19057d:
loadtrainer FISHER, RALPH1 loadtrainer FISHER, RALPH1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar RalphFightCount, 1 loadvar wRalphFightCount, 1
clearflag ENGINE_RALPH clearflag ENGINE_RALPH
end end
@@ -266,7 +266,7 @@ UnknownScript_0x19057d:
loadtrainer FISHER, RALPH2 loadtrainer FISHER, RALPH2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar RalphFightCount, 2 loadvar wRalphFightCount, 2
clearflag ENGINE_RALPH clearflag ENGINE_RALPH
end end
@@ -274,7 +274,7 @@ UnknownScript_0x19057d:
loadtrainer FISHER, RALPH3 loadtrainer FISHER, RALPH3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar RalphFightCount, 3 loadvar wRalphFightCount, 3
clearflag ENGINE_RALPH clearflag ENGINE_RALPH
end end
@@ -282,7 +282,7 @@ UnknownScript_0x19057d:
loadtrainer FISHER, RALPH4 loadtrainer FISHER, RALPH4
startbattle startbattle
returnafterbattle returnafterbattle
loadvar RalphFightCount, 4 loadvar wRalphFightCount, 4
clearflag ENGINE_RALPH clearflag ENGINE_RALPH
end end
@@ -402,7 +402,7 @@ UnknownScript_0x190659:
UnknownScript_0x19066d: UnknownScript_0x19066d:
scall UnknownScript_0x1906f9 scall UnknownScript_0x1906f9
winlosstext PicnickerLiz1BeatenText, $0000 winlosstext PicnickerLiz1BeatenText, $0000
copybytetovar LizFightCount copybytetovar wLizFightCount
if_equal 4, .Fight4 if_equal 4, .Fight4
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
@@ -424,7 +424,7 @@ UnknownScript_0x19066d:
loadtrainer PICNICKER, LIZ1 loadtrainer PICNICKER, LIZ1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar LizFightCount, 1 loadvar wLizFightCount, 1
clearflag ENGINE_LIZ clearflag ENGINE_LIZ
end end
@@ -432,7 +432,7 @@ UnknownScript_0x19066d:
loadtrainer PICNICKER, LIZ2 loadtrainer PICNICKER, LIZ2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar LizFightCount, 2 loadvar wLizFightCount, 2
clearflag ENGINE_LIZ clearflag ENGINE_LIZ
end end
@@ -440,7 +440,7 @@ UnknownScript_0x19066d:
loadtrainer PICNICKER, LIZ3 loadtrainer PICNICKER, LIZ3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar LizFightCount, 3 loadvar wLizFightCount, 3
clearflag ENGINE_LIZ clearflag ENGINE_LIZ
end end
@@ -448,7 +448,7 @@ UnknownScript_0x19066d:
loadtrainer PICNICKER, LIZ4 loadtrainer PICNICKER, LIZ4
startbattle startbattle
returnafterbattle returnafterbattle
loadvar LizFightCount, 4 loadvar wLizFightCount, 4
clearflag ENGINE_LIZ clearflag ENGINE_LIZ
end end

10
maps/Route33.asm
View File

@@ -58,7 +58,7 @@ UnknownScript_0x1ac03d:
UnknownScript_0x1ac051: UnknownScript_0x1ac051:
scall UnknownScript_0x1ac0e3 scall UnknownScript_0x1ac0e3
winlosstext HikerAnthony2BeatenText, $0000 winlosstext HikerAnthony2BeatenText, $0000
copybytetovar AnthonyFightCount copybytetovar wAnthonyFightCount
if_equal 4, .Fight4 if_equal 4, .Fight4
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
@@ -80,7 +80,7 @@ UnknownScript_0x1ac051:
loadtrainer HIKER, ANTHONY2 loadtrainer HIKER, ANTHONY2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar AnthonyFightCount, 1 loadvar wAnthonyFightCount, 1
clearflag ENGINE_ANTHONY clearflag ENGINE_ANTHONY
end end
@@ -88,7 +88,7 @@ UnknownScript_0x1ac051:
loadtrainer HIKER, ANTHONY1 loadtrainer HIKER, ANTHONY1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar AnthonyFightCount, 2 loadvar wAnthonyFightCount, 2
clearflag ENGINE_ANTHONY clearflag ENGINE_ANTHONY
end end
@@ -96,7 +96,7 @@ UnknownScript_0x1ac051:
loadtrainer HIKER, ANTHONY3 loadtrainer HIKER, ANTHONY3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar AnthonyFightCount, 3 loadvar wAnthonyFightCount, 3
clearflag ENGINE_ANTHONY clearflag ENGINE_ANTHONY
end end
@@ -104,7 +104,7 @@ UnknownScript_0x1ac051:
loadtrainer HIKER, ANTHONY4 loadtrainer HIKER, ANTHONY4
startbattle startbattle
returnafterbattle returnafterbattle
loadvar AnthonyFightCount, 4 loadvar wAnthonyFightCount, 4
clearflag ENGINE_ANTHONY clearflag ENGINE_ANTHONY
end end

20
maps/Route34.asm
View File

@@ -125,7 +125,7 @@ UnknownScript_0x780a9:
UnknownScript_0x780bd: UnknownScript_0x780bd:
scall UnknownScript_0x7814f scall UnknownScript_0x7814f
winlosstext CamperTodd1BeatenText, $0000 winlosstext CamperTodd1BeatenText, $0000
copybytetovar ToddFightCount copybytetovar wToddFightCount
if_equal 4, .Fight4 if_equal 4, .Fight4
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
@@ -147,7 +147,7 @@ UnknownScript_0x780bd:
loadtrainer CAMPER, TODD1 loadtrainer CAMPER, TODD1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ToddFightCount, 1 loadvar wToddFightCount, 1
clearflag ENGINE_TODD clearflag ENGINE_TODD
end end
@@ -155,7 +155,7 @@ UnknownScript_0x780bd:
loadtrainer CAMPER, TODD2 loadtrainer CAMPER, TODD2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ToddFightCount, 2 loadvar wToddFightCount, 2
clearflag ENGINE_TODD clearflag ENGINE_TODD
end end
@@ -163,7 +163,7 @@ UnknownScript_0x780bd:
loadtrainer CAMPER, TODD3 loadtrainer CAMPER, TODD3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ToddFightCount, 3 loadvar wToddFightCount, 3
clearflag ENGINE_TODD clearflag ENGINE_TODD
end end
@@ -171,7 +171,7 @@ UnknownScript_0x780bd:
loadtrainer CAMPER, TODD4 loadtrainer CAMPER, TODD4
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ToddFightCount, 4 loadvar wToddFightCount, 4
clearflag ENGINE_TODD clearflag ENGINE_TODD
end end
@@ -266,7 +266,7 @@ UnknownScript_0x7818b:
UnknownScript_0x7819f: UnknownScript_0x7819f:
scall UnknownScript_0x78240 scall UnknownScript_0x78240
winlosstext PicnickerGina1BeatenText, $0000 winlosstext PicnickerGina1BeatenText, $0000
copybytetovar GinaFightCount copybytetovar wGinaFightCount
if_equal 4, .Fight4 if_equal 4, .Fight4
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
@@ -288,7 +288,7 @@ UnknownScript_0x7819f:
loadtrainer PICNICKER, GINA1 loadtrainer PICNICKER, GINA1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar GinaFightCount, 1 loadvar wGinaFightCount, 1
clearflag ENGINE_GINA clearflag ENGINE_GINA
end end
@@ -296,7 +296,7 @@ UnknownScript_0x7819f:
loadtrainer PICNICKER, GINA2 loadtrainer PICNICKER, GINA2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar GinaFightCount, 2 loadvar wGinaFightCount, 2
clearflag ENGINE_GINA clearflag ENGINE_GINA
end end
@@ -304,7 +304,7 @@ UnknownScript_0x7819f:
loadtrainer PICNICKER, GINA3 loadtrainer PICNICKER, GINA3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar GinaFightCount, 3 loadvar wGinaFightCount, 3
clearflag ENGINE_GINA clearflag ENGINE_GINA
end end
@@ -312,7 +312,7 @@ UnknownScript_0x7819f:
loadtrainer PICNICKER, GINA4 loadtrainer PICNICKER, GINA4
startbattle startbattle
returnafterbattle returnafterbattle
loadvar GinaFightCount, 4 loadvar wGinaFightCount, 4
clearflag ENGINE_GINA clearflag ENGINE_GINA
end end

10
maps/Route35.asm
View File

@@ -261,7 +261,7 @@ UnknownScript_0x19c9a7:
UnknownScript_0x19c9bb: UnknownScript_0x19c9bb:
scall UnknownScript_0x19c91b scall UnknownScript_0x19c91b
winlosstext Bug_catcherArnie1BeatenText, $0000 winlosstext Bug_catcherArnie1BeatenText, $0000
copybytetovar ArnieFightCount copybytetovar wArnieFightCount
if_equal 4, .Fight4 if_equal 4, .Fight4
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
@@ -283,7 +283,7 @@ UnknownScript_0x19c9bb:
loadtrainer BUG_CATCHER, ARNIE1 loadtrainer BUG_CATCHER, ARNIE1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ArnieFightCount, 1 loadvar wArnieFightCount, 1
clearflag ENGINE_ARNIE clearflag ENGINE_ARNIE
end end
@@ -291,7 +291,7 @@ UnknownScript_0x19c9bb:
loadtrainer BUG_CATCHER, ARNIE2 loadtrainer BUG_CATCHER, ARNIE2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ArnieFightCount, 2 loadvar wArnieFightCount, 2
clearflag ENGINE_ARNIE clearflag ENGINE_ARNIE
end end
@@ -299,7 +299,7 @@ UnknownScript_0x19c9bb:
loadtrainer BUG_CATCHER, ARNIE3 loadtrainer BUG_CATCHER, ARNIE3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ArnieFightCount, 3 loadvar wArnieFightCount, 3
clearflag ENGINE_ARNIE clearflag ENGINE_ARNIE
end end
@@ -307,7 +307,7 @@ UnknownScript_0x19c9bb:
loadtrainer BUG_CATCHER, ARNIE4 loadtrainer BUG_CATCHER, ARNIE4
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ArnieFightCount, 4 loadvar wArnieFightCount, 4
clearflag ENGINE_ARNIE clearflag ENGINE_ARNIE
end end

10
maps/Route36.asm
View File

@@ -211,7 +211,7 @@ UnknownScript_0x19412c:
UnknownScript_0x194140: UnknownScript_0x194140:
scall UnknownScript_0x1941e1 scall UnknownScript_0x1941e1
winlosstext SchoolboyAlan1BeatenText, $0000 winlosstext SchoolboyAlan1BeatenText, $0000
copybytetovar AlanFightCount copybytetovar wAlanFightCount
if_equal 4, .Fight4 if_equal 4, .Fight4
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
@@ -233,7 +233,7 @@ UnknownScript_0x194140:
loadtrainer SCHOOLBOY, ALAN1 loadtrainer SCHOOLBOY, ALAN1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar AlanFightCount, 1 loadvar wAlanFightCount, 1
clearflag ENGINE_ALAN clearflag ENGINE_ALAN
end end
@@ -241,7 +241,7 @@ UnknownScript_0x194140:
loadtrainer SCHOOLBOY, ALAN2 loadtrainer SCHOOLBOY, ALAN2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar AlanFightCount, 2 loadvar wAlanFightCount, 2
clearflag ENGINE_ALAN clearflag ENGINE_ALAN
end end
@@ -249,7 +249,7 @@ UnknownScript_0x194140:
loadtrainer SCHOOLBOY, ALAN3 loadtrainer SCHOOLBOY, ALAN3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar AlanFightCount, 3 loadvar wAlanFightCount, 3
clearflag ENGINE_ALAN clearflag ENGINE_ALAN
end end
@@ -257,7 +257,7 @@ UnknownScript_0x194140:
loadtrainer SCHOOLBOY, ALAN4 loadtrainer SCHOOLBOY, ALAN4
startbattle startbattle
returnafterbattle returnafterbattle
loadvar AlanFightCount, 4 loadvar wAlanFightCount, 4
clearflag ENGINE_ALAN clearflag ENGINE_ALAN
end end

20
maps/Route38.asm
View File

@@ -109,7 +109,7 @@ UnknownScript_0x1a1d6e:
UnknownScript_0x1a1d82: UnknownScript_0x1a1d82:
scall UnknownScript_0x1a1e23 scall UnknownScript_0x1a1e23
winlosstext LassDana1BeatenText, $0000 winlosstext LassDana1BeatenText, $0000
copybytetovar DanaFightCount copybytetovar wDanaFightCount
if_equal 4, .Fight4 if_equal 4, .Fight4
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
@@ -131,7 +131,7 @@ UnknownScript_0x1a1d82:
loadtrainer LASS, DANA1 loadtrainer LASS, DANA1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar DanaFightCount, 1 loadvar wDanaFightCount, 1
clearflag ENGINE_DANA clearflag ENGINE_DANA
end end
@@ -139,7 +139,7 @@ UnknownScript_0x1a1d82:
loadtrainer LASS, DANA2 loadtrainer LASS, DANA2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar DanaFightCount, 2 loadvar wDanaFightCount, 2
clearflag ENGINE_DANA clearflag ENGINE_DANA
end end
@@ -147,7 +147,7 @@ UnknownScript_0x1a1d82:
loadtrainer LASS, DANA3 loadtrainer LASS, DANA3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar DanaFightCount, 3 loadvar wDanaFightCount, 3
clearflag ENGINE_DANA clearflag ENGINE_DANA
end end
@@ -155,7 +155,7 @@ UnknownScript_0x1a1d82:
loadtrainer LASS, DANA4 loadtrainer LASS, DANA4
startbattle startbattle
returnafterbattle returnafterbattle
loadvar DanaFightCount, 4 loadvar wDanaFightCount, 4
clearflag ENGINE_DANA clearflag ENGINE_DANA
end end
@@ -261,7 +261,7 @@ UnknownScript_0x1a1e61:
UnknownScript_0x1a1e75: UnknownScript_0x1a1e75:
scall UnknownScript_0x1a1f01 scall UnknownScript_0x1a1f01
winlosstext SchoolboyChad1BeatenText, $0000 winlosstext SchoolboyChad1BeatenText, $0000
copybytetovar ChadFightCount copybytetovar wChadFightCount
if_equal 4, .Fight4 if_equal 4, .Fight4
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
@@ -283,7 +283,7 @@ UnknownScript_0x1a1e75:
loadtrainer SCHOOLBOY, CHAD1 loadtrainer SCHOOLBOY, CHAD1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ChadFightCount, 1 loadvar wChadFightCount, 1
clearflag ENGINE_CHAD clearflag ENGINE_CHAD
end end
@@ -291,7 +291,7 @@ UnknownScript_0x1a1e75:
loadtrainer SCHOOLBOY, CHAD2 loadtrainer SCHOOLBOY, CHAD2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ChadFightCount, 2 loadvar wChadFightCount, 2
clearflag ENGINE_CHAD clearflag ENGINE_CHAD
end end
@@ -299,7 +299,7 @@ UnknownScript_0x1a1e75:
loadtrainer SCHOOLBOY, CHAD3 loadtrainer SCHOOLBOY, CHAD3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ChadFightCount, 3 loadvar wChadFightCount, 3
clearflag ENGINE_CHAD clearflag ENGINE_CHAD
end end
@@ -307,7 +307,7 @@ UnknownScript_0x1a1e75:
loadtrainer SCHOOLBOY, CHAD4 loadtrainer SCHOOLBOY, CHAD4
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ChadFightCount, 4 loadvar wChadFightCount, 4
clearflag ENGINE_CHAD clearflag ENGINE_CHAD
end end

8
maps/Route42.asm
View File

@@ -77,7 +77,7 @@ UnknownScript_0x1a926b:
UnknownScript_0x1a927f: UnknownScript_0x1a927f:
scall UnknownScript_0x1a9309 scall UnknownScript_0x1a9309
winlosstext FisherTully1BeatenText, $0000 winlosstext FisherTully1BeatenText, $0000
copybytetovar TullyFightCount copybytetovar wTullyFightCount
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
if_equal 1, .Fight1 if_equal 1, .Fight1
@@ -95,7 +95,7 @@ UnknownScript_0x1a927f:
loadtrainer FISHER, TULLY1 loadtrainer FISHER, TULLY1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar TullyFightCount, 1 loadvar wTullyFightCount, 1
clearflag ENGINE_TULLY clearflag ENGINE_TULLY
end end
@@ -103,7 +103,7 @@ UnknownScript_0x1a927f:
loadtrainer FISHER, TULLY2 loadtrainer FISHER, TULLY2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar TullyFightCount, 2 loadvar wTullyFightCount, 2
clearflag ENGINE_TULLY clearflag ENGINE_TULLY
end end
@@ -111,7 +111,7 @@ UnknownScript_0x1a927f:
loadtrainer FISHER, TULLY3 loadtrainer FISHER, TULLY3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar TullyFightCount, 3 loadvar wTullyFightCount, 3
clearflag ENGINE_TULLY clearflag ENGINE_TULLY
end end

16
maps/Route43.asm
View File

@@ -121,7 +121,7 @@ UnknownScript_0x19d0bb:
UnknownScript_0x19d0cf: UnknownScript_0x19d0cf:
scall UnknownScript_0x19d144 scall UnknownScript_0x19d144
winlosstext PokemaniacBrent1BeatenText, $0000 winlosstext PokemaniacBrent1BeatenText, $0000
copybytetovar BrentFightCount copybytetovar wBrentFightCount
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
if_equal 1, .Fight1 if_equal 1, .Fight1
@@ -139,7 +139,7 @@ UnknownScript_0x19d0cf:
loadtrainer POKEMANIAC, BRENT1 loadtrainer POKEMANIAC, BRENT1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar BrentFightCount, 1 loadvar wBrentFightCount, 1
clearflag ENGINE_BRENT clearflag ENGINE_BRENT
end end
@@ -147,7 +147,7 @@ UnknownScript_0x19d0cf:
loadtrainer POKEMANIAC, BRENT2 loadtrainer POKEMANIAC, BRENT2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar BrentFightCount, 2 loadvar wBrentFightCount, 2
clearflag ENGINE_BRENT clearflag ENGINE_BRENT
end end
@@ -155,7 +155,7 @@ UnknownScript_0x19d0cf:
loadtrainer POKEMANIAC, BRENT3 loadtrainer POKEMANIAC, BRENT3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar BrentFightCount, 3 loadvar wBrentFightCount, 3
clearflag ENGINE_BRENT clearflag ENGINE_BRENT
end end
@@ -300,7 +300,7 @@ UnknownScript_0x19d1ad:
UnknownScript_0x19d1c1: UnknownScript_0x19d1c1:
scall UnknownScript_0x19d251 scall UnknownScript_0x19d251
winlosstext PicnickerTiffany3BeatenText, $0000 winlosstext PicnickerTiffany3BeatenText, $0000
copybytetovar TiffanyFightCount copybytetovar wTiffanyFightCount
if_equal 3, .Fight3 if_equal 3, .Fight3
if_equal 2, .Fight2 if_equal 2, .Fight2
if_equal 1, .Fight1 if_equal 1, .Fight1
@@ -318,7 +318,7 @@ UnknownScript_0x19d1c1:
loadtrainer PICNICKER, TIFFANY3 loadtrainer PICNICKER, TIFFANY3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar TiffanyFightCount, 1 loadvar wTiffanyFightCount, 1
clearflag ENGINE_TIFFANY clearflag ENGINE_TIFFANY
end end
@@ -326,7 +326,7 @@ UnknownScript_0x19d1c1:
loadtrainer PICNICKER, TIFFANY1 loadtrainer PICNICKER, TIFFANY1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar TiffanyFightCount, 2 loadvar wTiffanyFightCount, 2
clearflag ENGINE_TIFFANY clearflag ENGINE_TIFFANY
end end
@@ -334,7 +334,7 @@ UnknownScript_0x19d1c1:
loadtrainer PICNICKER, TIFFANY2 loadtrainer PICNICKER, TIFFANY2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar TiffanyFightCount, 3 loadvar wTiffanyFightCount, 3
clearflag ENGINE_TIFFANY clearflag ENGINE_TIFFANY
end end

12
maps/Route44.asm
View File

@@ -53,7 +53,7 @@ UnknownScript_0x19d856:
UnknownScript_0x19d86a: UnknownScript_0x19d86a:
scall UnknownScript_0x19d8f7 scall UnknownScript_0x19d8f7
winlosstext Bird_keeperVance1BeatenText, $0000 winlosstext Bird_keeperVance1BeatenText, $0000
copybytetovar VanceFightCount copybytetovar wVanceFightCount
if_equal 2, .Fight2 if_equal 2, .Fight2
if_equal 1, .Fight1 if_equal 1, .Fight1
if_equal 0, .LoadFight0 if_equal 0, .LoadFight0
@@ -67,7 +67,7 @@ UnknownScript_0x19d86a:
loadtrainer BIRD_KEEPER, VANCE1 loadtrainer BIRD_KEEPER, VANCE1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar VanceFightCount, 1 loadvar wVanceFightCount, 1
clearflag ENGINE_VANCE clearflag ENGINE_VANCE
end end
@@ -75,7 +75,7 @@ UnknownScript_0x19d86a:
loadtrainer BIRD_KEEPER, VANCE2 loadtrainer BIRD_KEEPER, VANCE2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar VanceFightCount, 2 loadvar wVanceFightCount, 2
clearflag ENGINE_VANCE clearflag ENGINE_VANCE
end end
@@ -229,7 +229,7 @@ UnknownScript_0x19d95a:
UnknownScript_0x19d96e: UnknownScript_0x19d96e:
scall UnknownScript_0x19d8f7 scall UnknownScript_0x19d8f7
winlosstext FisherWilton1BeatenText, $0000 winlosstext FisherWilton1BeatenText, $0000
copybytetovar WiltonFightCount copybytetovar wWiltonFightCount
if_equal 2, .Fight2 if_equal 2, .Fight2
if_equal 1, .Fight1 if_equal 1, .Fight1
if_equal 0, .LoadFight0 if_equal 0, .LoadFight0
@@ -243,7 +243,7 @@ UnknownScript_0x19d96e:
loadtrainer FISHER, WILTON1 loadtrainer FISHER, WILTON1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar WiltonFightCount, 1 loadvar wWiltonFightCount, 1
clearflag ENGINE_WILTON clearflag ENGINE_WILTON
end end
@@ -251,7 +251,7 @@ UnknownScript_0x19d96e:
loadtrainer FISHER, WILTON2 loadtrainer FISHER, WILTON2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar WiltonFightCount, 2 loadvar wWiltonFightCount, 2
clearflag ENGINE_WILTON clearflag ENGINE_WILTON
end end

6
maps/Route45.asm
View File

@@ -227,7 +227,7 @@ UnknownScript_0x19e1a4:
UnknownScript_0x19e1b8: UnknownScript_0x19e1b8:
scall UnknownScript_0x19e133 scall UnknownScript_0x19e133
winlosstext HikerParry3BeatenText, $0000 winlosstext HikerParry3BeatenText, $0000
copybytetovar ParryFightCount copybytetovar wParryFightCount
if_equal 2, .Fight2 if_equal 2, .Fight2
if_equal 1, .Fight1 if_equal 1, .Fight1
if_equal 0, .LoadFight0 if_equal 0, .LoadFight0
@@ -241,7 +241,7 @@ UnknownScript_0x19e1b8:
loadtrainer HIKER, PARRY3 loadtrainer HIKER, PARRY3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ParryFightCount, 1 loadvar wParryFightCount, 1
clearflag ENGINE_PARRY clearflag ENGINE_PARRY
end end
@@ -249,7 +249,7 @@ UnknownScript_0x19e1b8:
loadtrainer HIKER, PARRY1 loadtrainer HIKER, PARRY1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ParryFightCount, 2 loadvar wParryFightCount, 2
clearflag ENGINE_PARRY clearflag ENGINE_PARRY
end end

6
maps/Route46.asm
View File

@@ -80,7 +80,7 @@ UnknownScript_0x1a96c6:
UnknownScript_0x1a96da: UnknownScript_0x1a96da:
scall UnknownScript_0x1a9767 scall UnknownScript_0x1a9767
winlosstext PicnickerErin1BeatenText, $0000 winlosstext PicnickerErin1BeatenText, $0000
copybytetovar ErinFightCount copybytetovar wErinFightCount
if_equal 2, .Fight2 if_equal 2, .Fight2
if_equal 1, .Fight1 if_equal 1, .Fight1
if_equal 0, .LoadFight0 if_equal 0, .LoadFight0
@@ -94,7 +94,7 @@ UnknownScript_0x1a96da:
loadtrainer PICNICKER, ERIN1 loadtrainer PICNICKER, ERIN1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ErinFightCount, 1 loadvar wErinFightCount, 1
clearflag ENGINE_ERIN clearflag ENGINE_ERIN
end end
@@ -102,7 +102,7 @@ UnknownScript_0x1a96da:
loadtrainer PICNICKER, ERIN2 loadtrainer PICNICKER, ERIN2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar ErinFightCount, 2 loadvar wErinFightCount, 2
clearflag ENGINE_ERIN clearflag ENGINE_ERIN
end end

48
wram.asm
View File

@@ -2216,36 +2216,36 @@ wMobileBattleRoomTrigger:: ds 1 ; d9c0
SECTION "Events", WRAMX, BANK [1] SECTION "Events", WRAMX, BANK [1]
JackFightCount:: ds 1 wJackFightCount:: ds 1
ds 1 ds 1
HueyFightCount:: ds 1 wHueyFightCount:: ds 1
GavenFightCount:: ds 1 wGavenFightCount:: ds 1
BethFightCount:: ds 1 wBethFightCount:: ds 1
JoseFightCount:: ds 1 wJoseFightCount:: ds 1
ReenaFightCount:: ds 1 wReenaFightCount:: ds 1
JoeyFightCount:: ds 1 wJoeyFightCount:: ds 1
WadeFightCount:: ds 1 wWadeFightCount:: ds 1
RalphFightCount:: ds 1 wRalphFightCount:: ds 1
LizFightCount:: ds 1 wLizFightCount:: ds 1
AnthonyFightCount:: ds 1 wAnthonyFightCount:: ds 1
ToddFightCount:: ds 1 wToddFightCount:: ds 1
GinaFightCount:: ds 1 wGinaFightCount:: ds 1
wda00:: ds 1 wda00:: ds 1
ArnieFightCount:: ds 1 wArnieFightCount:: ds 1
AlanFightCount:: ds 1 wAlanFightCount:: ds 1
DanaFightCount:: ds 1 wDanaFightCount:: ds 1
ChadFightCount:: ds 1 wChadFightCount:: ds 1
ds 1 ds 1
TullyFightCount:: ds 1 wTullyFightCount:: ds 1
BrentFightCount:: ds 1 wBrentFightCount:: ds 1
TiffanyFightCount:: ds 1 wTiffanyFightCount:: ds 1
VanceFightCount:: ds 1 wVanceFightCount:: ds 1
WiltonFightCount:: ds 1 wWiltonFightCount:: ds 1
ds 1 ds 1
ParryFightCount:: ds 1 wParryFightCount:: ds 1
ErinFightCount:: ds 1 wErinFightCount:: ds 1
ds 100 ds 100