summaryrefslogtreecommitdiff
path: root/src/text
diff options
context:
space:
mode:
authorElectroDeoxys <ElectroDeoxys@gmail.com>2020-06-03 15:03:24 +0100
committerElectroDeoxys <ElectroDeoxys@gmail.com>2020-12-16 00:23:26 +0000
commit046cb28bde1c0d6716380f83e26df4a568d7691c (patch)
treef01ffcbcdb2cb9b8c964499cefdf35575cefd8e1 /src/text
parentb75d9712271fc49b7c3f83fc65c4b260624af386 (diff)
Fighting attack effects
Diffstat (limited to 'src/text')
-rw-r--r--src/text/text1.asm4
-rw-r--r--src/text/text2.asm14
-rw-r--r--src/text/text_offsets.asm18
3 files changed, 18 insertions, 18 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm
index e1985c1..031befb 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -1073,7 +1073,7 @@ VenomPowderCheckText: ; 37cdf (d:7cdf)
line "opponent is Poisoned & Confused."
done
-Text00e5: ; 37d1f (d:7d1f)
+IfTailsYourPokemonBecomesConfusedText: ; 37d1f (d:7d1f)
text "If Tails, your Pokémon"
line "becomes Confused."
done
@@ -1088,7 +1088,7 @@ Text00e7: ; 37d70 (d:7d70)
line "Draw 1 card from Deck!"
done
-Text00e8: ; 37d92 (d:7d92)
+FlipUntilFailAppears10DamageForEachHeadsText: ; 37d92 (d:7d92)
text "Flip until Tails appears."
line "10 damage for each Heads!!!"
done
diff --git a/src/text/text2.asm b/src/text/text2.asm
index 90e405f..d6a982b 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -32,7 +32,7 @@ IfHeadsDoNotReceiveDamageOrEffectText: ; 38124 (e:4124)
line "or effect of opponent's next Attack!"
done
-Text00fc: ; 3816a (e:416a)
+IfHeadsOpponentCannotAttackText: ; 3816a (e:416a)
text "If Heads, opponent cannot Attack"
line "next turn!"
done
@@ -237,7 +237,7 @@ ChooseAttackOpponentWillNotBeAbleToUseText: ; 38955 (e:4955)
line "not be able to use on the next turn."
done
-Text0125: ; 3899f (e:499f)
+ChooseBasicFightingPokemonFromDeckText: ; 3899f (e:499f)
text "Choose a Basic Fighting Pokémon"
line "from the Deck."
done
@@ -270,7 +270,7 @@ ChooseNidoranText: ; 38a61 (e:4a61)
line "or a Nidoran♂."
done
-Text012c: ; 38a83 (e:4a83)
+ChooseBasicFightingPokemonText: ; 38a83 (e:4a83)
text "Choose a Basic"
line "Fighting Pokémon"
done
@@ -441,7 +441,7 @@ KrabbyText: ; 392f0 (e:52f0)
text "Krabby"
done
-Text0143: ; 392f8 (e:52f8)
+FightingPokemonDeckText: ; 392f8 (e:52f8)
text "Fighting Pokémon"
done
@@ -449,12 +449,12 @@ Text0144: ; 3930a (e:530a)
text "Basic Energy"
done
-Text0145: ; 39318 (e:5318)
+PeekWasUsedToLookInYourHandText: ; 39318 (e:5318)
text "Peek was used to look at the"
line "<RAMTEXT> in your Hand."
done
-Text0146: ; 39346 (e:5346)
+CardPeekWasUsedOnText: ; 39346 (e:5346)
text "Card Peek was used on"
done
@@ -468,7 +468,7 @@ WasChosenForTheEffectOfAmnesiaText: ; 39392 (e:5392)
line "for the effect of Amnesia."
done
-Text0149: ; 393bb (e:53bb)
+BasicPokemonWasPlacedOnEachBenchText: ; 393bb (e:53bb)
text "A Basic Pokémon was placed"
line "on each Bench."
done
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index f4cecee..728a110 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -230,10 +230,10 @@ TextOffsets:: ; 34000 (d:4000)
textpointer PoisonCheckText ; 0x00e2
textpointer ConfusionCheckText ; 0x00e3
textpointer VenomPowderCheckText ; 0x00e4
- textpointer Text00e5 ; 0x00e5
+ textpointer IfTailsYourPokemonBecomesConfusedText ; 0x00e5
textpointer DamageCheckIfTailsNoDamageText ; 0x00e6
textpointer Text00e7 ; 0x00e7
- textpointer Text00e8 ; 0x00e8
+ textpointer FlipUntilFailAppears10DamageForEachHeadsText ; 0x00e8
textpointer IfHeadPlus10IfTails10ToYourselfText ; 0x00e9
textpointer DamageToOppBenchIfHeadsDamageToYoursIfTailsText ; 0x00ea
textpointer IfHeadsChangeOpponentsActivePokemonText ; 0x00eb
@@ -253,7 +253,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer PokemonsSleepCheckText ; 0x00f9
textpointer PoisonedIfHeadsConfusedIfTailsText ; 0x00fa
textpointer IfHeadsDoNotReceiveDamageOrEffectText ; 0x00fb
- textpointer Text00fc ; 0x00fc
+ textpointer IfHeadsOpponentCannotAttackText ; 0x00fc
textpointer AttackUnsuccessfulText ; 0x00fd
textpointer UnableToRetreatDueToAcidText ; 0x00fe
textpointer UnableToUseTrainerDueToHeadacheText ; 0x00ff
@@ -294,14 +294,14 @@ TextOffsets:: ; 34000 (d:4000)
textpointer ChooseAKrabbyFromDeckText ; 0x0122
textpointer ChooseDiscardEnergyCardFromOpponentText ; 0x0123
textpointer ChooseAttackOpponentWillNotBeAbleToUseText ; 0x0124
- textpointer Text0125 ; 0x0125
+ textpointer ChooseBasicFightingPokemonFromDeckText ; 0x0125
textpointer ChooseAnOddishFromDeckText ; 0x0126
textpointer ChooseAnOddishText ; 0x0127
textpointer ChooseAKrabbyText ; 0x0128
textpointer Text0129 ; 0x0129
textpointer ChooseNidoranFromDeckText ; 0x012a
textpointer ChooseNidoranText ; 0x012b
- textpointer Text012c ; 0x012c
+ textpointer ChooseBasicFightingPokemonText ; 0x012c
textpointer ProcedureForEnergyTransferText ; 0x012d
textpointer ChooseABellsproutFromDeckText ; 0x012e
textpointer ChooseABellsproutText ; 0x012f
@@ -324,13 +324,13 @@ TextOffsets:: ; 34000 (d:4000)
textpointer OddishText ; 0x0140
textpointer BellsproutText ; 0x0141
textpointer KrabbyText ; 0x0142
- textpointer Text0143 ; 0x0143
+ textpointer FightingPokemonDeckText ; 0x0143
textpointer Text0144 ; 0x0144
- textpointer Text0145 ; 0x0145
- textpointer Text0146 ; 0x0146
+ textpointer PeekWasUsedToLookInYourHandText ; 0x0145
+ textpointer CardPeekWasUsedOnText ; 0x0146
textpointer Text0147 ; 0x0147
textpointer WasChosenForTheEffectOfAmnesiaText ; 0x0148
- textpointer Text0149 ; 0x0149
+ textpointer BasicPokemonWasPlacedOnEachBenchText ; 0x0149
textpointer WasUnsuccessfulText ; 0x014a
textpointer ThereWasNoEffectFromTxRam2Text ; 0x014b
textpointer Text014c ; 0x014c