From 5ee1d3908bcf4cbd8ae05c0dbd420fb8cc6aca2f Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sun, 10 May 2020 10:35:17 +0100 Subject: Disasm Victreebel Lure attack --- src/text/text1.asm | 2 +- src/text/text_offsets.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/text') diff --git a/src/text/text1.asm b/src/text/text1.asm index 07d7a7a..00dc22f 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 -Text00b7: ; 375d7 (d:75d7) +LureNoPokemonOnTheBenchText: ; 375d7 (d:75d7) text "No Pokémon on the Bench." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 605ec7d..7ff0d44 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 Text00b5 ; 0x00b5 textpointer Text00b6 ; 0x00b6 - textpointer Text00b7 ; 0x00b7 + textpointer LureNoPokemonOnTheBenchText ; 0x00b7 textpointer Text00b8 ; 0x00b8 textpointer Text00b9 ; 0x00b9 textpointer Text00ba ; 0x00ba -- cgit v1.2.3 From 467f016e401386a8a30d38429d96056df66bf38c Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sun, 10 May 2020 21:58:45 +0100 Subject: Oddish Sprout effect --- src/text/text1.asm | 2 +- src/text/text2.asm | 10 +++++----- src/text/text_offsets.asm | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/text') diff --git a/src/text/text1.asm b/src/text/text1.asm index 00dc22f..46bb72d 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -831,7 +831,7 @@ Text00b0: ; 3749e (d:749e) line "in the Discard Pile." done -Text00b1: ; 374d4 (d:74d4) +NoCardsLeftInTheDeckText: ; 374d4 (d:74d4) text "There are no cards left in the Deck." done diff --git a/src/text/text2.asm b/src/text/text2.asm index 97ecf45..b9ffa9b 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -242,12 +242,12 @@ Text0125: ; 3899f (e:499f) line "from the Deck." done -Text0126: ; 389cf (e:49cf) +ChooseAnOddishFromTheDeckText: ; 389cf (e:49cf) text "Choose an Oddish" line "from the Deck." done -Text0127: ; 389f0 (e:49f0) +ChooseAnOddishText: ; 389f0 (e:49f0) text "Choose an Oddish" done @@ -406,12 +406,12 @@ Text013a: ; 391dc (e:51dc) line "to be used with Metronome." done -Text013b: ; 39215 (e:5215) +ThereIsNoInTheDeckText: ; 39215 (e:5215) text "There is no " line "in the Deck." done -Text013c: ; 39231 (e:5231) +WouldYouLikeToCheckTheDeckText: ; 39231 (e:5231) text "Would you like to check the Deck?" done @@ -429,7 +429,7 @@ Text013f: ; 392c9 (e:52c9) text "Nidoran♂ Nidoran♀" done -Text0140: ; 392dc (e:52dc) +OddishText: ; 392dc (e:52dc) text "Oddish" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 7ff0d44..941f9ae 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -178,7 +178,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer NoEnergyAttachedToOpponentsActiveText ; 0x00ae textpointer Text00af ; 0x00af textpointer Text00b0 ; 0x00b0 - textpointer Text00b1 ; 0x00b1 + textpointer NoCardsLeftInTheDeckText ; 0x00b1 textpointer NoSpaceOnTheBenchText ; 0x00b2 textpointer NoPokemonCapableOfEvolvingText ; 0x00b3 textpointer CantEvolvePokemonInSameTurnItsPlacedText ; 0x00b4 @@ -295,8 +295,8 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text0123 ; 0x0123 textpointer Text0124 ; 0x0124 textpointer Text0125 ; 0x0125 - textpointer Text0126 ; 0x0126 - textpointer Text0127 ; 0x0127 + textpointer ChooseAnOddishFromTheDeckText ; 0x0126 + textpointer ChooseAnOddishText ; 0x0127 textpointer Text0128 ; 0x0128 textpointer Text0129 ; 0x0129 textpointer Text012a ; 0x012a @@ -316,12 +316,12 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text0138 ; 0x0138 textpointer Text0139 ; 0x0139 textpointer Text013a ; 0x013a - textpointer Text013b ; 0x013b - textpointer Text013c ; 0x013c + textpointer ThereIsNoInTheDeckText ; 0x013b + textpointer WouldYouLikeToCheckTheDeckText ; 0x013c textpointer Text013d ; 0x013d textpointer Text013e ; 0x013e textpointer Text013f ; 0x013f - textpointer Text0140 ; 0x0140 + textpointer OddishText ; 0x0140 textpointer Text0141 ; 0x0141 textpointer Text0142 ; 0x0142 textpointer Text0143 ; 0x0143 -- cgit v1.2.3 From c11acb74b4bc7decf962b191fbb08d6b72e515aa Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Mon, 11 May 2020 00:25:17 +0100 Subject: Exeggutor Teleport effect --- src/text/text1.asm | 2 +- src/text/text_offsets.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/text') diff --git a/src/text/text1.asm b/src/text/text1.asm index 46bb72d..ff07f9d 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -981,7 +981,7 @@ Text00d1: ; 379ae (d:79ae) text "Can only be used on the Bench." done -Text00d2: ; 379ce (d:79ce) +ThereAreNoPokemonOnBenchText: ; 379ce (d:79ce) text "There are no Pokémon on the Bench." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 941f9ae..bc9d545 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -211,7 +211,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text00cf ; 0x00cf textpointer Text00d0 ; 0x00d0 textpointer Text00d1 ; 0x00d1 - textpointer Text00d2 ; 0x00d2 + textpointer ThereAreNoPokemonOnBenchText ; 0x00d2 textpointer Text00d3 ; 0x00d3 textpointer UnableDueToToxicGasText ; 0x00d4 textpointer Text00d5 ; 0x00d5 -- cgit v1.2.3 From a45b7780623fcc8b1d5af8863f07786a8f74a9e6 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Mon, 11 May 2020 10:16:23 +0100 Subject: NidoranF attacks --- src/text/text10.asm | 2 +- src/text/text2.asm | 6 +++--- src/text/text_offsets.asm | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/text') diff --git a/src/text/text10.asm b/src/text/text10.asm index 057820f..49fb302 100644 --- a/src/text/text10.asm +++ b/src/text/text10.asm @@ -85,7 +85,7 @@ NidoranFName: ; 582e5 (16:42e5) text "Nidoran♀" done -FurySweepesName: ; 582ef (16:42ef) +FurySwipesName: ; 582ef (16:42ef) text "Fury Swipes" done diff --git a/src/text/text2.asm b/src/text/text2.asm index b9ffa9b..bea4094 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -260,12 +260,12 @@ Text0129: ; 38a14 (e:4a14) line "Energy card." done -Text012a: ; 38a31 (e:4a31) +ChooseNidoranFromDeckText: ; 38a31 (e:4a31) text "Choose a Nidoran♀ or a" line "Nidoran♂ from the Deck." done -Text012b: ; 38a61 (e:4a61) +ChooseNidoranText: ; 38a61 (e:4a61) text "Choose a Nidoran♀" line "or a Nidoran♂." done @@ -425,7 +425,7 @@ Text013e: ; 3928c (e:528c) line " Yours Opponent's" done -Text013f: ; 392c9 (e:52c9) +NidoranMNidoranFText: ; 392c9 (e:52c9) text "Nidoran♂ Nidoran♀" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index bc9d545..5cc70d0 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -299,8 +299,8 @@ TextOffsets:: ; 34000 (d:4000) textpointer ChooseAnOddishText ; 0x0127 textpointer Text0128 ; 0x0128 textpointer Text0129 ; 0x0129 - textpointer Text012a ; 0x012a - textpointer Text012b ; 0x012b + textpointer ChooseNidoranFromDeckText ; 0x012a + textpointer ChooseNidoranText ; 0x012b textpointer Text012c ; 0x012c textpointer Text012d ; 0x012d textpointer Text012e ; 0x012e @@ -320,7 +320,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer WouldYouLikeToCheckTheDeckText ; 0x013c textpointer Text013d ; 0x013d textpointer Text013e ; 0x013e - textpointer Text013f ; 0x013f + textpointer NidoranMNidoranFText ; 0x013f textpointer OddishText ; 0x0140 textpointer Text0141 ; 0x0141 textpointer Text0142 ; 0x0142 @@ -2124,7 +2124,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer CobraName ; 0x0848 textpointer ArbokDescription ; 0x0849 textpointer NidoranFName ; 0x084a - textpointer FurySweepesName ; 0x084b + textpointer FurySwipesName ; 0x084b textpointer TripleAttackX10Description ; 0x084c textpointer CallForFamilyName ; 0x084d textpointer NidoranFsCallForFamilyDescription ; 0x084e -- cgit v1.2.3 From a3d2aee4fb7427393ae0d28a558488af493bb1b3 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Mon, 11 May 2020 10:30:31 +0100 Subject: NidoranM Horn Hazard effect --- src/text/text1.asm | 2 +- src/text/text_offsets.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/text') diff --git a/src/text/text1.asm b/src/text/text1.asm index ff07f9d..edac289 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -1078,7 +1078,7 @@ Text00e5: ; 37d1f (d:7d1f) line "becomes Confused." done -Text00e6: ; 37d4a (d:7d4a) +DamageCheckIfTailsNoDamageText: ; 37d4a (d:7d4a) text "Damage check!" line "If Tails, no damage!!!" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 5cc70d0..a4eac01 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -231,7 +231,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer ConfusionCheckText ; 0x00e3 textpointer VenomPowderCheckText ; 0x00e4 textpointer Text00e5 ; 0x00e5 - textpointer Text00e6 ; 0x00e6 + textpointer DamageCheckIfTailsNoDamageText ; 0x00e6 textpointer Text00e7 ; 0x00e7 textpointer Text00e8 ; 0x00e8 textpointer IfHeadPlus10IfTails10ToYourselfText ; 0x00e9 -- cgit v1.2.3 From 5d155daebbd51d2346046e42694c4893fc1d8dbb Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Tue, 12 May 2020 17:30:12 +0100 Subject: Some effects and changed ChangedType to ChangedColor --- src/text/text1.asm | 20 ++++++++++---------- src/text/text2.asm | 14 +++++++------- src/text/text_offsets.asm | 34 +++++++++++++++++----------------- 3 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src/text') diff --git a/src/text/text1.asm b/src/text/text1.asm index edac289..1cb1e0a 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -290,11 +290,11 @@ DuelistPlacedACardText: ; 367f9 (d:67f9) line "a ." done -Text0045: ; 36808 (d:6808) +UnableToSelectText: ; 36808 (d:6808) text "Unable to select." done -Text0046: ; 3681b (d:681b) +ColorListText: ; 3681b (d:681b) text "Grass" line "Fire" line "Water" @@ -303,27 +303,27 @@ Text0046: ; 3681b (d:681b) line "Psychic" done -Text0047: ; 36848 (d:6848) +GrassSymbolText: ; 36848 (d:6848) textfw0 "" done -Text0048: ; 3684b (d:684b) +FireSymbolText: ; 3684b (d:684b) textfw0 "" done -Text0049: ; 3684e (d:684e) +WaterSymbolText: ; 3684e (d:684e) textfw0 "" done -Text004a: ; 36851 (d:6851) +LightningSymbolText: ; 36851 (d:6851) textfw0 "" done -Text004b: ; 36854 (d:6854) +FightingSymbolText: ; 36854 (d:6854) textfw0 "" done -Text004c: ; 36857 (d:6857) +PsychicSymbolText: ; 36857 (d:6857) textfw0 "" done @@ -945,7 +945,7 @@ Text00c9: ; 37897 (d:7897) text "No Resistance." done -Text00ca: ; 378a7 (d:78a7) +OnlyOncePerTurnText: ; 378a7 (d:78a7) text "Only once per turn." done @@ -963,7 +963,7 @@ Text00cd: ; 37923 (d:7923) text "There is no Energy card attached." done -Text00ce: ; 37946 (d:7946) +NoGrassEnergyText: ; 37946 (d:7946) text "No Grass Energy." done diff --git a/src/text/text2.asm b/src/text/text2.asm index bea4094..1afa4d8 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -146,7 +146,7 @@ Text0112: ; 3860a (e:460a) line "to change with Conversion 2." done -Text0113: ; 38647 (e:4647) +ChoosePokemonWishToColorChangeText: ; 38647 (e:4647) text "Choose the Pokémon whose color you" line "wish to change with Color change." done @@ -163,7 +163,7 @@ Text0115: ; 386af (e:46af) text " to ." done -Text0116: ; 386d3 (e:46d3) +ChangedTheColorOfText: ; 386d3 (e:46d3) text "Changed the color of" line "" text " to ." @@ -242,7 +242,7 @@ Text0125: ; 3899f (e:499f) line "from the Deck." done -ChooseAnOddishFromTheDeckText: ; 389cf (e:49cf) +ChooseAnOddishFromDeckText: ; 389cf (e:49cf) text "Choose an Oddish" line "from the Deck." done @@ -275,7 +275,7 @@ Text012c: ; 38a83 (e:4a83) line "Fighting Pokémon" done -Text012d: ; 38aa4 (e:4aa4) +ProcedureForEnergyTransferText: ; 38aa4 (e:4aa4) text "Procedure for Energy Transfer:" line "" line "1. Choose the Pokémon to move Grass" @@ -289,12 +289,12 @@ Text012d: ; 38aa4 (e:4aa4) line "4. Press the B Button to end." done -Text012e: ; 38b8f (e:4b8f) +ChooseABellsproutFromDeckText: ; 38b8f (e:4b8f) text "Choose a Bellsprout" line "from the Deck." done -Text012f: ; 38bb3 (e:4bb3) +ChooseABellsproutText: ; 38bb3 (e:4bb3) text "Choose a Bellsprout." done @@ -433,7 +433,7 @@ OddishText: ; 392dc (e:52dc) text "Oddish" done -Text0141: ; 392e4 (e:52e4) +BellsproutText: ; 392e4 (e:52e4) text "Bellsprout" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index a4eac01..e0c3cb8 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -70,14 +70,14 @@ TextOffsets:: ; 34000 (d:4000) textpointer WillDrawNPrizesText ; 0x0042 textpointer DrewNPrizesText ; 0x0043 textpointer DuelistPlacedACardText ; 0x0044 - textpointer Text0045 ; 0x0045 - textpointer Text0046 ; 0x0046 - textpointer Text0047 ; 0x0047 - textpointer Text0048 ; 0x0048 - textpointer Text0049 ; 0x0049 - textpointer Text004a ; 0x004a - textpointer Text004b ; 0x004b - textpointer Text004c ; 0x004c + textpointer UnableToSelectText ; 0x0045 + textpointer ColorListText ; 0x0046 + textpointer GrassSymbolText ; 0x0047 + textpointer FireSymbolText ; 0x0048 + textpointer WaterSymbolText ; 0x0049 + textpointer LightningSymbolText ; 0x004a + textpointer FightingSymbolText ; 0x004b + textpointer PsychicSymbolText ; 0x004c textpointer Text004d ; 0x004d textpointer KnockOutText ; 0x004e textpointer DamageToSelfDueToConfusionText ; 0x004f @@ -203,11 +203,11 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text00c7 ; 0x00c7 textpointer Text00c8 ; 0x00c8 textpointer Text00c9 ; 0x00c9 - textpointer Text00ca ; 0x00ca + textpointer OnlyOncePerTurnText ; 0x00ca textpointer CannotUseDueToStatusText ; 0x00cb textpointer Text00cc ; 0x00cc textpointer Text00cd ; 0x00cd - textpointer Text00ce ; 0x00ce + textpointer NoGrassEnergyText ; 0x00ce textpointer Text00cf ; 0x00cf textpointer Text00d0 ; 0x00d0 textpointer Text00d1 ; 0x00d1 @@ -276,10 +276,10 @@ TextOffsets:: ; 34000 (d:4000) textpointer DuelistIsSelectingPokemonToPlaceInArenaText ; 0x0110 textpointer Text0111 ; 0x0111 textpointer Text0112 ; 0x0112 - textpointer Text0113 ; 0x0113 + textpointer ChoosePokemonWishToColorChangeText ; 0x0113 textpointer Text0114 ; 0x0114 textpointer Text0115 ; 0x0115 - textpointer Text0116 ; 0x0116 + textpointer ChangedTheColorOfText ; 0x0116 textpointer Text0117 ; 0x0117 textpointer DrawCardsFromTheDeckText ; 0x0118 textpointer CannotDrawCardBecauseNoCardsInDeckText ; 0x0119 @@ -295,16 +295,16 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text0123 ; 0x0123 textpointer Text0124 ; 0x0124 textpointer Text0125 ; 0x0125 - textpointer ChooseAnOddishFromTheDeckText ; 0x0126 + textpointer ChooseAnOddishFromDeckText ; 0x0126 textpointer ChooseAnOddishText ; 0x0127 textpointer Text0128 ; 0x0128 textpointer Text0129 ; 0x0129 textpointer ChooseNidoranFromDeckText ; 0x012a textpointer ChooseNidoranText ; 0x012b textpointer Text012c ; 0x012c - textpointer Text012d ; 0x012d - textpointer Text012e ; 0x012e - textpointer Text012f ; 0x012f + textpointer ProcedureForEnergyTransferText ; 0x012d + textpointer ChooseABellsproutFromDeckText ; 0x012e + textpointer ChooseABellsproutText ; 0x012f textpointer Text0130 ; 0x0130 textpointer Text0131 ; 0x0131 textpointer Text0132 ; 0x0132 @@ -322,7 +322,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text013e ; 0x013e textpointer NidoranMNidoranFText ; 0x013f textpointer OddishText ; 0x0140 - textpointer Text0141 ; 0x0141 + textpointer BellsproutText ; 0x0141 textpointer Text0142 ; 0x0142 textpointer Text0143 ; 0x0143 textpointer Text0144 ; 0x0144 -- cgit v1.2.3 From b18a90284bed0f381c924c1bd9bddc6f254ad36c Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Wed, 13 May 2020 17:30:24 +0100 Subject: Finish Grass effects --- src/text/text1.asm | 4 ++-- src/text/text2.asm | 2 +- src/text/text_offsets.asm | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/text') diff --git a/src/text/text1.asm b/src/text/text1.asm index 1cb1e0a..e391fa4 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -849,7 +849,7 @@ CantEvolvePokemonInSameTurnItsPlacedText: ; 37546 (d:7546) line "in the same turn it was placed." done -Text00b5: ; 37583 (d:7583) +NotAffectedByPoisonSleepParalysisOrConfusionText: ; 37583 (d:7583) text "Not affected by Poison," line "Sleep, Paralysis, or Confusion." done @@ -1108,7 +1108,7 @@ IfHeadsChangeOpponentsActivePokemonText: ; 37e46 (d:7e46) line "Active Pokémon." done -Text00ec: ; 37e73 (d:7e73) +IfHeadsHealIsSuccessfulText: ; 37e73 (d:7e73) text "If Heads," line "Heal is successful." done diff --git a/src/text/text2.asm b/src/text/text2.asm index 1afa4d8..1195ac6 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -298,7 +298,7 @@ ChooseABellsproutText: ; 38bb3 (e:4bb3) text "Choose a Bellsprout." done -Text0130: ; 38bc9 (e:4bc9) +ChoosePkmnToRemoveDamageCounterText: ; 38bc9 (e:4bc9) text "Choose a Pokémon to remove" line "the Damage counter from." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index e0c3cb8..ee5dfce 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -182,7 +182,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer NoSpaceOnTheBenchText ; 0x00b2 textpointer NoPokemonCapableOfEvolvingText ; 0x00b3 textpointer CantEvolvePokemonInSameTurnItsPlacedText ; 0x00b4 - textpointer Text00b5 ; 0x00b5 + textpointer NotAffectedByPoisonSleepParalysisOrConfusionText ; 0x00b5 textpointer Text00b6 ; 0x00b6 textpointer LureNoPokemonOnTheBenchText ; 0x00b7 textpointer Text00b8 ; 0x00b8 @@ -237,7 +237,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer IfHeadPlus10IfTails10ToYourselfText ; 0x00e9 textpointer Text00ea ; 0x00ea textpointer IfHeadsChangeOpponentsActivePokemonText ; 0x00eb - textpointer Text00ec ; 0x00ec + textpointer IfHeadsHealIsSuccessfulText ; 0x00ec textpointer Text00ed ; 0x00ed textpointer Text00ee ; 0x00ee textpointer TrainerCardSuccessCheckText ; 0x00ef @@ -305,7 +305,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer ProcedureForEnergyTransferText ; 0x012d textpointer ChooseABellsproutFromDeckText ; 0x012e textpointer ChooseABellsproutText ; 0x012f - textpointer Text0130 ; 0x0130 + textpointer ChoosePkmnToRemoveDamageCounterText ; 0x0130 textpointer Text0131 ; 0x0131 textpointer Text0132 ; 0x0132 textpointer Text0133 ; 0x0133 -- cgit v1.2.3 From 2fa7cf63dfe4920d3b1081dd9728e4c9af89aa0a Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Thu, 14 May 2020 16:12:41 +0100 Subject: Disassemble Water effects --- src/text/text1.asm | 12 ++++++------ src/text/text2.asm | 14 +++++++------- src/text/text_offsets.asm | 26 +++++++++++++------------- 3 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/text') 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 " 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 -- cgit v1.2.3 From e6b82ee26eb8ed1ccf58718db1a9f6f5027e8200 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Fri, 15 May 2020 10:39:58 +0100 Subject: Fire attack effects --- src/text/text1.asm | 2 +- src/text/text2.asm | 14 +++++++------- src/text/text_offsets.asm | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/text') diff --git a/src/text/text1.asm b/src/text/text1.asm index 79ed84e..ab5a0fb 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -906,7 +906,7 @@ NotEnoughEnergyCardsText: ; 37781 (d:7781) text "Not enough Energy cards." done -Text00c1: ; 3779b (d:779b) +NotEnoughFireEnergyText: ; 3779b (d:779b) text "Not enough Fire Energy." done diff --git a/src/text/text2.asm b/src/text/text2.asm index 0406103..f5686db 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -207,17 +207,17 @@ Text011e: ; 3882e (e:482e) line "1 Fire Energy card." done -Text011f: ; 38856 (e:4856) +ChooseAndDiscard2FireEnergyCardsText: ; 38856 (e:4856) text "Choose and Discard" line "2 Fire Energy cards." done -Text0120: ; 3887f (e:487f) +DiscardOppDeckAsManyFireEnergyCardsText: ; 3887f (e:487f) text "Discard from opponent's Deck as many" line "Fire Energy cards as were discarded." done -Text0121: ; 388ca (e:48ca) +ChooseAndDiscard2EnergyCardsText: ; 388ca (e:48ca) text "Choose and Discard" line "2 Energy cards." done @@ -488,12 +488,12 @@ Text014c: ; 3941c (e:541c) line "Play Area was moved." done -Text014d: ; 3944b (e:544b) +DrewFireEnergyFromTheHandText: ; 3944b (e:544b) text " drew" line " Fire Energy from the Hand." done -Text014e: ; 39470 (e:5470) +ThePkmnCardsInHandAndDeckWereShuffledText: ; 39470 (e:5470) text "The Pokémon cards in 's" line "Hand and Deck were shuffled" done @@ -679,7 +679,7 @@ Text0173: ; 39a9c (e:5a9c) line "to Discard." done -Text0174: ; 39ab9 (e:5ab9) +DiscardedCardsFromDeckText: ; 39ab9 (e:5ab9) text "Discarded cards" line "from 's Deck." done @@ -713,7 +713,7 @@ Text017a: ; 39b46 (e:5b46) line "to !" done -Text017b: ; 39b58 (e:5b58) +ThereWasNoFireEnergyText: ; 39b58 (e:5b58) text "There was no Fire Energy." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index a91e656..29cc0ca 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -194,7 +194,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text00be ; 0x00be textpointer EnergyCardsRequiredToRetreatText ; 0x00bf textpointer NotEnoughEnergyCardsText ; 0x00c0 - textpointer Text00c1 ; 0x00c1 + textpointer NotEnoughFireEnergyText ; 0x00c1 textpointer Text00c2 ; 0x00c2 textpointer NotEnoughWaterEnergyText ; 0x00c3 textpointer Text00c4 ; 0x00c4 @@ -288,9 +288,9 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text011c ; 0x011c textpointer Text011d ; 0x011d textpointer Text011e ; 0x011e - textpointer Text011f ; 0x011f - textpointer Text0120 ; 0x0120 - textpointer Text0121 ; 0x0121 + textpointer ChooseAndDiscard2FireEnergyCardsText ; 0x011f + textpointer DiscardOppDeckAsManyFireEnergyCardsText ; 0x0120 + textpointer ChooseAndDiscard2EnergyCardsText ; 0x0121 textpointer ChooseAKrabbyFromDeckText ; 0x0122 textpointer ChooseDiscardEnergyCardFromOpponentText ; 0x0123 textpointer ChooseAttackOpponentWillNotBeAbleToUseText ; 0x0124 @@ -334,8 +334,8 @@ TextOffsets:: ; 34000 (d:4000) textpointer WasUnsuccessfulText ; 0x014a textpointer ThereWasNoEffectFromTxRam2Text ; 0x014b textpointer Text014c ; 0x014c - textpointer Text014d ; 0x014d - textpointer Text014e ; 0x014e + textpointer DrewFireEnergyFromTheHandText ; 0x014d + textpointer ThePkmnCardsInHandAndDeckWereShuffledText ; 0x014e textpointer Text014f ; 0x014f textpointer Text0150 ; 0x0150 textpointer Text0151 ; 0x0151 @@ -373,14 +373,14 @@ TextOffsets:: ; 34000 (d:4000) textpointer YouReceivedTheseCardsText ; 0x0171 textpointer Text0172 ; 0x0172 textpointer Text0173 ; 0x0173 - textpointer Text0174 ; 0x0174 + textpointer DiscardedCardsFromDeckText ; 0x0174 textpointer Text0175 ; 0x0175 textpointer Text0176 ; 0x0176 textpointer Text0177 ; 0x0177 textpointer Text0178 ; 0x0178 textpointer Text0179 ; 0x0179 textpointer Text017a ; 0x017a - textpointer Text017b ; 0x017b + textpointer ThereWasNoFireEnergyText ; 0x017b textpointer Text017c ; 0x017c textpointer Text017d ; 0x017d textpointer ThereWasNoEffectFromToxicText ; 0x017e -- cgit v1.2.3 From b75d9712271fc49b7c3f83fc65c4b260624af386 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Wed, 3 Jun 2020 00:06:25 +0100 Subject: Psychic attack effects --- src/text/text1.asm | 14 +++++++------- src/text/text2.asm | 32 ++++++++++++++++---------------- src/text/text_offsets.asm | 46 +++++++++++++++++++++++----------------------- 3 files changed, 46 insertions(+), 46 deletions(-) (limited to 'src/text') 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 " was placed" line "in the Hand." done @@ -708,7 +708,7 @@ Text0179: ; 39b32 (e:5b32) line " damage!" done -Text017a: ; 39b46 (e:5b46) +PokemonDevolvedToText: ; 39b46 (e:5b46) text " devolved" line "to !" 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 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 '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 -- cgit v1.2.3 From 046cb28bde1c0d6716380f83e26df4a568d7691c Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Wed, 3 Jun 2020 15:03:24 +0100 Subject: Fighting attack effects --- src/text/text1.asm | 4 ++-- src/text/text2.asm | 14 +++++++------- src/text/text_offsets.asm | 18 +++++++++--------- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/text') 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 " 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 -- cgit v1.2.3 From 75fa5549f3a5e7fe5a690454852559e6e1705cb1 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Thu, 4 Jun 2020 16:28:16 +0100 Subject: Lightning attack effects --- src/text/text1.asm | 4 ++-- src/text/text2.asm | 12 ++++++------ src/text/text_offsets.asm | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/text') 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 "" 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, 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 ." done -Text014c: ; 3941c (e:541c) +TheEnergyCardFromPlayAreaWasMovedText: ; 3941c (e:541c) text "The Energy card from '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 -- cgit v1.2.3 From f1479c9e5072e362ab8c4ed5cd30d578b675dbb2 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sun, 7 Jun 2020 17:11:57 +0100 Subject: Colorless attack effects --- src/text/text1.asm | 12 ++++++------ src/text/text2.asm | 20 ++++++++++---------- src/text/text_offsets.asm | 32 ++++++++++++++++---------------- 3 files changed, 32 insertions(+), 32 deletions(-) (limited to 'src/text') 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 "" line "metamorphs to ." 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 " to ." done -Text0115: ; 386af (e:46af) +ChangedTheResistanceOfPokemonToColorText: ; 386af (e:46af) text "Changed the Resistance of" line "" text " to ." @@ -169,7 +169,7 @@ ChangedTheColorOfText: ; 386d3 (e:46d3) text " to ." 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 " 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 "" 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 -- cgit v1.2.3 From 999e27c0a2ca7984e02b29595cc53515868e7644 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Tue, 15 Dec 2020 21:48:36 +0000 Subject: (Most) trainer effects --- src/text/text1.asm | 20 +++++------ src/text/text2.asm | 64 ++++++++++++++++++------------------ src/text/text_offsets.asm | 84 +++++++++++++++++++++++------------------------ 3 files changed, 84 insertions(+), 84 deletions(-) (limited to 'src/text') diff --git a/src/text/text1.asm b/src/text/text1.asm index 23ad017..fa1d585 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -826,7 +826,7 @@ ThereAreNoEnergyCardsInDiscardPileText: ; 3746a (d:746a) line "in the the Discard Pile." done -Text00b0: ; 3749e (d:749e) +ThereAreNoBasicEnergyCardsInDiscardPileText: ; 3749e (d:749e) text "There are no Basic Energy cards" line "in the Discard Pile." done @@ -854,7 +854,7 @@ NotAffectedByPoisonSleepParalysisOrConfusionText: ; 37583 (d:7583) line "Sleep, Paralysis, or Confusion." done -Text00b6: ; 375bc (d:75bc) +NotEnoughCardsInHandText: ; 375bc (d:75bc) text "Not enough cards in Hand." done @@ -862,22 +862,22 @@ EffectNoPokemonOnTheBenchText: ; 375d7 (d:75d7) text "No Pokémon on the Bench." done -Text00b8: ; 375f1 (d:75f1) +ThereAreNoPokemonInDiscardPileText: ; 375f1 (d:75f1) text "There are no Pokémon" line "in the Discard Pile." done -Text00b9: ; 3761c (d:761c) +ConditionsForEvolvingToStage2NotFulfilledText: ; 3761c (d:761c) text "Conditions for evolving to" line "Stage 2 not fulfilled." done -Text00ba: ; 3764f (d:764f) +ThereAreNoCardsInHandThatYouCanChangeText: ; 3764f (d:764f) text "There are no cards in Hand" line "that you can change." done -Text00bb: ; 37680 (d:7680) +ThereAreNoCardsInTheDiscardPileText: ; 37680 (d:7680) text "There are no cards in the" line "Discard Pile." done @@ -887,12 +887,12 @@ ThereAreNoStage1PokemonText: ; 376a9 (d:76a9) line "in the Play Area." done -Text00bd: ; 376d9 (d:76d9) +NoEnergyCardsAttachedToPokemonInYourPlayAreaText: ; 376d9 (d:76d9) text "No Energy cards are attached to" line "Pokémon in your Play Area." done -Text00be: ; 37715 (d:7715) +NoEnergyCardsAttachedToPokemonInOppPlayAreaText: ; 37715 (d:7715) text "No Energy cards attached to Pokémon" line "in your opponent's Play Area." done @@ -959,7 +959,7 @@ CannotBeUsedInTurnWhichWasPlayedText: ; 378ef (d:78ef) line "which it was played." done -Text00cd: ; 37923 (d:7923) +ThereIsNoEnergyCardAttachedText: ; 37923 (d:7923) text "There is no Energy card attached." done @@ -1128,7 +1128,7 @@ TrainerCardSuccessCheckText: ; 37eea (d:7eea) line "If Heads, you're successful!" done -Text00f0: ; 37f24 (d:7f24) +CardCheckIfHeads8CardsIfTails1CardText: ; 37f24 (d:7f24) text "Card check!" line "If Heads, 8 cards! If Tails, 1 card!" done diff --git a/src/text/text2.asm b/src/text/text2.asm index 9d328b6..43a8ba5 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -503,22 +503,22 @@ Text014f: ; 394a6 (e:54a6) line "A Button is pressed. B Button quits." done -Text0150: ; 394f0 (e:54f0) +ChoosePokemonToRemoveDamageCounterFromText: ; 394f0 (e:54f0) text "Choose a Pokémon to remove" line "the Damage counter from." done -Text0151: ; 39525 (e:5525) +ChooseCardToDiscardFromHandText: ; 39525 (e:5525) text "Choose the card to Discard" line "from the Hand." done -Text0152: ; 39550 (e:5550) +ChoosePokemonToRemoveEnergyFromText: ; 39550 (e:5550) text "Choose a Pokémon to remove" line "Energy from and choose the Energy." done -Text0153: ; 3958f (e:558f) +Choose2BasicEnergyCardsFromDiscardPileText: ; 3958f (e:558f) text "Choose 2 Basic Energy cards" line "from the Discard Pile." done @@ -528,22 +528,22 @@ Text0154: ; 395c3 (e:55c3) line "Button to remove Damage counters." done -Text0155: ; 39607 (e:5607) +Choose2CardsFromHandToDiscardText: ; 39607 (e:5607) text "Choose 2 cards from the Hand" line "to Discard." done -Text0156: ; 39631 (e:5631) +Choose2HandCardsFromHandToReturnToDeckText: ; 39631 (e:5631) text "Choose 2 cards from the Hand" line "to return to the Deck." done -Text0157: ; 39666 (e:5666) +ChooseCardToPlaceInHandText: ; 39666 (e:5666) text "Choose a card to" line "place in the Hand." done -Text0158: ; 3968b (e:568b) +ChoosePokemonToAttachDefenderToText: ; 3968b (e:568b) text "Choose a Pokémon to" line "attach Defender to." done @@ -553,75 +553,75 @@ Text0159: ; 396b4 (e:56b4) line "A to Draw, B to End." done -Text015a: ; 396e6 (e:56e6) +ChoosePokemonToReturnToTheDeckText: ; 396e6 (e:56e6) text "Choose a Pokémon to" line "return to the Deck." done -Text015b: ; 3970f (e:570f) +ChoosePokemonToPlaceInPlayText: ; 3970f (e:570f) text "Choose a Pokémon to" line "place in play." done -Text015c: ; 39733 (e:5733) +ChooseBasicPokemonToEvolveText: ; 39733 (e:5733) text "Choose a Basic Pokémon" line "to Evolve." done -Text015d: ; 39756 (e:5756) +ChoosePokemonToScoopUpText: ; 39756 (e:5756) text "Choose a Pokémon to" line "Scoop Up." done -Text015e: ; 39775 (e:5775) +ChooseCardFromYourHandToSwitchText: ; 39775 (e:5775) text "Choose a card from your" line "Hand to Switch." done -Text015f: ; 3979e (e:579e) +ChooseCardToSwitchText: ; 3979e (e:579e) text "Choose a card to" line "Switch." done -Text0160: ; 397b8 (e:57b8) +ChooseBasicOrEvolutionPokemonCardFromDeckText: ; 397b8 (e:57b8) text "Choose a Basic or Evolution" line "Pokémon card from the Deck." done -Text0161: ; 397f1 (e:57f1) +ChoosePokemonCardText: ; 397f1 (e:57f1) text "Choose" line "a Pokémon card." done -Text0162: ; 39809 (e:5809) +RearrangeThe5CardsAtTopOfDeckText: ; 39809 (e:5809) text "Rearrange the 5 cards at" line "the top of the Deck." done -Text0163: ; 39838 (e:5838) +PleaseCheckTheOpponentsHandText: ; 39838 (e:5838) text "Please check the opponent's" line "Hand." done -Text0164: ; 3985b (e:585b) +EvolutionCardText: ; 3985b (e:585b) text "Evolution card" done -Text0165: ; 3986b (e:586b) +CardWasChosenText: ; 3986b (e:586b) text " was chosen." done -Text0166: ; 3987a (e:587a) +ChooseBasicPokemonToPlaceOnBenchText: ; 3987a (e:587a) text "Choose a Basic Pokémon" line "to place on the Bench." done -Text0167: ; 398a9 (e:58a9) +ChooseEvolutionCardAndPressAButtonToDevolveText: ; 398a9 (e:58a9) text "Choose an Evolution card and" line "press the A Button to Devolve 1." done -Text0168: ; 398e8 (e:58e8) +ChoosePokemonInYourAreaThenPokemonInYourOppText: ; 398e8 (e:58e8) text "Choose a Pokémon in your Area, then" line "a Pokémon in your opponent's." done @@ -636,22 +636,22 @@ Text016a: ; 39952 (e:5952) line "with the Active Pokémon." done -Text016b: ; 39987 (e:5987) +PokemonAndAllAttachedCardsWereReturnedToDeckText: ; 39987 (e:5987) text " and all attached" line "cards were returned to the Deck." done -Text016c: ; 399bc (e:59bc) +PokemonWasReturnedFromArenaToHandText: ; 399bc (e:59bc) text " was returned" line "from the Arena to the Hand." done -Text016d: ; 399e8 (e:59e8) +PokemonWasReturnedFromBenchToHandText: ; 399e8 (e:59e8) text " was returned" line "from the Bench to the Hand." done -Text016e: ; 39a14 (e:5a14) +PokemonWasReturnedToDeckText: ; 39a14 (e:5a14) text " was returned" line "to the Deck." done @@ -669,12 +669,12 @@ YouReceivedTheseCardsText: ; 39a63 (e:5a63) text "You received these cards:" done -Text0172: ; 39a7e (e:5a7e) +ChooseTheCardToPutBackText: ; 39a7e (e:5a7e) text "Choose the card" line "to put back." done -Text0173: ; 39a9c (e:5a9c) +ChooseTheCardToDiscardText: ; 39a9c (e:5a9c) text "Choose the card" line "to Discard." done @@ -698,12 +698,12 @@ CameToTheBenchText: ; 39b03 (e:5b03) line "came to the Bench!" done -Text0178: ; 39b19 (e:5b19) +DuelistHasNoCardsInHandText: ; 39b19 (e:5b19) text " has" line "no cards in Hand!" done -Text0179: ; 39b32 (e:5b32) +PokemonHealedDamageText: ; 39b32 (e:5b32) text " healed" line " damage!" done @@ -721,7 +721,7 @@ YouCanSelectMoreCardsQuitText: ; 39b73 (e:5b73) text "You can select more cards. Quit?" done -Text017d: ; 39b97 (e:5b97) +ThereWasNoEffectText: ; 39b97 (e:5b97) text "There was no effect!" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index a7af9be..b44dc3e 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -177,21 +177,21 @@ TextOffsets:: ; 34000 (d:4000) textpointer NoDamageCountersText ; 0x00ad textpointer NoEnergyAttachedToOpponentsActiveText ; 0x00ae textpointer ThereAreNoEnergyCardsInDiscardPileText ; 0x00af - textpointer Text00b0 ; 0x00b0 + textpointer ThereAreNoBasicEnergyCardsInDiscardPileText ; 0x00b0 textpointer NoCardsLeftInTheDeckText ; 0x00b1 textpointer NoSpaceOnTheBenchText ; 0x00b2 textpointer NoPokemonCapableOfEvolvingText ; 0x00b3 textpointer CantEvolvePokemonInSameTurnItsPlacedText ; 0x00b4 textpointer NotAffectedByPoisonSleepParalysisOrConfusionText ; 0x00b5 - textpointer Text00b6 ; 0x00b6 + textpointer NotEnoughCardsInHandText ; 0x00b6 textpointer EffectNoPokemonOnTheBenchText ; 0x00b7 - textpointer Text00b8 ; 0x00b8 - textpointer Text00b9 ; 0x00b9 - textpointer Text00ba ; 0x00ba - textpointer Text00bb ; 0x00bb + textpointer ThereAreNoPokemonInDiscardPileText ; 0x00b8 + textpointer ConditionsForEvolvingToStage2NotFulfilledText ; 0x00b9 + textpointer ThereAreNoCardsInHandThatYouCanChangeText ; 0x00ba + textpointer ThereAreNoCardsInTheDiscardPileText ; 0x00bb textpointer ThereAreNoStage1PokemonText ; 0x00bc - textpointer Text00bd ; 0x00bd - textpointer Text00be ; 0x00be + textpointer NoEnergyCardsAttachedToPokemonInYourPlayAreaText ; 0x00bd + textpointer NoEnergyCardsAttachedToPokemonInOppPlayAreaText ; 0x00be textpointer EnergyCardsRequiredToRetreatText ; 0x00bf textpointer NotEnoughEnergyCardsText ; 0x00c0 textpointer NotEnoughFireEnergyText ; 0x00c1 @@ -206,7 +206,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer OnlyOncePerTurnText ; 0x00ca textpointer CannotUseDueToStatusText ; 0x00cb textpointer CannotBeUsedInTurnWhichWasPlayedText ; 0x00cc - textpointer Text00cd ; 0x00cd + textpointer ThereIsNoEnergyCardAttachedText ; 0x00cd textpointer NoGrassEnergyText ; 0x00ce textpointer CannotUseSinceTheresOnly1PkmnText ; 0x00cf textpointer CannotUseBecauseItWillBeKnockedOutText ; 0x00d0 @@ -241,7 +241,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer IfTailsDamageToYourselfTooText ; 0x00ed textpointer SuccessCheckIfHeadsAttackIsSuccessfulText ; 0x00ee textpointer TrainerCardSuccessCheckText ; 0x00ef - textpointer Text00f0 ; 0x00f0 + textpointer CardCheckIfHeads8CardsIfTails1CardText ; 0x00f0 textpointer IfHeadsNoDamageNextTurnText ; 0x00f1 textpointer Text00f2 ; 0x00f2 textpointer DamageCheckIfHeadsPlusDamageText ; 0x00f3 @@ -337,52 +337,52 @@ TextOffsets:: ; 34000 (d:4000) textpointer DrewFireEnergyFromTheHandText ; 0x014d textpointer ThePkmnCardsInHandAndDeckWereShuffledText ; 0x014e textpointer Text014f ; 0x014f - textpointer Text0150 ; 0x0150 - textpointer Text0151 ; 0x0151 - textpointer Text0152 ; 0x0152 - textpointer Text0153 ; 0x0153 + textpointer ChoosePokemonToRemoveDamageCounterFromText ; 0x0150 + textpointer ChooseCardToDiscardFromHandText ; 0x0151 + textpointer ChoosePokemonToRemoveEnergyFromText ; 0x0152 + textpointer Choose2BasicEnergyCardsFromDiscardPileText ; 0x0153 textpointer Text0154 ; 0x0154 - textpointer Text0155 ; 0x0155 - textpointer Text0156 ; 0x0156 - textpointer Text0157 ; 0x0157 - textpointer Text0158 ; 0x0158 + textpointer Choose2CardsFromHandToDiscardText ; 0x0155 + textpointer Choose2HandCardsFromHandToReturnToDeckText ; 0x0156 + textpointer ChooseCardToPlaceInHandText ; 0x0157 + textpointer ChoosePokemonToAttachDefenderToText ; 0x0158 textpointer Text0159 ; 0x0159 - textpointer Text015a ; 0x015a - textpointer Text015b ; 0x015b - textpointer Text015c ; 0x015c - textpointer Text015d ; 0x015d - textpointer Text015e ; 0x015e - textpointer Text015f ; 0x015f - textpointer Text0160 ; 0x0160 - textpointer Text0161 ; 0x0161 - textpointer Text0162 ; 0x0162 - textpointer Text0163 ; 0x0163 - textpointer Text0164 ; 0x0164 - textpointer Text0165 ; 0x0165 - textpointer Text0166 ; 0x0166 - textpointer Text0167 ; 0x0167 - textpointer Text0168 ; 0x0168 + textpointer ChoosePokemonToReturnToTheDeckText ; 0x015a + textpointer ChoosePokemonToPlaceInPlayText ; 0x015b + textpointer ChooseBasicPokemonToEvolveText ; 0x015c + textpointer ChoosePokemonToScoopUpText ; 0x015d + textpointer ChooseCardFromYourHandToSwitchText ; 0x015e + textpointer ChooseCardToSwitchText ; 0x015f + textpointer ChooseBasicOrEvolutionPokemonCardFromDeckText ; 0x0160 + textpointer ChoosePokemonCardText ; 0x0161 + textpointer RearrangeThe5CardsAtTopOfDeckText ; 0x0162 + textpointer PleaseCheckTheOpponentsHandText ; 0x0163 + textpointer EvolutionCardText ; 0x0164 + textpointer CardWasChosenText ; 0x0165 + textpointer ChooseBasicPokemonToPlaceOnBenchText ; 0x0166 + textpointer ChooseEvolutionCardAndPressAButtonToDevolveText ; 0x0167 + textpointer ChoosePokemonInYourAreaThenPokemonInYourOppText ; 0x0168 textpointer Text0169 ; 0x0169 textpointer Text016a ; 0x016a - textpointer Text016b ; 0x016b - textpointer Text016c ; 0x016c - textpointer Text016d ; 0x016d - textpointer Text016e ; 0x016e + textpointer PokemonAndAllAttachedCardsWereReturnedToDeckText ; 0x016b + textpointer PokemonWasReturnedFromArenaToHandText ; 0x016c + textpointer PokemonWasReturnedFromBenchToHandText ; 0x016d + textpointer PokemonWasReturnedToDeckText ; 0x016e textpointer WasPlacedInTheHandText ; 0x016f textpointer TheCardYouReceivedText ; 0x0170 textpointer YouReceivedTheseCardsText ; 0x0171 - textpointer Text0172 ; 0x0172 - textpointer Text0173 ; 0x0173 + textpointer ChooseTheCardToPutBackText ; 0x0172 + textpointer ChooseTheCardToDiscardText ; 0x0173 textpointer DiscardedCardsFromDeckText ; 0x0174 textpointer Text0175 ; 0x0175 textpointer NoneCameText ; 0x0176 textpointer CameToTheBenchText ; 0x0177 - textpointer Text0178 ; 0x0178 - textpointer Text0179 ; 0x0179 + textpointer DuelistHasNoCardsInHandText ; 0x0178 + textpointer PokemonHealedDamageText ; 0x0179 textpointer PokemonDevolvedToText ; 0x017a textpointer ThereWasNoFireEnergyText ; 0x017b textpointer YouCanSelectMoreCardsQuitText ; 0x017c - textpointer Text017d ; 0x017d + textpointer ThereWasNoEffectText ; 0x017d textpointer ThereWasNoEffectFromToxicText ; 0x017e textpointer ThereWasNoEffectFromPoisonText ; 0x017f textpointer ThereWasNoEffectFromSleepText ; 0x0180 -- cgit v1.2.3