diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2019-07-20 14:19:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 14:19:58 +0200 |
| commit | 0b35ceb3481cca5a0527f540e4c685051de901c6 (patch) | |
| tree | 7f4e30d90706d1309c7d8f2013ef50980b27e391 /src/text | |
| parent | 53ad70b112d47ffa2536ee179fd136df900018a3 (diff) | |
| parent | c6b095eae729ed1a8cc19c28be746c43744d83d3 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/text')
| -rw-r--r-- | src/text/text1.asm | 10 | ||||
| -rw-r--r-- | src/text/text2.asm | 8 | ||||
| -rw-r--r-- | src/text/text_offsets.asm | 20 |
3 files changed, 19 insertions, 19 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm index 19c999b..e7b0fe4 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -406,7 +406,7 @@ FinishedTurnWithoutAttackingText: ; 36a74 (d:6a74) line "without Attacking." done -DuelistsTurnText: ; 36a9a (d:6a9a) +DuelistTurnText: ; 36a9a (d:6a9a) text "<RAMNAME>'s Turn." done @@ -434,21 +434,21 @@ ShufflesTheDeckText: ; 36afe (d:6afe) text "<RAMNAME> shuffles the Deck." done -Text0064: ; 36b14 (d:6b14) +ThisIsJustPracticeDoNotShuffleText: ; 36b14 (d:6b14) text "Since this is just practice," line "Do not shuffle the Deck." done -Text0065: ; 36b4b (d:6b4b) +EachPlayerShuffleOpponentsDeckText: ; 36b4b (d:6b4b) text "Each player will" line "shuffle the opponent's Deck." done -Text0066: ; 36b7a (d:6b7a) +EachPlayerDraw7CardsText: ; 36b7a (d:6b7a) text "Each player will draw 7 cards." done -Text0067: ; 36b9a (d:6b9a) +Drew7CardsText: ; 36b9a (d:6b9a) text "<RAMNAME>" line "drew 7 cards." done diff --git a/src/text/text2.asm b/src/text/text2.asm index 61d7fdc..78fb6f9 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -1775,19 +1775,19 @@ Text024d: ; 3bd08 (e:7d08) text "Please choose a Prize." done -HandText2: ; 3bd20 (e:7d20) +HandText_2: ; 3bd20 (e:7d20) text "Hand" done -Text024f: ; 3bd26 (e:7d26) +DuelistHandText_2: ; 3bd26 (e:7d26) text "<RAMNAME>'s Hand" done -Text0250: ; 3bd30 (e:7d30) +DuelistDiscardPileText: ; 3bd30 (e:7d30) text "<RAMNAME>'s Discard Pile" done -Text0251: ; 3bd42 (e:7d42) +EmptyLineText: ; 3bd42 (e:7d42) textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " " textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " " done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 56dda1f..f1ca193 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -95,16 +95,16 @@ TextOffsets:: ; 34000 (d:4000) textpointer RetreatWasUnsuccessfulText ; 0x005b textpointer WillUseThePokemonPowerText ; 0x005c textpointer FinishedTurnWithoutAttackingText ; 0x005d - textpointer DuelistsTurnText ; 0x005e + textpointer DuelistTurnText ; 0x005e textpointer AttachedEnergyToPokemonText ; 0x005f textpointer PokemonEvolvedIntoPokemonText ; 0x0060 textpointer PlacedOnTheBenchText ; 0x0061 textpointer PlacedInTheArenaText ; 0x0062 textpointer ShufflesTheDeckText ; 0x0063 - textpointer Text0064 ; 0x0064 - textpointer Text0065 ; 0x0065 - textpointer Text0066 ; 0x0066 - textpointer Text0067 ; 0x0067 + textpointer ThisIsJustPracticeDoNotShuffleText ; 0x0064 + textpointer EachPlayerShuffleOpponentsDeckText ; 0x0065 + textpointer EachPlayerDraw7CardsText ; 0x0066 + textpointer Drew7CardsText ; 0x0067 textpointer DeckHasXCardsText ; 0x0068 textpointer ChooseBasicPkmnToPlaceInArenaText ; 0x0069 textpointer ThereAreNoBasicPokemonInHand ; 0x006a @@ -542,7 +542,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text021a ; 0x021a textpointer Text021b ; 0x021b textpointer Text021c ; 0x021c - textpointer EndText ; 0x021d + textpointer EndText ; 0x021d textpointer WhatIsYourNameText ; 0x021e textpointer Text021f ; 0x021f textpointer Text0220 ; 0x0220 @@ -591,10 +591,10 @@ TextOffsets:: ; 34000 (d:4000) textpointer GlossaryText ; 0x024b textpointer WhichCardWouldYouLikeToSeeText ; 0x024c textpointer Text024d ; 0x024d - textpointer HandText2 ; 0x024e - textpointer Text024f ; 0x024f - textpointer Text0250 ; 0x0250 - textpointer Text0251 ; 0x0251 + textpointer HandText_2 ; 0x024e + textpointer DuelistHandText_2 ; 0x024f + textpointer DuelistDiscardPileText ; 0x0250 + textpointer EmptyLineText ; 0x0251 textpointer Text0252 ; 0x0252 textpointer Text0253 ; 0x0253 textpointer Text0254 ; 0x0254 |