After Feedback

Fixed some variables after receiving feedback on my changes.

2 files changed, 26 insertions, 26 deletions

diff --git a/src/text/text1.asm b/src/text/text1.asm
index ceb97a0..1bfcf54 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -90,39 +90,39 @@ TypesOfCardsText: ; 363c0 (d:63c0)
 	text "Types of cards"
 	done
 
-TypeGrassPokemonText: ; 363d0 (d:63d0)
+GrassPokemonText: ; 363d0 (d:63d0)
 	text "Grass Pokémon"
 	done
 
-TypeFirePokemonText: ; 363df (d:63df)
+FirePokemonText: ; 363df (d:63df)
 	text "Fire Pokémon"
 	done
 
-TypeWaterPokemonText: ; 363ed (d:63ed)
+WaterPokemonText: ; 363ed (d:63ed)
 	text "Water Pokémon"
 	done
 
-TypeLightningPokemonText: ; 363fc (d:63fc)
+LightningPokemonText: ; 363fc (d:63fc)
 	text "Lightning Pokémon"
 	done
 
-TypeFightingPokemonText: ; 3640f (d:640f)
+FightingPokemonText: ; 3640f (d:640f)
 	text "Fighting Pokémon"
 	done
 
-TypePsychicPokemonText: ; 36421 (d:6421)
+PsychicPokemonText: ; 36421 (d:6421)
 	text "Psychic Pokémon"
 	done
 
-TypeColorlessPokemonText: ; 36432 (d:6432)
+ColorlessPokemonText: ; 36432 (d:6432)
 	text "Colorless Pokémon"
 	done
 
-TypeTrainerCardText: ; 36445 (d:6445)
+TrainerCardText: ; 36445 (d:6445)
 	text "Trainer Card"
 	done
 
-TypeEnergyCardText: ; 36453 (d:6453)
+EnergyCardText: ; 36453 (d:6453)
 	text "Energy Card"
 	done
 
@@ -260,11 +260,11 @@ MayOnlyAttachOneEnergyCardText: ; 366d9 (d:66d9)
 	line "per turn."
 	done
 
-UsePkMnPowerQuestionText: ; 36706 (d:6706)
+UseThisPokemonPowerText: ; 36706 (d:6706)
 	text "Use this Pokémon Power?"
 	done
 
-PkMnPowerSelectNotRequiredText: ; 3671f (d:671f)
+PokemonPowerSelectNotRequiredText: ; 3671f (d:671f)
 	text "You do not need to select the"
 	line "Pokémon Power to use it."
 	done
@@ -349,7 +349,7 @@ ChooseNextActivePokemonText: ; 368be (d:68be)
 	line "Please choose the next Pokémon."
 	done
 
-PressSTARTWhenReadyText: ; 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
 
-SelectCpuOpponentText: ; 36f65 (d:6f65)
+SelectComputerOpponentText: ; 36f65 (d:6f65)
 	text "Select a computer opponent."
 	done
 
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index abe203e..ceb2a41 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -25,15 +25,15 @@ TextOffsets:: ; 34000 (d:4000)
 	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 GrassPokemonText                                 ; 0x0018
+	textpointer FirePokemonText                                 ; 0x0019
+	textpointer WaterPokemonText                                 ; 0x001a
+	textpointer LightningPokemonText                                 ; 0x001b
+	textpointer FightingPokemonText                                 ; 0x001c
+	textpointer PsychicPokemonText                                 ; 0x001d
+	textpointer ColorlessPokemonText                                 ; 0x001e
+	textpointer TrainerCardText                                 ; 0x001f
+	textpointer EnergyCardText                                 ; 0x0020
 	textpointer Text0021                                 ; 0x0021
 	textpointer Text0022                                 ; 0x0022
 	textpointer NoPokemonOnTheBenchText                  ; 0x0023
@@ -64,8 +64,8 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer NoSelectableAttackText                   ; 0x003c
 	textpointer UnableToRetreatText                      ; 0x003d
 	textpointer MayOnlyAttachOneEnergyCardText           ; 0x003e
-	textpointer UsePkMnPowerQuestionText                                 ; 0x003f
-	textpointer PkMnPowerSelectNotRequiredText                                 ; 0x0040
+	textpointer UseThisPokemonPowerText                                 ; 0x003f
+	textpointer PokemonPowerSelectNotRequiredText                                 ; 0x0040
 	textpointer DiscardDescription                       ; 0x0041
 	textpointer WillDrawNPrizesText                                 ; 0x0042
 	textpointer DrewNPrizesText                                 ; 0x0043
@@ -83,7 +83,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer DamageToSelfDueToConfusionText           ; 0x004f
 	textpointer ChooseEnergyCardToDiscardText            ; 0x0050
 	textpointer ChooseNextActivePokemonText                                 ; 0x0051
-	textpointer PressSTARTWhenReadyText                                 ; 0x0052
+	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 SelectCpuOpponentText                                 ; 0x008a
+	textpointer SelectComputerOpponentText                                 ; 0x008a
 	textpointer Text008b                                 ; 0x008b
 	textpointer Text008c                                 ; 0x008c
 	textpointer Text008d                                 ; 0x008d