correct some text labels with multiple meanings

5 files changed, 15 insertions, 15 deletions

diff --git a/src/data/cards.asm b/src/data/cards.asm
index d791dcb..ca5aa34 100755
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -1875,7 +1875,7 @@ ExeggcuteCard: ; 31648 (c:5648)
 
 	; move 1
 	energy PSYCHIC, 1 ; energies
-	tx HypnosisName ; name
+	tx DrowzeeKindOrHypnosisName ; name
 	tx InflictSleepDescription ; description
 	dw NONE ; description (cont)
 	db 0 ; damage
@@ -6239,7 +6239,7 @@ MachopCard: ; 32bdd (c:6bdd)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx SuperpowerName ; kind
+	tx MachopKindOrSuperpowerName ; kind
 	db 66 ; Pokedex number
 	db 0
 	db 20 ; level
@@ -6290,7 +6290,7 @@ MachokeCard: ; 32c1e (c:6c1e)
 	db 3 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx SuperpowerName ; kind
+	tx MachopKindOrSuperpowerName ; kind
 	db 67 ; Pokedex number
 	db 0
 	db 40 ; level
@@ -6341,7 +6341,7 @@ MachampCard: ; 32c5f (c:6c5f)
 	db 3 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx SuperpowerName ; kind
+	tx MachopKindOrSuperpowerName ; kind
 	db 68 ; Pokedex number
 	db 0
 	db 67 ; level
@@ -7536,7 +7536,7 @@ Haunter2Card: ; 33277 (c:7277)
 
 	; move 1
 	energy PSYCHIC, 1 ; energies
-	tx HypnosisName ; name
+	tx DrowzeeKindOrHypnosisName ; name
 	tx InflictSleepDescription ; description
 	dw NONE ; description (cont)
 	db 0 ; damage
@@ -7667,7 +7667,7 @@ DrowzeeCard: ; 332f9 (c:72f9)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx HypnosisName ; kind
+	tx DrowzeeKindOrHypnosisName ; kind
 	db 96 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -7718,7 +7718,7 @@ HypnoCard: ; 3333a (c:733a)
 	db 2 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx HypnosisName ; kind
+	tx DrowzeeKindOrHypnosisName ; kind
 	db 97 ; Pokedex number
 	db 0
 	db 36 ; level
@@ -7769,7 +7769,7 @@ MrMimeCard: ; 3337b (c:737b)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx MrMimeKindAndBarrierName ; kind
+	tx MrMimeKindOrBarrierName ; kind
 	db 122 ; Pokedex number
 	db 0
 	db 28 ; level
@@ -7856,7 +7856,7 @@ Mewtwo1Card: ; 333fd (c:73fd)
 
 	; move 2
 	energy PSYCHIC, 2 ; energies
-	tx MrMimeKindAndBarrierName ; name
+	tx MrMimeKindOrBarrierName ; name
 	tx BarrierDescription ; description
 	dw NONE ; description (cont)
 	db 0 ; damage
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index fce099e..1e6e14f 100755
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -2224,7 +2224,7 @@ TextOffsets:: ; 34000 (d:4000)
 	text ToxicGasDescription
 	text MukDescription
 	text ExeggcuteName
-	text HypnosisName
+	text DrowzeeKindOrHypnosisName
 	text ExeggcutesLeechSeedDescription
 	text ExeggcuteKind
 	text ExeggcuteDescription
@@ -2598,7 +2598,7 @@ TextOffsets:: ; 34000 (d:4000)
 	text PrimeapeDescription
 	text MachopName
 	text LowKickName
-	text SuperpowerName
+	text MachopKindOrSuperpowerName
 	text MachopDescription
 	text MachokeName
 	text KarateChopName
@@ -2747,7 +2747,7 @@ TextOffsets:: ; 34000 (d:4000)
 	text InvisibleWallDescriptionCont
 	text MeditateName
 	text MrMimesMeditateDescription
-	text MrMimeKindAndBarrierName
+	text MrMimeKindOrBarrierName
 	text MrMimeDescription
 	text JynxName
 	text DoubleAttackX10Description
diff --git a/src/text/texta.asm b/src/text/texta.asm
index 1de7c7b..48adce3 100644
--- a/src/text/texta.asm
+++ b/src/text/texta.asm
@@ -472,7 +472,7 @@ MukDescription: ; 59750 (16:5750)
 ExeggcuteName: ; 597b1 (16:57b1)
 	db TX_START,"Exeggcute",TX_END
 
-HypnosisName: ; 597bc (16:57bc)
+DrowzeeKindOrHypnosisName: ; 597bc (16:57bc)
 	db TX_START,"Hypnosis",TX_END
 
 ExeggcutesLeechSeedDescription: ; 597c6 (16:57c6)
diff --git a/src/text/textb.asm b/src/text/textb.asm
index 0786360..f7a84da 100644
--- a/src/text/textb.asm
+++ b/src/text/textb.asm
@@ -753,7 +753,7 @@ MachopName: ; 5ea27 (17:6a27)
 LowKickName: ; 5ea2f (17:6a2f)
 	db TX_START,"Low Kick",TX_END
 
-SuperpowerName: ; 5ea39 (17:6a39)
+MachopKindOrSuperpowerName: ; 5ea39 (17:6a39)
 	db TX_START,"Superpower",TX_END
 
 MachopDescription: ; 5ea45 (17:6a45)
diff --git a/src/text/textc.asm b/src/text/textc.asm
index 7243527..7887c18 100644
--- a/src/text/textc.asm
+++ b/src/text/textc.asm
@@ -231,7 +231,7 @@ MrMimesMeditateDescription: ; 60d2b (18:4d2b)
 	db "for each damage counter on the\n"
 	db "Defending Pok`mon.",TX_END
 
-MrMimeKindAndBarrierName: ; 60d81 (18:4d81)
+MrMimeKindOrBarrierName: ; 60d81 (18:4d81)
 	db TX_START,"Barrier",TX_END
 
 MrMimeDescription: ; 60d8a (18:4d8a)