diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2020-06-04 16:28:16 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2020-12-16 00:24:21 +0000 |
| commit | 75fa5549f3a5e7fe5a690454852559e6e1705cb1 (patch) | |
| tree | 710a640c330f9b4c83d0a4ddc67ae2e5bd6a3854 /src/text | |
| parent | 046cb28bde1c0d6716380f83e26df4a568d7691c (diff) | |
Lightning attack effects
Diffstat (limited to 'src/text')
| -rw-r--r-- | src/text/text1.asm | 4 | ||||
| -rw-r--r-- | src/text/text2.asm | 12 | ||||
| -rw-r--r-- | src/text/text_offsets.asm | 16 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm index 031befb..577bef5 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -327,7 +327,7 @@ PsychicSymbolText: ; 36857 (d:6857) textfw0 "<PSYCHIC>" done -Text004d: ; 3685a (d:685a) +BenchText: ; 3685a (d:685a) text "Bench" done @@ -1113,7 +1113,7 @@ IfHeadsHealIsSuccessfulText: ; 37e73 (d:7e73) line "Heal is successful." done -Text00ed: ; 37e92 (d:7e92) +IfTailsDamageToYourselfTooText: ; 37e92 (d:7e92) text "If Tails, <RAMNUM> damage" line "to yourself, too." done diff --git a/src/text/text2.asm b/src/text/text2.asm index d6a982b..9c127f5 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -187,17 +187,17 @@ ChoosePkmnInTheBenchToGiveDamageText: ; 38769 (e:4769) line "to give damage to." done -Text011b: ; 3879b (e:479b) +ChooseUpTo3PkmnOnBenchToGiveDamageText: ; 3879b (e:479b) text "Choose up to 3 Pokémon on the" line "Bench to give damage to." done -Text011c: ; 387d3 (e:47d3) +Choose1BasicEnergyCardFromDeckText: ; 387d3 (e:47d3) text "Choose 1 Basic Energy card" line "from the Deck." done -Text011d: ; 387fe (e:47fe) +ChoosePokemonToAttachEnergyCardText: ; 387fe (e:47fe) text "Choose a Pokémon to attach" line "the Energy card to." done @@ -255,7 +255,7 @@ ChooseAKrabbyText: ; 38a02 (e:4a02) text "Choose a Krabby." done -Text0129: ; 38a14 (e:4a14) +ChooseBasicEnergyCardText: ; 38a14 (e:4a14) text "Choose a Basic" line "Energy card." done @@ -445,7 +445,7 @@ FightingPokemonDeckText: ; 392f8 (e:52f8) text "Fighting Pokémon" done -Text0144: ; 3930a (e:530a) +BasicEnergyText: ; 3930a (e:530a) text "Basic Energy" done @@ -483,7 +483,7 @@ ThereWasNoEffectFromTxRam2Text: ; 393ff (e:53ff) line "from <RAMTEXT>." done -Text014c: ; 3941c (e:541c) +TheEnergyCardFromPlayAreaWasMovedText: ; 3941c (e:541c) text "The Energy card from <RAMNAME>'s" line "Play Area was moved." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 728a110..fad0a83 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -78,7 +78,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer LightningSymbolText ; 0x004a textpointer FightingSymbolText ; 0x004b textpointer PsychicSymbolText ; 0x004c - textpointer Text004d ; 0x004d + textpointer BenchText ; 0x004d textpointer KnockOutText ; 0x004e textpointer DamageToSelfDueToConfusionText ; 0x004f textpointer ChooseEnergyCardToDiscardText ; 0x0050 @@ -238,7 +238,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer DamageToOppBenchIfHeadsDamageToYoursIfTailsText ; 0x00ea textpointer IfHeadsChangeOpponentsActivePokemonText ; 0x00eb textpointer IfHeadsHealIsSuccessfulText ; 0x00ec - textpointer Text00ed ; 0x00ed + textpointer IfTailsDamageToYourselfTooText ; 0x00ed textpointer SuccessCheckIfHeadsAttackIsSuccessfulText ; 0x00ee textpointer TrainerCardSuccessCheckText ; 0x00ef textpointer Text00f0 ; 0x00f0 @@ -284,9 +284,9 @@ TextOffsets:: ; 34000 (d:4000) textpointer DrawCardsFromTheDeckText ; 0x0118 textpointer CannotDrawCardBecauseNoCardsInDeckText ; 0x0119 textpointer ChoosePkmnInTheBenchToGiveDamageText ; 0x011a - textpointer Text011b ; 0x011b - textpointer Text011c ; 0x011c - textpointer Text011d ; 0x011d + textpointer ChooseUpTo3PkmnOnBenchToGiveDamageText ; 0x011b + textpointer Choose1BasicEnergyCardFromDeckText ; 0x011c + textpointer ChoosePokemonToAttachEnergyCardText ; 0x011d textpointer Text011e ; 0x011e textpointer ChooseAndDiscard2FireEnergyCardsText ; 0x011f textpointer DiscardOppDeckAsManyFireEnergyCardsText ; 0x0120 @@ -298,7 +298,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer ChooseAnOddishFromDeckText ; 0x0126 textpointer ChooseAnOddishText ; 0x0127 textpointer ChooseAKrabbyText ; 0x0128 - textpointer Text0129 ; 0x0129 + textpointer ChooseBasicEnergyCardText ; 0x0129 textpointer ChooseNidoranFromDeckText ; 0x012a textpointer ChooseNidoranText ; 0x012b textpointer ChooseBasicFightingPokemonText ; 0x012c @@ -325,7 +325,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer BellsproutText ; 0x0141 textpointer KrabbyText ; 0x0142 textpointer FightingPokemonDeckText ; 0x0143 - textpointer Text0144 ; 0x0144 + textpointer BasicEnergyText ; 0x0144 textpointer PeekWasUsedToLookInYourHandText ; 0x0145 textpointer CardPeekWasUsedOnText ; 0x0146 textpointer Text0147 ; 0x0147 @@ -333,7 +333,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer BasicPokemonWasPlacedOnEachBenchText ; 0x0149 textpointer WasUnsuccessfulText ; 0x014a textpointer ThereWasNoEffectFromTxRam2Text ; 0x014b - textpointer Text014c ; 0x014c + textpointer TheEnergyCardFromPlayAreaWasMovedText ; 0x014c textpointer DrewFireEnergyFromTheHandText ; 0x014d textpointer ThePkmnCardsInHandAndDeckWereShuffledText ; 0x014e textpointer Text014f ; 0x014f |
