diff options
author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2020-05-14 16:12:41 +0100 |
---|---|---|
committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2020-12-16 00:22:57 +0000 |
commit | 2fa7cf63dfe4920d3b1081dd9728e4c9af89aa0a (patch) | |
tree | e173b6fe4486b73d0c5e7c7a8e0267c14ae66016 /src/text | |
parent | b18a90284bed0f381c924c1bd9bddc6f254ad36c (diff) |
Disassemble Water effects
Diffstat (limited to 'src/text')
-rw-r--r-- | src/text/text1.asm | 12 | ||||
-rw-r--r-- | src/text/text2.asm | 14 | ||||
-rw-r--r-- | src/text/text_offsets.asm | 26 |
3 files changed, 26 insertions, 26 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm index e391fa4..79ed84e 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -858,7 +858,7 @@ Text00b6: ; 375bc (d:75bc) text "Not enough cards in Hand." done -LureNoPokemonOnTheBenchText: ; 375d7 (d:75d7) +EffectNoPokemonOnTheBenchText: ; 375d7 (d:75d7) text "No Pokémon on the Bench." done @@ -914,7 +914,7 @@ Text00c2: ; 377b4 (d:77b4) text "Not enough Psychic Energy." done -Text00c3: ; 377d0 (d:77d0) +NotEnoughWaterEnergyText: ; 377d0 (d:77d0) text "Not enough Water Energy." done @@ -923,7 +923,7 @@ Text00c4: ; 377ea (d:77ea) line "in the Discard Pile." done -Text00c5: ; 3781b (d:781b) +NoAttackMayBeChoosenText: ; 3781b (d:781b) text "No Attacks may be choosen." done @@ -954,7 +954,7 @@ CannotUseDueToStatusText: ; 378bc (d:78bc) line "or Confusion." done -Text00cc: ; 378ef (d:78ef) +CannotBeUsedInTurnWhichWasPlayedText: ; 378ef (d:78ef) text "Cannot be used in the turn in" line "which it was played." done @@ -1098,7 +1098,7 @@ IfHeadPlus10IfTails10ToYourselfText: ; 37dc9 (d:7dc9) line "If Tails, +10 damage to yourself!" done -Text00ea: ; 37e03 (d:7e03) +DamageToOppBenchIfHeadsDamageToYoursIfTailsText: ; 37e03 (d:7e03) text "10 damage to opponent's Bench if" line "Heads, damage to yours if Tails." done @@ -1118,7 +1118,7 @@ Text00ed: ; 37e92 (d:7e92) line "to yourself, too." done -Text00ee: ; 37eb8 (d:7eb8) +SuccessCheckIfHeadsAttackIsSuccessfulText: ; 37eb8 (d:7eb8) text "Success check!!!" line "If Heads, Attack is successful!" done diff --git a/src/text/text2.asm b/src/text/text2.asm index 1195ac6..0406103 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -27,7 +27,7 @@ PoisonedIfHeadsConfusedIfTailsText: ; 380ed (e:40ed) line "and Confused if Tails." done -Text00fb: ; 38124 (e:4124) +IfHeadsDoNotReceiveDamageOrEffectText: ; 38124 (e:4124) text "If Heads, do not receive damage" line "or effect of opponent's next Attack!" done @@ -222,17 +222,17 @@ Text0121: ; 388ca (e:48ca) line "2 Energy cards." done -Text0122: ; 388ee (e:48ee) +ChooseAKrabbyFromDeckText: ; 388ee (e:48ee) text "Choose a Krabby" line "from the Deck." done -Text0123: ; 3890e (e:490e) +ChooseDiscardEnergyCardFromOpponentText: ; 3890e (e:490e) text "Choose and Discard an Energy card" line "from the opponent's Active Pokémon." done -Text0124: ; 38955 (e:4955) +ChooseAttackOpponentWillNotBeAbleToUseText: ; 38955 (e:4955) text "Choose the Attack the opponent will" line "not be able to use on the next turn." done @@ -251,7 +251,7 @@ ChooseAnOddishText: ; 389f0 (e:49f0) text "Choose an Oddish" done -Text0128: ; 38a02 (e:4a02) +ChooseAKrabbyText: ; 38a02 (e:4a02) text "Choose a Krabby." done @@ -437,7 +437,7 @@ BellsproutText: ; 392e4 (e:52e4) text "Bellsprout" done -Text0142: ; 392f0 (e:52f0) +KrabbyText: ; 392f0 (e:52f0) text "Krabby" done @@ -463,7 +463,7 @@ Text0147: ; 3935d (e:535d) line "cards were returned to the Hand." done -Text0148: ; 39392 (e:5392) +WasChosenForTheEffectOfAmnesiaText: ; 39392 (e:5392) text "<RAMTEXT> was chosen" line "for the effect of Amnesia." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index ee5dfce..a91e656 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -184,7 +184,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer CantEvolvePokemonInSameTurnItsPlacedText ; 0x00b4 textpointer NotAffectedByPoisonSleepParalysisOrConfusionText ; 0x00b5 textpointer Text00b6 ; 0x00b6 - textpointer LureNoPokemonOnTheBenchText ; 0x00b7 + textpointer EffectNoPokemonOnTheBenchText ; 0x00b7 textpointer Text00b8 ; 0x00b8 textpointer Text00b9 ; 0x00b9 textpointer Text00ba ; 0x00ba @@ -196,16 +196,16 @@ TextOffsets:: ; 34000 (d:4000) textpointer NotEnoughEnergyCardsText ; 0x00c0 textpointer Text00c1 ; 0x00c1 textpointer Text00c2 ; 0x00c2 - textpointer Text00c3 ; 0x00c3 + textpointer NotEnoughWaterEnergyText ; 0x00c3 textpointer Text00c4 ; 0x00c4 - textpointer Text00c5 ; 0x00c5 + textpointer NoAttackMayBeChoosenText ; 0x00c5 textpointer Text00c6 ; 0x00c6 textpointer Text00c7 ; 0x00c7 textpointer Text00c8 ; 0x00c8 textpointer Text00c9 ; 0x00c9 textpointer OnlyOncePerTurnText ; 0x00ca textpointer CannotUseDueToStatusText ; 0x00cb - textpointer Text00cc ; 0x00cc + textpointer CannotBeUsedInTurnWhichWasPlayedText ; 0x00cc textpointer Text00cd ; 0x00cd textpointer NoGrassEnergyText ; 0x00ce textpointer Text00cf ; 0x00cf @@ -235,11 +235,11 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text00e7 ; 0x00e7 textpointer Text00e8 ; 0x00e8 textpointer IfHeadPlus10IfTails10ToYourselfText ; 0x00e9 - textpointer Text00ea ; 0x00ea + textpointer DamageToOppBenchIfHeadsDamageToYoursIfTailsText ; 0x00ea textpointer IfHeadsChangeOpponentsActivePokemonText ; 0x00eb textpointer IfHeadsHealIsSuccessfulText ; 0x00ec textpointer Text00ed ; 0x00ed - textpointer Text00ee ; 0x00ee + textpointer SuccessCheckIfHeadsAttackIsSuccessfulText ; 0x00ee textpointer TrainerCardSuccessCheckText ; 0x00ef textpointer Text00f0 ; 0x00f0 textpointer IfHeadsNoDamageNextTurnText ; 0x00f1 @@ -252,7 +252,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer ConfusionCheckRetreatText ; 0x00f8 textpointer PokemonsSleepCheckText ; 0x00f9 textpointer PoisonedIfHeadsConfusedIfTailsText ; 0x00fa - textpointer Text00fb ; 0x00fb + textpointer IfHeadsDoNotReceiveDamageOrEffectText ; 0x00fb textpointer Text00fc ; 0x00fc textpointer AttackUnsuccessfulText ; 0x00fd textpointer UnableToRetreatDueToAcidText ; 0x00fe @@ -291,13 +291,13 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text011f ; 0x011f textpointer Text0120 ; 0x0120 textpointer Text0121 ; 0x0121 - textpointer Text0122 ; 0x0122 - textpointer Text0123 ; 0x0123 - textpointer Text0124 ; 0x0124 + textpointer ChooseAKrabbyFromDeckText ; 0x0122 + textpointer ChooseDiscardEnergyCardFromOpponentText ; 0x0123 + textpointer ChooseAttackOpponentWillNotBeAbleToUseText ; 0x0124 textpointer Text0125 ; 0x0125 textpointer ChooseAnOddishFromDeckText ; 0x0126 textpointer ChooseAnOddishText ; 0x0127 - textpointer Text0128 ; 0x0128 + textpointer ChooseAKrabbyText ; 0x0128 textpointer Text0129 ; 0x0129 textpointer ChooseNidoranFromDeckText ; 0x012a textpointer ChooseNidoranText ; 0x012b @@ -323,13 +323,13 @@ TextOffsets:: ; 34000 (d:4000) textpointer NidoranMNidoranFText ; 0x013f textpointer OddishText ; 0x0140 textpointer BellsproutText ; 0x0141 - textpointer Text0142 ; 0x0142 + textpointer KrabbyText ; 0x0142 textpointer Text0143 ; 0x0143 textpointer Text0144 ; 0x0144 textpointer Text0145 ; 0x0145 textpointer Text0146 ; 0x0146 textpointer Text0147 ; 0x0147 - textpointer Text0148 ; 0x0148 + textpointer WasChosenForTheEffectOfAmnesiaText ; 0x0148 textpointer Text0149 ; 0x0149 textpointer WasUnsuccessfulText ; 0x014a textpointer ThereWasNoEffectFromTxRam2Text ; 0x014b |