summaryrefslogtreecommitdiff
path: root/src/text
diff options
context:
space:
mode:
authorElectroDeoxys <ElectroDeoxys@gmail.com>2020-06-07 17:11:57 +0100
committerElectroDeoxys <ElectroDeoxys@gmail.com>2020-12-16 00:24:22 +0000
commitf1479c9e5072e362ab8c4ed5cd30d578b675dbb2 (patch)
tree0f138ddd18bfc2824536ac4c35022961ef7a8b39 /src/text
parent75fa5549f3a5e7fe5a690454852559e6e1705cb1 (diff)
Colorless attack effects
Diffstat (limited to 'src/text')
-rw-r--r--src/text/text1.asm12
-rw-r--r--src/text/text2.asm20
-rw-r--r--src/text/text_offsets.asm32
3 files changed, 32 insertions, 32 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm
index 577bef5..23ad017 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -927,21 +927,21 @@ NoAttackMayBeChoosenText: ; 3781b (d:781b)
text "No Attacks may be choosen."
done
-Text00c6: ; 37837 (d:7837)
+YouDidNotReceiveAnAttackToMirrorMoveText: ; 37837 (d:7837)
text "You did not receive an Attack"
line "to Mirror Move."
done
-Text00c7: ; 37866 (d:7866)
+ThisAttackCannotBeUsedTwiceText: ; 37866 (d:7866)
text "This attack cannot"
line "be used twice."
done
-Text00c8: ; 37889 (d:7889)
+NoWeaknessText: ; 37889 (d:7889)
text "No Weakness."
done
-Text00c9: ; 37897 (d:7897)
+NoResistanceText: ; 37897 (d:7897)
text "No Resistance."
done
@@ -977,7 +977,7 @@ CannotUseBecauseItWillBeKnockedOutText: ; 37982 (d:7982)
line "it will be Knocked Out."
done
-Text00d1: ; 379ae (d:79ae)
+CanOnlyBeUsedOnTheBenchText: ; 379ae (d:79ae)
text "Can only be used on the Bench."
done
@@ -1083,7 +1083,7 @@ DamageCheckIfTailsNoDamageText: ; 37d4a (d:7d4a)
line "If Tails, no damage!!!"
done
-Text00e7: ; 37d70 (d:7d70)
+IfHeadsDraw1CardFromDeckText: ; 37d70 (d:7d70)
text "If Heads,"
line "Draw 1 card from Deck!"
done
diff --git a/src/text/text2.asm b/src/text/text2.asm
index 9c127f5..9d328b6 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -116,7 +116,7 @@ NoDamageOrEffectDueToTransparencyText: ; 384d8 (e:44d8)
line "due to the effects of Transparency"
done
-Text010d: ; 3851f (e:451f)
+MetamorphsToText: ; 3851f (e:451f)
text "<RAMTEXT>"
line "metamorphs to <RAMTEXT>."
done
@@ -136,12 +136,12 @@ DuelistIsSelectingPokemonToPlaceInArenaText: ; 3859e (e:459e)
line "to place in the Arena."
done
-Text0111: ; 385cf (e:45cf)
+ChooseWeaknessYouWishToChangeText: ; 385cf (e:45cf)
text "Choose the Weakness you wish"
line "to change with Conversion 1."
done
-Text0112: ; 3860a (e:460a)
+ChooseResistanceYouWishToChangeText: ; 3860a (e:460a)
text "Choose the Resistance you wish"
line "to change with Conversion 2."
done
@@ -151,13 +151,13 @@ ChoosePokemonWishToColorChangeText: ; 38647 (e:4647)
line "wish to change with Color change."
done
-Text0114: ; 3868d (e:468d)
+ChangedTheWeaknessOfPokemonToColorText: ; 3868d (e:468d)
text "Changed the Weakness of"
line ""
text "<RAMTEXT> to <RAMTEXT>."
done
-Text0115: ; 386af (e:46af)
+ChangedTheResistanceOfPokemonToColorText: ; 386af (e:46af)
text "Changed the Resistance of"
line ""
text "<RAMTEXT> to <RAMTEXT>."
@@ -169,7 +169,7 @@ ChangedTheColorOfText: ; 386d3 (e:46d3)
text "<RAMTEXT> to <RAMTEXT>."
done
-Text0117: ; 386f2 (e:46f2)
+Draw1CardFromTheDeckText: ; 386f2 (e:46f2)
text "Draw 1 card from the Deck."
done
@@ -401,7 +401,7 @@ ProcedureForStrangeBehaviorText: ; 390b4 (e:50b4)
line " Slowbro will be Knocked Out."
done
-Text013a: ; 391dc (e:51dc)
+ChooseOppAttackToBeUsedWithMetronomeText: ; 391dc (e:51dc)
text "Choose the opponent's Attack"
line "to be used with Metronome."
done
@@ -458,7 +458,7 @@ CardPeekWasUsedOnText: ; 39346 (e:5346)
text "Card Peek was used on"
done
-Text0147: ; 3935d (e:535d)
+PokemonAndAllAttachedCardsReturnedToHandText: ; 3935d (e:535d)
text "<RAMTEXT> and all attached"
line "cards were returned to the Hand."
done
@@ -689,11 +689,11 @@ Text0175: ; 39adb (e:5adb)
line "from the Hand."
done
-Text0176: ; 39af7 (e:5af7)
+NoneCameText: ; 39af7 (e:5af7)
text "None came!"
done
-Text0177: ; 39b03 (e:5b03)
+CameToTheBenchText: ; 39b03 (e:5b03)
text "<RAMTEXT>"
line "came to the Bench!"
done
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index fad0a83..a7af9be 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -199,10 +199,10 @@ TextOffsets:: ; 34000 (d:4000)
textpointer NotEnoughWaterEnergyText ; 0x00c3
textpointer ThereAreNoTrainerCardsInDiscardPileText ; 0x00c4
textpointer NoAttackMayBeChoosenText ; 0x00c5
- textpointer Text00c6 ; 0x00c6
- textpointer Text00c7 ; 0x00c7
- textpointer Text00c8 ; 0x00c8
- textpointer Text00c9 ; 0x00c9
+ textpointer YouDidNotReceiveAnAttackToMirrorMoveText ; 0x00c6
+ textpointer ThisAttackCannotBeUsedTwiceText ; 0x00c7
+ textpointer NoWeaknessText ; 0x00c8
+ textpointer NoResistanceText ; 0x00c9
textpointer OnlyOncePerTurnText ; 0x00ca
textpointer CannotUseDueToStatusText ; 0x00cb
textpointer CannotBeUsedInTurnWhichWasPlayedText ; 0x00cc
@@ -210,7 +210,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer NoGrassEnergyText ; 0x00ce
textpointer CannotUseSinceTheresOnly1PkmnText ; 0x00cf
textpointer CannotUseBecauseItWillBeKnockedOutText ; 0x00d0
- textpointer Text00d1 ; 0x00d1
+ textpointer CanOnlyBeUsedOnTheBenchText ; 0x00d1
textpointer ThereAreNoPokemonOnBenchText ; 0x00d2
textpointer OpponentIsNotAsleepText ; 0x00d3
textpointer UnableDueToToxicGasText ; 0x00d4
@@ -232,7 +232,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer VenomPowderCheckText ; 0x00e4
textpointer IfTailsYourPokemonBecomesConfusedText ; 0x00e5
textpointer DamageCheckIfTailsNoDamageText ; 0x00e6
- textpointer Text00e7 ; 0x00e7
+ textpointer IfHeadsDraw1CardFromDeckText ; 0x00e7
textpointer FlipUntilFailAppears10DamageForEachHeadsText ; 0x00e8
textpointer IfHeadPlus10IfTails10ToYourselfText ; 0x00e9
textpointer DamageToOppBenchIfHeadsDamageToYoursIfTailsText ; 0x00ea
@@ -270,17 +270,17 @@ TextOffsets:: ; 34000 (d:4000)
textpointer UnableToUseAttackDueToNShieldText ; 0x010a
textpointer NoDamageOrEffectDueToNShieldText ; 0x010b
textpointer NoDamageOrEffectDueToTransparencyText ; 0x010c
- textpointer Text010d ; 0x010d
+ textpointer MetamorphsToText ; 0x010d
textpointer SelectPkmnOnBenchToSwitchWithActiveText ; 0x010e
textpointer SelectPokemonToPlaceInTheArenaText ; 0x010f
textpointer DuelistIsSelectingPokemonToPlaceInArenaText ; 0x0110
- textpointer Text0111 ; 0x0111
- textpointer Text0112 ; 0x0112
+ textpointer ChooseWeaknessYouWishToChangeText ; 0x0111
+ textpointer ChooseResistanceYouWishToChangeText ; 0x0112
textpointer ChoosePokemonWishToColorChangeText ; 0x0113
- textpointer Text0114 ; 0x0114
- textpointer Text0115 ; 0x0115
+ textpointer ChangedTheWeaknessOfPokemonToColorText ; 0x0114
+ textpointer ChangedTheResistanceOfPokemonToColorText ; 0x0115
textpointer ChangedTheColorOfText ; 0x0116
- textpointer Text0117 ; 0x0117
+ textpointer Draw1CardFromTheDeckText ; 0x0117
textpointer DrawCardsFromTheDeckText ; 0x0118
textpointer CannotDrawCardBecauseNoCardsInDeckText ; 0x0119
textpointer ChoosePkmnInTheBenchToGiveDamageText ; 0x011a
@@ -315,7 +315,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer ProcedureForDamageSwapText ; 0x0137
textpointer ProcedureForDevolutionBeamText ; 0x0138
textpointer ProcedureForStrangeBehaviorText ; 0x0139
- textpointer Text013a ; 0x013a
+ textpointer ChooseOppAttackToBeUsedWithMetronomeText ; 0x013a
textpointer ThereIsNoInTheDeckText ; 0x013b
textpointer WouldYouLikeToCheckTheDeckText ; 0x013c
textpointer PleaseSelectTheDeckText ; 0x013d
@@ -328,7 +328,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer BasicEnergyText ; 0x0144
textpointer PeekWasUsedToLookInYourHandText ; 0x0145
textpointer CardPeekWasUsedOnText ; 0x0146
- textpointer Text0147 ; 0x0147
+ textpointer PokemonAndAllAttachedCardsReturnedToHandText ; 0x0147
textpointer WasChosenForTheEffectOfAmnesiaText ; 0x0148
textpointer BasicPokemonWasPlacedOnEachBenchText ; 0x0149
textpointer WasUnsuccessfulText ; 0x014a
@@ -375,8 +375,8 @@ TextOffsets:: ; 34000 (d:4000)
textpointer Text0173 ; 0x0173
textpointer DiscardedCardsFromDeckText ; 0x0174
textpointer Text0175 ; 0x0175
- textpointer Text0176 ; 0x0176
- textpointer Text0177 ; 0x0177
+ textpointer NoneCameText ; 0x0176
+ textpointer CameToTheBenchText ; 0x0177
textpointer Text0178 ; 0x0178
textpointer Text0179 ; 0x0179
textpointer PokemonDevolvedToText ; 0x017a