Merge pull request #48 from xCrystal/master

More home and bank1 progress

3 files changed, 78 insertions, 78 deletions

diff --git a/src/text/text1.asm b/src/text/text1.asm
index 0274dc2..19c999b 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -62,19 +62,19 @@ LbsText: ; 36385 (d:6385)
 	text "lbs."
 	done
 
-Text0011: ; 3638b (d:638b)
+PromostarRarityText: ; 3638b (d:638b)
 	textfw0 " "
 	done
 
-Text0012: ; 3638d (d:638d)
+CircleRarityText: ; 3638d (d:638d)
 	textfw3 "●"
 	done
 
-Text0013: ; 36390 (d:6390)
+DiamondRarityText: ; 36390 (d:6390)
 	textfw3 "◆"
 	done
 
-Text0014: ; 36393 (d:6393)
+StarRarityText: ; 36393 (d:6393)
 	textfw3 "★"
 	done
 
@@ -171,7 +171,7 @@ IsCuredOfParalysisText: ; 36539 (d:6539)
 	line "cured of Paralysis."
 	done
 
-Text002b: ; 36553 (d:6553)
+BetweenTurnsText: ; 36553 (d:6553)
 	text "Between Turns."
 	done
 
@@ -331,7 +331,7 @@ Text004d: ; 3685a (d:685a)
 	text "Bench"
 	done
 
-Text004e: ; 36861 (d:6861)
+KnockOutText: ; 36861 (d:6861)
 	text "Knock Out"
 	done
 
@@ -376,12 +376,12 @@ TransmitingDataText: ; 369a2 (d:69a2)
 	text "Transmitting data..."
 	done
 
-Text0058: ; 369b8 (d:69b8)
+WaitingHandExamineText: ; 369b8 (d:69b8)
 	text "Waiting..."
 	line "    Hand        Examine"
 	done
 
-Text0059: ; 369dc (d:69dc)
+SelectingBenchPokemonHandExamineBackText: ; 369dc (d:69dc)
 	text "Selecting Bench Pokémon..."
 	line "    Hand        Examine     Back"
 	done
@@ -406,16 +406,16 @@ FinishedTurnWithoutAttackingText: ; 36a74 (d:6a74)
 	line "without Attacking."
 	done
 
-Text005e: ; 36a9a (d:6a9a)
+DuelistsTurnText: ; 36a9a (d:6a9a)
 	text "<RAMNAME>'s Turn."
 	done
 
-Text005f: ; 36aa5 (d:6aa5)
+AttachedEnergyToPokemonText: ; 36aa5 (d:6aa5)
 	text "Attached <RAMTEXT>"
 	line "to <RAMTEXT>."
 	done
 
-Text0060: ; 36ab7 (d:6ab7)
+PokemonEvolvedIntoPokemonText: ; 36ab7 (d:6ab7)
 	text "<RAMTEXT> evolved"
 	line "into <RAMTEXT>."
 	done
@@ -462,7 +462,7 @@ ChooseBasicPkmnToPlaceInArenaText: ; 36bc2 (d:6bc2)
 	line "to place in the Arena."
 	done
 
-Text006a: ; 36bf1 (d:6bf1)
+ThereAreNoBasicPokemonInHand: ; 36bf1 (d:6bf1)
 	text "There are no Basic Pokémon"
 	line "in <RAMNAME>'s hand."
 	done
@@ -472,7 +472,7 @@ NeitherPlayerHasBasicPkmnText: ; 36c1a (d:6c1a)
 	line "Pokémon in his or her hand."
 	done
 
-Text006c: ; 36c54 (d:6c54)
+ReturnCardsToDeckAndDrawAgainText: ; 36c54 (d:6c54)
 	text "Return the cards to the Deck"
 	line "and draw again."
 	done
@@ -482,12 +482,12 @@ ChooseUpTo5BasicPkmnToPlaceOnBenchText: ; 36c82 (d:6c82)
 	line "to place on the Bench."
 	done
 
-Text006e: ; 36cbf (d:6cbf)
+PleaseChooseAnActivePokemonText: ; 36cbf (d:6cbf)
 	text "Please choose an"
 	line "Active Pokémon."
 	done
 
-Text006f: ; 36ce1 (d:6ce1)
+ChooseYourBenchPokemonText: ; 36ce1 (d:6ce1)
 	text "Choose your"
 	line "Bench Pokémon."
 	done
@@ -496,7 +496,7 @@ YouDrewText: ; 36cfd (d:6cfd)
 	text "You drew <RAMTEXT>."
 	done
 
-Text0071: ; 36d0a (d:6d0a)
+YouCannotSelectThisCardText: ; 36d0a (d:6d0a)
 	text "You cannot select this card."
 	done
 
@@ -509,13 +509,13 @@ PleasePlacePrizesText: ; 36d3f (d:6d3f)
 	line "<RAMNUM> Prizes."
 	done
 
-IfHeadPlayerPlaysFirstText: ; 36d57 (d:6d57)
+IfHeadsDuelistPlaysFirstText: ; 36d57 (d:6d57)
 	text "If heads,"
 	line ""
 	text "<RAMTEXT> plays first."
 	done
 
-CoinTossToDetermineWhoFirstText: ; 36d72 (d:6d72)
+CoinTossToDecideWhoPlaysFirstText: ; 36d72 (d:6d72)
 	text "A coin will be tossed"
 	line "to decide who plays first."
 	done
@@ -543,21 +543,21 @@ StartSuddenDeathMatchText: ; 36e05 (d:6e05)
 	line "Match for 1 Prize!"
 	done
 
-Text007b: ; 36e2e (d:6e2e)
+PrizesLeftActivePokemonCardsInDeckText: ; 36e2e (d:6e2e)
 	text "Prizes Left"
 	line "Active Pokémon"
 	line "Cards in Deck"
 	done
 
-Text007c: ; 36e58 (d:6e58)
+NoneText: ; 36e58 (d:6e58)
 	text "None"
 	done
 
-Text007d: ; 36e5e (d:6e5e)
+YesText: ; 36e5e (d:6e5e)
 	text "Yes"
 	done
 
-Text007e: ; 36e63 (d:6e63)
+CardsText: ; 36e63 (d:6e63)
 	text "Cards"
 	done
 
@@ -586,17 +586,17 @@ UnableToUsePkmnPowerDueToToxicGasText: ; 36ed5 (d:6ed5)
 	line "the effect of Toxic Gas."
 	done
 
-Text0084: ; 36f11 (d:6f11)
+PlayCheck1Text: ; 36f11 (d:6f11)
 	text "  Play"
 	line "  Check"
 	done
 
-Text0085: ; 36f21 (d:6f21)
+PlayCheck2Text: ; 36f21 (d:6f21)
 	text "  Play"
 	line "  Check"
 	done
 
-Text0086: ; 36f31 (d:6f31)
+SelectCheckText: ; 36f31 (d:6f31)
 	text "  Select"
 	line "  Check"
 	done
diff --git a/src/text/text2.asm b/src/text/text2.asm
index cd3aeed..934a2ec 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -18,7 +18,7 @@ ConfusionCheckRetreatText: ; 380ac (e:40ac)
 	line "If Tails, unable to Retreat."
 	done
 
-Text00f9: ; 380db (e:40db)
+PokemonsSleepCheckText: ; 380db (e:40db)
 	text "<RAMTEXT>'s Sleep check."
 	done
 
@@ -173,11 +173,11 @@ Text0117: ; 386f2 (e:46f2)
 	text "Draw 1 card from the Deck."
 	done
 
-DrawCardsFromTheDeck: ; 3870e (e:470e)
+DrawCardsFromTheDeckText: ; 3870e (e:470e)
 	text "Draw <RAMNUM> card(s) from the Deck."
 	done
 
-NoCardsInDeckCannotDraw: ; 3872d (e:472d)
+CannotDrawCardBecauseNoCardsInDeckText: ; 3872d (e:472d)
 	text "Cannot draw a card because"
 	line "there are no cards in the Deck."
 	done
@@ -478,7 +478,7 @@ WasUnsuccessfulText: ; 393e6 (e:53e6)
 	line "<RAMTEXT> was unsuccessful."
 	done
 
-Text014b: ; 393ff (e:53ff)
+ThereWasNoEffectFromTxRam2Text: ; 393ff (e:53ff)
 	text "There was no effect"
 	line "from <RAMTEXT>."
 	done
@@ -725,32 +725,32 @@ Text017d: ; 39b97 (e:5b97)
 	text "There was no effect!"
 	done
 
-Text017e: ; 39bad (e:5bad)
+ThereWasNoEffectFromToxicText: ; 39bad (e:5bad)
 	text "There was no effect"
 	line "from Toxic"
 	done
 
-Text017f: ; 39bcd (e:5bcd)
+ThereWasNoEffectFromPoisonText: ; 39bcd (e:5bcd)
 	text "There was no effect"
 	line "from Poison."
 	done
 
-Text0180: ; 39bef (e:5bef)
+ThereWasNoEffectFromSleepText: ; 39bef (e:5bef)
 	text "There was no effect"
 	line "from Sleep."
 	done
 
-Text0181: ; 39c10 (e:5c10)
+ThereWasNoEffectFromParalysisText: ; 39c10 (e:5c10)
 	text "There was no effect"
 	line "from Paralysis."
 	done
 
-Text0182: ; 39c35 (e:5c35)
+ThereWasNoEffectFromConfusionText: ; 39c35 (e:5c35)
 	text "There was no effect"
 	line "from Confusion."
 	done
 
-Text0183: ; 39c5a (e:5c5a)
+ThereWasNoEffectFromPoisonConfusionText: ; 39c5a (e:5c5a)
 	text "There was no effet"
 	line "from Poison, Confusion."
 	done
@@ -1479,7 +1479,7 @@ GrassAndPsychicDeckName: ; 3b75d (e:775d)
 	text "Grass & Psychic"
 	done
 
-Text0212: ; 3b76e (e:776e)
+RetreatCostText: ; 3b76e (e:776e)
 	text "Retreat Cost"
 	done
 
@@ -1491,11 +1491,11 @@ Text0214: ; 3b799 (e:7799)
 	textfw3 "S", "W", "I", "T", "C", "H", " ", "T", "O", " ", "L", "O", "W", "E", "R"
 	done
 
-Text0215: ; 3b7b6 (e:77b6)
+FeetText: ; 3b7b6 (e:77b6)
 	textfw3 "'"
 	done
 
-Text0216: ; 3b7b9 (e:77b9)
+InchesText: ; 3b7b9 (e:77b9)
 	textfw3 "”"
 	done
 
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index 7838e80..d09504f 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -18,10 +18,10 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer PokemonText                              ; 0x000e
 	textpointer Text000f                                 ; 0x000f
 	textpointer LbsText                                  ; 0x0010
-	textpointer Text0011                                 ; 0x0011
-	textpointer Text0012                                 ; 0x0012
-	textpointer Text0013                                 ; 0x0013
-	textpointer Text0014                                 ; 0x0014
+	textpointer PromostarRarityText                                 ; 0x0011
+	textpointer CircleRarityText                                 ; 0x0012
+	textpointer DiamondRarityText                                 ; 0x0013
+	textpointer StarRarityText                                 ; 0x0014
 	textpointer Text0015                                 ; 0x0015
 	textpointer Text0016                                 ; 0x0016
 	textpointer Text0017                                 ; 0x0017
@@ -44,7 +44,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer IsStillAsleepText                        ; 0x0028
 	textpointer IsCuredOfSleepText                       ; 0x0029
 	textpointer IsCuredOfParalysisText                   ; 0x002a
-	textpointer Text002b                                 ; 0x002b
+	textpointer BetweenTurnsText                         ; 0x002b
 	textpointer Text002c                                 ; 0x002c
 	textpointer Text002d                                 ; 0x002d
 	textpointer Text002e                                 ; 0x002e
@@ -79,9 +79,9 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text004b                                 ; 0x004b
 	textpointer Text004c                                 ; 0x004c
 	textpointer Text004d                                 ; 0x004d
-	textpointer Text004e                                 ; 0x004e
+	textpointer KnockOutText                             ; 0x004e
 	textpointer DamageToSelfDueToConfusionText           ; 0x004f
-	textpointer ChooseEnergyCardToDiscardText                                 ; 0x0050
+	textpointer ChooseEnergyCardToDiscardText            ; 0x0050
 	textpointer Text0051                                 ; 0x0051
 	textpointer Text0052                                 ; 0x0052
 	textpointer YouPlayFirstText                         ; 0x0053
@@ -89,15 +89,15 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer TransmissionErrorText                    ; 0x0055
 	textpointer ChooseTheCardYouWishToExamineText        ; 0x0056
 	textpointer TransmitingDataText                      ; 0x0057
-	textpointer Text0058                                 ; 0x0058
-	textpointer Text0059                                 ; 0x0059
+	textpointer WaitingHandExamineText                                 ; 0x0058
+	textpointer SelectingBenchPokemonHandExamineBackText                                 ; 0x0059
 	textpointer RetreatedToTheBenchText                  ; 0x005a
 	textpointer RetreatWasUnsuccessfulText               ; 0x005b
 	textpointer WillUseThePokemonPowerText               ; 0x005c
 	textpointer FinishedTurnWithoutAttackingText         ; 0x005d
-	textpointer Text005e                                 ; 0x005e
-	textpointer Text005f                                 ; 0x005f
-	textpointer Text0060                                 ; 0x0060
+	textpointer DuelistsTurnText                         ; 0x005e
+	textpointer AttachedEnergyToPokemonText                                 ; 0x005f
+	textpointer PokemonEvolvedIntoPokemonText                                 ; 0x0060
 	textpointer PlacedOnTheBenchText                     ; 0x0061
 	textpointer PlacedInTheArenaText                     ; 0x0062
 	textpointer ShufflesTheDeckText                      ; 0x0063
@@ -107,35 +107,35 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text0067                                 ; 0x0067
 	textpointer DeckHasXCardsText                        ; 0x0068
 	textpointer ChooseBasicPkmnToPlaceInArenaText        ; 0x0069
-	textpointer Text006a                                 ; 0x006a
+	textpointer ThereAreNoBasicPokemonInHand                                 ; 0x006a
 	textpointer NeitherPlayerHasBasicPkmnText            ; 0x006b
-	textpointer Text006c                                 ; 0x006c
+	textpointer ReturnCardsToDeckAndDrawAgainText                                 ; 0x006c
 	textpointer ChooseUpTo5BasicPkmnToPlaceOnBenchText   ; 0x006d
-	textpointer Text006e                                 ; 0x006e
-	textpointer Text006f                                 ; 0x006f
+	textpointer PleaseChooseAnActivePokemonText                                 ; 0x006e
+	textpointer ChooseYourBenchPokemonText                                 ; 0x006f
 	textpointer YouDrewText                              ; 0x0070
-	textpointer Text0071                                 ; 0x0071
+	textpointer YouCannotSelectThisCardText                                 ; 0x0071
 	textpointer PlacingThePrizesText                     ; 0x0072
 	textpointer PleasePlacePrizesText                    ; 0x0073
-	textpointer IfHeadPlayerPlaysFirstText               ; 0x0074
-	textpointer CoinTossToDetermineWhoFirstText          ; 0x0075
+	textpointer IfHeadsDuelistPlaysFirstText               ; 0x0074
+	textpointer CoinTossToDecideWhoPlaysFirstText          ; 0x0075
 	textpointer DecisionText                             ; 0x0076
 	textpointer DuelWasADrawText                         ; 0x0077
 	textpointer WonDuelText                              ; 0x0078
 	textpointer LostDuelText                             ; 0x0079
 	textpointer StartSuddenDeathMatchText                ; 0x007a
-	textpointer Text007b                                 ; 0x007b
-	textpointer Text007c                                 ; 0x007c
-	textpointer Text007d                                 ; 0x007d
-	textpointer Text007e                                 ; 0x007e
+	textpointer PrizesLeftActivePokemonCardsInDeckText                                 ; 0x007b
+	textpointer NoneText                                 ; 0x007c
+	textpointer YesText                                 ; 0x007d
+	textpointer CardsText                                 ; 0x007e
 	textpointer Text007f                                 ; 0x007f
 	textpointer Text0080                                 ; 0x0080
 	textpointer WasKnockedOutText                        ; 0x0081
 	textpointer HavePokemonPowerText                     ; 0x0082
 	textpointer UnableToUsePkmnPowerDueToToxicGasText    ; 0x0083
-	textpointer Text0084                                 ; 0x0084
-	textpointer Text0085                                 ; 0x0085
-	textpointer Text0086                                 ; 0x0086
+	textpointer PlayCheck1Text                                 ; 0x0084
+	textpointer PlayCheck2Text                                 ; 0x0085
+	textpointer SelectCheckText                                 ; 0x0086
 	textpointer Text0087                                 ; 0x0087
 	textpointer DuelistIsThinkingText                    ; 0x0088
 	textpointer Text0089                                 ; 0x0089
@@ -192,7 +192,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text00bc                                 ; 0x00bc
 	textpointer Text00bd                                 ; 0x00bd
 	textpointer Text00be                                 ; 0x00be
-	textpointer EnergyCardsRequiredToRetreatText                                 ; 0x00bf
+	textpointer EnergyCardsRequiredToRetreatText         ; 0x00bf
 	textpointer NotEnoughEnergyCardsText                 ; 0x00c0
 	textpointer Text00c1                                 ; 0x00c1
 	textpointer Text00c2                                 ; 0x00c2
@@ -250,7 +250,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer TransparencyCheckText                    ; 0x00f6
 	textpointer ConfusionCheckDamageText                 ; 0x00f7
 	textpointer ConfusionCheckRetreatText                ; 0x00f8
-	textpointer Text00f9                                 ; 0x00f9
+	textpointer PokemonsSleepCheckText                   ; 0x00f9
 	textpointer Text00fa                                 ; 0x00fa
 	textpointer Text00fb                                 ; 0x00fb
 	textpointer Text00fc                                 ; 0x00fc
@@ -281,8 +281,8 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text0115                                 ; 0x0115
 	textpointer Text0116                                 ; 0x0116
 	textpointer Text0117                                 ; 0x0117
-	textpointer DrawCardsFromTheDeck                     ; 0x0118
-	textpointer NoCardsInDeckCannotDraw                  ; 0x0119
+	textpointer DrawCardsFromTheDeckText                     ; 0x0118
+	textpointer CannotDrawCardBecauseNoCardsInDeckText                  ; 0x0119
 	textpointer Text011a                                 ; 0x011a
 	textpointer Text011b                                 ; 0x011b
 	textpointer Text011c                                 ; 0x011c
@@ -332,7 +332,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text0148                                 ; 0x0148
 	textpointer Text0149                                 ; 0x0149
 	textpointer WasUnsuccessfulText                      ; 0x014a
-	textpointer Text014b                                 ; 0x014b
+	textpointer ThereWasNoEffectFromTxRam2Text                                 ; 0x014b
 	textpointer Text014c                                 ; 0x014c
 	textpointer Text014d                                 ; 0x014d
 	textpointer Text014e                                 ; 0x014e
@@ -383,12 +383,12 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text017b                                 ; 0x017b
 	textpointer Text017c                                 ; 0x017c
 	textpointer Text017d                                 ; 0x017d
-	textpointer Text017e                                 ; 0x017e
-	textpointer Text017f                                 ; 0x017f
-	textpointer Text0180                                 ; 0x0180
-	textpointer Text0181                                 ; 0x0181
-	textpointer Text0182                                 ; 0x0182
-	textpointer Text0183                                 ; 0x0183
+	textpointer ThereWasNoEffectFromToxicText                                 ; 0x017e
+	textpointer ThereWasNoEffectFromPoisonText                                 ; 0x017f
+	textpointer ThereWasNoEffectFromSleepText                                 ; 0x0180
+	textpointer ThereWasNoEffectFromParalysisText                                 ; 0x0181
+	textpointer ThereWasNoEffectFromConfusionText                                 ; 0x0182
+	textpointer ThereWasNoEffectFromPoisonConfusionText                                 ; 0x0183
 	textpointer Text0184                                 ; 0x0184
 	textpointer Text0185                                 ; 0x0185
 	textpointer Text0186                                 ; 0x0186
@@ -531,11 +531,11 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer LightningAndFireDeckName                 ; 0x020f
 	textpointer WaterAndFightingDeckName                 ; 0x0210
 	textpointer GrassAndPsychicDeckName                  ; 0x0211
-	textpointer Text0212                                 ; 0x0212
+	textpointer RetreatCostText                                 ; 0x0212
 	textpointer Text0213                                 ; 0x0213
 	textpointer Text0214                                 ; 0x0214
-	textpointer Text0215                                 ; 0x0215
-	textpointer Text0216                                 ; 0x0216
+	textpointer FeetText                                 ; 0x0215
+	textpointer InchesText                                 ; 0x0216
 	textpointer YourDiscardPileText                      ; 0x0217
 	textpointer OpponentsDiscardPileText                 ; 0x0218
 	textpointer Text0219                                 ; 0x0219