summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xsrc/data/cards.asm50
-rwxr-xr-xsrc/text/text_offsets.asm38
-rw-r--r--src/text/texta.asm22
-rw-r--r--src/text/textb.asm8
-rw-r--r--src/text/textc.asm4
-rw-r--r--src/text/textd.asm4
6 files changed, 63 insertions, 63 deletions
diff --git a/src/data/cards.asm b/src/data/cards.asm
index a7ed8ce..4808905 100755
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -841,7 +841,7 @@ ArbokCard: ; 310f3 (c:50f3)
; move 2
energy GRASS, 2, COLORLESS, 1 ; energies
- dw PoisonFangText_ ; name
+ dw PoisonFangName_ ; name
dw InflictPoisonDescription_ ; description
dw NONE ; description (cont)
db 20 ; damage
@@ -869,7 +869,7 @@ ArbokCard: ; 310f3 (c:50f3)
NidoranFCard: ; 31134 (c:5134)
db GRASS ; type
dw $733 ; gfx
- dw NidoranFText_ ; name
+ dw NidoranFName_ ; name
db CIRCLE ; rarity
db MYSTERY | JUNGLE ; set
db NIDORANF
@@ -879,7 +879,7 @@ NidoranFCard: ; 31134 (c:5134)
; move 1
energy GRASS, 1 ; energies
- dw FurySweepesText_ ; name
+ dw FurySweepesName_ ; name
dw TripleAttackX10Description_ ; description
dw NONE ; description (cont)
db 10 ; damage
@@ -894,8 +894,8 @@ NidoranFCard: ; 31134 (c:5134)
; move 2
energy GRASS, 2 ; energies
- dw CallForFamilyText_ ; name
- dw NidoranFsCallForFamilyDescription_ ; description
+ dw CallforFamilyName_ ; name
+ dw NidoranFsCallforFamilyDescription_ ; description
dw NONE ; description (cont)
db 0 ; damage
db 128
@@ -928,7 +928,7 @@ NidorinaCard: ; 31175 (c:5175)
db NIDORINA
db 70 ; hp
db STAGE1 ; stage
- dw NidoranFText_ ; pre-evo name
+ dw NidoranFName_ ; pre-evo name
; move 1
energy GRASS, 1 ; energies
@@ -1689,8 +1689,8 @@ BellsproutCard: ; 31503 (c:5503)
; move 2
energy GRASS, 1 ; energies
- dw CallForFamilyText_ ; name
- dw BellsproutsCallForFamilyDescription_ ; description
+ dw CallforFamilyName_ ; name
+ dw BellsproutsCallforFamilyDescription_ ; description
dw NONE ; description (cont)
db 0 ; damage
db 128
@@ -2749,8 +2749,8 @@ Arcanine1Card: ; 31a17 (c:5a17)
; move 2
energy FIRE, 2 ; energies
- dw FlamesOfRageName_ ; name
- dw FlamesOfRageDescription_ ; description
+ dw FlamesofRageName_ ; name
+ dw FlamesofRageDescription_ ; description
dw NONE ; description (cont)
db 40 ; damage
db 1
@@ -3438,7 +3438,7 @@ PsyduckCard: ; 31d64 (c:5d64)
; move 2
energy WATER, 1 ; energies
- dw FurySweepesText_ ; name
+ dw FurySweepesName_ ; name
dw TripleAttackX10Description_ ; description
dw NONE ; description (cont)
db 10 ; damage
@@ -3915,8 +3915,8 @@ ShellderCard: ; 31fad (c:5fad)
; move 2
energy WATER, 1 ; energies
- dw HideInShellName_ ; name
- dw HideInShellDescription_ ; description
+ dw HideinShellName_ ; name
+ dw HideinShellDescription_ ; description
dw NONE ; description (cont)
db 0 ; damage
db 128
@@ -4006,8 +4006,8 @@ KrabbyCard: ; 3202f (c:602f)
; move 1
energy WATER, 1 ; energies
- dw CallForFamilyText_ ; name
- dw KrabbysCallForFamilyDescription_ ; description
+ dw CallforFamilyName_ ; name
+ dw KrabbysCallforFamilyDescription_ ; description
dw NONE ; description (cont)
db 0 ; damage
db 128
@@ -6073,8 +6073,8 @@ Zapdos3Card: ; 32a16 (c:6a16)
; move 1
energy 0 ; energies
- dw PealOfThunderName_ ; name
- dw PealOfThunderDescription_ ; description
+ dw PealofThunderName_ ; name
+ dw PealofThunderDescription_ ; description
dw NONE ; description (cont)
db 0 ; damage
db 4
@@ -6194,7 +6194,7 @@ SandslashCard: ; 32a98 (c:6a98)
; move 2
energy FIGHTING, 2 ; energies
- dw FurySweepesText_ ; name
+ dw FurySweepesName_ ; name
dw TripleAttackX20Description_ ; description
dw NONE ; description (cont)
db 20 ; damage
@@ -6391,7 +6391,7 @@ PrimeapeCard: ; 32b9c (c:6b9c)
; move 1
energy FIGHTING, 2 ; energies
- dw FurySweepesText_ ; name
+ dw FurySweepesName_ ; name
dw TripleAttackX20Description_ ; description
dw NONE ; description (cont)
db 20 ; damage
@@ -6883,8 +6883,8 @@ Marowak1Card: ; 32de5 (c:6de5)
; move 2
energy FIGHTING, 2, COLORLESS, 1 ; energies
- dw CallForFriendName_ ; name
- dw CallForFriendDescription_ ; description
+ dw CallforFriendName_ ; name
+ dw CallforFriendDescription_ ; description
dw NONE ; description (cont)
db 0 ; damage
db 128
@@ -9162,8 +9162,8 @@ WigglytuffCard: ; 338d0 (c:78d0)
; move 2
energy COLORLESS, 3 ; energies
- dw DoTheWaveName_ ; name
- dw DoTheWaveDescription_ ; description
+ dw DotheWaveName_ ; name
+ dw DotheWaveDescription_ ; description
dw NONE ; description (cont)
db 10 ; damage
db 1
@@ -10485,12 +10485,12 @@ ItemFinderCard: ; 33f47 (c:7f47)
GustofWindCard: ; 33f55 (c:7f55)
db TRAINER_CARD ; type
dw $5308 ; gfx
- dw GustOfWindName_ ; name
+ dw GustofWindName_ ; name
db CIRCLE ; rarity
db EVOLUTION | NONE ; set
db GUST_OF_WIND
dw $4f92 ; function
- dw GustOfWindDescription_ ; description
+ dw GustofWindDescription_ ; description
dw NONE ; description (cont)
DevolutionSprayCard: ; 33f63 (c:7f63)
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index 5b810fc..71720a9 100755
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -2121,14 +2121,14 @@ TextOffsets:: ; 34000 (d:4000)
text ArbokName
text TerrorStrikeName
text TerrorStrikeDescription
- text PoisonFangText
+ text PoisonFangName
text ArbokKind
text ArbokDescription
- text NidoranFText
- text FurySweepesText
+ text NidoranFName
+ text FurySweepesName
text TripleAttackX10Description
- text CallForFamilyText
- text NidoranFsCallForFamilyDescription
+ text CallforFamilyName
+ text NidoranFsCallforFamilyDescription
text NidoranFKind
text NidoranFDescription
text NidorinaName
@@ -2201,7 +2201,7 @@ TextOffsets:: ; 34000 (d:4000)
text VenomothKind
text VenomothDescription
text BellsproutName
- text BellsproutsCallForFamilyDescription
+ text BellsproutsCallforFamilyDescription
text BellsproutDescription
text WeepinbellName
text RazorLeafName
@@ -2299,8 +2299,8 @@ TextOffsets:: ; 34000 (d:4000)
text ArcanineName
text QuickAttackName
text QuickAttackDescription
- text FlamesOfRageName
- text FlamesOfRageDescription
+ text FlamesofRageName
+ text FlamesofRageDescription
text ArcanineKind
text Arcanine1Description
text ArcaninesFlamethrowerDescription
@@ -2401,8 +2401,8 @@ TextOffsets:: ; 34000 (d:4000)
text IceBeamName
text DewgongDescription
text ShellderName
- text HideInShellName
- text HideInShellDescription
+ text HideinShellName
+ text HideinShellDescription
text ShellderKind
text ShellderDescription
text CloysterName
@@ -2411,7 +2411,7 @@ TextOffsets:: ; 34000 (d:4000)
text SpikeCannonName
text CloysterDescription
text KrabbyName
- text KrabbysCallForFamilyDescription
+ text KrabbysCallforFamilyDescription
text KrabbyKind
text KrabbyDescription
text KinglerName
@@ -2566,8 +2566,8 @@ TextOffsets:: ; 34000 (d:4000)
text ThunderboltName
text ThunderboltDescription
text Zapdos2Description
- text PealOfThunderName
- text PealOfThunderDescription
+ text PealofThunderName
+ text PealofThunderDescription
text BigThunderName
text BigThunderDescription
text Zapdos3Description
@@ -2639,8 +2639,8 @@ TextOffsets:: ; 34000 (d:4000)
text CuboneDescription
text MarowakName
text BonemerangName
- text CallForFriendName
- text CallForFriendDescription
+ text CallforFriendName
+ text CallforFriendDescription
text MarowakKind
text Marowak1Description
text BoneAttackName
@@ -2834,8 +2834,8 @@ TextOffsets:: ; 34000 (d:4000)
text LullabyName
text Jigglypuff3Description
text WigglytuffName
- text DoTheWaveName
- text DoTheWaveDescription
+ text DotheWaveName
+ text DotheWaveDescription
text WigglytuffDescription
text MeowthName
text CatPunchName
@@ -2971,8 +2971,8 @@ TextOffsets:: ; 34000 (d:4000)
text DefenderDescription
text ItemFinderName
text ItemFinderDescription
- text GustOfWindName
- text GustOfWindDescription
+ text GustofWindName
+ text GustofWindDescription
text DevolutionSprayName
text DevolutionSprayDescription
text DevolutionSprayDescriptionCont
diff --git a/src/text/texta.asm b/src/text/texta.asm
index a345e76..c3447f4 100644
--- a/src/text/texta.asm
+++ b/src/text/texta.asm
@@ -53,7 +53,7 @@ TerrorStrikeDescription: ; 581bc (16:41bc)
db "(Do the damage before switching\n"
db "the Pok`mon.)",TX_END
-PoisonFangText: ; 58277 (16:4277)
+PoisonFangName: ; 58277 (16:4277)
db TX_START,"Poison Fang",TX_END
ArbokKind: ; 58284 (16:4284)
@@ -64,20 +64,20 @@ ArbokDescription: ; 5828b (16:428b)
db "warning markings on its belly differ\n"
db "from area to area.",TX_END
-NidoranFText: ; 582e5 (16:42e5)
+NidoranFName: ; 582e5 (16:42e5)
db TX_START,"Nidoran%",TX_END
-FurySweepesText: ; 582ef (16:42ef)
+FurySweepesName: ; 582ef (16:42ef)
db TX_START,"Fury Swipes",TX_END
TripleAttackX10Description: ; 582fc (16:42fc)
db TX_START,"Flip 3 coins. This attack does 10\n"
db "damage times the number of heads.",TX_END
-CallForFamilyText: ; 58341 (16:4341)
+CallforFamilyName: ; 58341 (16:4341)
db TX_START,"Call for Family",TX_END
-NidoranFsCallForFamilyDescription: ; 58352 (16:4352)
+NidoranFsCallforFamilyDescription: ; 58352 (16:4352)
db TX_START,"Search your deck for a Basic Pok`mon\n"
db "named Nidoran% or Nidoran$ and put\n"
db "it onto your Bench. Shuffle your\n"
@@ -378,7 +378,7 @@ VenomothDescription: ; 59284 (16:5284)
BellsproutName: ; 592e5 (16:52e5)
db TX_START,"Bellsprout",TX_END
-BellsproutsCallForFamilyDescription: ; 592f1 (16:52f1)
+BellsproutsCallforFamilyDescription: ; 592f1 (16:52f1)
db TX_START,"Search your deck for a Basic Pok`mon\n"
db "named Bellsprout and put it onto\n"
db "your Bench. Shuffle your deck\n"
@@ -771,10 +771,10 @@ QuickAttackDescription: ; 5a56a (16:656a)
db "if tails, this attack does 10\n"
db "damage.",TX_END
-FlamesOfRageName: ; 5a5d8 (16:65d8)
+FlamesofRageName: ; 5a5d8 (16:65d8)
db TX_START,"Flames of Rage",TX_END
-FlamesOfRageDescription: ; 5a5e8 (16:65e8)
+FlamesofRageDescription: ; 5a5e8 (16:65e8)
db TX_START,"Discard 2 ",TX_FIRE," Energy cards attached\n"
db "to Arcanine in order to use this\n"
db "attack. This attack does 40 damage\n"
@@ -1187,10 +1187,10 @@ DewgongDescription: ; 5bb11 (16:7b11)
ShellderName: ; 5bb6e (16:7b6e)
db TX_START,"Shellder",TX_END
-HideInShellName: ; 5bb78 (16:7b78)
+HideinShellName: ; 5bb78 (16:7b78)
db TX_START,"Hide in Shell",TX_END
-HideInShellDescription: ; 5bb87 (16:7b87)
+HideinShellDescription: ; 5bb87 (16:7b87)
db TX_START,"Flip a coin. If heads, prevent all\n"
db "damage done to Shellder during your\n"
db "opponent's next turn. (Any other\n"
@@ -1227,7 +1227,7 @@ CloysterDescription: ; 5bd09 (16:7d09)
KrabbyName: ; 5bd63 (16:7d63)
db TX_START,"Krabby",TX_END
-KrabbysCallForFamilyDescription: ; 5bd6b (16:7d6b)
+KrabbysCallforFamilyDescription: ; 5bd6b (16:7d6b)
db TX_START,"Search your deck for a Basic Pok`mon\n"
db "named Krabby and put it onto your\n"
db "Bench. Shuffle your deck afterward.\n"
diff --git a/src/text/textb.asm b/src/text/textb.asm
index 51b1f8e..b52b915 100644
--- a/src/text/textb.asm
+++ b/src/text/textb.asm
@@ -621,10 +621,10 @@ Zapdos2Description: ; 5e2e7 (17:62e7)
db "appear from clouds while wielding\n"
db "enormous lightning bolts.",TX_END
-PealOfThunderName: ; 5e345 (17:6345)
+PealofThunderName: ; 5e345 (17:6345)
db TX_START,"Peal of Thunder",TX_END
-PealOfThunderDescription: ; 5e356 (17:6356)
+PealofThunderDescription: ; 5e356 (17:6356)
db TX_START,"When you put Zapdos into play during\n"
db "your turn (not during set-up), do\n"
db "30 damage to a Pok`mon other than\n"
@@ -924,10 +924,10 @@ MarowakName: ; 5f329 (17:7329)
BonemerangName: ; 5f332 (17:7332)
db TX_START,"Bonemerang",TX_END
-CallForFriendName: ; 5f33e (17:733e)
+CallforFriendName: ; 5f33e (17:733e)
db TX_START,"Call for Friend",TX_END
-CallForFriendDescription: ; 5f34f (17:734f)
+CallforFriendDescription: ; 5f34f (17:734f)
db TX_START,"Search your deck for a ",TX_FIGHTING," Basic\n"
db "Pok`mon card and put it onto your\n"
db "Bench. Shuffle your deck afterward.\n"
diff --git a/src/text/textc.asm b/src/text/textc.asm
index 08e78ee..7243527 100644
--- a/src/text/textc.asm
+++ b/src/text/textc.asm
@@ -605,10 +605,10 @@ Jigglypuff3Description: ; 62145 (18:6145)
WigglytuffName: ; 621ac (18:61ac)
db TX_START,"Wigglytuff",TX_END
-DoTheWaveName: ; 621b8 (18:61b8)
+DotheWaveName: ; 621b8 (18:61b8)
db TX_START,"Do the Wave",TX_END
-DoTheWaveDescription: ; 621c5 (18:61c5)
+DotheWaveDescription: ; 621c5 (18:61c5)
db TX_START,"Does 10 damage plus 10 more damage\n"
db "for each of your Benched Pok`mon.",TX_END
diff --git a/src/text/textd.asm b/src/text/textd.asm
index 2c4bb4c..d300663 100644
--- a/src/text/textd.asm
+++ b/src/text/textd.asm
@@ -55,10 +55,10 @@ ItemFinderDescription: ; 6434f (19:434f)
db "card from your discard pile into\n"
db "your hand.",TX_END
-GustOfWindName: ; 643c2 (19:43c2)
+GustofWindName: ; 643c2 (19:43c2)
db TX_START,"Gust of Wind",TX_END
-GustOfWindDescription: ; 643d0 (19:43d0)
+GustofWindDescription: ; 643d0 (19:43d0)
db TX_START,"Choose 1 of your opponent's Benched\n"
db "Pok`mon and switch it with his or\n"
db "her Active Pok`mon.",TX_END
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 16:11:06 +0000