First contributions

- Renamed some generic variables
- Changed variable ThrashDescriptiPn to ThrashDescriptiOn (TrashDescription, the O and P were to clarify which letter I changed)

5 files changed, 91 insertions, 91 deletions

diff --git a/src/data/cards.asm b/src/data/cards.asm
index 8bbc091..a15f0e5 100644
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -1114,7 +1114,7 @@ NidokingCard: ; 31279 (c:5279)
 	; move 1
 	energy GRASS, 1, COLORLESS, 2 ; energies
 	tx ThrashName ; name
-	tx ThrashDescriptipn ; description
+	tx ThrashDescription ; description
 	dw NONE ; description (cont)
 	db 30 ; damage
 	db DAMAGE_PLUS ; category
diff --git a/src/text/text1.asm b/src/text/text1.asm
index 075a9ef..ceb97a0 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -54,7 +54,7 @@ PokemonText: ; 36378 (d:6378)
 	text " Pokémon"
 	done
 
-Text000f: ; 36382 (d:6382)
+MetresText: ; 36382 (d:6382)
 	textfw3 "m"
 	done
 
@@ -78,51 +78,51 @@ StarRarityText: ; 36393 (d:6393)
 	textfw3 "★"
 	done
 
-Text0015: ; 36396 (d:6396)
+AllCardsOwnedText: ; 36396 (d:6396)
 	text " All cards owned:"
 	done
 
-Text0016: ; 363a9 (d:63a9)
+TotalNumberOfCardsText: ; 363a9 (d:63a9)
 	text "Total number of cards"
 	done
 
-Text0017: ; 363c0 (d:63c0)
+TypesOfCardsText: ; 363c0 (d:63c0)
 	text "Types of cards"
 	done
 
-Text0018: ; 363d0 (d:63d0)
+TypeGrassPokemonText: ; 363d0 (d:63d0)
 	text "Grass Pokémon"
 	done
 
-Text0019: ; 363df (d:63df)
+TypeFirePokemonText: ; 363df (d:63df)
 	text "Fire Pokémon"
 	done
 
-Text001a: ; 363ed (d:63ed)
+TypeWaterPokemonText: ; 363ed (d:63ed)
 	text "Water Pokémon"
 	done
 
-Text001b: ; 363fc (d:63fc)
+TypeLightningPokemonText: ; 363fc (d:63fc)
 	text "Lightning Pokémon"
 	done
 
-Text001c: ; 3640f (d:640f)
+TypeFightingPokemonText: ; 3640f (d:640f)
 	text "Fighting Pokémon"
 	done
 
-Text001d: ; 36421 (d:6421)
+TypePsychicPokemonText: ; 36421 (d:6421)
 	text "Psychic Pokémon"
 	done
 
-Text001e: ; 36432 (d:6432)
+TypeColorlessPokemonText: ; 36432 (d:6432)
 	text "Colorless Pokémon"
 	done
 
-Text001f: ; 36445 (d:6445)
+TypeTrainerCardText: ; 36445 (d:6445)
 	text "Trainer Card"
 	done
 
-Text0020: ; 36453 (d:6453)
+TypeEnergyCardText: ; 36453 (d:6453)
 	text "Energy Card"
 	done
 
@@ -175,15 +175,15 @@ BetweenTurnsText: ; 36553 (d:6553)
 	text "Between Turns."
 	done
 
-Text002c: ; 36563 (d:6563)
+UnableToUseItText: ; 36563 (d:6563)
 	text "Unable to use it."
 	done
 
-Text002d: ; 36576 (d:6576)
+NoEnergyCardsText: ; 36576 (d:6576)
 	text "No Energy cards."
 	done
 
-Text002e: ; 36588 (d:6588)
+IsThisOKText: ; 36588 (d:6588)
 	text "Is this OK?"
 	done
 
@@ -195,7 +195,7 @@ DiscardName: ; 365a1 (d:65a1)
 	text "Discard"
 	done
 
-Text0031: ; 365aa (d:65aa)
+IncompleteText: ; 365aa (d:65aa)
 	text "Incomplete"
 	done
 
@@ -217,7 +217,7 @@ PokemonsAttackText: ; 365d8 (d:65d8)
 	text "<RAMTEXT>!"
 	done
 
-Text0036: ; 365e1 (d:65e1)
+ResistanceLessDamageText: ; 365e1 (d:65e1)
 	text "<RAMTEXT> received"
 	line "<RAMNUM> damage due to Resistance!"
 	done
@@ -232,17 +232,17 @@ Text0038: ; 3662f (d:662f)
 	line "<RAMNUM> damage due to Weakness!"
 	done
 
-Text0039: ; 36655 (d:6655)
+ResistanceNoDamageText: ; 36655 (d:6655)
 	text "<RAMTEXT> did not"
 	line "receive damage due to Resistance."
 	done
 
-Text003a: ; 36682 (d:6682)
+AttackDamageText: ; 36682 (d:6682)
 	text "<RAMTEXT> took"
 	line "<RAMNUM> damage."
 	done
 
-Text003b: ; 36694 (d:6694)
+NoDamageText: ; 36694 (d:6694)
 	text "<RAMTEXT> did not"
 	line "receive damage!"
 	done
@@ -260,11 +260,11 @@ MayOnlyAttachOneEnergyCardText: ; 366d9 (d:66d9)
 	line "per turn."
 	done
 
-Text003f: ; 36706 (d:6706)
+UsePkMnPowerQuestionText: ; 36706 (d:6706)
 	text "Use this Pokémon Power?"
 	done
 
-Text0040: ; 3671f (d:671f)
+PkMnPowerSelectNotRequiredText: ; 3671f (d:671f)
 	text "You do not need to select the"
 	line "Pokémon Power to use it."
 	done
@@ -344,12 +344,12 @@ ChooseEnergyCardToDiscardText: ; 36891 (d:6891)
 	line "you wish to discard."
 	done
 
-Text0051: ; 368be (d:68be)
+ChooseNextActivePokemonText: ; 368be (d:68be)
 	text "The Active Pokémon was Knocked Out."
 	line "Please choose the next Pokémon."
 	done
 
-Text0052: ; 36903 (d:6903)
+PressSTARTWhenReadyText: ; 36903 (d:6903)
 	text "Press START"
 	line "When you are ready."
 	done
@@ -616,7 +616,7 @@ Text0089: ; 36f5a (d:6f5a)
 	textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " ", " "
 	done
 
-Text008a: ; 36f65 (d:6f65)
+SelectCpuOpponentText: ; 36f65 (d:6f65)
 	text "Select a computer opponent."
 	done
 
@@ -781,7 +781,7 @@ TheDiscardPileHasNoCardsText: ; 3735b (d:735b)
 	text "The Discard Pile has no cards."
 	done
 
-Text00a6: ; 3737b (d:737b)
+PlayerDiscardPileText: ; 3737b (d:737b)
 	text "Player's Discard Pile"
 	done
 
@@ -802,21 +802,21 @@ PleaseSelectHandText: ; 373b5 (d:73b5)
 	line "Hand."
 	done
 
-Text00ab: ; 373ca (d:73ca)
+PleaseSelectCardText: ; 373ca (d:73ca)
 	text "Please select"
 	line "Card."
 	done
 
-Text00ac: ; 373df (d:73df)
+NoPokemonWithDamageCountersText: ; 373df (d:73df)
 	text "There are no Pokémon"
 	line "with Damage Counters."
 	done
 
-Text00ad: ; 3740b (d:740b)
+NoDamageCountersText: ; 3740b (d:740b)
 	text "There are no Damage Counters."
 	done
 
-Text00ae: ; 3742a (d:742a)
+NoEnergyAttachedToOpponentsActiveText: ; 3742a (d:742a)
 	text "No Energy cards are attached to"
 	line "the opponent's Active Pokémon."
 	done
diff --git a/src/text/text10.asm b/src/text/text10.asm
index 316397e..057820f 100644
--- a/src/text/text10.asm
+++ b/src/text/text10.asm
@@ -207,7 +207,7 @@ ThrashName: ; 58719 (16:4719)
 	text "Thrash"
 	done
 
-ThrashDescriptipn: ; 58721 (16:4721)
+ThrashDescription: ; 58721 (16:4721)
 	text "Flip a coin. If heads, this attack"
 	line "does 30 damage plus 10 more damage;"
 	line "if tails, this attack does 30 damage"
diff --git a/src/text/text3.asm b/src/text/text3.asm
index 60b3c25..78c22de 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -1065,65 +1065,65 @@ Text033e: ; 3e834 (f:6834)
 	line "Close"
 	done
 
-Text033f: ; 3e85f (f:685f)
+PlayerStatusNameText: ; 3e85f (f:685f)
 	text "Name <RAMNAME>"
 	done
 
-Text0340: ; 3e867 (f:6867)
+PlayerStatusAlbumText: ; 3e867 (f:6867)
 	text "Album           "
 	half2full
 	textfw0 "/"
 	done
 
-Text0341: ; 3e87b (f:687b)
+PlayerStatusPlayTimeText: ; 3e87b (f:687b)
 	text "Play time         "
 	half2full
 	textfw3 ":"
 	done
 
-Text0342: ; 3e892 (f:6892)
+PlayerDiaryTitleText: ; 3e892 (f:6892)
 	text "<RAMNAME>'s diary"
 	done
 
-Text0343: ; 3e89d (f:689d)
+PlayerDiaryMedalsWonText: ; 3e89d (f:689d)
 	text "Master Medals Won "
 	done
 
-Text0344: ; 3e8b1 (f:68b1)
+PlayerDiarySaveQuestionText: ; 3e8b1 (f:68b1)
 	text "Would you like to keep a diary?"
 	done
 
-Text0345: ; 3e8d2 (f:68d2)
+PlayerDiarySaveConfirmText: ; 3e8d2 (f:68d2)
 	text "<RAMNAME>"
 	line "wrote in the diary."
 	done
 
-Text0346: ; 3e8e9 (f:68e9)
+PlayerDiarySaveCancelText: ; 3e8e9 (f:68e9)
 	text "Nothing was recorded "
 	line "in the diary."
 	done
 
-Text0347: ; 3e90e (f:690e)
+PlayerStatusMedalsTitleText: ; 3e90e (f:690e)
 	text "Master Medals"
 	done
 
-Text0348: ; 3e91d (f:691d)
+ConfigMenuTitleText: ; 3e91d (f:691d)
 	text "           Change Settings"
 	done
 
-Text0349: ; 3e939 (f:6939)
+ConfigMenuMessageSpeedText: ; 3e939 (f:6939)
 	text "Message Speed"
 	line ""
 	line "   Slow   1   2   3   4   5   Fast"
 	done
 
-Text034a: ; 3e96c (f:696c)
+ConfigMenuDuelAnimationText: ; 3e96c (f:696c)
 	text "Duel Animation"
 	line ""
 	line "  Show All    Skip Some       None"
 	done
 
-Text034b: ; 3e9a0 (f:69a0)
+ConfigMenuExitText: ; 3e9a0 (f:69a0)
 	text "   Exit Settings"
 	done
 
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index 56f1f41..abe203e 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -16,24 +16,24 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer LengthText                               ; 0x000c
 	textpointer WeightText                               ; 0x000d
 	textpointer PokemonText                              ; 0x000e
-	textpointer Text000f                                 ; 0x000f
+	textpointer MetresText                                ; 0x000f
 	textpointer LbsText                                  ; 0x0010
 	textpointer PromostarRarityText                                 ; 0x0011
 	textpointer CircleRarityText                                 ; 0x0012
 	textpointer DiamondRarityText                                 ; 0x0013
 	textpointer StarRarityText                                 ; 0x0014
-	textpointer Text0015                                 ; 0x0015
-	textpointer Text0016                                 ; 0x0016
-	textpointer Text0017                                 ; 0x0017
-	textpointer Text0018                                 ; 0x0018
-	textpointer Text0019                                 ; 0x0019
-	textpointer Text001a                                 ; 0x001a
-	textpointer Text001b                                 ; 0x001b
-	textpointer Text001c                                 ; 0x001c
-	textpointer Text001d                                 ; 0x001d
-	textpointer Text001e                                 ; 0x001e
-	textpointer Text001f                                 ; 0x001f
-	textpointer Text0020                                 ; 0x0020
+	textpointer AllCardsOwnedText                                 ; 0x0015
+	textpointer TotalNumberOfCardsText                                 ; 0x0016
+	textpointer TypesOfCardsText                                 ; 0x0017
+	textpointer TypeGrassPokemonText                                 ; 0x0018
+	textpointer TypeFirePokemonText                                 ; 0x0019
+	textpointer TypeWaterPokemonText                                 ; 0x001a
+	textpointer TypeLightningPokemonText                                 ; 0x001b
+	textpointer TypeFightingPokemonText                                 ; 0x001c
+	textpointer TypePsychicPokemonText                                 ; 0x001d
+	textpointer TypeColorlessPokemonText                                 ; 0x001e
+	textpointer TypeTrainerCardText                                 ; 0x001f
+	textpointer TypeEnergyCardText                                 ; 0x0020
 	textpointer Text0021                                 ; 0x0021
 	textpointer Text0022                                 ; 0x0022
 	textpointer NoPokemonOnTheBenchText                  ; 0x0023
@@ -45,27 +45,27 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer IsCuredOfSleepText                       ; 0x0029
 	textpointer IsCuredOfParalysisText                   ; 0x002a
 	textpointer BetweenTurnsText                         ; 0x002b
-	textpointer Text002c                                 ; 0x002c
-	textpointer Text002d                                 ; 0x002d
-	textpointer Text002e                                 ; 0x002e
+	textpointer UnableToUseItText                                 ; 0x002c
+	textpointer NoEnergyCardsText                                 ; 0x002d
+	textpointer IsThisOKText                                 ; 0x002e
 	textpointer YesOrNoText                              ; 0x002f
 	textpointer DiscardName                              ; 0x0030
-	textpointer Text0031                                 ; 0x0031
+	textpointer IncompleteText                                 ; 0x0031
 	textpointer Text0032                                 ; 0x0032
 	textpointer UsedText                                 ; 0x0033
 	textpointer Text0034                                 ; 0x0034
 	textpointer PokemonsAttackText                       ; 0x0035
-	textpointer Text0036                                 ; 0x0036
+	textpointer ResistanceLessDamageText                                 ; 0x0036
 	textpointer Text0037                                 ; 0x0037
 	textpointer Text0038                                 ; 0x0038
-	textpointer Text0039                                 ; 0x0039
-	textpointer Text003a                                 ; 0x003a
-	textpointer Text003b                                 ; 0x003b
+	textpointer ResistanceNoDamageText                                 ; 0x0039
+	textpointer AttackDamageText                                 ; 0x003a
+	textpointer NoDamageText                                 ; 0x003b
 	textpointer NoSelectableAttackText                   ; 0x003c
 	textpointer UnableToRetreatText                      ; 0x003d
 	textpointer MayOnlyAttachOneEnergyCardText           ; 0x003e
-	textpointer Text003f                                 ; 0x003f
-	textpointer Text0040                                 ; 0x0040
+	textpointer UsePkMnPowerQuestionText                                 ; 0x003f
+	textpointer PkMnPowerSelectNotRequiredText                                 ; 0x0040
 	textpointer DiscardDescription                       ; 0x0041
 	textpointer WillDrawNPrizesText                                 ; 0x0042
 	textpointer DrewNPrizesText                                 ; 0x0043
@@ -82,8 +82,8 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer KnockOutText                             ; 0x004e
 	textpointer DamageToSelfDueToConfusionText           ; 0x004f
 	textpointer ChooseEnergyCardToDiscardText            ; 0x0050
-	textpointer Text0051                                 ; 0x0051
-	textpointer Text0052                                 ; 0x0052
+	textpointer ChooseNextActivePokemonText                                 ; 0x0051
+	textpointer PressSTARTWhenReadyText                                 ; 0x0052
 	textpointer YouPlayFirstText                         ; 0x0053
 	textpointer YouPlaySecondText                        ; 0x0054
 	textpointer TransmissionErrorText                    ; 0x0055
@@ -139,7 +139,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text0087                                 ; 0x0087
 	textpointer DuelistIsThinkingText                    ; 0x0088
 	textpointer Text0089                                 ; 0x0089
-	textpointer Text008a                                 ; 0x008a
+	textpointer SelectCpuOpponentText                                 ; 0x008a
 	textpointer Text008b                                 ; 0x008b
 	textpointer Text008c                                 ; 0x008c
 	textpointer Text008d                                 ; 0x008d
@@ -167,15 +167,15 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text00a3                                 ; 0x00a3
 	textpointer NoCardsInHandText                        ; 0x00a4
 	textpointer TheDiscardPileHasNoCardsText             ; 0x00a5
-	textpointer Text00a6                                 ; 0x00a6
+	textpointer PlayerDiscardPileText                                 ; 0x00a6
 	textpointer DuelistHandText                          ; 0x00a7
 	textpointer DuelistPlayAreaText                      ; 0x00a8
 	textpointer DuelistDeckText                          ; 0x00a9
 	textpointer PleaseSelectHandText                     ; 0x00aa
-	textpointer Text00ab                                 ; 0x00ab
-	textpointer Text00ac                                 ; 0x00ac
-	textpointer Text00ad                                 ; 0x00ad
-	textpointer Text00ae                                 ; 0x00ae
+	textpointer PleaseSelectCardText                                 ; 0x00ab
+	textpointer NoPokemonWithDamageCountersText                                 ; 0x00ac
+	textpointer NoDamageCountersText                                 ; 0x00ad
+	textpointer NoEnergyAttachedToOpponentsActiveText                                 ; 0x00ae
 	textpointer Text00af                                 ; 0x00af
 	textpointer Text00b0                                 ; 0x00b0
 	textpointer Text00b1                                 ; 0x00b1
@@ -832,19 +832,19 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text033c                                 ; 0x033c
 	textpointer Text033d                                 ; 0x033d
 	textpointer Text033e                                 ; 0x033e
-	textpointer Text033f                                 ; 0x033f
-	textpointer Text0340                                 ; 0x0340
-	textpointer Text0341                                 ; 0x0341
-	textpointer Text0342                                 ; 0x0342
-	textpointer Text0343                                 ; 0x0343
-	textpointer Text0344                                 ; 0x0344
-	textpointer Text0345                                 ; 0x0345
-	textpointer Text0346                                 ; 0x0346
-	textpointer Text0347                                 ; 0x0347
-	textpointer Text0348                                 ; 0x0348
-	textpointer Text0349                                 ; 0x0349
-	textpointer Text034a                                 ; 0x034a
-	textpointer Text034b                                 ; 0x034b
+	textpointer PlayerStatusNameText                                 ; 0x033f
+	textpointer PlayerStatusAlbumText                                 ; 0x0340
+	textpointer PlayerStatusPlayTimeText                                 ; 0x0341
+	textpointer PlayerDiaryTitleText                                 ; 0x0342
+	textpointer PlayerDiaryMedalsWonText                                 ; 0x0343
+	textpointer PlayerDiarySaveQuestionText                                 ; 0x0344
+	textpointer PlayerDiarySaveConfirmText                                 ; 0x0345
+	textpointer PlayerDiarySaveCancelText                                 ; 0x0346
+	textpointer PlayerStatusMedalsTitleText                                 ; 0x0347
+	textpointer ConfigMenuTitleText                                 ; 0x0348
+	textpointer ConfigMenuMessageSpeedText                                 ; 0x0349
+	textpointer ConfigMenuDuelAnimationText                                 ; 0x034a
+	textpointer ConfigMenuExitText                                 ; 0x034b
 	textpointer Text034c                                 ; 0x034c
 	textpointer Text034d                                 ; 0x034d
 	textpointer Text034e                                 ; 0x034e
@@ -2150,7 +2150,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer NidorinoDescription                      ; 0x0862
 	textpointer NidokingName                             ; 0x0863
 	textpointer ThrashName                               ; 0x0864
-	textpointer ThrashDescriptipn                        ; 0x0865
+	textpointer ThrashDescription                        ; 0x0865
 	textpointer ToxicName                                ; 0x0866
 	textpointer ToxicDescription                         ; 0x0867
 	textpointer NidokingDescription                      ; 0x0868