summaryrefslogtreecommitdiff
path: root/src/text
diff options
context:
space:
mode:
authorElectroDeoxys <ElectroDeoxys@gmail.com>2020-06-03 00:06:25 +0100
committerElectroDeoxys <ElectroDeoxys@gmail.com>2020-12-16 00:22:58 +0000
commitb75d9712271fc49b7c3f83fc65c4b260624af386 (patch)
tree02bf51664de3fd7715da015402de95023f5e9bc1 /src/text
parente6b82ee26eb8ed1ccf58718db1a9f6f5027e8200 (diff)
Psychic attack effects
Diffstat (limited to 'src/text')
-rw-r--r--src/text/text1.asm14
-rw-r--r--src/text/text2.asm32
-rw-r--r--src/text/text_offsets.asm46
3 files changed, 46 insertions, 46 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm
index ab5a0fb..e1985c1 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -821,7 +821,7 @@ NoEnergyAttachedToOpponentsActiveText: ; 3742a (d:742a)
line "the opponent's Active Pokémon."
done
-Text00af: ; 3746a (d:746a)
+ThereAreNoEnergyCardsInDiscardPileText: ; 3746a (d:746a)
text "There are no Energy cards"
line "in the the Discard Pile."
done
@@ -882,7 +882,7 @@ Text00bb: ; 37680 (d:7680)
line "Discard Pile."
done
-Text00bc: ; 376a9 (d:76a9)
+ThereAreNoStage1PokemonText: ; 376a9 (d:76a9)
text "There are no Stage 1 Pokémon"
line "in the Play Area."
done
@@ -910,7 +910,7 @@ NotEnoughFireEnergyText: ; 3779b (d:779b)
text "Not enough Fire Energy."
done
-Text00c2: ; 377b4 (d:77b4)
+NotEnoughPsychicEnergyText: ; 377b4 (d:77b4)
text "Not enough Psychic Energy."
done
@@ -918,7 +918,7 @@ NotEnoughWaterEnergyText: ; 377d0 (d:77d0)
text "Not enough Water Energy."
done
-Text00c4: ; 377ea (d:77ea)
+ThereAreNoTrainerCardsInDiscardPileText: ; 377ea (d:77ea)
text "There are no Trainer Cards"
line "in the Discard Pile."
done
@@ -967,12 +967,12 @@ NoGrassEnergyText: ; 37946 (d:7946)
text "No Grass Energy."
done
-Text00cf: ; 37958 (d:7958)
+CannotUseSinceTheresOnly1PkmnText: ; 37958 (d:7958)
text "Cannot use since there's only"
line "1 Pokémon."
done
-Text00d0: ; 37982 (d:7982)
+CannotUseBecauseItWillBeKnockedOutText: ; 37982 (d:7982)
text "Cannot use because"
line "it will be Knocked Out."
done
@@ -985,7 +985,7 @@ ThereAreNoPokemonOnBenchText: ; 379ce (d:79ce)
text "There are no Pokémon on the Bench."
done
-Text00d3: ; 379f2 (d:79f2)
+OpponentIsNotAsleepText: ; 379f2 (d:79f2)
text "Opponent is not Asleep"
done
diff --git a/src/text/text2.asm b/src/text/text2.asm
index f5686db..90e405f 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -182,7 +182,7 @@ CannotDrawCardBecauseNoCardsInDeckText: ; 3872d (e:472d)
line "there are no cards in the Deck."
done
-Text011a: ; 38769 (e:4769)
+ChoosePkmnInTheBenchToGiveDamageText: ; 38769 (e:4769)
text "Choose a Pokémon on the Bench"
line "to give damage to."
done
@@ -303,7 +303,7 @@ ChoosePkmnToRemoveDamageCounterText: ; 38bc9 (e:4bc9)
line "the Damage counter from."
done
-Text0131: ; 38bfe (e:4bfe)
+ProcedureForCurseText: ; 38bfe (e:4bfe)
text "Procedure for Curse:"
line ""
line "1. Choose a Pokémon to move the"
@@ -317,22 +317,22 @@ Text0131: ; 38bfe (e:4bfe)
line "3. Press the B Button to cancel."
done
-Text0132: ; 38cda (e:4cda)
+Choose2EnergyCardsFromDiscardPileToAttachText: ; 38cda (e:4cda)
text "Choose 2 Energy cards from the"
line "Discard Pileto attach to a Pokémon."
done
-Text0133: ; 38d1e (e:4d1e)
+Choose2EnergyCardsFromDiscardPileForHandText: ; 38d1e (e:4d1e)
text "Choose 2 Energy cards from the"
line "Discard Pile for your Hand."
done
-Text0134: ; 38d5a (e:4d5a)
+ChooseAnEnergyCardText: ; 38d5a (e:4d5a)
text "Choose an Energy"
line "card."
done
-Text0135: ; 38d72 (e:4d72)
+ProcedureForProphecyText: ; 38d72 (e:4d72)
text "Procedure for Prophecy:"
line ""
line "1. Choose either your Deck"
@@ -348,12 +348,12 @@ Text0135: ; 38d72 (e:4d72)
line "4. Press the B Button to cancel."
done
-Text0136: ; 38e70 (e:4e70)
+ChooseTheOrderOfTheCardsText: ; 38e70 (e:4e70)
text "Choose the order"
line "of the cards."
done
-Text0137: ; 38e90 (e:4e90)
+ProcedureForDamageSwapText: ; 38e90 (e:4e90)
text "Procedure for Damage Swap:"
line ""
line "1. Choose a Pokémon to move a"
@@ -372,7 +372,7 @@ Text0137: ; 38e90 (e:4e90)
line " it will Knock Out the Pokémon."
done
-Text0138: ; 38fcc (e:4fcc)
+ProcedureForDevolutionBeamText: ; 38fcc (e:4fcc)
text "Procedure for Devolution Beam."
line ""
line "1. Choose either a Pokémon in your"
@@ -385,7 +385,7 @@ Text0138: ; 38fcc (e:4fcc)
line "3. Press the B Button to cancel."
done
-Text0139: ; 390b4 (e:50b4)
+ProcedureForStrangeBehaviorText: ; 390b4 (e:50b4)
text "Procedure for Strange Behavior:"
line ""
line "1. Choose the Pokémon with the"
@@ -415,12 +415,12 @@ WouldYouLikeToCheckTheDeckText: ; 39231 (e:5231)
text "Would you like to check the Deck?"
done
-Text013d: ; 39254 (e:5254)
+PleaseSelectTheDeckText: ; 39254 (e:5254)
text "Please select the Deck:"
line " Yours Opponent's"
done
-Text013e: ; 3928c (e:528c)
+PleaseSelectThePlayAreaText: ; 3928c (e:528c)
text "Please select the Play Area:"
line " Yours Opponent's"
done
@@ -656,7 +656,7 @@ Text016e: ; 39a14 (e:5a14)
line "to the Deck."
done
-Text016f: ; 39a31 (e:5a31)
+WasPlacedInTheHandText: ; 39a31 (e:5a31)
text "<RAMTEXT> was placed"
line "in the Hand."
done
@@ -708,7 +708,7 @@ Text0179: ; 39b32 (e:5b32)
line "<RAMNUM> damage!"
done
-Text017a: ; 39b46 (e:5b46)
+PokemonDevolvedToText: ; 39b46 (e:5b46)
text "<RAMTEXT> devolved"
line "to <RAMTEXT>!"
done
@@ -717,7 +717,7 @@ ThereWasNoFireEnergyText: ; 39b58 (e:5b58)
text "There was no Fire Energy."
done
-Text017c: ; 39b73 (e:5b73)
+YouCanSelectMoreCardsQuitText: ; 39b73 (e:5b73)
text "You can select <RAMNUM> more cards. Quit?"
done
@@ -755,7 +755,7 @@ ThereWasNoEffectFromPoisonConfusionText: ; 39c5a (e:5c5a)
line "from Poison, Confusion."
done
-Text0184: ; 39c86 (e:5c86)
+ExchangedCardsInDuelistsHandText: ; 39c86 (e:5c86)
text "Exchanged the cards"
line "in <RAMNAME>'s Hand."
done
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index 29cc0ca..f4cecee 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -176,7 +176,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer NoPokemonWithDamageCountersText ; 0x00ac
textpointer NoDamageCountersText ; 0x00ad
textpointer NoEnergyAttachedToOpponentsActiveText ; 0x00ae
- textpointer Text00af ; 0x00af
+ textpointer ThereAreNoEnergyCardsInDiscardPileText ; 0x00af
textpointer Text00b0 ; 0x00b0
textpointer NoCardsLeftInTheDeckText ; 0x00b1
textpointer NoSpaceOnTheBenchText ; 0x00b2
@@ -189,15 +189,15 @@ TextOffsets:: ; 34000 (d:4000)
textpointer Text00b9 ; 0x00b9
textpointer Text00ba ; 0x00ba
textpointer Text00bb ; 0x00bb
- textpointer Text00bc ; 0x00bc
+ textpointer ThereAreNoStage1PokemonText ; 0x00bc
textpointer Text00bd ; 0x00bd
textpointer Text00be ; 0x00be
textpointer EnergyCardsRequiredToRetreatText ; 0x00bf
textpointer NotEnoughEnergyCardsText ; 0x00c0
textpointer NotEnoughFireEnergyText ; 0x00c1
- textpointer Text00c2 ; 0x00c2
+ textpointer NotEnoughPsychicEnergyText ; 0x00c2
textpointer NotEnoughWaterEnergyText ; 0x00c3
- textpointer Text00c4 ; 0x00c4
+ textpointer ThereAreNoTrainerCardsInDiscardPileText ; 0x00c4
textpointer NoAttackMayBeChoosenText ; 0x00c5
textpointer Text00c6 ; 0x00c6
textpointer Text00c7 ; 0x00c7
@@ -208,11 +208,11 @@ TextOffsets:: ; 34000 (d:4000)
textpointer CannotBeUsedInTurnWhichWasPlayedText ; 0x00cc
textpointer Text00cd ; 0x00cd
textpointer NoGrassEnergyText ; 0x00ce
- textpointer Text00cf ; 0x00cf
- textpointer Text00d0 ; 0x00d0
+ textpointer CannotUseSinceTheresOnly1PkmnText ; 0x00cf
+ textpointer CannotUseBecauseItWillBeKnockedOutText ; 0x00d0
textpointer Text00d1 ; 0x00d1
textpointer ThereAreNoPokemonOnBenchText ; 0x00d2
- textpointer Text00d3 ; 0x00d3
+ textpointer OpponentIsNotAsleepText ; 0x00d3
textpointer UnableDueToToxicGasText ; 0x00d4
textpointer Text00d5 ; 0x00d5
textpointer BackUpIsBrokenText ; 0x00d6
@@ -283,7 +283,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer Text0117 ; 0x0117
textpointer DrawCardsFromTheDeckText ; 0x0118
textpointer CannotDrawCardBecauseNoCardsInDeckText ; 0x0119
- textpointer Text011a ; 0x011a
+ textpointer ChoosePkmnInTheBenchToGiveDamageText ; 0x011a
textpointer Text011b ; 0x011b
textpointer Text011c ; 0x011c
textpointer Text011d ; 0x011d
@@ -306,20 +306,20 @@ TextOffsets:: ; 34000 (d:4000)
textpointer ChooseABellsproutFromDeckText ; 0x012e
textpointer ChooseABellsproutText ; 0x012f
textpointer ChoosePkmnToRemoveDamageCounterText ; 0x0130
- textpointer Text0131 ; 0x0131
- textpointer Text0132 ; 0x0132
- textpointer Text0133 ; 0x0133
- textpointer Text0134 ; 0x0134
- textpointer Text0135 ; 0x0135
- textpointer Text0136 ; 0x0136
- textpointer Text0137 ; 0x0137
- textpointer Text0138 ; 0x0138
- textpointer Text0139 ; 0x0139
+ textpointer ProcedureForCurseText ; 0x0131
+ textpointer Choose2EnergyCardsFromDiscardPileToAttachText ; 0x0132
+ textpointer Choose2EnergyCardsFromDiscardPileForHandText ; 0x0133
+ textpointer ChooseAnEnergyCardText ; 0x0134
+ textpointer ProcedureForProphecyText ; 0x0135
+ textpointer ChooseTheOrderOfTheCardsText ; 0x0136
+ textpointer ProcedureForDamageSwapText ; 0x0137
+ textpointer ProcedureForDevolutionBeamText ; 0x0138
+ textpointer ProcedureForStrangeBehaviorText ; 0x0139
textpointer Text013a ; 0x013a
textpointer ThereIsNoInTheDeckText ; 0x013b
textpointer WouldYouLikeToCheckTheDeckText ; 0x013c
- textpointer Text013d ; 0x013d
- textpointer Text013e ; 0x013e
+ textpointer PleaseSelectTheDeckText ; 0x013d
+ textpointer PleaseSelectThePlayAreaText ; 0x013e
textpointer NidoranMNidoranFText ; 0x013f
textpointer OddishText ; 0x0140
textpointer BellsproutText ; 0x0141
@@ -368,7 +368,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer Text016c ; 0x016c
textpointer Text016d ; 0x016d
textpointer Text016e ; 0x016e
- textpointer Text016f ; 0x016f
+ textpointer WasPlacedInTheHandText ; 0x016f
textpointer TheCardYouReceivedText ; 0x0170
textpointer YouReceivedTheseCardsText ; 0x0171
textpointer Text0172 ; 0x0172
@@ -379,9 +379,9 @@ TextOffsets:: ; 34000 (d:4000)
textpointer Text0177 ; 0x0177
textpointer Text0178 ; 0x0178
textpointer Text0179 ; 0x0179
- textpointer Text017a ; 0x017a
+ textpointer PokemonDevolvedToText ; 0x017a
textpointer ThereWasNoFireEnergyText ; 0x017b
- textpointer Text017c ; 0x017c
+ textpointer YouCanSelectMoreCardsQuitText ; 0x017c
textpointer Text017d ; 0x017d
textpointer ThereWasNoEffectFromToxicText ; 0x017e
textpointer ThereWasNoEffectFromPoisonText ; 0x017f
@@ -389,7 +389,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer ThereWasNoEffectFromParalysisText ; 0x0181
textpointer ThereWasNoEffectFromConfusionText ; 0x0182
textpointer ThereWasNoEffectFromPoisonConfusionText ; 0x0183
- textpointer Text0184 ; 0x0184
+ textpointer ExchangedCardsInDuelistsHandText ; 0x0184
textpointer Text0185 ; 0x0185
textpointer Text0186 ; 0x0186
textpointer Text0187 ; 0x0187