Merge branch 'master' into master

3 files changed, 59 insertions, 59 deletions

diff --git a/src/text/text1.asm b/src/text/text1.asm
index 8245b3b..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
@@ -434,21 +434,21 @@ ShufflesTheDeckText: ; 36afe (d:6afe)
 	text "<RAMNAME> shuffles the Deck."
 	done
 
-Text0064: ; 36b14 (d:6b14)
+ThisIsJustPracticeDoNotShuffleText: ; 36b14 (d:6b14)
 	text "Since this is just practice,"
 	line "Do not shuffle the Deck."
 	done
 
-Text0065: ; 36b4b (d:6b4b)
+EachPlayerShuffleOpponentsDeckText: ; 36b4b (d:6b4b)
 	text "Each player will"
 	line "shuffle the opponent's Deck."
 	done
 
-Text0066: ; 36b7a (d:6b7a)
+EachPlayerDraw7CardsText: ; 36b7a (d:6b7a)
 	text "Each player will draw 7 cards."
 	done
 
-Text0067: ; 36b9a (d:6b9a)
+Drew7CardsText: ; 36b9a (d:6b9a)
 	text "<RAMNAME>"
 	line "drew 7 cards."
 	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
@@ -1093,7 +1093,7 @@ Text00e8: ; 37d92 (d:7d92)
 	line "10 damage for each Heads!!!"
 	done
 
-Text00e9: ; 37dc9 (d:7dc9)
+IfHeadPlus10IfTails10ToYourselfText: ; 37dc9 (d:7dc9)
 	text "If Heads, + 10 damage!"
 	line "If Tails, +10 damage to yourself!"
 	done
@@ -1142,12 +1142,12 @@ Text00f2: ; 37f9a (d:7f9a)
 	text "Damage check"
 	done
 
-Text00f3: ; 37fa8 (d:7fa8)
+DamageCheckIfHeadsPlusDamageText: ; 37fa8 (d:7fa8)
 	text "Damage check!"
 	line "If Heads, +<RAMNUM> damage!!"
 	done
 
-Text00f4: ; 37fcd (d:7fcd)
+DamageCheckIfHeadsXDamageText: ; 37fcd (d:7fcd)
 	text "Damage check!"
 	line "If Heads, x <RAMNUM> damage!!"
 	done
diff --git a/src/text/text2.asm b/src/text/text2.asm
index 042dcd9..97ecf45 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -22,7 +22,7 @@ PokemonsSleepCheckText: ; 380db (e:40db)
 	text "<RAMTEXT>'s Sleep check."
 	done
 
-Text00fa: ; 380ed (e:40ed)
+PoisonedIfHeadsConfusedIfTailsText: ; 380ed (e:40ed)
 	text "Opponent is Poisoned if Heads,"
 	line "and Confused if Tails."
 	done
@@ -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
@@ -1715,15 +1715,15 @@ Text023e: ; 3bbf8 (e:7bf8)
 	text "No cards chosen."
 	done
 
-Text023f: ; 3bc0a (e:7c0a)
+YourPokemonText: ; 3bc0a (e:7c0a)
 	text "Your Pokémon"
 	done
 
-Text0240: ; 3bc18 (e:7c18)
+YourDiscardPileText2: ; 3bc18 (e:7c18)
 	text "Your Discard Pile"
 	done
 
-Text0241: ; 3bc2b (e:7c2b)
+YourHandText: ; 3bc2b (e:7c2b)
 	text "Your Hand"
 	done
 
@@ -1731,15 +1731,15 @@ Text0242: ; 3bc36 (e:7c36)
 	text "To Your Play Area"
 	done
 
-Text0243: ; 3bc49 (e:7c49)
+OpponentsPokemonText: ; 3bc49 (e:7c49)
 	text "Opponent's Pokémon"
 	done
 
-Text0244: ; 3bc5d (e:7c5d)
+OpponentsDiscardPileText2: ; 3bc5d (e:7c5d)
 	text "Opponent's Discard Pile"
 	done
 
-Text0245: ; 3bc76 (e:7c76)
+OpponentsHandText: ; 3bc76 (e:7c76)
 	text "Opponent Hand"
 	done
 
@@ -1747,27 +1747,27 @@ Text0246: ; 3bc85 (e:7c85)
 	text "To Opponent's Play Area"
 	done
 
-Text0247: ; 3bc9e (e:7c9e)
+DuelistsPlayAreaText: ; 3bc9e (e:7c9e)
 	text "<RAMNAME>'s Play Area"
 	done
 
-Text0248: ; 3bcad (e:7cad)
+YourPlayAreaText: ; 3bcad (e:7cad)
 	text "Your Play Area"
 	done
 
-Text0249: ; 3bcbd (e:7cbd)
+OppPlayAreaText: ; 3bcbd (e:7cbd)
 	text "Opp. Play Area"
 	done
 
-Text024a: ; 3bccd (e:7ccd)
+InPlayAreaText: ; 3bccd (e:7ccd)
 	text "In Play Area"
 	done
 
-Text024b: ; 3bcdb (e:7cdb)
+GlossaryText: ; 3bcdb (e:7cdb)
 	text "Glossary"
 	done
 
-Text024c: ; 3bce5 (e:7ce5)
+WhichCardWouldYouLikeToSeeText: ; 3bce5 (e:7ce5)
 	text "Which card would you like to see?"
 	done
 
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index 24091f1..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
@@ -101,10 +101,10 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer PlacedOnTheBenchText                     ; 0x0061
 	textpointer PlacedInTheArenaText                     ; 0x0062
 	textpointer ShufflesTheDeckText                      ; 0x0063
-	textpointer Text0064                                 ; 0x0064
-	textpointer Text0065                                 ; 0x0065
-	textpointer Text0066                                 ; 0x0066
-	textpointer Text0067                                 ; 0x0067
+	textpointer ThisIsJustPracticeDoNotShuffleText                                 ; 0x0064
+	textpointer EachPlayerShuffleOpponentsDeckText                                 ; 0x0065
+	textpointer EachPlayerDraw7CardsText                                 ; 0x0066
+	textpointer Drew7CardsText                                 ; 0x0067
 	textpointer DeckHasXCardsText                        ; 0x0068
 	textpointer ChooseBasicPkmnToPlaceInArenaText        ; 0x0069
 	textpointer ThereAreNoBasicPokemonInHand                                 ; 0x006a
@@ -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
@@ -234,7 +234,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text00e6                                 ; 0x00e6
 	textpointer Text00e7                                 ; 0x00e7
 	textpointer Text00e8                                 ; 0x00e8
-	textpointer Text00e9                                 ; 0x00e9
+	textpointer IfHeadPlus10IfTails10ToYourselfText                                 ; 0x00e9
 	textpointer Text00ea                                 ; 0x00ea
 	textpointer Text00eb                                 ; 0x00eb
 	textpointer Text00ec                                 ; 0x00ec
@@ -244,14 +244,14 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text00f0                                 ; 0x00f0
 	textpointer IfHeadsNoDamageNextTurnText              ; 0x00f1
 	textpointer Text00f2                                 ; 0x00f2
-	textpointer Text00f3                                 ; 0x00f3
-	textpointer Text00f4                                 ; 0x00f4
+	textpointer DamageCheckIfHeadsPlusDamageText                                 ; 0x00f3
+	textpointer DamageCheckIfHeadsXDamageText                                 ; 0x00f4
 	textpointer AcidCheckText                            ; 0x00f5
 	textpointer TransparencyCheckText                    ; 0x00f6
 	textpointer ConfusionCheckDamageText                 ; 0x00f7
 	textpointer ConfusionCheckRetreatText                ; 0x00f8
 	textpointer PokemonsSleepCheckText                   ; 0x00f9
-	textpointer Text00fa                                 ; 0x00fa
+	textpointer PoisonedIfHeadsConfusedIfTailsText                                 ; 0x00fa
 	textpointer Text00fb                                 ; 0x00fb
 	textpointer Text00fc                                 ; 0x00fc
 	textpointer AttackUnsuccessfulText                   ; 0x00fd
@@ -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
@@ -542,7 +542,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text021a                                 ; 0x021a
 	textpointer Text021b                                 ; 0x021b
 	textpointer Text021c                                 ; 0x021c
-	textpointer EndText                                 ; 0x021d
+	textpointer EndText                                  ; 0x021d
 	textpointer WhatIsYourNameText                                 ; 0x021e
 	textpointer Text021f                                 ; 0x021f
 	textpointer Text0220                                 ; 0x0220
@@ -576,25 +576,25 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text023c                                 ; 0x023c
 	textpointer Text023d                                 ; 0x023d
 	textpointer Text023e                                 ; 0x023e
-	textpointer Text023f                                 ; 0x023f
-	textpointer Text0240                                 ; 0x0240
-	textpointer Text0241                                 ; 0x0241
+	textpointer YourPokemonText                          ; 0x023f
+	textpointer YourDiscardPileText2                     ; 0x0240
+	textpointer YourHandText                             ; 0x0241
 	textpointer Text0242                                 ; 0x0242
-	textpointer Text0243                                 ; 0x0243
-	textpointer Text0244                                 ; 0x0244
-	textpointer Text0245                                 ; 0x0245
+	textpointer OpponentsPokemonText                     ; 0x0243
+	textpointer OpponentsDiscardPileText2                ; 0x0244
+	textpointer OpponentsHandText                        ; 0x0245
 	textpointer Text0246                                 ; 0x0246
-	textpointer Text0247                                 ; 0x0247
-	textpointer Text0248                                 ; 0x0248
-	textpointer Text0249                                 ; 0x0249
-	textpointer Text024a                                 ; 0x024a
-	textpointer Text024b                                 ; 0x024b
-	textpointer Text024c                                 ; 0x024c
+	textpointer DuelistsPlayAreaText                     ; 0x0247
+	textpointer YourPlayAreaText                         ; 0x0248
+	textpointer OppPlayAreaText                          ; 0x0249
+	textpointer InPlayAreaText                           ; 0x024a
+	textpointer GlossaryText                             ; 0x024b
+	textpointer WhichCardWouldYouLikeToSeeText           ; 0x024c
 	textpointer Text024d                                 ; 0x024d
-	textpointer HandText_2                                 ; 0x024e
-	textpointer DuelistHandText_2                                 ; 0x024f
-	textpointer DuelistDiscardPileText                                 ; 0x0250
-	textpointer EmptyLineText                                 ; 0x0251
+	textpointer HandText_2                               ; 0x024e
+	textpointer DuelistHandText_2                        ; 0x024f
+	textpointer DuelistDiscardPileText                   ; 0x0250
+	textpointer EmptyLineText                            ; 0x0251
 	textpointer Text0252                                 ; 0x0252
 	textpointer Text0253                                 ; 0x0253
 	textpointer Text0254                                 ; 0x0254