Merge remote-tracking branch 'origin/master' into master1

4 files changed, 22 insertions, 22 deletions

diff --git a/src/text/text1.asm b/src/text/text1.asm
index 8789758..075a9ef 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -277,15 +277,15 @@ DiscardDescription: ; 36757 (d:6757)
 	line "a Pokémon Power)"
 	done
 
-Text0042: ; 367cc (d:67cc)
+WillDrawNPrizesText: ; 367cc (d:67cc)
 	text "<RAMNAME> will draw <RAMNUM> Prize(s)."
 	done
 
-Text0043: ; 367e5 (d:67e5)
+DrewNPrizesText: ; 367e5 (d:67e5)
 	text "<RAMNAME> drew <RAMNUM> Prize(s)."
 	done
 
-Text0044: ; 367f9 (d:67f9)
+DuelistPlacedACardText: ; 367f9 (d:67f9)
 	text "<RAMNAME> placed"
 	line "a <RAMTEXT>."
 	done
@@ -561,12 +561,12 @@ CardsText: ; 36e63 (d:6e63)
 	text "Cards"
 	done
 
-Text007f: ; 36e6a (d:6e6a)
+TookAllThePrizesText: ; 36e6a (d:6e6a)
 	text "<RAMNAME> took"
 	line "all the Prizes!"
 	done
 
-Text0080: ; 36e82 (d:6e82)
+ThereAreNoPokemonInPlayAreaText: ; 36e82 (d:6e82)
 	text "There are no Pokémon"
 	line "in <RAMNAME>'s Play Area!"
 	done
diff --git a/src/text/text2.asm b/src/text/text2.asm
index 8dac791..97ecf45 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -126,12 +126,12 @@ SelectPkmnOnBenchToSwitchWithActiveText: ; 38533 (e:4533)
 	line "to switch with the Active Pokémon."
 	done
 
-Text010f: ; 38575 (e:4575)
+SelectPokemonToPlaceInTheArenaText: ; 38575 (e:4575)
 	text "Select a Pokémon to place"
 	line "in the Arena."
 	done
 
-Text0110: ; 3859e (e:459e)
+DuelistIsSelectingPokemonToPlaceInArenaText: ; 3859e (e:459e)
 	text "<RAMNAME> is selecting a Pokémon"
 	line "to place in the Arena."
 	done
diff --git a/src/text/text3.asm b/src/text/text3.asm
index 04d0b05..60b3c25 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -619,11 +619,11 @@ Text02f5: ; 3d2e6 (f:52e6)
 	line "very rare Pokémon cards!"
 	done
 
-Text02f6: ; 3d31c (f:531c)
+PokemonCardGlossaryText: ; 3d31c (f:531c)
 	text "Pokémon Card Glossary"
 	done
 
-Text02f7: ; 3d333 (f:5333)
+GlossaryMenuPage1Text: ; 3d333 (f:5333)
 	text "Deck                Active Pokémon"
 	line "Discard Pile        Bench Pokémon"
 	line "Hand                Prizes    "
@@ -631,7 +631,7 @@ Text02f7: ; 3d333 (f:5333)
 	line "Bench               To next page    "
 	done
 
-Text02f8: ; 3d3e0 (f:53e0)
+GlossaryMenuPage2Text: ; 3d3e0 (f:53e0)
 	text "Energy Card         Pokémon Power "
 	line "Trainer Card        Weakness       "
 	line "Basic Pokémon       Resistance"
@@ -639,7 +639,7 @@ Text02f8: ; 3d3e0 (f:53e0)
 	line "Attack              To previous page"
 	done
 
-Text02f9: ; 3d48f (f:548f)
+ChooseWordAndPressAButtonText: ; 3d48f (f:548f)
 	text "Choose a word and press the"
 	line "A button."
 	done
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index 6e03ba2..56f1f41 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -67,9 +67,9 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text003f                                 ; 0x003f
 	textpointer Text0040                                 ; 0x0040
 	textpointer DiscardDescription                       ; 0x0041
-	textpointer Text0042                                 ; 0x0042
-	textpointer Text0043                                 ; 0x0043
-	textpointer Text0044                                 ; 0x0044
+	textpointer WillDrawNPrizesText                                 ; 0x0042
+	textpointer DrewNPrizesText                                 ; 0x0043
+	textpointer DuelistPlacedACardText                                 ; 0x0044
 	textpointer Text0045                                 ; 0x0045
 	textpointer Text0046                                 ; 0x0046
 	textpointer Text0047                                 ; 0x0047
@@ -128,8 +128,8 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer NoneText                                 ; 0x007c
 	textpointer YesText                                 ; 0x007d
 	textpointer CardsText                                 ; 0x007e
-	textpointer Text007f                                 ; 0x007f
-	textpointer Text0080                                 ; 0x0080
+	textpointer TookAllThePrizesText                                 ; 0x007f
+	textpointer ThereAreNoPokemonInPlayAreaText                                 ; 0x0080
 	textpointer WasKnockedOutText                        ; 0x0081
 	textpointer HavePokemonPowerText                     ; 0x0082
 	textpointer UnableToUsePkmnPowerDueToToxicGasText    ; 0x0083
@@ -272,8 +272,8 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer NoDamageOrEffectDueToTransparencyText    ; 0x010c
 	textpointer Text010d                                 ; 0x010d
 	textpointer SelectPkmnOnBenchToSwitchWithActiveText  ; 0x010e
-	textpointer Text010f                                 ; 0x010f
-	textpointer Text0110                                 ; 0x0110
+	textpointer SelectPokemonToPlaceInTheArenaText                                 ; 0x010f
+	textpointer DuelistIsSelectingPokemonToPlaceInArenaText                                 ; 0x0110
 	textpointer Text0111                                 ; 0x0111
 	textpointer Text0112                                 ; 0x0112
 	textpointer Text0113                                 ; 0x0113
@@ -759,10 +759,10 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text02f3                                 ; 0x02f3
 	textpointer Text02f4                                 ; 0x02f4
 	textpointer Text02f5                                 ; 0x02f5
-	textpointer Text02f6                                 ; 0x02f6
-	textpointer Text02f7                                 ; 0x02f7
-	textpointer Text02f8                                 ; 0x02f8
-	textpointer Text02f9                                 ; 0x02f9
+	textpointer PokemonCardGlossaryText                                 ; 0x02f6
+	textpointer GlossaryMenuPage1Text                                 ; 0x02f7
+	textpointer GlossaryMenuPage2Text                                 ; 0x02f8
+	textpointer ChooseWordAndPressAButtonText                                 ; 0x02f9
 	textpointer Text02fa                                 ; 0x02fa
 	textpointer Text02fb                                 ; 0x02fb
 	textpointer Text02fc                                 ; 0x02fc