diff options
Diffstat (limited to 'src/text')
| -rw-r--r-- | src/text/text1.asm | 2 | ||||
| -rw-r--r-- | src/text/text2.asm | 14 | ||||
| -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 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 "<RAMNAME> drew" line "<RAMNUM> Fire Energy from the Hand." done -Text014e: ; 39470 (e:5470) +ThePkmnCardsInHandAndDeckWereShuffledText: ; 39470 (e:5470) text "The Pokémon cards in <RAMNAME>'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 <RAMNUM> cards" line "from <RAMNAME>'s Deck." done @@ -713,7 +713,7 @@ Text017a: ; 39b46 (e:5b46) line "to <RAMTEXT>!" 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 |