diff options
| author | jidoc01 <jidoc01@naver.com> | 2019-07-07 22:50:09 +0900 |
|---|---|---|
| committer | jidoc01 <jidoc01@naver.com> | 2019-07-07 22:50:09 +0900 |
| commit | ca2034184fa5f5e7dc4d9a779d5e2a2a17a024c5 (patch) | |
| tree | 045bc79cfeebd2014530050aed7a1d334c324444 /src/text | |
| parent | a1dcd04fc19fd14776c94a7b41d993a270aae8f6 (diff) | |
| parent | 87ddb7aaeb884e9f4d73aeeb66d747ccb6077bf3 (diff) | |
Merge branch 'master' of https://github.com/pret/poketcg
Diffstat (limited to 'src/text')
| -rw-r--r-- | src/text/text1.asm | 2 | ||||
| -rw-r--r-- | src/text/text2.asm | 6 | ||||
| -rw-r--r-- | src/text/text_offsets.asm | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm index 19c999b..8245b3b 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 diff --git a/src/text/text2.asm b/src/text/text2.asm index 4cb3784..042dcd9 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -1779,15 +1779,15 @@ 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 36611ca..8421f29 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -95,7 +95,7 @@ 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 @@ -591,10 +591,10 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text024b ; 0x024b textpointer Text024c ; 0x024c textpointer Text024d ; 0x024d - textpointer HandText_2 ; 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 |