Rename 'Kind' labels (issue #36)

author: xCrystal <rgr.crystal@gmail.com> 2018-06-30 18:26:11 +0200
committer: xCrystal <rgr.crystal@gmail.com> 2018-06-30 18:26:11 +0200
commit: ec76e14e6ed4506d4081eb2c1b510747a33c7a53 (patch)
tree: 0adf241b7ed4c018553d870ff41f04b18933275f /src
parent: 32f3634c48b336290d10eb232a69412266549c5b (diff)
9 files changed, 387 insertions, 387 deletions
diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm
index e857aa6..c110a69 100644
--- a/src/constants/card_data_constants.asm
+++ b/src/constants/card_data_constants.asm
@@ -62,7 +62,7 @@ CARD_DATA_MOVE2_ANIMATION       EQU $31
 CARD_DATA_RETREAT_COST          EQU $32
 CARD_DATA_WEAKNESS              EQU $33
 CARD_DATA_RESISTANCE            EQU $34
-CARD_DATA_KIND                  EQU $35
+CARD_DATA_CATEGORY              EQU $35
 CARD_DATA_POKEDEX_NUMBER        EQU $37
 CARD_DATA_UNKNOWN1              EQU $38
 CARD_DATA_LEVEL                 EQU $39
diff --git a/src/data/cards.asm b/src/data/cards.asm
index 480607e..db2a9ec 100644
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -275,7 +275,7 @@ BulbasaurCard: ; 30e28 (c:4e28)
 	db 1 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx BulbasaurKind ; kind
+	tx SeedName ; category
 	db 1 ; Pokedex number
 	db 0
 	db 13 ; level
@@ -326,7 +326,7 @@ IvysaurCard: ; 30e69 (c:4e69)
 	db 1 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx BulbasaurKind ; kind
+	tx SeedName ; category
 	db 2 ; Pokedex number
 	db 0
 	db 20 ; level
@@ -377,7 +377,7 @@ Venusaur1Card: ; 30eaa (c:4eaa)
 	db 2 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx BulbasaurKind ; kind
+	tx SeedName ; category
 	db 3 ; Pokedex number
 	db 0
 	db 64 ; level
@@ -428,7 +428,7 @@ Venusaur2Card: ; 30eeb (c:4eeb)
 	db 2 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx BulbasaurKind ; kind
+	tx SeedName ; category
 	db 3 ; Pokedex number
 	db 0
 	db 67 ; level
@@ -479,7 +479,7 @@ CaterpieCard: ; 30f2c (c:4f2c)
 	db 1 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx CaterpieKind ; kind
+	tx WormName ; category
 	db 10 ; Pokedex number
 	db 0
 	db 13 ; level
@@ -530,7 +530,7 @@ MetapodCard: ; 30f6d (c:4f6d)
 	db 2 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx MetapodKind ; kind
+	tx CocoonName ; category
 	db 11 ; Pokedex number
 	db 0
 	db 21 ; level
@@ -581,7 +581,7 @@ ButterfreeCard: ; 30fae (c:4fae)
 	db 0 ; retreat cost
 	db WR_FIRE ; weakness
 	db WR_FIGHTING ; resistance
-	tx ButterfreeKind ; kind
+	tx ButterflyName ; category
 	db 12 ; Pokedex number
 	db 0
 	db 28 ; level
@@ -632,7 +632,7 @@ WeedleCard: ; 30fef (c:4fef)
 	db 1 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx WeedleKind ; kind
+	tx HairyBugName ; category
 	db 13 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -683,7 +683,7 @@ KakunaCard: ; 31030 (c:5030)
 	db 2 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx MetapodKind ; kind
+	tx CocoonName ; category
 	db 14 ; Pokedex number
 	db 0
 	db 23 ; level
@@ -734,7 +734,7 @@ BeedrillCard: ; 31071 (c:5071)
 	db 0 ; retreat cost
 	db WR_FIRE ; weakness
 	db WR_FIGHTING ; resistance
-	tx BeedrillKind ; kind
+	tx PoisonBeeName ; category
 	db 15 ; Pokedex number
 	db 0
 	db 32 ; level
@@ -785,7 +785,7 @@ EkansCard: ; 310b2 (c:50b2)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx EkansKind ; kind
+	tx SnakeName ; category
 	db 23 ; Pokedex number
 	db 0
 	db 10 ; level
@@ -836,7 +836,7 @@ ArbokCard: ; 310f3 (c:50f3)
 	db 2 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx ArbokKind ; kind
+	tx CobraName ; category
 	db 24 ; Pokedex number
 	db 0
 	db 27 ; level
@@ -887,7 +887,7 @@ NidoranFCard: ; 31134 (c:5134)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx NidoranFKind ; kind
+	tx PoisonPinName ; category
 	db 29 ; Pokedex number
 	db 0
 	db 13 ; level
@@ -938,7 +938,7 @@ NidorinaCard: ; 31175 (c:5175)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx NidoranFKind ; kind
+	tx PoisonPinName ; category
 	db 30 ; Pokedex number
 	db 0
 	db 24 ; level
@@ -989,7 +989,7 @@ NidoqueenCard: ; 311b6 (c:51b6)
 	db 3 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx NidoqueenKind ; kind
+	tx DrillName ; category
 	db 31 ; Pokedex number
 	db 0
 	db 43 ; level
@@ -1040,7 +1040,7 @@ NidoranMCard: ; 311f7 (c:51f7)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx NidoranFKind ; kind
+	tx PoisonPinName ; category
 	db 32 ; Pokedex number
 	db 0
 	db 20 ; level
@@ -1091,7 +1091,7 @@ NidorinoCard: ; 31238 (c:5238)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx NidoranFKind ; kind
+	tx PoisonPinName ; category
 	db 33 ; Pokedex number
 	db 0
 	db 25 ; level
@@ -1142,7 +1142,7 @@ NidokingCard: ; 31279 (c:5279)
 	db 3 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx NidoqueenKind ; kind
+	tx DrillName ; category
 	db 34 ; Pokedex number
 	db 0
 	db 48 ; level
@@ -1193,7 +1193,7 @@ ZubatCard: ; 312ba (c:52ba)
 	db 0 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db WR_FIGHTING ; resistance
-	tx ZubatKind ; kind
+	tx BatName ; category
 	db 41 ; Pokedex number
 	db 0
 	db 10 ; level
@@ -1244,7 +1244,7 @@ GolbatCard: ; 312fb (c:52fb)
 	db 0 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db WR_FIGHTING ; resistance
-	tx ZubatKind ; kind
+	tx BatName ; category
 	db 42 ; Pokedex number
 	db 0
 	db 29 ; level
@@ -1295,7 +1295,7 @@ OddishCard: ; 3133c (c:533c)
 	db 1 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx OddishKind ; kind
+	tx WeedName ; category
 	db 43 ; Pokedex number
 	db 0
 	db 8 ; level
@@ -1346,7 +1346,7 @@ GloomCard: ; 3137d (c:537d)
 	db 1 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx OddishKind ; kind
+	tx WeedName ; category
 	db 44 ; Pokedex number
 	db 0
 	db 22 ; level
@@ -1397,7 +1397,7 @@ VileplumeCard: ; 313be (c:53be)
 	db 2 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx VileplumeKind ; kind
+	tx FlowerName ; category
 	db 45 ; Pokedex number
 	db 0
 	db 35 ; level
@@ -1448,7 +1448,7 @@ ParasCard: ; 313ff (c:53ff)
 	db 1 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx ParasKind ; kind
+	tx MushroomName ; category
 	db 46 ; Pokedex number
 	db 0
 	db 8 ; level
@@ -1499,7 +1499,7 @@ ParasectCard: ; 31440 (c:5440)
 	db 1 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx ParasKind ; kind
+	tx MushroomName ; category
 	db 47 ; Pokedex number
 	db 0
 	db 28 ; level
@@ -1550,7 +1550,7 @@ VenonatCard: ; 31481 (c:5481)
 	db 1 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx VenonatKind ; kind
+	tx InsectName ; category
 	db 48 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -1601,7 +1601,7 @@ VenomothCard: ; 314c2 (c:54c2)
 	db 0 ; retreat cost
 	db WR_FIRE ; weakness
 	db WR_FIGHTING ; resistance
-	tx VenomothKind ; kind
+	tx PoisonmothName ; category
 	db 49 ; Pokedex number
 	db 0
 	db 28 ; level
@@ -1652,7 +1652,7 @@ BellsproutCard: ; 31503 (c:5503)
 	db 1 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx VileplumeKind ; kind
+	tx FlowerName ; category
 	db 69 ; Pokedex number
 	db 0
 	db 11 ; level
@@ -1703,7 +1703,7 @@ WeepinbellCard: ; 31544 (c:5544)
 	db 1 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx WeepinbellKind ; kind
+	tx FlycatcherName ; category
 	db 70 ; Pokedex number
 	db 0
 	db 28 ; level
@@ -1754,7 +1754,7 @@ VictreebelCard: ; 31585 (c:5585)
 	db 2 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx WeepinbellKind ; kind
+	tx FlycatcherName ; category
 	db 71 ; Pokedex number
 	db 0
 	db 42 ; level
@@ -1805,7 +1805,7 @@ GrimerCard: ; 315c6 (c:55c6)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx GrimerKindOrSludgeName ; kind
+	tx SludgeName ; category
 	db 88 ; Pokedex number
 	db 0
 	db 17 ; level
@@ -1841,7 +1841,7 @@ MukCard: ; 31607 (c:5607)
 
 	; move 2
 	energy GRASS, 3 ; energies
-	tx GrimerKindOrSludgeName ; name
+	tx SludgeName ; name
 	tx MayInflictPoisonDescription ; description
 	dw NONE ; description (cont)
 	db 30 ; damage
@@ -1856,7 +1856,7 @@ MukCard: ; 31607 (c:5607)
 	db 2 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx GrimerKindOrSludgeName ; kind
+	tx SludgeName ; category
 	db 89 ; Pokedex number
 	db 0
 	db 34 ; level
@@ -1878,7 +1878,7 @@ ExeggcuteCard: ; 31648 (c:5648)
 
 	; move 1
 	energy PSYCHIC, 1 ; energies
-	tx DrowzeeKindOrHypnosisName ; name
+	tx HypnosisName ; name
 	tx InflictSleepDescription ; description
 	dw NONE ; description (cont)
 	db 0 ; damage
@@ -1907,7 +1907,7 @@ ExeggcuteCard: ; 31648 (c:5648)
 	db 1 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx ExeggcuteKind ; kind
+	tx EggName ; category
 	db 102 ; Pokedex number
 	db 0
 	db 14 ; level
@@ -1958,7 +1958,7 @@ ExeggutorCard: ; 31689 (c:5689)
 	db 3 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx ExeggutorKind ; kind
+	tx CoconutName ; category
 	db 103 ; Pokedex number
 	db 0
 	db 35 ; level
@@ -2009,7 +2009,7 @@ KoffingCard: ; 316ca (c:56ca)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx KoffingKind ; kind
+	tx PoisonGasName ; category
 	db 109 ; Pokedex number
 	db 0
 	db 13 ; level
@@ -2060,7 +2060,7 @@ WeezingCard: ; 3170b (c:570b)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx KoffingKind ; kind
+	tx PoisonGasName ; category
 	db 110 ; Pokedex number
 	db 0
 	db 27 ; level
@@ -2111,7 +2111,7 @@ Tangela1Card: ; 3174c (c:574c)
 	db 2 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx TangelaKind ; kind
+	tx VineName ; category
 	db 114 ; Pokedex number
 	db 0
 	db 8 ; level
@@ -2162,7 +2162,7 @@ Tangela2Card: ; 3178d (c:578d)
 	db 2 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx TangelaKind ; kind
+	tx VineName ; category
 	db 114 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -2213,7 +2213,7 @@ ScytherCard: ; 317ce (c:57ce)
 	db 0 ; retreat cost
 	db WR_FIRE ; weakness
 	db WR_FIGHTING ; resistance
-	tx ScytherKind ; kind
+	tx MantisName ; category
 	db 123 ; Pokedex number
 	db 0
 	db 25 ; level
@@ -2264,7 +2264,7 @@ PinsirCard: ; 3180f (c:580f)
 	db 1 ; retreat cost
 	db WR_FIRE ; weakness
 	db NONE ; resistance
-	tx PinsirKind ; kind
+	tx StagbeetleName ; category
 	db 127 ; Pokedex number
 	db 0
 	db 24 ; level
@@ -2315,7 +2315,7 @@ CharmanderCard: ; 31850 (c:5850)
 	db 1 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx CharmanderKind ; kind
+	tx LizardName ; category
 	db 4 ; Pokedex number
 	db 0
 	db 10 ; level
@@ -2366,7 +2366,7 @@ CharmeleonCard: ; 31891 (c:5891)
 	db 1 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx CharmeleonKind ; kind
+	tx FlameName ; category
 	db 5 ; Pokedex number
 	db 0
 	db 32 ; level
@@ -2417,7 +2417,7 @@ CharizardCard: ; 318d2 (c:58d2)
 	db 3 ; retreat cost
 	db WR_WATER ; weakness
 	db WR_FIGHTING ; resistance
-	tx CharmeleonKind ; kind
+	tx FlameName ; category
 	db 6 ; Pokedex number
 	db 0
 	db 76 ; level
@@ -2468,7 +2468,7 @@ VulpixCard: ; 31913 (c:5913)
 	db 1 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx VulpixKind ; kind
+	tx FoxName ; category
 	db 37 ; Pokedex number
 	db 0
 	db 11 ; level
@@ -2519,7 +2519,7 @@ Ninetails1Card: ; 31954 (c:5954)
 	db 1 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx VulpixKind ; kind
+	tx FoxName ; category
 	db 38 ; Pokedex number
 	db 0
 	db 32 ; level
@@ -2570,7 +2570,7 @@ Ninetails2Card: ; 31995 (c:5995)
 	db 1 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx VulpixKind ; kind
+	tx FoxName ; category
 	db 38 ; Pokedex number
 	db 0
 	db 35 ; level
@@ -2621,7 +2621,7 @@ GrowlitheCard: ; 319d6 (c:59d6)
 	db 1 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx GrowlitheKind ; kind
+	tx PuppyName ; category
 	db 58 ; Pokedex number
 	db 0
 	db 18 ; level
@@ -2672,7 +2672,7 @@ Arcanine1Card: ; 31a17 (c:5a17)
 	db 1 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx ArcanineKind ; kind
+	tx LegendaryName ; category
 	db 59 ; Pokedex number
 	db 0
 	db 34 ; level
@@ -2723,7 +2723,7 @@ Arcanine2Card: ; 31a58 (c:5a58)
 	db 3 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx ArcanineKind ; kind
+	tx LegendaryName ; category
 	db 59 ; Pokedex number
 	db 0
 	db 45 ; level
@@ -2774,7 +2774,7 @@ PonytaCard: ; 31a99 (c:5a99)
 	db 1 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx PonytaKind ; kind
+	tx FireHorseName ; category
 	db 77 ; Pokedex number
 	db 0
 	db 10 ; level
@@ -2825,7 +2825,7 @@ RapidashCard: ; 31ada (c:5ada)
 	db 0 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx PonytaKind ; kind
+	tx FireHorseName ; category
 	db 78 ; Pokedex number
 	db 0
 	db 33 ; level
@@ -2876,7 +2876,7 @@ Magmar1Card: ; 31b1b (c:5b1b)
 	db 2 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx MagmarKind ; kind
+	tx SpitfireName ; category
 	db 126 ; Pokedex number
 	db 0
 	db 24 ; level
@@ -2927,7 +2927,7 @@ Magmar2Card: ; 31b5c (c:5b5c)
 	db 1 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx MagmarKind ; kind
+	tx SpitfireName ; category
 	db 126 ; Pokedex number
 	db 0
 	db 31 ; level
@@ -2978,7 +2978,7 @@ Flareon1Card: ; 31b9d (c:5b9d)
 	db 1 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx CharmeleonKind ; kind
+	tx FlameName ; category
 	db 136 ; Pokedex number
 	db 0
 	db 22 ; level
@@ -3029,7 +3029,7 @@ Flareon2Card: ; 31bde (c:5bde)
 	db 1 ; retreat cost
 	db WR_WATER ; weakness
 	db NONE ; resistance
-	tx CharmeleonKind ; kind
+	tx FlameName ; category
 	db 136 ; Pokedex number
 	db 0
 	db 28 ; level
@@ -3080,7 +3080,7 @@ Moltres1Card: ; 31c1f (c:5c1f)
 	db 2 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx CharmeleonKind ; kind
+	tx FlameName ; category
 	db 146 ; Pokedex number
 	db 0
 	db 35 ; level
@@ -3131,7 +3131,7 @@ Moltres2Card: ; 31c60 (c:5c60)
 	db 2 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx CharmeleonKind ; kind
+	tx FlameName ; category
 	db 146 ; Pokedex number
 	db 0
 	db 37 ; level
@@ -3182,7 +3182,7 @@ SquirtleCard: ; 31ca1 (c:5ca1)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx SquirtleKind ; kind
+	tx TinyTurtleName ; category
 	db 7 ; Pokedex number
 	db 0
 	db 8 ; level
@@ -3233,7 +3233,7 @@ WartortleCard: ; 31ce2 (c:5ce2)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx WartortleKind ; kind
+	tx TurtleName ; category
 	db 8 ; Pokedex number
 	db 0
 	db 22 ; level
@@ -3284,7 +3284,7 @@ BlastoiseCard: ; 31d23 (c:5d23)
 	db 3 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx BlastoiseKind ; kind
+	tx ShellfishName ; category
 	db 9 ; Pokedex number
 	db 0
 	db 52 ; level
@@ -3335,7 +3335,7 @@ PsyduckCard: ; 31d64 (c:5d64)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx PsyduckKind ; kind
+	tx DuckName ; category
 	db 54 ; Pokedex number
 	db 0
 	db 15 ; level
@@ -3386,7 +3386,7 @@ GolduckCard: ; 31da5 (c:5da5)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx PsyduckKind ; kind
+	tx DuckName ; category
 	db 55 ; Pokedex number
 	db 0
 	db 27 ; level
@@ -3437,7 +3437,7 @@ PoliwagCard: ; 31de6 (c:5de6)
 	db 1 ; retreat cost
 	db WR_GRASS ; weakness
 	db NONE ; resistance
-	tx PoliwagKind ; kind
+	tx TadpoleName ; category
 	db 60 ; Pokedex number
 	db 0
 	db 13 ; level
@@ -3488,7 +3488,7 @@ PoliwhirlCard: ; 31e27 (c:5e27)
 	db 1 ; retreat cost
 	db WR_GRASS ; weakness
 	db NONE ; resistance
-	tx PoliwagKind ; kind
+	tx TadpoleName ; category
 	db 61 ; Pokedex number
 	db 0
 	db 28 ; level
@@ -3539,7 +3539,7 @@ PoliwrathCard: ; 31e68 (c:5e68)
 	db 3 ; retreat cost
 	db WR_GRASS ; weakness
 	db NONE ; resistance
-	tx PoliwagKind ; kind
+	tx TadpoleName ; category
 	db 62 ; Pokedex number
 	db 0
 	db 48 ; level
@@ -3590,7 +3590,7 @@ TentacoolCard: ; 31ea9 (c:5ea9)
 	db 0 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx TentacoolKind ; kind
+	tx JellyfishName ; category
 	db 72 ; Pokedex number
 	db 0
 	db 10 ; level
@@ -3641,7 +3641,7 @@ TentacruelCard: ; 31eea (c:5eea)
 	db 0 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx TentacoolKind ; kind
+	tx JellyfishName ; category
 	db 73 ; Pokedex number
 	db 0
 	db 21 ; level
@@ -3692,7 +3692,7 @@ SeelCard: ; 31f2b (c:5f2b)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx SeelKind ; kind
+	tx SeaLionName ; category
 	db 86 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -3743,7 +3743,7 @@ DewgongCard: ; 31f6c (c:5f6c)
 	db 3 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx SeelKind ; kind
+	tx SeaLionName ; category
 	db 87 ; Pokedex number
 	db 0
 	db 42 ; level
@@ -3794,7 +3794,7 @@ ShellderCard: ; 31fad (c:5fad)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx ShellderKind ; kind
+	tx BivalveName ; category
 	db 90 ; Pokedex number
 	db 0
 	db 8 ; level
@@ -3845,7 +3845,7 @@ CloysterCard: ; 31fee (c:5fee)
 	db 2 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx ShellderKind ; kind
+	tx BivalveName ; category
 	db 91 ; Pokedex number
 	db 0
 	db 25 ; level
@@ -3896,7 +3896,7 @@ KrabbyCard: ; 3202f (c:602f)
 	db 2 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx KrabbyKind ; kind
+	tx RiverCrabName ; category
 	db 98 ; Pokedex number
 	db 0
 	db 20 ; level
@@ -3947,7 +3947,7 @@ KinglerCard: ; 32070 (c:6070)
 	db 3 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx KinglerKind ; kind
+	tx PincerName ; category
 	db 99 ; Pokedex number
 	db 0
 	db 27 ; level
@@ -3998,7 +3998,7 @@ HorseaCard: ; 320b1 (c:60b1)
 	db 0 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx HorseaKind ; kind
+	tx DragonName ; category
 	db 116 ; Pokedex number
 	db 0
 	db 19 ; level
@@ -4049,7 +4049,7 @@ SeadraCard: ; 320f2 (c:60f2)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx HorseaKind ; kind
+	tx DragonName ; category
 	db 117 ; Pokedex number
 	db 0
 	db 23 ; level
@@ -4100,7 +4100,7 @@ GoldeenCard: ; 32133 (c:6133)
 	db 0 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx GoldeenKind ; kind
+	tx GoldfishName ; category
 	db 118 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -4151,7 +4151,7 @@ SeakingCard: ; 32174 (c:6174)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx GoldeenKind ; kind
+	tx GoldfishName ; category
 	db 119 ; Pokedex number
 	db 0
 	db 28 ; level
@@ -4202,7 +4202,7 @@ StaryuCard: ; 321b5 (c:61b5)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx StaryuKind ; kind
+	tx StarshapeName ; category
 	db 120 ; Pokedex number
 	db 0
 	db 15 ; level
@@ -4253,7 +4253,7 @@ StarmieCard: ; 321f6 (c:61f6)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx StarmieKind ; kind
+	tx MysteriousName ; category
 	db 121 ; Pokedex number
 	db 0
 	db 28 ; level
@@ -4304,7 +4304,7 @@ MagikarpCard: ; 32237 (c:6237)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx MagikarpKind ; kind
+	tx FishName ; category
 	db 129 ; Pokedex number
 	db 0
 	db 8 ; level
@@ -4355,7 +4355,7 @@ GyaradosCard: ; 32278 (c:6278)
 	db 3 ; retreat cost
 	db WR_GRASS ; weakness
 	db WR_FIGHTING ; resistance
-	tx GyaradosKind ; kind
+	tx AtrociousName ; category
 	db 130 ; Pokedex number
 	db 0
 	db 41 ; level
@@ -4406,7 +4406,7 @@ LaprasCard: ; 322b9 (c:62b9)
 	db 2 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx LaprasKind ; kind
+	tx TransportName ; category
 	db 131 ; Pokedex number
 	db 0
 	db 31 ; level
@@ -4457,7 +4457,7 @@ Vaporeon1Card: ; 322fa (c:62fa)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx VaporeonKind ; kind
+	tx BubbleJetName ; category
 	db 134 ; Pokedex number
 	db 0
 	db 29 ; level
@@ -4508,7 +4508,7 @@ Vaporeon2Card: ; 3233b (c:633b)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db NONE ; resistance
-	tx VaporeonKind ; kind
+	tx BubbleJetName ; category
 	db 134 ; Pokedex number
 	db 0
 	db 42 ; level
@@ -4559,7 +4559,7 @@ OmanyteCard: ; 3237c (c:637c)
 	db 1 ; retreat cost
 	db WR_GRASS ; weakness
 	db NONE ; resistance
-	tx OmanyteKind ; kind
+	tx SpiralName ; category
 	db 138 ; Pokedex number
 	db 0
 	db 19 ; level
@@ -4610,7 +4610,7 @@ OmastarCard: ; 323bd (c:63bd)
 	db 1 ; retreat cost
 	db WR_GRASS ; weakness
 	db NONE ; resistance
-	tx OmanyteKind ; kind
+	tx SpiralName ; category
 	db 139 ; Pokedex number
 	db 0
 	db 32 ; level
@@ -4661,7 +4661,7 @@ Articuno1Card: ; 323fe (c:63fe)
 	db 2 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx ArticunoKind ; kind
+	tx FreezeName ; category
 	db 144 ; Pokedex number
 	db 0
 	db 35 ; level
@@ -4712,7 +4712,7 @@ Articuno2Card: ; 3243f (c:643f)
 	db 2 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx ArticunoKind ; kind
+	tx FreezeName ; category
 	db 144 ; Pokedex number
 	db 0
 	db 37 ; level
@@ -4763,7 +4763,7 @@ Pikachu1Card: ; 32480 (c:6480)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx PikachuKind ; kind
+	tx MouseName ; category
 	db 25 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -4814,7 +4814,7 @@ Pikachu2Card: ; 324c1 (c:64c1)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx PikachuKind ; kind
+	tx MouseName ; category
 	db 25 ; Pokedex number
 	db 0
 	db 14 ; level
@@ -4865,7 +4865,7 @@ Pikachu3Card: ; 32502 (c:6502)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx PikachuKind ; kind
+	tx MouseName ; category
 	db 25 ; Pokedex number
 	db 0
 	db 16 ; level
@@ -4916,7 +4916,7 @@ Pikachu4Card: ; 32543 (c:6543)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx PikachuKind ; kind
+	tx MouseName ; category
 	db 25 ; Pokedex number
 	db 0
 	db 16 ; level
@@ -4967,7 +4967,7 @@ FlyingPikachuCard: ; 32584 (c:6584)
 	db 1 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx PikachuKind ; kind
+	tx MouseName ; category
 	db 25 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -5018,7 +5018,7 @@ SurfingPikachu1Card: ; 325c5 (c:65c5)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx PikachuKind ; kind
+	tx MouseName ; category
 	db 25 ; Pokedex number
 	db 0
 	db 13 ; level
@@ -5069,7 +5069,7 @@ SurfingPikachu2Card: ; 32606 (c:6606)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx PikachuKind ; kind
+	tx MouseName ; category
 	db 25 ; Pokedex number
 	db 0
 	db 13 ; level
@@ -5120,7 +5120,7 @@ Raichu1Card: ; 32647 (c:6647)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx PikachuKind ; kind
+	tx MouseName ; category
 	db 26 ; Pokedex number
 	db 0
 	db 40 ; level
@@ -5171,7 +5171,7 @@ Raichu2Card: ; 32688 (c:6688)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx PikachuKind ; kind
+	tx MouseName ; category
 	db 26 ; Pokedex number
 	db 0
 	db 45 ; level
@@ -5222,7 +5222,7 @@ Magnemite1Card: ; 326c9 (c:66c9)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx MagnemiteKind ; kind
+	tx MagnetName ; category
 	db 81 ; Pokedex number
 	db 0
 	db 13 ; level
@@ -5273,7 +5273,7 @@ Magnemite2Card: ; 3270a (c:670a)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx MagnemiteKind ; kind
+	tx MagnetName ; category
 	db 81 ; Pokedex number
 	db 0
 	db 15 ; level
@@ -5324,7 +5324,7 @@ Magneton1Card: ; 3274b (c:674b)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx MagnemiteKind ; kind
+	tx MagnetName ; category
 	db 82 ; Pokedex number
 	db 0
 	db 28 ; level
@@ -5375,7 +5375,7 @@ Magneton2Card: ; 3278c (c:678c)
 	db 2 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx MagnemiteKind ; kind
+	tx MagnetName ; category
 	db 82 ; Pokedex number
 	db 0
 	db 35 ; level
@@ -5426,7 +5426,7 @@ VoltorbCard: ; 327cd (c:67cd)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx VoltorbKind ; kind
+	tx BallName ; category
 	db 100 ; Pokedex number
 	db 0
 	db 10 ; level
@@ -5477,7 +5477,7 @@ Electrode1Card: ; 3280e (c:680e)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx VoltorbKind ; kind
+	tx BallName ; category
 	db 101 ; Pokedex number
 	db 0
 	db 35 ; level
@@ -5528,7 +5528,7 @@ Electrode2Card: ; 3284f (c:684f)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx VoltorbKind ; kind
+	tx BallName ; category
 	db 101 ; Pokedex number
 	db 0
 	db 42 ; level
@@ -5579,7 +5579,7 @@ Electabuzz1Card: ; 32890 (c:6890)
 	db 2 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx ElectabuzzKind ; kind
+	tx ElectricName ; category
 	db 125 ; Pokedex number
 	db 0
 	db 20 ; level
@@ -5630,7 +5630,7 @@ Electabuzz2Card: ; 328d1 (c:68d1)
 	db 2 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx ElectabuzzKind ; kind
+	tx ElectricName ; category
 	db 125 ; Pokedex number
 	db 0
 	db 35 ; level
@@ -5681,7 +5681,7 @@ Jolteon1Card: ; 32912 (c:6912)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx JolteonKind ; kind
+	tx LightningName ; category
 	db 135 ; Pokedex number
 	db 0
 	db 24 ; level
@@ -5732,7 +5732,7 @@ Jolteon2Card: ; 32953 (c:6953)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db NONE ; resistance
-	tx JolteonKind ; kind
+	tx LightningName ; category
 	db 135 ; Pokedex number
 	db 0
 	db 29 ; level
@@ -5783,7 +5783,7 @@ Zapdos1Card: ; 32994 (c:6994)
 	db 2 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx ElectabuzzKind ; kind
+	tx ElectricName ; category
 	db 145 ; Pokedex number
 	db 0
 	db 40 ; level
@@ -5834,7 +5834,7 @@ Zapdos2Card: ; 329d5 (c:69d5)
 	db 3 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx ElectabuzzKind ; kind
+	tx ElectricName ; category
 	db 145 ; Pokedex number
 	db 0
 	db 64 ; level
@@ -5885,7 +5885,7 @@ Zapdos3Card: ; 32a16 (c:6a16)
 	db 2 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx ElectabuzzKind ; kind
+	tx ElectricName ; category
 	db 145 ; Pokedex number
 	db 0
 	db 68 ; level
@@ -5936,7 +5936,7 @@ SandshrewCard: ; 32a57 (c:6a57)
 	db 1 ; retreat cost
 	db WR_GRASS ; weakness
 	db WR_LIGHTNING ; resistance
-	tx PikachuKind ; kind
+	tx MouseName ; category
 	db 27 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -5987,7 +5987,7 @@ SandslashCard: ; 32a98 (c:6a98)
 	db 1 ; retreat cost
 	db WR_GRASS ; weakness
 	db WR_LIGHTNING ; resistance
-	tx PikachuKind ; kind
+	tx MouseName ; category
 	db 28 ; Pokedex number
 	db 0
 	db 33 ; level
@@ -6038,7 +6038,7 @@ DiglettCard: ; 32ad9 (c:6ad9)
 	db 0 ; retreat cost
 	db WR_GRASS ; weakness
 	db WR_LIGHTNING ; resistance
-	tx DiglettKind ; kind
+	tx MoleName ; category
 	db 50 ; Pokedex number
 	db 0
 	db 8 ; level
@@ -6089,7 +6089,7 @@ DugtrioCard: ; 32b1a (c:6b1a)
 	db 2 ; retreat cost
 	db WR_GRASS ; weakness
 	db WR_LIGHTNING ; resistance
-	tx DiglettKind ; kind
+	tx MoleName ; category
 	db 51 ; Pokedex number
 	db 0
 	db 36 ; level
@@ -6140,7 +6140,7 @@ MankeyCard: ; 32b5b (c:6b5b)
 	db 0 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx MankeyKind ; kind
+	tx PigMonkeyName ; category
 	db 56 ; Pokedex number
 	db 0
 	db 7 ; level
@@ -6191,7 +6191,7 @@ PrimeapeCard: ; 32b9c (c:6b9c)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx MankeyKind ; kind
+	tx PigMonkeyName ; category
 	db 57 ; Pokedex number
 	db 0
 	db 35 ; level
@@ -6242,7 +6242,7 @@ MachopCard: ; 32bdd (c:6bdd)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx MachopKindOrSuperpowerName ; kind
+	tx SuperpowerName ; category
 	db 66 ; Pokedex number
 	db 0
 	db 20 ; level
@@ -6293,7 +6293,7 @@ MachokeCard: ; 32c1e (c:6c1e)
 	db 3 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx MachopKindOrSuperpowerName ; kind
+	tx SuperpowerName ; category
 	db 67 ; Pokedex number
 	db 0
 	db 40 ; level
@@ -6344,7 +6344,7 @@ MachampCard: ; 32c5f (c:6c5f)
 	db 3 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx MachopKindOrSuperpowerName ; kind
+	tx SuperpowerName ; category
 	db 68 ; Pokedex number
 	db 0
 	db 67 ; level
@@ -6395,7 +6395,7 @@ GeodudeCard: ; 32ca0 (c:6ca0)
 	db 1 ; retreat cost
 	db WR_GRASS ; weakness
 	db NONE ; resistance
-	tx GeodudeKind ; kind
+	tx RockName ; category
 	db 74 ; Pokedex number
 	db 0
 	db 16 ; level
@@ -6446,7 +6446,7 @@ GravelerCard: ; 32ce1 (c:6ce1)
 	db 2 ; retreat cost
 	db WR_GRASS ; weakness
 	db NONE ; resistance
-	tx GeodudeKind ; kind
+	tx RockName ; category
 	db 75 ; Pokedex number
 	db 0
 	db 29 ; level
@@ -6497,7 +6497,7 @@ GolemCard: ; 32d22 (c:6d22)
 	db 4 ; retreat cost
 	db WR_GRASS ; weakness
 	db NONE ; resistance
-	tx GolemKind ; kind
+	tx MegatonName ; category
 	db 76 ; Pokedex number
 	db 0
 	db 36 ; level
@@ -6548,7 +6548,7 @@ OnixCard: ; 32d63 (c:6d63)
 	db 3 ; retreat cost
 	db WR_GRASS ; weakness
 	db NONE ; resistance
-	tx OnixKind ; kind
+	tx RockSnakeName ; category
 	db 95 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -6599,7 +6599,7 @@ CuboneCard: ; 32da4 (c:6da4)
 	db 1 ; retreat cost
 	db WR_GRASS ; weakness
 	db WR_LIGHTNING ; resistance
-	tx CuboneKind ; kind
+	tx LonelyName ; category
 	db 104 ; Pokedex number
 	db 0
 	db 13 ; level
@@ -6650,7 +6650,7 @@ Marowak1Card: ; 32de5 (c:6de5)
 	db 1 ; retreat cost
 	db WR_GRASS ; weakness
 	db WR_LIGHTNING ; resistance
-	tx MarowakKind ; kind
+	tx BonekeeperName ; category
 	db 105 ; Pokedex number
 	db 0
 	db 26 ; level
@@ -6701,7 +6701,7 @@ Marowak2Card: ; 32e26 (c:6e26)
 	db 2 ; retreat cost
 	db WR_GRASS ; weakness
 	db WR_LIGHTNING ; resistance
-	tx MarowakKind ; kind
+	tx BonekeeperName ; category
 	db 105 ; Pokedex number
 	db 0
 	db 32 ; level
@@ -6752,7 +6752,7 @@ HitmonleeCard: ; 32e67 (c:6e67)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx HitmonleeKind ; kind
+	tx KickingName ; category
 	db 106 ; Pokedex number
 	db 0
 	db 30 ; level
@@ -6803,7 +6803,7 @@ HitmonchanCard: ; 32ea8 (c:6ea8)
 	db 2 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx HitmonchanKind ; kind
+	tx PunchingName ; category
 	db 107 ; Pokedex number
 	db 0
 	db 33 ; level
@@ -6854,7 +6854,7 @@ RhyhornCard: ; 32ee9 (c:6ee9)
 	db 3 ; retreat cost
 	db WR_GRASS ; weakness
 	db WR_LIGHTNING ; resistance
-	tx RhyhornKind ; kind
+	tx SpikeName ; category
 	db 111 ; Pokedex number
 	db 0
 	db 18 ; level
@@ -6905,7 +6905,7 @@ RhydonCard: ; 32f2a (c:6f2a)
 	db 3 ; retreat cost
 	db WR_GRASS ; weakness
 	db WR_LIGHTNING ; resistance
-	tx NidoqueenKind ; kind
+	tx DrillName ; category
 	db 112 ; Pokedex number
 	db 0
 	db 48 ; level
@@ -6956,7 +6956,7 @@ KabutoCard: ; 32f6b (c:6f6b)
 	db 1 ; retreat cost
 	db WR_GRASS ; weakness
 	db NONE ; resistance
-	tx BlastoiseKind ; kind
+	tx ShellfishName ; category
 	db 140 ; Pokedex number
 	db 0
 	db 9 ; level
@@ -7007,7 +7007,7 @@ KabutopsCard: ; 32fac (c:6fac)
 	db 1 ; retreat cost
 	db WR_GRASS ; weakness
 	db NONE ; resistance
-	tx BlastoiseKind ; kind
+	tx ShellfishName ; category
 	db 141 ; Pokedex number
 	db 0
 	db 30 ; level
@@ -7058,7 +7058,7 @@ AerodactylCard: ; 32fed (c:6fed)
 	db 2 ; retreat cost
 	db WR_GRASS ; weakness
 	db WR_FIGHTING ; resistance
-	tx AerodactylKind ; kind
+	tx FossilName ; category
 	db 142 ; Pokedex number
 	db 0
 	db 28 ; level
@@ -7109,7 +7109,7 @@ AbraCard: ; 3302e (c:702e)
 	db 0 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx AbraKind ; kind
+	tx PsiName ; category
 	db 63 ; Pokedex number
 	db 0
 	db 10 ; level
@@ -7160,7 +7160,7 @@ KadabraCard: ; 3306f (c:706f)
 	db 3 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx AbraKind ; kind
+	tx PsiName ; category
 	db 64 ; Pokedex number
 	db 0
 	db 38 ; level
@@ -7211,7 +7211,7 @@ AlakazamCard: ; 330b0 (c:70b0)
 	db 3 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx AbraKind ; kind
+	tx PsiName ; category
 	db 65 ; Pokedex number
 	db 0
 	db 42 ; level
@@ -7262,7 +7262,7 @@ Slowpoke1Card: ; 330f1 (c:70f1)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx SlowpokeKind ; kind
+	tx DopeyName ; category
 	db 79 ; Pokedex number
 	db 0
 	db 9 ; level
@@ -7313,7 +7313,7 @@ Slowpoke2Card: ; 33132 (c:7132)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx SlowpokeKind ; kind
+	tx DopeyName ; category
 	db 79 ; Pokedex number
 	db 0
 	db 18 ; level
@@ -7364,7 +7364,7 @@ SlowbroCard: ; 33173 (c:7173)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx SlowbroKind ; kind
+	tx HermitcrabName ; category
 	db 80 ; Pokedex number
 	db 0
 	db 26 ; level
@@ -7415,7 +7415,7 @@ Gastly1Card: ; 331b4 (c:71b4)
 	db 0 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx GastlyKind ; kind
+	tx GasName ; category
 	db 92 ; Pokedex number
 	db 0
 	db 8 ; level
@@ -7466,7 +7466,7 @@ Gastly2Card: ; 331f5 (c:71f5)
 	db 0 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx GastlyKind ; kind
+	tx GasName ; category
 	db 92 ; Pokedex number
 	db 0
 	db 17 ; level
@@ -7517,7 +7517,7 @@ Haunter1Card: ; 33236 (c:7236)
 	db 0 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx GastlyKind ; kind
+	tx GasName ; category
 	db 93 ; Pokedex number
 	db 0
 	db 17 ; level
@@ -7539,7 +7539,7 @@ Haunter2Card: ; 33277 (c:7277)
 
 	; move 1
 	energy PSYCHIC, 1 ; energies
-	tx DrowzeeKindOrHypnosisName ; name
+	tx HypnosisName ; name
 	tx InflictSleepDescription ; description
 	dw NONE ; description (cont)
 	db 0 ; damage
@@ -7568,7 +7568,7 @@ Haunter2Card: ; 33277 (c:7277)
 	db 1 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx GastlyKind ; kind
+	tx GasName ; category
 	db 93 ; Pokedex number
 	db 0
 	db 22 ; level
@@ -7619,7 +7619,7 @@ GengarCard: ; 332b8 (c:72b8)
 	db 1 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx GengarKind ; kind
+	tx ShadowName ; category
 	db 94 ; Pokedex number
 	db 0
 	db 38 ; level
@@ -7670,7 +7670,7 @@ DrowzeeCard: ; 332f9 (c:72f9)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx DrowzeeKindOrHypnosisName ; kind
+	tx HypnosisName ; category
 	db 96 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -7721,7 +7721,7 @@ HypnoCard: ; 3333a (c:733a)
 	db 2 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx DrowzeeKindOrHypnosisName ; kind
+	tx HypnosisName ; category
 	db 97 ; Pokedex number
 	db 0
 	db 36 ; level
@@ -7772,7 +7772,7 @@ MrMimeCard: ; 3337b (c:737b)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx MrMimeKindOrBarrierName ; kind
+	tx BarrierName ; category
 	db 122 ; Pokedex number
 	db 0
 	db 28 ; level
@@ -7823,7 +7823,7 @@ JynxCard: ; 333bc (c:73bc)
 	db 2 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx JynxKind ; kind
+	tx HumanShapeName ; category
 	db 124 ; Pokedex number
 	db 0
 	db 23 ; level
@@ -7859,12 +7859,12 @@ Mewtwo1Card: ; 333fd (c:73fd)
 
 	; move 2
 	energy PSYCHIC, 2 ; energies
-	tx MrMimeKindOrBarrierName ; name
+	tx BarrierName ; name
 	tx BarrierDescription ; description
 	dw NONE ; description (cont)
 	db 0 ; damage
 	db RESIDUAL ; category
-	dw MewtwoMrMimeKindAndBarrierEffectCommands ; effect commands
+	dw MewtwoBarrierEffectCommands ; effect commands
 	db NONE ; flags 1
 	db NULLIFY_OR_WEAKEN_ATTACK + DISCARD_ENERGY ; flags 2
 	db NONE ; flags 3
@@ -7874,7 +7874,7 @@ Mewtwo1Card: ; 333fd (c:73fd)
 	db 3 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx MewtwoKind ; kind
+	tx GeneticName ; category
 	db 150 ; Pokedex number
 	db 0
 	db 53 ; level
@@ -7925,7 +7925,7 @@ Mewtwo2Card: ; 3343e (c:743e)
 	db 2 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx MewtwoKind ; kind
+	tx GeneticName ; category
 	db 150 ; Pokedex number
 	db 0
 	db 60 ; level
@@ -7976,7 +7976,7 @@ Mewtwo3Card: ; 3347f (c:747f)
 	db 2 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx MewtwoKind ; kind
+	tx GeneticName ; category
 	db 150 ; Pokedex number
 	db 0
 	db 60 ; level
@@ -8027,7 +8027,7 @@ Mew1Card: ; 334c0 (c:74c0)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx MewKind ; kind
+	tx NewSpeciesName ; category
 	db 151 ; Pokedex number
 	db 0
 	db 8 ; level
@@ -8078,7 +8078,7 @@ Mew2Card: ; 33501 (c:7501)
 	db 0 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx MewKind ; kind
+	tx NewSpeciesName ; category
 	db 151 ; Pokedex number
 	db 0
 	db 15 ; level
@@ -8129,7 +8129,7 @@ Mew3Card: ; 33542 (c:7542)
 	db 1 ; retreat cost
 	db WR_PSYCHIC ; weakness
 	db NONE ; resistance
-	tx MewKind ; kind
+	tx NewSpeciesName ; category
 	db 151 ; Pokedex number
 	db 0
 	db 23 ; level
@@ -8180,7 +8180,7 @@ PidgeyCard: ; 33583 (c:7583)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db WR_FIGHTING ; resistance
-	tx PidgeyKind ; kind
+	tx TinyBirdName ; category
 	db 16 ; Pokedex number
 	db 0
 	db 8 ; level
@@ -8231,7 +8231,7 @@ PidgeottoCard: ; 335c4 (c:75c4)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db WR_FIGHTING ; resistance
-	tx PidgeottoKind ; kind
+	tx BirdName ; category
 	db 17 ; Pokedex number
 	db 0
 	db 36 ; level
@@ -8282,7 +8282,7 @@ Pidgeot1Card: ; 33605 (c:7605)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db WR_FIGHTING ; resistance
-	tx PidgeottoKind ; kind
+	tx BirdName ; category
 	db 18 ; Pokedex number
 	db 0
 	db 38 ; level
@@ -8333,7 +8333,7 @@ Pidgeot2Card: ; 33646 (c:7646)
 	db 0 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db WR_FIGHTING ; resistance
-	tx PidgeottoKind ; kind
+	tx BirdName ; category
 	db 18 ; Pokedex number
 	db 0
 	db 40 ; level
@@ -8384,7 +8384,7 @@ RattataCard: ; 33687 (c:7687)
 	db 0 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx RattataKind ; kind
+	tx RatName ; category
 	db 19 ; Pokedex number
 	db 0
 	db 9 ; level
@@ -8435,7 +8435,7 @@ RaticateCard: ; 336c8 (c:76c8)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx RattataKind ; kind
+	tx RatName ; category
 	db 20 ; Pokedex number
 	db 0
 	db 41 ; level
@@ -8486,7 +8486,7 @@ SpearowCard: ; 33709 (c:7709)
 	db 0 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db WR_FIGHTING ; resistance
-	tx PidgeyKind ; kind
+	tx TinyBirdName ; category
 	db 21 ; Pokedex number
 	db 0
 	db 13 ; level
@@ -8537,7 +8537,7 @@ FearowCard: ; 3374a (c:774a)
 	db 0 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db WR_FIGHTING ; resistance
-	tx FearowKind ; kind
+	tx BeakName ; category
 	db 22 ; Pokedex number
 	db 0
 	db 27 ; level
@@ -8588,7 +8588,7 @@ ClefairyCard: ; 3378b (c:778b)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx ClefairyKind ; kind
+	tx FairyName ; category
 	db 35 ; Pokedex number
 	db 0
 	db 14 ; level
@@ -8639,7 +8639,7 @@ ClefableCard: ; 337cc (c:77cc)
 	db 2 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx ClefairyKind ; kind
+	tx FairyName ; category
 	db 36 ; Pokedex number
 	db 0
 	db 34 ; level
@@ -8690,7 +8690,7 @@ Jigglypuff1Card: ; 3380d (c:780d)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx JigglypuffKind ; kind
+	tx BalloonName ; category
 	db 39 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -8741,7 +8741,7 @@ Jigglypuff2Card: ; 3384e (c:784e)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx JigglypuffKind ; kind
+	tx BalloonName ; category
 	db 39 ; Pokedex number
 	db 0
 	db 13 ; level
@@ -8792,7 +8792,7 @@ Jigglypuff3Card: ; 3388f (c:788f)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx JigglypuffKind ; kind
+	tx BalloonName ; category
 	db 39 ; Pokedex number
 	db 0
 	db 14 ; level
@@ -8843,7 +8843,7 @@ WigglytuffCard: ; 338d0 (c:78d0)
 	db 2 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx JigglypuffKind ; kind
+	tx BalloonName ; category
 	db 40 ; Pokedex number
 	db 0
 	db 36 ; level
@@ -8894,7 +8894,7 @@ Meowth1Card: ; 33911 (c:7911)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx MeowthKind ; kind
+	tx ScratchCatName ; category
 	db 52 ; Pokedex number
 	db 0
 	db 14 ; level
@@ -8945,7 +8945,7 @@ Meowth2Card: ; 33952 (c:7952)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx MeowthKind ; kind
+	tx ScratchCatName ; category
 	db 52 ; Pokedex number
 	db 0
 	db 15 ; level
@@ -8996,7 +8996,7 @@ PersianCard: ; 33993 (c:7993)
 	db 0 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx PersianKind ; kind
+	tx ClassyCatName ; category
 	db 53 ; Pokedex number
 	db 0
 	db 25 ; level
@@ -9047,7 +9047,7 @@ FarfetchdCard: ; 339d4 (c:79d4)
 	db 1 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db WR_FIGHTING ; resistance
-	tx FarfetchdKind ; kind
+	tx WildDuckName ; category
 	db 83 ; Pokedex number
 	db 0
 	db 20 ; level
@@ -9098,7 +9098,7 @@ DoduoCard: ; 33a15 (c:7a15)
 	db 0 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db WR_FIGHTING ; resistance
-	tx DoduoKind ; kind
+	tx TwinBirdName ; category
 	db 84 ; Pokedex number
 	db 0
 	db 10 ; level
@@ -9149,7 +9149,7 @@ DodrioCard: ; 33a56 (c:7a56)
 	db 0 ; retreat cost
 	db WR_LIGHTNING ; weakness
 	db WR_FIGHTING ; resistance
-	tx DodrioKind ; kind
+	tx TriplebirdName ; category
 	db 85 ; Pokedex number
 	db 0
 	db 28 ; level
@@ -9200,7 +9200,7 @@ LickitungCard: ; 33a97 (c:7a97)
 	db 3 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx LickitungKind ; kind
+	tx LickingName ; category
 	db 108 ; Pokedex number
 	db 0
 	db 26 ; level
@@ -9251,7 +9251,7 @@ ChanseyCard: ; 33ad8 (c:7ad8)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx ExeggcuteKind ; kind
+	tx EggName ; category
 	db 113 ; Pokedex number
 	db 0
 	db 55 ; level
@@ -9302,7 +9302,7 @@ KangaskhanCard: ; 33b19 (c:7b19)
 	db 3 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx KangaskhanKind ; kind
+	tx ParentName ; category
 	db 115 ; Pokedex number
 	db 0
 	db 40 ; level
@@ -9353,7 +9353,7 @@ TaurosCard: ; 33b5a (c:7b5a)
 	db 2 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx TaurosKind ; kind
+	tx WildBullName ; category
 	db 128 ; Pokedex number
 	db 0
 	db 32 ; level
@@ -9404,7 +9404,7 @@ DittoCard: ; 33b9b (c:7b9b)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx DittoKind ; kind
+	tx TransformName ; category
 	db 132 ; Pokedex number
 	db 0
 	db 19 ; level
@@ -9455,7 +9455,7 @@ EeveeCard: ; 33bdc (c:7bdc)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx EeveeKind ; kind
+	tx EvolutionName ; category
 	db 133 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -9506,7 +9506,7 @@ PorygonCard: ; 33c1d (c:7c1d)
 	db 1 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx PorygonKind ; kind
+	tx VirtualName ; category
 	db 137 ; Pokedex number
 	db 0
 	db 12 ; level
@@ -9557,7 +9557,7 @@ SnorlaxCard: ; 33c5e (c:7c5e)
 	db 4 ; retreat cost
 	db WR_FIGHTING ; weakness
 	db WR_PSYCHIC ; resistance
-	tx SnorlaxKind ; kind
+	tx SleepingName ; category
 	db 143 ; Pokedex number
 	db 0
 	db 20 ; level
@@ -9608,7 +9608,7 @@ DratiniCard: ; 33c9f (c:7c9f)
 	db 1 ; retreat cost
 	db NONE ; weakness
 	db WR_PSYCHIC ; resistance
-	tx HorseaKind ; kind
+	tx DragonName ; category
 	db 147 ; Pokedex number
 	db 0
 	db 10 ; level
@@ -9659,7 +9659,7 @@ DragonairCard: ; 33ce0 (c:7ce0)
 	db 2 ; retreat cost
 	db NONE ; weakness
 	db WR_PSYCHIC ; resistance
-	tx HorseaKind ; kind
+	tx DragonName ; category
 	db 148 ; Pokedex number
 	db 0
 	db 33 ; level
@@ -9710,7 +9710,7 @@ Dragonite1Card: ; 33d21 (c:7d21)
 	db 2 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx HorseaKind ; kind
+	tx DragonName ; category
 	db 149 ; Pokedex number
 	db 0
 	db 41 ; level
@@ -9761,7 +9761,7 @@ Dragonite2Card: ; 33d62 (c:7d62)
 	db 1 ; retreat cost
 	db NONE ; weakness
 	db WR_FIGHTING ; resistance
-	tx HorseaKind ; kind
+	tx DragonName ; category
 	db 149 ; Pokedex number
 	db 0
 	db 45 ; level
diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm
index 1df3d0d..6dc74ee 100644
--- a/src/data/effect_commands.asm
+++ b/src/data/effect_commands.asm
@@ -797,7 +797,7 @@ MewtwoPsychicEffectCommands:
 	dbw $09, $5d7b
 	db  $00
 
-MewtwoMrMimeKindAndBarrierEffectCommands:
+MewtwoBarrierEffectCommands:
 	dbw $01, $5d8e
 	dbw $02, $5d9c
 	dbw $03, $5dbf
diff --git a/src/macros/wram.asm b/src/macros/wram.asm
index e692a92..cedb0dd 100644
--- a/src/macros/wram.asm
+++ b/src/macros/wram.asm
@@ -15,7 +15,7 @@ card_data_struct: MACRO
 \1RetreatCost::   ds 1
 \1Weakness::      ds 1
 \1Resistance::    ds 1
-\1Kind::          ds 2
+\1Category::      ds 2
 \1PokedexNumber:: ds 1
 \1Unknown1::      ds 1
 \1Level::         ds 1
diff --git a/src/text/text10.asm b/src/text/text10.asm
index 013e5da..316397e 100644
--- a/src/text/text10.asm
+++ b/src/text/text10.asm
@@ -17,7 +17,7 @@ DoubleAttackX30Description: ; 5807b (16:407b)
 	line "damage times the number of heads."
 	done
 
-BeedrillKind: ; 580c0 (16:40c0)
+PoisonBeeName: ; 580c0 (16:40c0)
 	text "Poison Bee"
 	done
 
@@ -39,7 +39,7 @@ WrapName: ; 5813e (16:413e)
 	text "Wrap"
 	done
 
-EkansKind: ; 58144 (16:4144)
+SnakeName: ; 58144 (16:4144)
 	text "Snake"
 	done
 
@@ -71,7 +71,7 @@ PoisonFangName: ; 58277 (16:4277)
 	text "Poison Fang"
 	done
 
-ArbokKind: ; 58284 (16:4284)
+CobraName: ; 58284 (16:4284)
 	text "Cobra"
 	done
 
@@ -106,7 +106,7 @@ NidoranFsCallForFamilyDescription: ; 58352 (16:4352)
 	line "attack if your Bench is full.)"
 	done
 
-NidoranFKind: ; 583ff (16:43ff)
+PoisonPinName: ; 583ff (16:43ff)
 	text "Poison Pin"
 	done
 
@@ -156,7 +156,7 @@ MegaPunchName: ; 58584 (16:4584)
 	text "Mega Punch"
 	done
 
-NidoqueenKind: ; 58590 (16:4590)
+DrillName: ; 58590 (16:4590)
 	text "Drill"
 	done
 
@@ -250,7 +250,7 @@ ZubatsLeechLifeDescription: ; 588b3 (16:48b3)
 	line "than that, remove all of them."
 	done
 
-ZubatKind: ; 58980 (16:4980)
+BatName: ; 58980 (16:4980)
 	text "Bat"
 	done
 
@@ -299,7 +299,7 @@ SproutDescription: ; 58b42 (16:4b42)
 	line "Bench is full.)"
 	done
 
-OddishKind: ; 58be1 (16:4be1)
+WeedName: ; 58be1 (16:4be1)
 	text "Weed"
 	done
 
@@ -357,7 +357,7 @@ PetalDanceDescription: ; 58def (16:4def)
 	line "doing damage)."
 	done
 
-VileplumeKind: ; 58e64 (16:4e64)
+FlowerName: ; 58e64 (16:4e64)
 	text "Flower"
 	done
 
@@ -383,7 +383,7 @@ InflictSleepDescription: ; 58ee9 (16:4ee9)
 	text "The Defending Pokémon is now Asleep."
 	done
 
-ParasKind: ; 58f0f (16:4f0f)
+MushroomName: ; 58f0f (16:4f0f)
 	text "Mushroom"
 	done
 
@@ -420,7 +420,7 @@ VenonatLeechLifeDescription: ; 58ffe (16:4ffe)
 	line "than that, remove all of them."
 	done
 
-VenonatKind: ; 590cf (16:50cf)
+InsectName: ; 590cf (16:50cf)
 	text "Insect"
 	done
 
@@ -458,7 +458,7 @@ VenomPowderDescription: ; 5922c (16:522c)
 	line "Poisoned."
 	done
 
-VenomothKind: ; 59278 (16:5278)
+PoisonmothName: ; 59278 (16:5278)
 	text "Poisonmoth"
 	done
 
@@ -494,7 +494,7 @@ RazorLeafName: ; 59403 (16:5403)
 	text "Razor Leaf"
 	done
 
-WeepinbellKind: ; 5940f (16:540f)
+FlycatcherName: ; 5940f (16:540f)
 	text "Flycatcher"
 	done
 
@@ -554,7 +554,7 @@ GrimersMinimizeDescription: ; 595dc (16:55dc)
 	line "Weakness and Resistance)."
 	done
 
-GrimerKindOrSludgeName: ; 5965e (16:565e)
+SludgeName: ; 5965e (16:565e)
 	text "Sludge"
 	done
 
@@ -589,7 +589,7 @@ ExeggcuteName: ; 597b1 (16:57b1)
 	text "Exeggcute"
 	done
 
-DrowzeeKindOrHypnosisName: ; 597bc (16:57bc)
+HypnosisName: ; 597bc (16:57bc)
 	text "Hypnosis"
 	done
 
@@ -599,7 +599,7 @@ ExeggcutesLeechSeedDescription: ; 597c6 (16:57c6)
 	line "damage counter from Exeggcute."
 	done
 
-ExeggcuteKind: ; 59828 (16:5828)
+EggName: ; 59828 (16:5828)
 	text "Egg"
 	done
 
@@ -633,7 +633,7 @@ BigEggsplosionDescription: ; 598d9 (16:58d9)
 	line "damage times the number of heads."
 	done
 
-ExeggutorKind: ; 5995c (16:595c)
+CoconutName: ; 5995c (16:595c)
 	text "Coconut"
 	done
 
@@ -658,7 +658,7 @@ FoulGasDescription: ; 599df (16:59df)
 	line "it is now Confused."
 	done
 
-KoffingKind: ; 59a3c (16:5a3c)
+PoisonGasName: ; 59a3c (16:5a3c)
 	text "Poison Gas"
 	done
 
@@ -702,7 +702,7 @@ BindName: ; 59bc7 (16:5bc7)
 	text "Bind"
 	done
 
-TangelaKind: ; 59bcd (16:5bcd)
+VineName: ; 59bcd (16:5bcd)
 	text "Vine"
 	done
 
@@ -736,7 +736,7 @@ SwordsDanceDescription: ; 59cc2 (16:5cc2)
 	line "doubled."
 	done
 
-ScytherKind: ; 59d0b (16:5d0b)
+MantisName: ; 59d0b (16:5d0b)
 	text "Mantis"
 	done
 
@@ -758,7 +758,7 @@ GuillotineName: ; 59d87 (16:5d87)
 	text "Guillotine"
 	done
 
-PinsirKind: ; 59d93 (16:5d93)
+StagbeetleName: ; 59d93 (16:5d93)
 	text "Stagbeetle"
 	done
 
@@ -782,7 +782,7 @@ EmberDescription: ; 59e15 (16:5e15)
 	line "attack."
 	done
 
-CharmanderKind: ; 59e63 (16:5e63)
+LizardName: ; 59e63 (16:5e63)
 	text "Lizard"
 	done
 
@@ -807,7 +807,7 @@ CharmeleonsFlamethrowerDescription: ; 59ef4 (16:5ef4)
 	line "attack."
 	done
 
-CharmeleonKind: ; 59f42 (16:5f42)
+FlameName: ; 59f42 (16:5f42)
 	text "Flame"
 	done
 
@@ -859,7 +859,7 @@ ConfuseRayName: ; 5a151 (16:6151)
 	text "Confuse Ray"
 	done
 
-VulpixKind: ; 5a15e (16:615e)
+FoxName: ; 5a15e (16:615e)
 	text "Fox"
 	done
 
@@ -938,7 +938,7 @@ FlareName: ; 5a4e8 (16:64e8)
 	text "Flare"
 	done
 
-GrowlitheKind: ; 5a4ef (16:64ef)
+PuppyName: ; 5a4ef (16:64ef)
 	text "Puppy"
 	done
 
@@ -975,7 +975,7 @@ FlamesOfRageDescription: ; 5a5e8 (16:65e8)
 	line "counter on Arcanine."
 	done
 
-ArcanineKind: ; 5a689 (16:6689)
+LegendaryName: ; 5a689 (16:6689)
 	text "Legendary"
 	done
 
@@ -1017,7 +1017,7 @@ FlameTailName: ; 5a7d6 (16:67d6)
 	text "Flame Tail"
 	done
 
-PonytaKind: ; 5a7e2 (16:67e2)
+FireHorseName: ; 5a7e2 (16:67e2)
 	text "Fire Horse"
 	done
 
@@ -1072,7 +1072,7 @@ FirePunchDescription: ; 5a9bf (16:69bf)
 	line "Magmar in order to use this attack."
 	done
 
-MagmarKind: ; 5aa09 (16:6a09)
+SpitfireName: ; 5aa09 (16:6a09)
 	text "Spitfire"
 	done
 
@@ -1202,7 +1202,7 @@ SquirtlesWithdrawDescription: ; 5af4b (16:6f4b)
 	line "effects of attacks still happen.)"
 	done
 
-SquirtleKind: ; 5afd6 (16:6fd6)
+TinyTurtleName: ; 5afd6 (16:6fd6)
 	text "Tiny Turtle"
 	done
 
@@ -1223,7 +1223,7 @@ WartortlesWithdrawDescription: ; 5b050 (16:7050)
 	line "effects of attacks still happen.)"
 	done
 
-WartortleKind: ; 5b0dc (16:70dc)
+TurtleName: ; 5b0dc (16:70dc)
 	text "Turtle"
 	done
 
@@ -1268,7 +1268,7 @@ HydroPumpDescription: ; 5b273 (16:7273)
 	line "add more than 20 damage in this way."
 	done
 
-BlastoiseKind: ; 5b322 (16:7322)
+ShellfishName: ; 5b322 (16:7322)
 	text "Shellfish"
 	done
 
@@ -1291,7 +1291,7 @@ HeadacheDescription: ; 5b3a2 (16:73a2)
 	line "cards during his or her next turn."
 	done
 
-PsyduckKind: ; 5b3e7 (16:73e7)
+DuckName: ; 5b3e7 (16:73e7)
 	text "Duck"
 	done
 
@@ -1341,7 +1341,7 @@ PoliwagsWaterGunDescription: ; 5b547 (16:7547)
 	line "add more than 20 damage in this way."
 	done
 
-PoliwagKind: ; 5b5f4 (16:75f4)
+TadpoleName: ; 5b5f4 (16:75f4)
 	text "Tadpole"
 	done
 
@@ -1417,7 +1417,7 @@ CowardiceDescription: ; 5b890 (16:7890)
 	line "is Asleep, Confused, or Paralyzed."
 	done
 
-TentacoolKind: ; 5b987 (16:7987)
+JellyfishName: ; 5b987 (16:7987)
 	text "Jellyfish"
 	done
 
@@ -1449,7 +1449,7 @@ HeadbuttName: ; 5ba7d (16:7a7d)
 	text "Headbutt"
 	done
 
-SeelKind: ; 5ba87 (16:7a87)
+SeaLionName: ; 5ba87 (16:7a87)
 	text "Sea Lion"
 	done
 
@@ -1492,7 +1492,7 @@ HideInShellDescription: ; 5bb87 (16:7b87)
 	line "effects of attacks still happen.)"
 	done
 
-ShellderKind: ; 5bc12 (16:7c12)
+BivalveName: ; 5bc12 (16:7c12)
 	text "Bivalve"
 	done
 
@@ -1539,7 +1539,7 @@ KrabbysCallForFamilyDescription: ; 5bd6b (16:7d6b)
 	line "Bench is full.)"
 	done
 
-KrabbyKind: ; 5be0a (16:7e0a)
+RiverCrabName: ; 5be0a (16:7e0a)
 	text "River Crab"
 	done
 
@@ -1566,7 +1566,7 @@ CrabhammerName: ; 5bec3 (16:7ec3)
 	text "Crabhammer"
 	done
 
-KinglerKind: ; 5becf (16:7ecf)
+PincerName: ; 5becf (16:7ecf)
 	text "Pincer"
 	done
 
@@ -1588,6 +1588,6 @@ OpponentAttackMayDoNothingDescription: ; 5bf4b (16:7f4b)
 	line "If tails, that attack does nothing."
 	done
 
-HorseaKind: ; 5bfd7 (16:7fd7)
+DragonName: ; 5bfd7 (16:7fd7)
 	text "Dragon"
 	done
diff --git a/src/text/text11.asm b/src/text/text11.asm
index 673150d..5304dfa 100644
--- a/src/text/text11.asm
+++ b/src/text/text11.asm
@@ -37,7 +37,7 @@ HornAttackName: ; 5c1f5 (17:41f5)
 	text "Horn Attack"
 	done
 
-GoldeenKind: ; 5c202 (17:4202)
+GoldfishName: ; 5c202 (17:4202)
 	text "Goldfish"
 	done
 
@@ -69,7 +69,7 @@ SlapName: ; 5c2df (17:42df)
 	text "Slap"
 	done
 
-StaryuKind: ; 5c2e5 (17:42e5)
+StarshapeName: ; 5c2e5 (17:42e5)
 	text "Starshape"
 	done
 
@@ -98,7 +98,7 @@ StarFreezeName: ; 5c3cf (17:43cf)
 	text "Star Freeze"
 	done
 
-StarmieKind: ; 5c3dc (17:43dc)
+MysteriousName: ; 5c3dc (17:43dc)
 	text "Mysterious"
 	done
 
@@ -121,7 +121,7 @@ MagikarpsFlailDescription: ; 5c45e (17:445e)
 	line "damage counters on Magikarp."
 	done
 
-MagikarpKind: ; 5c49f (17:449f)
+FishName: ; 5c49f (17:449f)
 	text "Fish"
 	done
 
@@ -143,7 +143,7 @@ BubblebeamName: ; 5c517 (17:4517)
 	text "Bubblebeam"
 	done
 
-GyaradosKind: ; 5c523 (17:4523)
+AtrociousName: ; 5c523 (17:4523)
 	text "Atrocious"
 	done
 
@@ -165,7 +165,7 @@ LaprasWaterGunDescription: ; 5c597 (17:4597)
 	line "more than 20 damage in this way."
 	done
 
-LaprasKind: ; 5c643 (17:4643)
+TransportName: ; 5c643 (17:4643)
 	text "Transport"
 	done
 
@@ -189,7 +189,7 @@ FocusEnergyDescription: ; 5c6c2 (17:46c2)
 	line "doubled."
 	done
 
-VaporeonKind: ; 5c70b (17:470b)
+BubbleJetName: ; 5c70b (17:470b)
 	text "Bubble Jet"
 	done
 
@@ -240,7 +240,7 @@ OmanytesWaterGunDescription: ; 5c932 (17:4932)
 	line "more than 20 damage in this way."
 	done
 
-OmanyteKind: ; 5c9df (17:49df)
+SpiralName: ; 5c9df (17:49df)
 	text "Spiral"
 	done
 
@@ -290,7 +290,7 @@ BlizzardDescription: ; 5cb77 (17:4b77)
 	line "for Benched Pokémon.)"
 	done
 
-ArticunoKind: ; 5cc5b (17:4c5b)
+FreezeName: ; 5cc5b (17:4c5b)
 	text "Freeze"
 	done
 
@@ -348,7 +348,7 @@ ThunderJoltDescription: ; 5ceb1 (17:4eb1)
 	line "10 damage to itself."
 	done
 
-PikachuKind: ; 5ceeb (17:4eeb)
+MouseName: ; 5ceeb (17:4eeb)
 	text "Mouse"
 	done
 
@@ -499,7 +499,7 @@ MagnemitesSelfdestructDescription: ; 5d59f (17:559f)
 	line "to itself."
 	done
 
-MagnemiteKind: ; 5d636 (17:5636)
+MagnetName: ; 5d636 (17:5636)
 	text "Magnet"
 	done
 
@@ -573,7 +573,7 @@ VoltorbName: ; 5d9fc (17:59fc)
 	text "Voltorb"
 	done
 
-VoltorbKind: ; 5da05 (17:5a05)
+BallName: ; 5da05 (17:5a05)
 	text "Ball"
 	done
 
@@ -653,7 +653,7 @@ ElectabuzzsQuickAttackDescription: ; 5dd7d (17:5d7d)
 	line "10 damage."
 	done
 
-ElectabuzzKind: ; 5ddec (17:5dec)
+ElectricName: ; 5ddec (17:5dec)
 	text "Electric"
 	done
 
@@ -694,7 +694,7 @@ StunNeedleName: ; 5dfa2 (17:5fa2)
 	text "Stun Needle"
 	done
 
-JolteonKind: ; 5dfaf (17:5faf)
+LightningName: ; 5dfaf (17:5faf)
 	text "Lightning"
 	done
 
@@ -837,7 +837,7 @@ MudSlapName: ; 5e68d (17:668d)
 	text "Mud Slap"
 	done
 
-DiglettKind: ; 5e697 (17:6697)
+MoleName: ; 5e697 (17:6697)
 	text "Mole"
 	done
 
@@ -890,7 +890,7 @@ PeekDescriptionCont: ; 5e8b8 (17:68b8)
 	line "is Asleep, Confused, or Paralyzed."
 	done
 
-MankeyKind: ; 5e8ff (17:68ff)
+PigMonkeyName: ; 5e8ff (17:68ff)
 	text "Pig Monkey"
 	done
 
@@ -928,7 +928,7 @@ LowKickName: ; 5ea2f (17:6a2f)
 	text "Low Kick"
 	done
 
-MachopKindOrSuperpowerName: ; 5ea39 (17:6a39)
+SuperpowerName: ; 5ea39 (17:6a39)
 	text "Superpower"
 	done
 
@@ -1013,7 +1013,7 @@ StoneBarrageDescription: ; 5ed50 (17:6d50)
 	line "the number of heads."
 	done
 
-GeodudeKind: ; 5eda8 (17:6da8)
+RockName: ; 5eda8 (17:6da8)
 	text "Rock"
 	done
 
@@ -1066,7 +1066,7 @@ GolemsSelfdestructDescription: ; 5ef5e (17:6f5e)
 	line "itself."
 	done
 
-GolemKind: ; 5eff2 (17:6ff2)
+MegatonName: ; 5eff2 (17:6ff2)
 	text "Megaton"
 	done
 
@@ -1089,7 +1089,7 @@ OnixsHardenDescription: ; 5f063 (17:7063)
 	line "happen.)"
 	done
 
-OnixKind: ; 5f11d (17:711d)
+RockSnakeName: ; 5f11d (17:711d)
 	text "Rock Snake"
 	done
 
@@ -1122,7 +1122,7 @@ CubonesRageDescription: ; 5f27f (17:727f)
 	line "for each damage counter on Cubone."
 	done
 
-CuboneKind: ; 5f2c6 (17:72c6)
+LonelyName: ; 5f2c6 (17:72c6)
 	text "Lonely"
 	done
 
@@ -1152,7 +1152,7 @@ CallforFriendDescription: ; 5f34f (17:734f)
 	line "Bench is full.)"
 	done
 
-MarowakKind: ; 5f3e9 (17:73e9)
+BonekeeperName: ; 5f3e9 (17:73e9)
 	text "Bonekeeper"
 	done
 
@@ -1212,7 +1212,7 @@ HighJumpKickName: ; 5f6d0 (17:76d0)
 	text "High Jump Kick"
 	done
 
-HitmonleeKind: ; 5f6e0 (17:76e0)
+KickingName: ; 5f6e0 (17:76e0)
 	text "Kicking"
 	done
 
@@ -1234,7 +1234,7 @@ SpecialPunch: ; 5f75f (17:775f)
 	text "Special Punch"
 	done
 
-HitmonchanKind: ; 5f76e (17:776e)
+PunchingName: ; 5f76e (17:776e)
 	text "Punching"
 	done
 
@@ -1260,7 +1260,7 @@ LeerDescription: ; 5f7ec (17:77ec)
 	line "ends this effect.)"
 	done
 
-RhyhornKind: ; 5f889 (17:7889)
+SpikeName: ; 5f889 (17:7889)
 	text "Spike"
 	done
 
@@ -1376,7 +1376,7 @@ PrehistoricPowerDescription: ; 5fd8b (17:7d8b)
 	line "Confused, or Paralyzed."
 	done
 
-AerodactylKind: ; 5fe00 (17:7e00)
+FossilName: ; 5fe00 (17:7e00)
 	text "Fossil"
 	done
 
@@ -1390,7 +1390,7 @@ AbraName: ; 5fe6c (17:7e6c)
 	text "Abra"
 	done
 
-AbraKind: ; 5fe72 (17:7e72)
+PsiName: ; 5fe72 (17:7e72)
 	text "Psi"
 	done
 
diff --git a/src/text/text12.asm b/src/text/text12.asm
index 80b3530..e3e7e12 100644
--- a/src/text/text12.asm
+++ b/src/text/text12.asm
@@ -25,7 +25,7 @@ SlowpokesAmnesiaDescription: ; 60155 (18:4155)
 	line "next turn."
 	done
 
-SlowpokeKind: ; 601c8 (18:41c8)
+DopeyName: ; 601c8 (18:41c8)
 	text "Dopey"
 	done
 
@@ -75,7 +75,7 @@ StrangeBehaviorDescription: ; 60360 (18:4360)
 	line "Confused, or Paralyzed."
 	done
 
-SlowbroKind: ; 6044c (18:444c)
+HermitcrabName: ; 6044c (18:444c)
 	text "Hermitcrab"
 	done
 
@@ -110,7 +110,7 @@ DestinyBondDescription: ; 6051c (18:451c)
 	line "Knock Out that Pokémon."
 	done
 
-GastlyKind: ; 605bf (18:45bf)
+GasName: ; 605bf (18:45bf)
 	text "Gas"
 	done
 
@@ -208,7 +208,7 @@ DarkMindDescription: ; 609c2 (18:49c2)
 	line "for Benched Pokémon.)"
 	done
 
-GengarKind: ; 60a5f (18:4a5f)
+ShadowName: ; 60a5f (18:4a5f)
 	text "Shadow"
 	done
 
@@ -284,7 +284,7 @@ MrMimesMeditateDescription: ; 60d2b (18:4d2b)
 	line "Defending Pokémon."
 	done
 
-MrMimeKindOrBarrierName: ; 60d81 (18:4d81)
+BarrierName: ; 60d81 (18:4d81)
 	text "Barrier"
 	done
 
@@ -309,7 +309,7 @@ JynxsMeditateDescription: ; 60e27 (18:4e27)
 	line "Defending Pokémon."
 	done
 
-JynxKind: ; 60e7d (18:4e7d)
+HumanShapeName: ; 60e7d (18:4e7d)
 	text "Human Shape"
 	done
 
@@ -341,7 +341,7 @@ BarrierDescription: ; 60f45 (18:4f45)
 	line "including damage, done to Mewtwo."
 	done
 
-MewtwoKind: ; 60ff3 (18:4ff3)
+GeneticName: ; 60ff3 (18:4ff3)
 	text "Genetic"
 	done
 
@@ -389,7 +389,7 @@ NeutralizingShieldDescription: ; 6114c (18:514c)
 	line "Paralyzed."
 	done
 
-MewKind: ; 611fa (18:51fa)
+NewSpeciesName: ; 611fa (18:51fa)
 	text "New Species"
 	done
 
@@ -442,7 +442,7 @@ PidgeyName: ; 61442 (18:5442)
 	text "Pidgey"
 	done
 
-PidgeyKind: ; 6144a (18:544a)
+TinyBirdName: ; 6144a (18:544a)
 	text "Tiny Bird"
 	done
 
@@ -467,7 +467,7 @@ PidgeottosMirrorMoveDescription: ; 614d0 (18:54d0)
 	line "Pokémon."
 	done
 
-PidgeottoKind: ; 61540 (18:5540)
+BirdName: ; 61540 (18:5540)
 	text "Bird"
 	done
 
@@ -537,7 +537,7 @@ RattataName: ; 618c5 (18:58c5)
 	text "Rattata"
 	done
 
-RattataKind: ; 618ce (18:58ce)
+RatName: ; 618ce (18:58ce)
 	text "Rat"
 	done
 
@@ -603,7 +603,7 @@ DrillPeckName: ; 61b72 (18:5b72)
 	text "Drill Peck"
 	done
 
-FearowKind: ; 61b7e (18:5b7e)
+BeakName: ; 61b7e (18:5b7e)
 	text "Beak"
 	done
 
@@ -634,7 +634,7 @@ ClefairysMetronomeDescription: ; 61bfd (18:5bfd)
 	line "still Colorless.)"
 	done
 
-ClefairyKind: ; 61cb9 (18:5cb9)
+FairyName: ; 61cb9 (18:5cb9)
 	text "Fairy"
 	done
 
@@ -691,7 +691,7 @@ JigglypuffsDoubleEdgeDescription: ; 61f12 (18:5f12)
 	text "Jigglypuff does 20 damage to itself."
 	done
 
-JigglypuffKind: ; 61f38 (18:5f38)
+BalloonName: ; 61f38 (18:5f38)
 	text "Balloon"
 	done
 
@@ -778,7 +778,7 @@ CatPunchDescription: ; 62287 (18:6287)
 	line "happen.)"
 	done
 
-MeowthKind: ; 62359 (18:6359)
+ScratchCatName: ; 62359 (18:6359)
 	text "Scratch Cat"
 	done
 
@@ -820,7 +820,7 @@ PounceDescription: ; 62475 (18:6475)
 	line "effect.)"
 	done
 
-PersianKind: ; 62552 (18:6552)
+ClassyCatName: ; 62552 (18:6552)
 	text "Classy Cat"
 	done
 
@@ -851,7 +851,7 @@ PotSmashName: ; 6269d (18:669d)
 	text "Pot Smash"
 	done
 
-FarfetchdKind: ; 626a8 (18:66a8)
+WildDuckName: ; 626a8 (18:66a8)
 	text "Wild Duck"
 	done
 
@@ -869,7 +869,7 @@ FuryAttackName: ; 62719 (18:6719)
 	text "Fury Attack"
 	done
 
-DoduoKind: ; 62726 (18:6726)
+TwinBirdName: ; 62726 (18:6726)
 	text "Twin Bird"
 	done
 
@@ -898,7 +898,7 @@ DodriosRageDescription: ; 627ee (18:67ee)
 	line "for each damage counter on Dodrio."
 	done
 
-DodrioKind: ; 62835 (18:6835)
+TriplebirdName: ; 62835 (18:6835)
 	text "Triplebird"
 	done
 
@@ -916,7 +916,7 @@ TongueWrapName: ; 628aa (18:68aa)
 	text "Tongue Wrap"
 	done
 
-LickitungKind: ; 628b7 (18:68b7)
+LickingName: ; 628b7 (18:68b7)
 	text "Licking"
 	done
 
@@ -967,7 +967,7 @@ CometPunchName: ; 62a63 (18:6a63)
 	text "Comet Punch"
 	done
 
-KangaskhanKind: ; 62a70 (18:6a70)
+ParentName: ; 62a70 (18:6a70)
 	text "Parent"
 	done
 
@@ -992,7 +992,7 @@ RampageDescription: ; 62ae7 (18:6ae7)
 	line "now Confused (after doing damage)."
 	done
 
-TaurosKind: ; 62b72 (18:6b72)
+WildBullName: ; 62b72 (18:6b72)
 	text "Wild Bull"
 	done
 
@@ -1026,7 +1026,7 @@ MorphDescriptionCont: ; 62c90 (18:6c90)
 	line "it)."
 	done
 
-DittoKind: ; 62d23 (18:6d23)
+TransformName: ; 62d23 (18:6d23)
 	text "Transform"
 	done
 
@@ -1048,7 +1048,7 @@ TailWagDescription: ; 62d94 (18:6d94)
 	line "effect.)"
 	done
 
-EeveeKind: ; 62e2f (18:6e2f)
+EvolutionName: ; 62e2f (18:6e2f)
 	text "Evolution"
 	done
 
@@ -1083,7 +1083,7 @@ Conversion2Description: ; 62f2d (18:6f2d)
 	line "Colorless."
 	done
 
-PorygonKind: ; 62f79 (18:6f79)
+VirtualName: ; 62f79 (18:6f79)
 	text "Virtual"
 	done
 
@@ -1113,7 +1113,7 @@ BodySlamName: ; 63088 (18:7088)
 	text "Body Slam"
 	done
 
-SnorlaxKind: ; 63093 (18:7093)
+SleepingName: ; 63093 (18:7093)
 	text "Sleeping"
 	done
 
diff --git a/src/text/text9.asm b/src/text/text9.asm
index 9beb35d..b329238 100644
--- a/src/text/text9.asm
+++ b/src/text/text9.asm
@@ -1251,7 +1251,7 @@ BulbasaursLeechSeedDescription: ; 57569 (15:7569)
 	line "damage counter from Bulbasaur."
 	done
 
-BulbasaurKind: ; 575cb (15:75cb)
+SeedName: ; 575cb (15:75cb)
 	text "Seed"
 	done
 
@@ -1370,7 +1370,7 @@ MayInflictParalysisDescription: ; 57ad0 (15:7ad0)
 	line "Pokémon is now Paralyzed."
 	done
 
-CaterpieKind: ; 57b10 (15:7b10)
+WormName: ; 57b10 (15:7b10)
 	text "Worm"
 	done
 
@@ -1399,7 +1399,7 @@ StunSporeName: ; 57c14 (15:7c14)
 	text "Stun Spore"
 	done
 
-MetapodKind: ; 57c20 (15:7c20)
+CocoonName: ; 57c20 (15:7c20)
 	text "Cocoon"
 	done
 
@@ -1440,7 +1440,7 @@ ButterfreesMegaDrainDescriptionCont: ; 57dee (15:7dee)
 	line "them."
 	done
 
-ButterfreeKind: ; 57e36 (15:7e36)
+ButterflyName: ; 57e36 (15:7e36)
 	text "Butterfly"
 	done
 
@@ -1463,7 +1463,7 @@ MayInflictPoisonDescription: ; 57eaf (15:7eaf)
 	line "Pokémon is now Poisoned."
 	done
 
-WeedleKind: ; 57eee (15:7eee)
+HairyBugName: ; 57eee (15:7eee)
 	text "Hairy Bug"
 	done
 
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index 7a77e79..568653d 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -2062,7 +2062,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer BulbasaurName                           ; 0x080a
 	textpointer LeechSeedName                           ; 0x080b
 	textpointer BulbasaursLeechSeedDescription          ; 0x080c
-	textpointer BulbasaurKind                           ; 0x080d
+	textpointer SeedName                           ; 0x080d
 	textpointer BulbasaurDescription                    ; 0x080e
 	textpointer IvysaurName                             ; 0x080f
 	textpointer VineWhipName                            ; 0x0810
@@ -2084,25 +2084,25 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer CaterpieName                            ; 0x0820
 	textpointer StringShotName                          ; 0x0821
 	textpointer MayInflictParalysisDescription          ; 0x0822
-	textpointer CaterpieKind                            ; 0x0823
+	textpointer WormName                            ; 0x0823
 	textpointer CaterpieDescription                     ; 0x0824
 	textpointer MetapodName                             ; 0x0825
 	textpointer StiffenName                             ; 0x0826
 	textpointer MetapodsStiffenDescription              ; 0x0827
 	textpointer StunSporeName                           ; 0x0828
-	textpointer MetapodKind                             ; 0x0829
+	textpointer CocoonName                             ; 0x0829
 	textpointer MetapodDescription                      ; 0x082a
 	textpointer ButterfreeName                          ; 0x082b
 	textpointer WhirlwindName                           ; 0x082c
 	textpointer WhirlwindDescription                    ; 0x082d
 	textpointer ButterfreesMegaDrainDescription         ; 0x082e
 	textpointer ButterfreesMegaDrainDescriptionCont     ; 0x082f
-	textpointer ButterfreeKind                          ; 0x0830
+	textpointer ButterflyName                          ; 0x0830
 	textpointer ButterfreeDescription                   ; 0x0831
 	textpointer WeedleName                              ; 0x0832
 	textpointer PoisonStingName                         ; 0x0833
 	textpointer MayInflictPoisonDescription             ; 0x0834
-	textpointer WeedleKind                              ; 0x0835
+	textpointer HairyBugName                              ; 0x0835
 	textpointer WeedleDescription                       ; 0x0836
 	textpointer KakunaName                              ; 0x0837
 	textpointer KakunasStiffenDescription               ; 0x0838
@@ -2110,25 +2110,25 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer BeedrillName                            ; 0x083a
 	textpointer TwineedleName                           ; 0x083b
 	textpointer DoubleAttackX30Description              ; 0x083c
-	textpointer BeedrillKind                            ; 0x083d
+	textpointer PoisonBeeName                            ; 0x083d
 	textpointer BeedrillDescription                     ; 0x083e
 	textpointer EkansName                               ; 0x083f
 	textpointer SpitPoisonName                          ; 0x0840
 	textpointer WrapName                                ; 0x0841
-	textpointer EkansKind                               ; 0x0842
+	textpointer SnakeName                               ; 0x0842
 	textpointer EkansDescription                        ; 0x0843
 	textpointer ArbokName                               ; 0x0844
 	textpointer TerrorStrikeName                        ; 0x0845
 	textpointer TerrorStrikeDescription                 ; 0x0846
 	textpointer PoisonFangName                          ; 0x0847
-	textpointer ArbokKind                               ; 0x0848
+	textpointer CobraName                               ; 0x0848
 	textpointer ArbokDescription                        ; 0x0849
 	textpointer NidoranFName                            ; 0x084a
 	textpointer FurySweepesName                         ; 0x084b
 	textpointer TripleAttackX10Description              ; 0x084c
 	textpointer CallForFamilyName                       ; 0x084d
 	textpointer NidoranFsCallForFamilyDescription       ; 0x084e
-	textpointer NidoranFKind                            ; 0x084f
+	textpointer PoisonPinName                            ; 0x084f
 	textpointer NidoranFDescription                     ; 0x0850
 	textpointer NidorinaName                            ; 0x0851
 	textpointer SupersonicName                          ; 0x0852
@@ -2139,7 +2139,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer BoyfriendsName                          ; 0x0857
 	textpointer BoyfriendsDescription                   ; 0x0858
 	textpointer MegaPunchName                           ; 0x0859
-	textpointer NidoqueenKind                           ; 0x085a
+	textpointer DrillName                           ; 0x085a
 	textpointer NidoqueenDescription                    ; 0x085b
 	textpointer NidoranMName                            ; 0x085c
 	textpointer HornHazardName                          ; 0x085d
@@ -2157,7 +2157,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer ZubatName                               ; 0x0869
 	textpointer LeechLifeName                           ; 0x086a
 	textpointer ZubatsLeechLifeDescription              ; 0x086b
-	textpointer ZubatKind                               ; 0x086c
+	textpointer BatName                               ; 0x086c
 	textpointer ZubatDescription                        ; 0x086d
 	textpointer GolbatName                              ; 0x086e
 	textpointer WingAttackName                          ; 0x086f
@@ -2166,7 +2166,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer OddishName                              ; 0x0872
 	textpointer SproutName                              ; 0x0873
 	textpointer SproutDescription                       ; 0x0874
-	textpointer OddishKind                              ; 0x0875
+	textpointer WeedName                              ; 0x0875
 	textpointer OddishDescription                       ; 0x0876
 	textpointer GloomName                               ; 0x0877
 	textpointer FoulOdorName                            ; 0x0878
@@ -2177,34 +2177,34 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer HealDescription                         ; 0x087d
 	textpointer PetalDanceName                          ; 0x087e
 	textpointer PetalDanceDescription                   ; 0x087f
-	textpointer VileplumeKind                           ; 0x0880
+	textpointer FlowerName                           ; 0x0880
 	textpointer VileplumeDescription                    ; 0x0881
 	textpointer ParasName                               ; 0x0882
 	textpointer ScratchName                             ; 0x0883
 	textpointer SporeName                               ; 0x0884
 	textpointer InflictSleepDescription                 ; 0x0885
-	textpointer ParasKind                               ; 0x0886
+	textpointer MushroomName                               ; 0x0886
 	textpointer ParasDescription                        ; 0x0887
 	textpointer ParasectName                            ; 0x0888
 	textpointer SlashName                               ; 0x0889
 	textpointer ParasectDescription                     ; 0x088a
 	textpointer VenonatName                             ; 0x088b
 	textpointer VenonatLeechLifeDescription             ; 0x088c
-	textpointer VenonatKind                             ; 0x088d
+	textpointer InsectName                             ; 0x088d
 	textpointer VenonatDescription                      ; 0x088e
 	textpointer VenomothName                            ; 0x088f
 	textpointer ShiftName                               ; 0x0890
 	textpointer ShiftDescription                        ; 0x0891
 	textpointer VenomPowderName                         ; 0x0892
 	textpointer VenomPowderDescription                  ; 0x0893
-	textpointer VenomothKind                            ; 0x0894
+	textpointer PoisonmothName                            ; 0x0894
 	textpointer VenomothDescription                     ; 0x0895
 	textpointer BellsproutName                          ; 0x0896
 	textpointer BellsproutsCallForFamilyDescription     ; 0x0897
 	textpointer BellsproutDescription                   ; 0x0898
 	textpointer WeepinbellName                          ; 0x0899
 	textpointer RazorLeafName                           ; 0x089a
-	textpointer WeepinbellKind                          ; 0x089b
+	textpointer FlycatcherName                          ; 0x089b
 	textpointer WeepinbellDescription                   ; 0x089c
 	textpointer VictreebelName                          ; 0x089d
 	textpointer LureName                                ; 0x089e
@@ -2216,28 +2216,28 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer NastyGooName                            ; 0x08a4
 	textpointer MinimizeName                            ; 0x08a5
 	textpointer GrimersMinimizeDescription              ; 0x08a6
-	textpointer GrimerKindOrSludgeName                  ; 0x08a7
+	textpointer SludgeName                  ; 0x08a7
 	textpointer GrimerDescription                       ; 0x08a8
 	textpointer MukName                                 ; 0x08a9
 	textpointer ToxicGasName                            ; 0x08aa
 	textpointer ToxicGasDescription                     ; 0x08ab
 	textpointer MukDescription                          ; 0x08ac
 	textpointer ExeggcuteName                           ; 0x08ad
-	textpointer DrowzeeKindOrHypnosisName               ; 0x08ae
+	textpointer HypnosisName               ; 0x08ae
 	textpointer ExeggcutesLeechSeedDescription          ; 0x08af
-	textpointer ExeggcuteKind                           ; 0x08b0
+	textpointer EggName                           ; 0x08b0
 	textpointer ExeggcuteDescription                    ; 0x08b1
 	textpointer ExeggutorName                           ; 0x08b2
 	textpointer TeleportName                            ; 0x08b3
 	textpointer TeleportDescription                     ; 0x08b4
 	textpointer BigEggsplosionName                      ; 0x08b5
 	textpointer BigEggsplosionDescription               ; 0x08b6
-	textpointer ExeggutorKind                           ; 0x08b7
+	textpointer CoconutName                           ; 0x08b7
 	textpointer ExeggutorDescription                    ; 0x08b8
 	textpointer KoffingName                             ; 0x08b9
 	textpointer FoulGasName                             ; 0x08ba
 	textpointer FoulGasDescription                      ; 0x08bb
-	textpointer KoffingKind                             ; 0x08bc
+	textpointer PoisonGasName                             ; 0x08bc
 	textpointer KoffingDescription                      ; 0x08bd
 	textpointer WeezingName                             ; 0x08be
 	textpointer SmogName                                ; 0x08bf
@@ -2246,29 +2246,29 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer WeezingDescription                      ; 0x08c2
 	textpointer TangelaName                             ; 0x08c3
 	textpointer BindName                                ; 0x08c4
-	textpointer TangelaKind                             ; 0x08c5
+	textpointer VineName                             ; 0x08c5
 	textpointer Tangela1Description                     ; 0x08c6
 	textpointer PoisonWhipName                          ; 0x08c7
 	textpointer Tangela2Description                     ; 0x08c8
 	textpointer ScytherName                             ; 0x08c9
 	textpointer SwordsDanceName                         ; 0x08ca
 	textpointer SwordsDanceDescription                  ; 0x08cb
-	textpointer ScytherKind                             ; 0x08cc
+	textpointer MantisName                             ; 0x08cc
 	textpointer ScytherDescription                      ; 0x08cd
 	textpointer PinsirName                              ; 0x08ce
 	textpointer IronGripName                            ; 0x08cf
 	textpointer GuillotineName                          ; 0x08d0
-	textpointer PinsirKind                              ; 0x08d1
+	textpointer StagbeetleName                              ; 0x08d1
 	textpointer PinsirDescription                       ; 0x08d2
 	textpointer CharmanderName                          ; 0x08d3
 	textpointer EmberName                               ; 0x08d4
 	textpointer EmberDescription                        ; 0x08d5
-	textpointer CharmanderKind                          ; 0x08d6
+	textpointer LizardName                          ; 0x08d6
 	textpointer CharmanderDescription                   ; 0x08d7
 	textpointer CharmeleonName                          ; 0x08d8
 	textpointer FlamethrowerName                        ; 0x08d9
 	textpointer CharmeleonsFlamethrowerDescription      ; 0x08da
-	textpointer CharmeleonKind                          ; 0x08db
+	textpointer FlameName                          ; 0x08db
 	textpointer CharmeleonDescription                   ; 0x08dc
 	textpointer CharizardName                           ; 0x08dd
 	textpointer EnergyBurnName                          ; 0x08de
@@ -2278,7 +2278,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer CharizardDescription                    ; 0x08e2
 	textpointer VulpixName                              ; 0x08e3
 	textpointer ConfuseRayName                          ; 0x08e4
-	textpointer VulpixKind                              ; 0x08e5
+	textpointer FoxName                              ; 0x08e5
 	textpointer VulpixDescription                       ; 0x08e6
 	textpointer NinetailsName                           ; 0x08e7
 	textpointer NinetailsLureDescription                ; 0x08e8
@@ -2293,14 +2293,14 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Ninetails2Description                   ; 0x08f1
 	textpointer GrowlitheName                           ; 0x08f2
 	textpointer FlareName                               ; 0x08f3
-	textpointer GrowlitheKind                           ; 0x08f4
+	textpointer PuppyName                           ; 0x08f4
 	textpointer GrowlitheDescription                    ; 0x08f5
 	textpointer ArcanineName                            ; 0x08f6
 	textpointer QuickAttackName                         ; 0x08f7
 	textpointer QuickAttackDescription                  ; 0x08f8
 	textpointer FlamesOfRageName                        ; 0x08f9
 	textpointer FlamesOfRageDescription                 ; 0x08fa
-	textpointer ArcanineKind                            ; 0x08fb
+	textpointer LegendaryName                            ; 0x08fb
 	textpointer Arcanine1Description                    ; 0x08fc
 	textpointer ArcaninesFlamethrowerDescription        ; 0x08fd
 	textpointer TakeDownName                            ; 0x08fe
@@ -2309,7 +2309,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer PonytaName                              ; 0x0901
 	textpointer SmashKickName                           ; 0x0902
 	textpointer FlameTailName                           ; 0x0903
-	textpointer PonytaKind                              ; 0x0904
+	textpointer FireHorseName                              ; 0x0904
 	textpointer PonytaDescription                       ; 0x0905
 	textpointer RapidashName                            ; 0x0906
 	textpointer StompName                               ; 0x0907
@@ -2320,7 +2320,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer MagmarName                              ; 0x090c
 	textpointer FirePunchName                           ; 0x090d
 	textpointer FirePunchDescription                    ; 0x090e
-	textpointer MagmarKind                              ; 0x090f
+	textpointer SpitfireName                              ; 0x090f
 	textpointer Magmar1Description                      ; 0x0910
 	textpointer SmokescreenName                         ; 0x0911
 	textpointer MagmarsSmokescreenDescription           ; 0x0912
@@ -2345,11 +2345,11 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer BubbleName                              ; 0x0925
 	textpointer WithdrawName                            ; 0x0926
 	textpointer SquirtlesWithdrawDescription            ; 0x0927
-	textpointer SquirtleKind                            ; 0x0928
+	textpointer TinyTurtleName                            ; 0x0928
 	textpointer SquirtleDescription                     ; 0x0929
 	textpointer WartortleName                           ; 0x092a
 	textpointer WartortlesWithdrawDescription           ; 0x092b
-	textpointer WartortleKind                           ; 0x092c
+	textpointer TurtleName                           ; 0x092c
 	textpointer WartortleDescription                    ; 0x092d
 	textpointer BlastoiseName                           ; 0x092e
 	textpointer RainDanceName                           ; 0x092f
@@ -2357,12 +2357,12 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer RainDanceDescriptionCont                ; 0x0931
 	textpointer HydroPumpName                           ; 0x0932
 	textpointer HydroPumpDescription                    ; 0x0933
-	textpointer BlastoiseKind                           ; 0x0934
+	textpointer ShellfishName                           ; 0x0934
 	textpointer BlastoiseDescription                    ; 0x0935
 	textpointer PsyduckName                             ; 0x0936
 	textpointer HeadacheName                            ; 0x0937
 	textpointer HeadacheDescription                     ; 0x0938
-	textpointer PsyduckKind                             ; 0x0939
+	textpointer DuckName                             ; 0x0939
 	textpointer PsyduckDescription                      ; 0x093a
 	textpointer GolduckName                             ; 0x093b
 	textpointer PsyshockName                            ; 0x093c
@@ -2372,7 +2372,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer PoliwagName                             ; 0x0940
 	textpointer WaterGunName                            ; 0x0941
 	textpointer PoliwagsWaterGunDescription             ; 0x0942
-	textpointer PoliwagKind                             ; 0x0943
+	textpointer TadpoleName                             ; 0x0943
 	textpointer PoliwagDescription                      ; 0x0944
 	textpointer PoliwhirlName                           ; 0x0945
 	textpointer AmnesiaName                             ; 0x0946
@@ -2386,14 +2386,14 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer TentacoolName                           ; 0x094e
 	textpointer CowardiceName                           ; 0x094f
 	textpointer CowardiceDescription                    ; 0x0950
-	textpointer TentacoolKind                           ; 0x0951
+	textpointer JellyfishName                           ; 0x0951
 	textpointer TentacoolDescription                    ; 0x0952
 	textpointer TentacruelName                          ; 0x0953
 	textpointer JellyfishStingName                      ; 0x0954
 	textpointer TentacruelDescription                   ; 0x0955
 	textpointer SeelName                                ; 0x0956
 	textpointer HeadbuttName                            ; 0x0957
-	textpointer SeelKind                                ; 0x0958
+	textpointer SeaLionName                                ; 0x0958
 	textpointer SeelDescription                         ; 0x0959
 	textpointer DewgongName                             ; 0x095a
 	textpointer AuroraBeamName                          ; 0x095b
@@ -2402,7 +2402,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer ShellderName                            ; 0x095e
 	textpointer HideInShellName                         ; 0x095f
 	textpointer HideInShellDescription                  ; 0x0960
-	textpointer ShellderKind                            ; 0x0961
+	textpointer BivalveName                            ; 0x0961
 	textpointer ShellderDescription                     ; 0x0962
 	textpointer CloysterName                            ; 0x0963
 	textpointer ClampName                               ; 0x0964
@@ -2411,17 +2411,17 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer CloysterDescription                     ; 0x0967
 	textpointer KrabbyName                              ; 0x0968
 	textpointer KrabbysCallForFamilyDescription         ; 0x0969
-	textpointer KrabbyKind                              ; 0x096a
+	textpointer RiverCrabName                              ; 0x096a
 	textpointer KrabbyDescription                       ; 0x096b
 	textpointer KinglerName                             ; 0x096c
 	textpointer FlailName                               ; 0x096d
 	textpointer KinglersFlailDescription                ; 0x096e
 	textpointer CrabhammerName                          ; 0x096f
-	textpointer KinglerKind                             ; 0x0970
+	textpointer PincerName                             ; 0x0970
 	textpointer KinglerDescription                      ; 0x0971
 	textpointer HorseaName                              ; 0x0972
 	textpointer OpponentAttackMayDoNothingDescription   ; 0x0973
-	textpointer HorseaKind                              ; 0x0974
+	textpointer DragonName                              ; 0x0974
 	textpointer HorseaDescription                       ; 0x0975
 	textpointer SeadraName                              ; 0x0976
 	textpointer SeadrasWaterGunDescription              ; 0x0977
@@ -2429,39 +2429,39 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer SeadraDescription                       ; 0x0979
 	textpointer GoldeenName                             ; 0x097a
 	textpointer HornAttackName                          ; 0x097b
-	textpointer GoldeenKind                             ; 0x097c
+	textpointer GoldfishName                             ; 0x097c
 	textpointer GoldeenDescription                      ; 0x097d
 	textpointer SeakingName                             ; 0x097e
 	textpointer WaterfallName                           ; 0x097f
 	textpointer SeakingDescription                      ; 0x0980
 	textpointer StaryuName                              ; 0x0981
 	textpointer SlapName                                ; 0x0982
-	textpointer StaryuKind                              ; 0x0983
+	textpointer StarshapeName                              ; 0x0983
 	textpointer StaryuDescription                       ; 0x0984
 	textpointer StarmieName                             ; 0x0985
 	textpointer RecoverName                             ; 0x0986
 	textpointer StarmiesRecoverDescription              ; 0x0987
 	textpointer StarFreezeName                          ; 0x0988
-	textpointer StarmieKind                             ; 0x0989
+	textpointer MysteriousName                             ; 0x0989
 	textpointer StarmieDescription                      ; 0x098a
 	textpointer MagikarpName                            ; 0x098b
 	textpointer TackleName                              ; 0x098c
 	textpointer MagikarpsFlailDescription               ; 0x098d
-	textpointer MagikarpKind                            ; 0x098e
+	textpointer FishName                            ; 0x098e
 	textpointer MagikarpDescription                     ; 0x098f
 	textpointer GyaradosName                            ; 0x0990
 	textpointer DragonRageName                          ; 0x0991
 	textpointer BubblebeamName                          ; 0x0992
-	textpointer GyaradosKind                            ; 0x0993
+	textpointer AtrociousName                            ; 0x0993
 	textpointer GyaradosDescription                     ; 0x0994
 	textpointer LaprasName                              ; 0x0995
 	textpointer LaprasWaterGunDescription               ; 0x0996
-	textpointer LaprasKind                              ; 0x0997
+	textpointer TransportName                              ; 0x0997
 	textpointer LaprasDescription                       ; 0x0998
 	textpointer VaporeonName                            ; 0x0999
 	textpointer FocusEnergyName                         ; 0x099a
 	textpointer FocusEnergyDescription                  ; 0x099b
-	textpointer VaporeonKind                            ; 0x099c
+	textpointer BubbleJetName                            ; 0x099c
 	textpointer Vaporeon1Description                    ; 0x099d
 	textpointer VaporeonsWaterGunDescription            ; 0x099e
 	textpointer Vaporeon2Description                    ; 0x099f
@@ -2470,7 +2470,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer ClairvoyanceName                        ; 0x09a2
 	textpointer ClairvoyanceDescription                 ; 0x09a3
 	textpointer OmanytesWaterGunDescription             ; 0x09a4
-	textpointer OmanyteKind                             ; 0x09a5
+	textpointer SpiralName                             ; 0x09a5
 	textpointer OmanyteDescription                      ; 0x09a6
 	textpointer OmastarName                             ; 0x09a7
 	textpointer OmastarsWaterGunDescription             ; 0x09a8
@@ -2479,7 +2479,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer FreezeDryName                           ; 0x09ab
 	textpointer BlizzardName                            ; 0x09ac
 	textpointer BlizzardDescription                     ; 0x09ad
-	textpointer ArticunoKind                            ; 0x09ae
+	textpointer FreezeName                            ; 0x09ae
 	textpointer Articuno1Description                    ; 0x09af
 	textpointer QuickfreezeName                         ; 0x09b0
 	textpointer QuickfreezeDescription                  ; 0x09b1
@@ -2490,7 +2490,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer GnawName                                ; 0x09b6
 	textpointer ThunderJoltName                         ; 0x09b7
 	textpointer ThunderJoltDescription                  ; 0x09b8
-	textpointer PikachuKind                             ; 0x09b9
+	textpointer MouseName                             ; 0x09b9
 	textpointer Pikachu1Description                     ; 0x09ba
 	textpointer SparkName                               ; 0x09bb
 	textpointer SparkDescription                        ; 0x09bc
@@ -2517,7 +2517,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer MagnemiteName                           ; 0x09d1
 	textpointer ThunderWaveName                         ; 0x09d2
 	textpointer MagnemitesSelfdestructDescription       ; 0x09d3
-	textpointer MagnemiteKind                           ; 0x09d4
+	textpointer MagnetName                           ; 0x09d4
 	textpointer Magnemite1Description                   ; 0x09d5
 	textpointer MagneticStormName                       ; 0x09d6
 	textpointer MagneticStormDescription                ; 0x09d7
@@ -2530,7 +2530,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Magneton2sSelfdestructDescription       ; 0x09de
 	textpointer Magneton2Description                    ; 0x09df
 	textpointer VoltorbName                             ; 0x09e0
-	textpointer VoltorbKind                             ; 0x09e1
+	textpointer BallName                             ; 0x09e1
 	textpointer VoltorbDescription                      ; 0x09e2
 	textpointer ElectrodeName                           ; 0x09e3
 	textpointer EnergySpikeName                         ; 0x09e4
@@ -2544,7 +2544,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer LightScreenDescription                  ; 0x09ec
 	textpointer LightScreenDescriptionCont              ; 0x09ed
 	textpointer ElectabuzzsQuickAttackDescription       ; 0x09ee
-	textpointer ElectabuzzKind                          ; 0x09ef
+	textpointer ElectricName                          ; 0x09ef
 	textpointer Electabuzz1Description                  ; 0x09f0
 	textpointer ThunderpunchName                        ; 0x09f1
 	textpointer ThunderpunchDescription                 ; 0x09f2
@@ -2552,7 +2552,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer JolteonName                             ; 0x09f4
 	textpointer DoubleAttackX20Description              ; 0x09f5
 	textpointer StunNeedleName                          ; 0x09f6
-	textpointer JolteonKind                             ; 0x09f7
+	textpointer LightningName                             ; 0x09f7
 	textpointer Jolteon1Description                     ; 0x09f8
 	textpointer PinMissileName                          ; 0x09f9
 	textpointer QuadrupleAttackX20Description           ; 0x09fa
@@ -2579,7 +2579,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer DiglettName                             ; 0x0a0f
 	textpointer DigName                                 ; 0x0a10
 	textpointer MudSlapName                             ; 0x0a11
-	textpointer DiglettKind                             ; 0x0a12
+	textpointer MoleName                             ; 0x0a12
 	textpointer DiglettDescription                      ; 0x0a13
 	textpointer DugtrioName                             ; 0x0a14
 	textpointer EarthquakeName                          ; 0x0a15
@@ -2589,7 +2589,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer PeekName                                ; 0x0a19
 	textpointer PeekDescription                         ; 0x0a1a
 	textpointer PeekDescriptionCont                     ; 0x0a1b
-	textpointer MankeyKind                              ; 0x0a1c
+	textpointer PigMonkeyName                              ; 0x0a1c
 	textpointer MankeyDescription                       ; 0x0a1d
 	textpointer PrimeapeName                            ; 0x0a1e
 	textpointer TantrumName                             ; 0x0a1f
@@ -2597,7 +2597,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer PrimeapeDescription                     ; 0x0a21
 	textpointer MachopName                              ; 0x0a22
 	textpointer LowKickName                             ; 0x0a23
-	textpointer MachopKindOrSuperpowerName              ; 0x0a24
+	textpointer SuperpowerName              ; 0x0a24
 	textpointer MachopDescription                       ; 0x0a25
 	textpointer MachokeName                             ; 0x0a26
 	textpointer KarateChopName                          ; 0x0a27
@@ -2614,7 +2614,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer GeodudeName                             ; 0x0a32
 	textpointer StoneBarrageName                        ; 0x0a33
 	textpointer StoneBarrageDescription                 ; 0x0a34
-	textpointer GeodudeKind                             ; 0x0a35
+	textpointer RockName                             ; 0x0a35
 	textpointer GeodudeDescription                      ; 0x0a36
 	textpointer GravelerName                            ; 0x0a37
 	textpointer HardenName                              ; 0x0a38
@@ -2624,23 +2624,23 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer GolemName                               ; 0x0a3c
 	textpointer AvalancheName                           ; 0x0a3d
 	textpointer GolemsSelfdestructDescription           ; 0x0a3e
-	textpointer GolemKind                               ; 0x0a3f
+	textpointer MegatonName                               ; 0x0a3f
 	textpointer GolemDescription                        ; 0x0a40
 	textpointer OnixName                                ; 0x0a41
 	textpointer OnixsHardenDescription                  ; 0x0a42
-	textpointer OnixKind                                ; 0x0a43
+	textpointer RockSnakeName                                ; 0x0a43
 	textpointer OnixDescription                         ; 0x0a44
 	textpointer CuboneName                              ; 0x0a45
 	textpointer SnivelName                              ; 0x0a46
 	textpointer SnivelDescription                       ; 0x0a47
 	textpointer CubonesRageDescription                  ; 0x0a48
-	textpointer CuboneKind                              ; 0x0a49
+	textpointer LonelyName                              ; 0x0a49
 	textpointer CuboneDescription                       ; 0x0a4a
 	textpointer MarowakName                             ; 0x0a4b
 	textpointer BonemerangName                          ; 0x0a4c
 	textpointer CallforFriendName                       ; 0x0a4d
 	textpointer CallforFriendDescription                ; 0x0a4e
-	textpointer MarowakKind                             ; 0x0a4f
+	textpointer BonekeeperName                             ; 0x0a4f
 	textpointer Marowak1Description                     ; 0x0a50
 	textpointer BoneAttackName                          ; 0x0a51
 	textpointer BoneAttackDescription                   ; 0x0a52
@@ -2651,17 +2651,17 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer StretchKickName                         ; 0x0a57
 	textpointer StretchKickDescription                  ; 0x0a58
 	textpointer HighJumpKickName                        ; 0x0a59
-	textpointer HitmonleeKind                           ; 0x0a5a
+	textpointer KickingName                           ; 0x0a5a
 	textpointer HitmonleeDescription                    ; 0x0a5b
 	textpointer HitmonchanName                          ; 0x0a5c
 	textpointer JabName                                 ; 0x0a5d
 	textpointer SpecialPunch                            ; 0x0a5e
-	textpointer HitmonchanKind                          ; 0x0a5f
+	textpointer PunchingName                          ; 0x0a5f
 	textpointer HitmonchanDescription                   ; 0x0a60
 	textpointer RhyhornName                             ; 0x0a61
 	textpointer LeerName                                ; 0x0a62
 	textpointer LeerDescription                         ; 0x0a63
-	textpointer RhyhornKind                             ; 0x0a64
+	textpointer SpikeName                             ; 0x0a64
 	textpointer RhyhornDescription                      ; 0x0a65
 	textpointer RhydonName                              ; 0x0a66
 	textpointer RamName                                 ; 0x0a67
@@ -2682,10 +2682,10 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer AerodactylName                          ; 0x0a76
 	textpointer PrehistoricPowerName                    ; 0x0a77
 	textpointer PrehistoricPowerDescription             ; 0x0a78
-	textpointer AerodactylKind                          ; 0x0a79
+	textpointer FossilName                          ; 0x0a79
 	textpointer AerodactylDescription                   ; 0x0a7a
 	textpointer AbraName                                ; 0x0a7b
-	textpointer AbraKind                                ; 0x0a7c
+	textpointer PsiName                                ; 0x0a7c
 	textpointer AbraDescription                         ; 0x0a7d
 	textpointer KadabraName                             ; 0x0a7e
 	textpointer KadabrasRecoverDescription              ; 0x0a7f
@@ -2697,7 +2697,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer AlakazamDescription                     ; 0x0a85
 	textpointer SlowpokeName                            ; 0x0a86
 	textpointer SlowpokesAmnesiaDescription             ; 0x0a87
-	textpointer SlowpokeKind                            ; 0x0a88
+	textpointer DopeyName                            ; 0x0a88
 	textpointer Slowpoke1Description                    ; 0x0a89
 	textpointer SpacingOutName                          ; 0x0a8a
 	textpointer SpacingOutDescription                   ; 0x0a8b
@@ -2706,14 +2706,14 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer SlowbroName                             ; 0x0a8e
 	textpointer StrangeBehaviorName                     ; 0x0a8f
 	textpointer StrangeBehaviorDescription              ; 0x0a90
-	textpointer SlowbroKind                             ; 0x0a91
+	textpointer HermitcrabName                             ; 0x0a91
 	textpointer SlowbroDescription                      ; 0x0a92
 	textpointer GastlyName                              ; 0x0a93
 	textpointer SleepingGasName                         ; 0x0a94
 	textpointer MayInflictSleepDescription              ; 0x0a95
 	textpointer DestinyBondName                         ; 0x0a96
 	textpointer DestinyBondDescription                  ; 0x0a97
-	textpointer GastlyKind                              ; 0x0a98
+	textpointer GasName                              ; 0x0a98
 	textpointer Gastly1Description                      ; 0x0a99
 	textpointer LickName                                ; 0x0a9a
 	textpointer EnergyConversionName                    ; 0x0a9b
@@ -2731,7 +2731,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer CurseDescription                        ; 0x0aa7
 	textpointer DarkMindName                            ; 0x0aa8
 	textpointer DarkMindDescription                     ; 0x0aa9
-	textpointer GengarKind                              ; 0x0aaa
+	textpointer ShadowName                              ; 0x0aaa
 	textpointer GengarDescription                       ; 0x0aab
 	textpointer DrowzeeName                             ; 0x0aac
 	textpointer PoundName                               ; 0x0aad
@@ -2746,18 +2746,18 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer InvisibleWallDescriptionCont            ; 0x0ab6
 	textpointer MeditateName                            ; 0x0ab7
 	textpointer MrMimesMeditateDescription              ; 0x0ab8
-	textpointer MrMimeKindOrBarrierName                 ; 0x0ab9
+	textpointer BarrierName                 ; 0x0ab9
 	textpointer MrMimeDescription                       ; 0x0aba
 	textpointer JynxName                                ; 0x0abb
 	textpointer DoubleAttackX10Description              ; 0x0abc
 	textpointer JynxsMeditateDescription                ; 0x0abd
-	textpointer JynxKind                                ; 0x0abe
+	textpointer HumanShapeName                                ; 0x0abe
 	textpointer JynxDescription                         ; 0x0abf
 	textpointer MewtwoName                              ; 0x0ac0
 	textpointer PsychicName                             ; 0x0ac1
 	textpointer PsychicDescription                      ; 0x0ac2
 	textpointer BarrierDescription                      ; 0x0ac3
-	textpointer MewtwoKind                              ; 0x0ac4
+	textpointer GeneticName                              ; 0x0ac4
 	textpointer Mewtwo1Description                      ; 0x0ac5
 	textpointer EnergyAbsorptionName                    ; 0x0ac6
 	textpointer EnergyAbsorptionDescription             ; 0x0ac7
@@ -2766,7 +2766,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer MewName                                 ; 0x0aca
 	textpointer NeutralizingShieldName                  ; 0x0acb
 	textpointer NeutralizingShieldDescription           ; 0x0acc
-	textpointer MewKind                                 ; 0x0acd
+	textpointer NewSpeciesName                                 ; 0x0acd
 	textpointer Mew1Description                         ; 0x0ace
 	textpointer MysteryAttackName                       ; 0x0acf
 	textpointer MysteryAttackDescription                ; 0x0ad0
@@ -2776,12 +2776,12 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer DevolutionBeamName                      ; 0x0ad4
 	textpointer DevolutionBeamDescription               ; 0x0ad5
 	textpointer PidgeyName                              ; 0x0ad6
-	textpointer PidgeyKind                              ; 0x0ad7
+	textpointer TinyBirdName                              ; 0x0ad7
 	textpointer PidgeyDescription                       ; 0x0ad8
 	textpointer PidgeottoName                           ; 0x0ad9
 	textpointer MirrorMoveName                          ; 0x0ada
 	textpointer PidgeottosMirrorMoveDescription         ; 0x0adb
-	textpointer PidgeottoKind                           ; 0x0adc
+	textpointer BirdName                           ; 0x0adc
 	textpointer PidgeottoDescription                    ; 0x0add
 	textpointer PidgeotName                             ; 0x0ade
 	textpointer SlicingWindName                         ; 0x0adf
@@ -2793,7 +2793,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer HurricaneDescription                    ; 0x0ae5
 	textpointer Pidgeot2Description                     ; 0x0ae6
 	textpointer RattataName                             ; 0x0ae7
-	textpointer RattataKind                             ; 0x0ae8
+	textpointer RatName                             ; 0x0ae8
 	textpointer RattataDescription                      ; 0x0ae9
 	textpointer RaticateName                            ; 0x0aea
 	textpointer SuperFangName                           ; 0x0aeb
@@ -2806,13 +2806,13 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer FearowName                              ; 0x0af2
 	textpointer FearowsAgilityDescription               ; 0x0af3
 	textpointer DrillPeckName                           ; 0x0af4
-	textpointer FearowKind                              ; 0x0af5
+	textpointer BeakName                              ; 0x0af5
 	textpointer FearowDescription                       ; 0x0af6
 	textpointer ClefairyName                            ; 0x0af7
 	textpointer SingName                                ; 0x0af8
 	textpointer MetronomeName                           ; 0x0af9
 	textpointer ClefairysMetronomeDescription           ; 0x0afa
-	textpointer ClefairyKind                            ; 0x0afb
+	textpointer FairyName                            ; 0x0afb
 	textpointer ClefairyDescription                     ; 0x0afc
 	textpointer ClefableName                            ; 0x0afd
 	textpointer ClefablesMetronomeDescription           ; 0x0afe
@@ -2823,7 +2823,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer FirstAidDescription                     ; 0x0b03
 	textpointer DoubleEdgeName                          ; 0x0b04
 	textpointer JigglypuffsDoubleEdgeDescription        ; 0x0b05
-	textpointer JigglypuffKind                          ; 0x0b06
+	textpointer BalloonName                          ; 0x0b06
 	textpointer Jigglypuff1Description                  ; 0x0b07
 	textpointer FriendshipSongName                      ; 0x0b08
 	textpointer FriendshipSongDescription               ; 0x0b09
@@ -2839,7 +2839,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer MeowthName                              ; 0x0b13
 	textpointer CatPunchName                            ; 0x0b14
 	textpointer CatPunchDescription                     ; 0x0b15
-	textpointer MeowthKind                              ; 0x0b16
+	textpointer ScratchCatName                              ; 0x0b16
 	textpointer Meowth1Description                      ; 0x0b17
 	textpointer PayDayName                              ; 0x0b18
 	textpointer PayDayDescription                       ; 0x0b19
@@ -2847,27 +2847,27 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer PersianName                             ; 0x0b1b
 	textpointer PounceName                              ; 0x0b1c
 	textpointer PounceDescription                       ; 0x0b1d
-	textpointer PersianKind                             ; 0x0b1e
+	textpointer ClassyCatName                             ; 0x0b1e
 	textpointer PersianDescription                      ; 0x0b1f
 	textpointer FarfetchdName                           ; 0x0b20
 	textpointer LeekSlapName                            ; 0x0b21
 	textpointer LeekSlapDescription                     ; 0x0b22
 	textpointer PotSmashName                            ; 0x0b23
-	textpointer FarfetchdKind                           ; 0x0b24
+	textpointer WildDuckName                           ; 0x0b24
 	textpointer FarfetchdDescription                    ; 0x0b25
 	textpointer DoduoName                               ; 0x0b26
 	textpointer FuryAttackName                          ; 0x0b27
-	textpointer DoduoKind                               ; 0x0b28
+	textpointer TwinBirdName                               ; 0x0b28
 	textpointer DoduoDescription                        ; 0x0b29
 	textpointer DodrioName                              ; 0x0b2a
 	textpointer RetreatAidName                          ; 0x0b2b
 	textpointer RetreatAidDescription                   ; 0x0b2c
 	textpointer DodriosRageDescription                  ; 0x0b2d
-	textpointer DodrioKind                              ; 0x0b2e
+	textpointer TriplebirdName                              ; 0x0b2e
 	textpointer DodrioDescription                       ; 0x0b2f
 	textpointer LickitungName                           ; 0x0b30
 	textpointer TongueWrapName                          ; 0x0b31
-	textpointer LickitungKind                           ; 0x0b32
+	textpointer LickingName                           ; 0x0b32
 	textpointer LickitungDescription                    ; 0x0b33
 	textpointer ChanseyName                             ; 0x0b34
 	textpointer ScrunchName                             ; 0x0b35
@@ -2878,35 +2878,35 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer FetchName                               ; 0x0b3a
 	textpointer FetchDescription                        ; 0x0b3b
 	textpointer CometPunchName                          ; 0x0b3c
-	textpointer KangaskhanKind                          ; 0x0b3d
+	textpointer ParentName                          ; 0x0b3d
 	textpointer KangaskhanDescription                   ; 0x0b3e
 	textpointer TaurosName                              ; 0x0b3f
 	textpointer RampageName                             ; 0x0b40
 	textpointer RampageDescription                      ; 0x0b41
-	textpointer TaurosKind                              ; 0x0b42
+	textpointer WildBullName                              ; 0x0b42
 	textpointer TaurosDescription                       ; 0x0b43
 	textpointer DittoName                               ; 0x0b44
 	textpointer MorphName                               ; 0x0b45
 	textpointer MorphDescription                        ; 0x0b46
 	textpointer MorphDescriptionCont                    ; 0x0b47
-	textpointer DittoKind                               ; 0x0b48
+	textpointer TransformName                               ; 0x0b48
 	textpointer DittoDescription                        ; 0x0b49
 	textpointer TailWagName                             ; 0x0b4a
 	textpointer TailWagDescription                      ; 0x0b4b
-	textpointer EeveeKind                               ; 0x0b4c
+	textpointer EvolutionName                               ; 0x0b4c
 	textpointer EeveeDescription                        ; 0x0b4d
 	textpointer PorygonName                             ; 0x0b4e
 	textpointer Conversion1Name                         ; 0x0b4f
 	textpointer Conversion1Description                  ; 0x0b50
 	textpointer Conversion2Name                         ; 0x0b51
 	textpointer Conversion2Description                  ; 0x0b52
-	textpointer PorygonKind                             ; 0x0b53
+	textpointer VirtualName                             ; 0x0b53
 	textpointer PorygonDescription                      ; 0x0b54
 	textpointer SnorlaxName                             ; 0x0b55
 	textpointer ThickSkinnedName                        ; 0x0b56
 	textpointer ThickSkinnedDescription                 ; 0x0b57
 	textpointer BodySlamName                            ; 0x0b58
-	textpointer SnorlaxKind                             ; 0x0b59
+	textpointer SleepingName                             ; 0x0b59
 	textpointer SnorlaxDescription                      ; 0x0b5a
 	textpointer DratiniName                             ; 0x0b5b
 	textpointer DratiniDescription                      ; 0x0b5c
author	xCrystal <rgr.crystal@gmail.com>	2018-06-30 18:26:11 +0200
committer	xCrystal <rgr.crystal@gmail.com>	2018-06-30 18:26:11 +0200
commit	ec76e14e6ed4506d4081eb2c1b510747a33c7a53 (patch)
tree	0adf241b7ed4c018553d870ff41f04b18933275f /src
parent	32f3634c48b336290d10eb232a69412266549c5b (diff)