(Most) trainer effects

3 files changed, 84 insertions, 84 deletions

diff --git a/src/text/text1.asm b/src/text/text1.asm
index 23ad017..fa1d585 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -826,7 +826,7 @@ ThereAreNoEnergyCardsInDiscardPileText: ; 3746a (d:746a)
 	line "in the the Discard Pile."
 	done
 
-Text00b0: ; 3749e (d:749e)
+ThereAreNoBasicEnergyCardsInDiscardPileText: ; 3749e (d:749e)
 	text "There are no Basic Energy cards"
 	line "in the Discard Pile."
 	done
@@ -854,7 +854,7 @@ NotAffectedByPoisonSleepParalysisOrConfusionText: ; 37583 (d:7583)
 	line "Sleep, Paralysis, or Confusion."
 	done
 
-Text00b6: ; 375bc (d:75bc)
+NotEnoughCardsInHandText: ; 375bc (d:75bc)
 	text "Not enough cards in Hand."
 	done
 
@@ -862,22 +862,22 @@ EffectNoPokemonOnTheBenchText: ; 375d7 (d:75d7)
 	text "No Pokémon on the Bench."
 	done
 
-Text00b8: ; 375f1 (d:75f1)
+ThereAreNoPokemonInDiscardPileText: ; 375f1 (d:75f1)
 	text "There are no Pokémon"
 	line "in the Discard Pile."
 	done
 
-Text00b9: ; 3761c (d:761c)
+ConditionsForEvolvingToStage2NotFulfilledText: ; 3761c (d:761c)
 	text "Conditions for evolving to"
 	line "Stage 2 not fulfilled."
 	done
 
-Text00ba: ; 3764f (d:764f)
+ThereAreNoCardsInHandThatYouCanChangeText: ; 3764f (d:764f)
 	text "There are no cards in Hand"
 	line "that you can change."
 	done
 
-Text00bb: ; 37680 (d:7680)
+ThereAreNoCardsInTheDiscardPileText: ; 37680 (d:7680)
 	text "There are no cards in the"
 	line "Discard Pile."
 	done
@@ -887,12 +887,12 @@ ThereAreNoStage1PokemonText: ; 376a9 (d:76a9)
 	line "in the Play Area."
 	done
 
-Text00bd: ; 376d9 (d:76d9)
+NoEnergyCardsAttachedToPokemonInYourPlayAreaText: ; 376d9 (d:76d9)
 	text "No Energy cards are attached to"
 	line "Pokémon in your Play Area."
 	done
 
-Text00be: ; 37715 (d:7715)
+NoEnergyCardsAttachedToPokemonInOppPlayAreaText: ; 37715 (d:7715)
 	text "No Energy cards attached to Pokémon"
 	line "in your opponent's Play Area."
 	done
@@ -959,7 +959,7 @@ CannotBeUsedInTurnWhichWasPlayedText: ; 378ef (d:78ef)
 	line "which it was played."
 	done
 
-Text00cd: ; 37923 (d:7923)
+ThereIsNoEnergyCardAttachedText: ; 37923 (d:7923)
 	text "There is no Energy card attached."
 	done
 
@@ -1128,7 +1128,7 @@ TrainerCardSuccessCheckText: ; 37eea (d:7eea)
 	line "If Heads, you're successful!"
 	done
 
-Text00f0: ; 37f24 (d:7f24)
+CardCheckIfHeads8CardsIfTails1CardText: ; 37f24 (d:7f24)
 	text "Card check!"
 	line "If Heads, 8 cards! If Tails, 1 card!"
 	done
diff --git a/src/text/text2.asm b/src/text/text2.asm
index 9d328b6..43a8ba5 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -503,22 +503,22 @@ Text014f: ; 394a6 (e:54a6)
 	line "A Button is pressed. B Button quits."
 	done
 
-Text0150: ; 394f0 (e:54f0)
+ChoosePokemonToRemoveDamageCounterFromText: ; 394f0 (e:54f0)
 	text "Choose a Pokémon to remove"
 	line "the Damage counter from."
 	done
 
-Text0151: ; 39525 (e:5525)
+ChooseCardToDiscardFromHandText: ; 39525 (e:5525)
 	text "Choose the card to Discard"
 	line "from the Hand."
 	done
 
-Text0152: ; 39550 (e:5550)
+ChoosePokemonToRemoveEnergyFromText: ; 39550 (e:5550)
 	text "Choose a Pokémon to remove"
 	line "Energy from and choose the Energy."
 	done
 
-Text0153: ; 3958f (e:558f)
+Choose2BasicEnergyCardsFromDiscardPileText: ; 3958f (e:558f)
 	text "Choose 2 Basic Energy cards"
 	line "from the Discard Pile."
 	done
@@ -528,22 +528,22 @@ Text0154: ; 395c3 (e:55c3)
 	line "Button to remove Damage counters."
 	done
 
-Text0155: ; 39607 (e:5607)
+Choose2CardsFromHandToDiscardText: ; 39607 (e:5607)
 	text "Choose 2 cards from the Hand"
 	line "to Discard."
 	done
 
-Text0156: ; 39631 (e:5631)
+Choose2HandCardsFromHandToReturnToDeckText: ; 39631 (e:5631)
 	text "Choose 2 cards from the Hand"
 	line "to return to the Deck."
 	done
 
-Text0157: ; 39666 (e:5666)
+ChooseCardToPlaceInHandText: ; 39666 (e:5666)
 	text "Choose a card to"
 	line "place in the Hand."
 	done
 
-Text0158: ; 3968b (e:568b)
+ChoosePokemonToAttachDefenderToText: ; 3968b (e:568b)
 	text "Choose a Pokémon to"
 	line "attach Defender to."
 	done
@@ -553,75 +553,75 @@ Text0159: ; 396b4 (e:56b4)
 	line "A to Draw, B to End."
 	done
 
-Text015a: ; 396e6 (e:56e6)
+ChoosePokemonToReturnToTheDeckText: ; 396e6 (e:56e6)
 	text "Choose a Pokémon to"
 	line "return to the Deck."
 	done
 
-Text015b: ; 3970f (e:570f)
+ChoosePokemonToPlaceInPlayText: ; 3970f (e:570f)
 	text "Choose a Pokémon to"
 	line "place in play."
 	done
 
-Text015c: ; 39733 (e:5733)
+ChooseBasicPokemonToEvolveText: ; 39733 (e:5733)
 	text "Choose a Basic Pokémon"
 	line "to Evolve."
 	done
 
-Text015d: ; 39756 (e:5756)
+ChoosePokemonToScoopUpText: ; 39756 (e:5756)
 	text "Choose a Pokémon to"
 	line "Scoop Up."
 	done
 
-Text015e: ; 39775 (e:5775)
+ChooseCardFromYourHandToSwitchText: ; 39775 (e:5775)
 	text "Choose a card from your"
 	line "Hand to Switch."
 	done
 
-Text015f: ; 3979e (e:579e)
+ChooseCardToSwitchText: ; 3979e (e:579e)
 	text "Choose a card to"
 	line "Switch."
 	done
 
-Text0160: ; 397b8 (e:57b8)
+ChooseBasicOrEvolutionPokemonCardFromDeckText: ; 397b8 (e:57b8)
 	text "Choose a Basic or Evolution"
 	line "Pokémon card from the Deck."
 	done
 
-Text0161: ; 397f1 (e:57f1)
+ChoosePokemonCardText: ; 397f1 (e:57f1)
 	text "Choose"
 	line "a Pokémon card."
 	done
 
-Text0162: ; 39809 (e:5809)
+RearrangeThe5CardsAtTopOfDeckText: ; 39809 (e:5809)
 	text "Rearrange the 5 cards at"
 	line "the top of the Deck."
 	done
 
-Text0163: ; 39838 (e:5838)
+PleaseCheckTheOpponentsHandText: ; 39838 (e:5838)
 	text "Please check the opponent's"
 	line "Hand."
 	done
 
-Text0164: ; 3985b (e:585b)
+EvolutionCardText: ; 3985b (e:585b)
 	text "Evolution card"
 	done
 
-Text0165: ; 3986b (e:586b)
+CardWasChosenText: ; 3986b (e:586b)
 	text "<RAMTEXT> was chosen."
 	done
 
-Text0166: ; 3987a (e:587a)
+ChooseBasicPokemonToPlaceOnBenchText: ; 3987a (e:587a)
 	text "Choose a Basic Pokémon"
 	line "to place on the Bench."
 	done
 
-Text0167: ; 398a9 (e:58a9)
+ChooseEvolutionCardAndPressAButtonToDevolveText: ; 398a9 (e:58a9)
 	text "Choose an Evolution card and"
 	line "press the A Button to Devolve 1."
 	done
 
-Text0168: ; 398e8 (e:58e8)
+ChoosePokemonInYourAreaThenPokemonInYourOppText: ; 398e8 (e:58e8)
 	text "Choose a Pokémon in your Area, then"
 	line "a Pokémon in your opponent's."
 	done
@@ -636,22 +636,22 @@ Text016a: ; 39952 (e:5952)
 	line "with the Active Pokémon."
 	done
 
-Text016b: ; 39987 (e:5987)
+PokemonAndAllAttachedCardsWereReturnedToDeckText: ; 39987 (e:5987)
 	text "<RAMTEXT> and all attached"
 	line "cards were returned to the Deck."
 	done
 
-Text016c: ; 399bc (e:59bc)
+PokemonWasReturnedFromArenaToHandText: ; 399bc (e:59bc)
 	text "<RAMTEXT> was returned"
 	line "from the Arena to the Hand."
 	done
 
-Text016d: ; 399e8 (e:59e8)
+PokemonWasReturnedFromBenchToHandText: ; 399e8 (e:59e8)
 	text "<RAMTEXT> was returned"
 	line "from the Bench to the Hand."
 	done
 
-Text016e: ; 39a14 (e:5a14)
+PokemonWasReturnedToDeckText: ; 39a14 (e:5a14)
 	text "<RAMTEXT> was returned"
 	line "to the Deck."
 	done
@@ -669,12 +669,12 @@ YouReceivedTheseCardsText: ; 39a63 (e:5a63)
 	text "You received these cards:"
 	done
 
-Text0172: ; 39a7e (e:5a7e)
+ChooseTheCardToPutBackText: ; 39a7e (e:5a7e)
 	text "Choose the card"
 	line "to put back."
 	done
 
-Text0173: ; 39a9c (e:5a9c)
+ChooseTheCardToDiscardText: ; 39a9c (e:5a9c)
 	text "Choose the card"
 	line "to Discard."
 	done
@@ -698,12 +698,12 @@ CameToTheBenchText: ; 39b03 (e:5b03)
 	line "came to the Bench!"
 	done
 
-Text0178: ; 39b19 (e:5b19)
+DuelistHasNoCardsInHandText: ; 39b19 (e:5b19)
 	text "<RAMNAME> has"
 	line "no cards in Hand!"
 	done
 
-Text0179: ; 39b32 (e:5b32)
+PokemonHealedDamageText: ; 39b32 (e:5b32)
 	text "<RAMTEXT> healed"
 	line "<RAMNUM> damage!"
 	done
@@ -721,7 +721,7 @@ YouCanSelectMoreCardsQuitText: ; 39b73 (e:5b73)
 	text "You can select <RAMNUM> more cards. Quit?"
 	done
 
-Text017d: ; 39b97 (e:5b97)
+ThereWasNoEffectText: ; 39b97 (e:5b97)
 	text "There was no effect!"
 	done
 
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index a7af9be..b44dc3e 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -177,21 +177,21 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer NoDamageCountersText                               ; 0x00ad
 	textpointer NoEnergyAttachedToOpponentsActiveText              ; 0x00ae
 	textpointer ThereAreNoEnergyCardsInDiscardPileText             ; 0x00af
-	textpointer Text00b0                                           ; 0x00b0
+	textpointer ThereAreNoBasicEnergyCardsInDiscardPileText        ; 0x00b0
 	textpointer NoCardsLeftInTheDeckText                           ; 0x00b1
 	textpointer NoSpaceOnTheBenchText                              ; 0x00b2
 	textpointer NoPokemonCapableOfEvolvingText                     ; 0x00b3
 	textpointer CantEvolvePokemonInSameTurnItsPlacedText           ; 0x00b4
 	textpointer NotAffectedByPoisonSleepParalysisOrConfusionText   ; 0x00b5
-	textpointer Text00b6                                           ; 0x00b6
+	textpointer NotEnoughCardsInHandText                           ; 0x00b6
 	textpointer EffectNoPokemonOnTheBenchText                      ; 0x00b7
-	textpointer Text00b8                                           ; 0x00b8
-	textpointer Text00b9                                           ; 0x00b9
-	textpointer Text00ba                                           ; 0x00ba
-	textpointer Text00bb                                           ; 0x00bb
+	textpointer ThereAreNoPokemonInDiscardPileText                 ; 0x00b8
+	textpointer ConditionsForEvolvingToStage2NotFulfilledText      ; 0x00b9
+	textpointer ThereAreNoCardsInHandThatYouCanChangeText          ; 0x00ba
+	textpointer ThereAreNoCardsInTheDiscardPileText                ; 0x00bb
 	textpointer ThereAreNoStage1PokemonText                        ; 0x00bc
-	textpointer Text00bd                                           ; 0x00bd
-	textpointer Text00be                                           ; 0x00be
+	textpointer NoEnergyCardsAttachedToPokemonInYourPlayAreaText   ; 0x00bd
+	textpointer NoEnergyCardsAttachedToPokemonInOppPlayAreaText    ; 0x00be
 	textpointer EnergyCardsRequiredToRetreatText                   ; 0x00bf
 	textpointer NotEnoughEnergyCardsText                           ; 0x00c0
 	textpointer NotEnoughFireEnergyText                            ; 0x00c1
@@ -206,7 +206,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer OnlyOncePerTurnText                                ; 0x00ca
 	textpointer CannotUseDueToStatusText                           ; 0x00cb
 	textpointer CannotBeUsedInTurnWhichWasPlayedText               ; 0x00cc
-	textpointer Text00cd                                           ; 0x00cd
+	textpointer ThereIsNoEnergyCardAttachedText                    ; 0x00cd
 	textpointer NoGrassEnergyText                                  ; 0x00ce
 	textpointer CannotUseSinceTheresOnly1PkmnText                  ; 0x00cf
 	textpointer CannotUseBecauseItWillBeKnockedOutText             ; 0x00d0
@@ -241,7 +241,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer IfTailsDamageToYourselfTooText                     ; 0x00ed
 	textpointer SuccessCheckIfHeadsAttackIsSuccessfulText          ; 0x00ee
 	textpointer TrainerCardSuccessCheckText                        ; 0x00ef
-	textpointer Text00f0                                           ; 0x00f0
+	textpointer CardCheckIfHeads8CardsIfTails1CardText             ; 0x00f0
 	textpointer IfHeadsNoDamageNextTurnText                        ; 0x00f1
 	textpointer Text00f2                                           ; 0x00f2
 	textpointer DamageCheckIfHeadsPlusDamageText                   ; 0x00f3
@@ -337,52 +337,52 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer DrewFireEnergyFromTheHandText                      ; 0x014d
 	textpointer ThePkmnCardsInHandAndDeckWereShuffledText          ; 0x014e
 	textpointer Text014f                                           ; 0x014f
-	textpointer Text0150                                           ; 0x0150
-	textpointer Text0151                                           ; 0x0151
-	textpointer Text0152                                           ; 0x0152
-	textpointer Text0153                                           ; 0x0153
+	textpointer ChoosePokemonToRemoveDamageCounterFromText         ; 0x0150
+	textpointer ChooseCardToDiscardFromHandText                    ; 0x0151
+	textpointer ChoosePokemonToRemoveEnergyFromText                ; 0x0152
+	textpointer Choose2BasicEnergyCardsFromDiscardPileText         ; 0x0153
 	textpointer Text0154                                           ; 0x0154
-	textpointer Text0155                                           ; 0x0155
-	textpointer Text0156                                           ; 0x0156
-	textpointer Text0157                                           ; 0x0157
-	textpointer Text0158                                           ; 0x0158
+	textpointer Choose2CardsFromHandToDiscardText                  ; 0x0155
+	textpointer Choose2HandCardsFromHandToReturnToDeckText         ; 0x0156
+	textpointer ChooseCardToPlaceInHandText                        ; 0x0157
+	textpointer ChoosePokemonToAttachDefenderToText                ; 0x0158
 	textpointer Text0159                                           ; 0x0159
-	textpointer Text015a                                           ; 0x015a
-	textpointer Text015b                                           ; 0x015b
-	textpointer Text015c                                           ; 0x015c
-	textpointer Text015d                                           ; 0x015d
-	textpointer Text015e                                           ; 0x015e
-	textpointer Text015f                                           ; 0x015f
-	textpointer Text0160                                           ; 0x0160
-	textpointer Text0161                                           ; 0x0161
-	textpointer Text0162                                           ; 0x0162
-	textpointer Text0163                                           ; 0x0163
-	textpointer Text0164                                           ; 0x0164
-	textpointer Text0165                                           ; 0x0165
-	textpointer Text0166                                           ; 0x0166
-	textpointer Text0167                                           ; 0x0167
-	textpointer Text0168                                           ; 0x0168
+	textpointer ChoosePokemonToReturnToTheDeckText                 ; 0x015a
+	textpointer ChoosePokemonToPlaceInPlayText                     ; 0x015b
+	textpointer ChooseBasicPokemonToEvolveText                     ; 0x015c
+	textpointer ChoosePokemonToScoopUpText                         ; 0x015d
+	textpointer ChooseCardFromYourHandToSwitchText                 ; 0x015e
+	textpointer ChooseCardToSwitchText                             ; 0x015f
+	textpointer ChooseBasicOrEvolutionPokemonCardFromDeckText      ; 0x0160
+	textpointer ChoosePokemonCardText                              ; 0x0161
+	textpointer RearrangeThe5CardsAtTopOfDeckText                  ; 0x0162
+	textpointer PleaseCheckTheOpponentsHandText                    ; 0x0163
+	textpointer EvolutionCardText                                  ; 0x0164
+	textpointer CardWasChosenText                                  ; 0x0165
+	textpointer ChooseBasicPokemonToPlaceOnBenchText               ; 0x0166
+	textpointer ChooseEvolutionCardAndPressAButtonToDevolveText    ; 0x0167
+	textpointer ChoosePokemonInYourAreaThenPokemonInYourOppText    ; 0x0168
 	textpointer Text0169                                           ; 0x0169
 	textpointer Text016a                                           ; 0x016a
-	textpointer Text016b                                           ; 0x016b
-	textpointer Text016c                                           ; 0x016c
-	textpointer Text016d                                           ; 0x016d
-	textpointer Text016e                                           ; 0x016e
+	textpointer PokemonAndAllAttachedCardsWereReturnedToDeckText   ; 0x016b
+	textpointer PokemonWasReturnedFromArenaToHandText              ; 0x016c
+	textpointer PokemonWasReturnedFromBenchToHandText              ; 0x016d
+	textpointer PokemonWasReturnedToDeckText                       ; 0x016e
 	textpointer WasPlacedInTheHandText                             ; 0x016f
 	textpointer TheCardYouReceivedText                             ; 0x0170
 	textpointer YouReceivedTheseCardsText                          ; 0x0171
-	textpointer Text0172                                           ; 0x0172
-	textpointer Text0173                                           ; 0x0173
+	textpointer ChooseTheCardToPutBackText                         ; 0x0172
+	textpointer ChooseTheCardToDiscardText                         ; 0x0173
 	textpointer DiscardedCardsFromDeckText                         ; 0x0174
 	textpointer Text0175                                           ; 0x0175
 	textpointer NoneCameText                                       ; 0x0176
 	textpointer CameToTheBenchText                                 ; 0x0177
-	textpointer Text0178                                           ; 0x0178
-	textpointer Text0179                                           ; 0x0179
+	textpointer DuelistHasNoCardsInHandText                        ; 0x0178
+	textpointer PokemonHealedDamageText                            ; 0x0179
 	textpointer PokemonDevolvedToText                              ; 0x017a
 	textpointer ThereWasNoFireEnergyText                           ; 0x017b
 	textpointer YouCanSelectMoreCardsQuitText                      ; 0x017c
-	textpointer Text017d                                           ; 0x017d
+	textpointer ThereWasNoEffectText                               ; 0x017d
 	textpointer ThereWasNoEffectFromToxicText                      ; 0x017e
 	textpointer ThereWasNoEffectFromPoisonText                     ; 0x017f
 	textpointer ThereWasNoEffectFromSleepText                      ; 0x0180