diff options
author | xCrystal <rgr.crystal@gmail.com> | 2018-07-31 14:11:48 +0200 |
---|---|---|
committer | xCrystal <rgr.crystal@gmail.com> | 2018-07-31 14:11:48 +0200 |
commit | 232f962d8d1c456a0ac0125cf9efe4c7de90bd8c (patch) | |
tree | 06108b0e4b890e4948298426cc5cd6f99a8de09c /src/text | |
parent | 00f7e8038194d8ef42e006fd2e6d0e573ee83f1d (diff) |
More bank1 and wram addresses
Diffstat (limited to 'src/text')
-rw-r--r-- | src/text/text1.asm | 18 | ||||
-rw-r--r-- | src/text/text2.asm | 4 | ||||
-rw-r--r-- | src/text/text_offsets.asm | 22 |
3 files changed, 22 insertions, 22 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm index a483926..db5aa24 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -376,12 +376,12 @@ TransmitingDataText: ; 369a2 (d:69a2) text "Transmitting data..." done -Text0058: ; 369b8 (d:69b8) +WaitingHandExamineText: ; 369b8 (d:69b8) text "Waiting..." line " Hand Examine" done -Text0059: ; 369dc (d:69dc) +SelectingBenchPokemonHandExamineBackText: ; 369dc (d:69dc) text "Selecting Bench Pokémon..." line " Hand Examine Back" done @@ -410,12 +410,12 @@ DuelistsTurnText: ; 36a9a (d:6a9a) text "<RAMNAME>'s Turn." done -Text005f: ; 36aa5 (d:6aa5) +AttachedEnergyToPokemonText: ; 36aa5 (d:6aa5) text "Attached <RAMTEXT>" line "to <RAMTEXT>." done -Text0060: ; 36ab7 (d:6ab7) +PokemonEvolvedIntoPokemonText: ; 36ab7 (d:6ab7) text "<RAMTEXT> evolved" line "into <RAMTEXT>." done @@ -509,13 +509,13 @@ PleasePlacePrizesText: ; 36d3f (d:6d3f) line "<RAMNUM> Prizes." done -IfHeadPlayerPlaysFirstText: ; 36d57 (d:6d57) +IfHeadsDuelistPlaysFirstText: ; 36d57 (d:6d57) text "If heads," line "" text "<RAMTEXT> plays first." done -CoinTossToDetermineWhoFirstText: ; 36d72 (d:6d72) +CoinTossToDecideWhoPlaysFirstText: ; 36d72 (d:6d72) text "A coin will be tossed" line "to decide who plays first." done @@ -586,17 +586,17 @@ UnableToUsePkmnPowerDueToToxicGasText: ; 36ed5 (d:6ed5) line "the effect of Toxic Gas." done -Text0084: ; 36f11 (d:6f11) +PlayCheck1Text: ; 36f11 (d:6f11) text " Play" line " Check" done -Text0085: ; 36f21 (d:6f21) +PlayCheck2Text: ; 36f21 (d:6f21) text " Play" line " Check" done -Text0086: ; 36f31 (d:6f31) +SelectCheckText: ; 36f31 (d:6f31) text " Select" line " Check" done diff --git a/src/text/text2.asm b/src/text/text2.asm index 845e9c5..6dcafbf 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -173,11 +173,11 @@ Text0117: ; 386f2 (e:46f2) text "Draw 1 card from the Deck." done -DrawCardsFromTheDeck: ; 3870e (e:470e) +DrawCardsFromTheDeckText: ; 3870e (e:470e) text "Draw <RAMNUM> card(s) from the Deck." done -NoCardsInDeckCannotDraw: ; 3872d (e:472d) +CannotDrawCardBecauseNoCardsInDeckText: ; 3872d (e:472d) text "Cannot draw a card because" line "there are no cards in the Deck." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 6b917ef..c4b8691 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -89,15 +89,15 @@ TextOffsets:: ; 34000 (d:4000) textpointer TransmissionErrorText ; 0x0055 textpointer ChooseTheCardYouWishToExamineText ; 0x0056 textpointer TransmitingDataText ; 0x0057 - textpointer Text0058 ; 0x0058 - textpointer Text0059 ; 0x0059 + textpointer WaitingHandExamineText ; 0x0058 + textpointer SelectingBenchPokemonHandExamineBackText ; 0x0059 textpointer RetreatedToTheBenchText ; 0x005a textpointer RetreatWasUnsuccessfulText ; 0x005b textpointer WillUseThePokemonPowerText ; 0x005c textpointer FinishedTurnWithoutAttackingText ; 0x005d textpointer DuelistsTurnText ; 0x005e - textpointer Text005f ; 0x005f - textpointer Text0060 ; 0x0060 + textpointer AttachedEnergyToPokemonText ; 0x005f + textpointer PokemonEvolvedIntoPokemonText ; 0x0060 textpointer PlacedOnTheBenchText ; 0x0061 textpointer PlacedInTheArenaText ; 0x0062 textpointer ShufflesTheDeckText ; 0x0063 @@ -117,8 +117,8 @@ TextOffsets:: ; 34000 (d:4000) textpointer YouCannotSelectThisCardText ; 0x0071 textpointer PlacingThePrizesText ; 0x0072 textpointer PleasePlacePrizesText ; 0x0073 - textpointer IfHeadPlayerPlaysFirstText ; 0x0074 - textpointer CoinTossToDetermineWhoFirstText ; 0x0075 + textpointer IfHeadsDuelistPlaysFirstText ; 0x0074 + textpointer CoinTossToDecideWhoPlaysFirstText ; 0x0075 textpointer DecisionText ; 0x0076 textpointer DuelWasADrawText ; 0x0077 textpointer WonDuelText ; 0x0078 @@ -133,9 +133,9 @@ TextOffsets:: ; 34000 (d:4000) textpointer WasKnockedOutText ; 0x0081 textpointer HavePokemonPowerText ; 0x0082 textpointer UnableToUsePkmnPowerDueToToxicGasText ; 0x0083 - textpointer Text0084 ; 0x0084 - textpointer Text0085 ; 0x0085 - textpointer Text0086 ; 0x0086 + textpointer PlayCheck1Text ; 0x0084 + textpointer PlayCheck2Text ; 0x0085 + textpointer SelectCheckText ; 0x0086 textpointer Text0087 ; 0x0087 textpointer DuelistIsThinkingText ; 0x0088 textpointer Text0089 ; 0x0089 @@ -281,8 +281,8 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text0115 ; 0x0115 textpointer Text0116 ; 0x0116 textpointer Text0117 ; 0x0117 - textpointer DrawCardsFromTheDeck ; 0x0118 - textpointer NoCardsInDeckCannotDraw ; 0x0119 + textpointer DrawCardsFromTheDeckText ; 0x0118 + textpointer CannotDrawCardBecauseNoCardsInDeckText ; 0x0119 textpointer Text011a ; 0x011a textpointer Text011b ; 0x011b textpointer Text011c ; 0x011c |