diff options
| author | Daniel Harding <33dannye@gmail.com> | 2021-02-20 15:40:48 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-20 15:40:48 -0600 |
| commit | 8a37415c695b81b3bf434d3a2fe2a911f68acc28 (patch) | |
| tree | 19f01560633eb9c043d1359f273e4a99cd1d2ed6 /src/text | |
| parent | 9183d47cdb013347a5b178d4fbc93201554599cb (diff) | |
| parent | 3010ae180480dea7ae8e7f4416235ae10aaf786f (diff) | |
Merge pull request #100 from ElectroDeoxys/master
Finishing bank $20 and some debug functions
Diffstat (limited to 'src/text')
| -rw-r--r-- | src/text/text1.asm | 2 | ||||
| -rw-r--r-- | src/text/text3.asm | 6 | ||||
| -rw-r--r-- | src/text/text_offsets.asm | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm index bdc5fa9..e94cb49 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -620,7 +620,7 @@ SelectComputerOpponentText: ; 36f65 (d:6f65) text "Select a computer opponent." done -Text008b: ; 36f82 (d:6f82) +NumberOfPrizesText: ; 36f82 (d:6f82) text "Number of Prizes" done diff --git a/src/text/text3.asm b/src/text/text3.asm index 96e039a..4fccc9c 100644 --- a/src/text/text3.asm +++ b/src/text/text3.asm @@ -1450,16 +1450,16 @@ Text0383: ; 3f2b9 (f:72b9) text "Right" done -Text0384: ; 3f2c0 (f:72c0) +SPRText: ; 3f2c0 (f:72c0) text "SPR_" done -Text0385: ; 3f2c6 (f:72c6) +WinLosePrizesDuelWithText: ; 3f2c6 (f:72c6) text "WIN <RAMNUM> Prizes Duel" line "LOSE with <RAMTEXT>(<RAMNUM>)" done -Text0386: ; 3f2f1 (f:72f1) +UseDuelistsDeckText: ; 3f2f1 (f:72f1) text " Use <RAMNUM>'s Deck" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 3f1d87d..a62e8e7 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -140,7 +140,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer DuelistIsThinkingText ; 0x0088 textpointer Text0089 ; 0x0089 textpointer SelectComputerOpponentText ; 0x008a - textpointer Text008b ; 0x008b + textpointer NumberOfPrizesText ; 0x008b textpointer Text008c ; 0x008c textpointer Text008d ; 0x008d textpointer Text008e ; 0x008e @@ -901,9 +901,9 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text0381 ; 0x0381 textpointer Text0382 ; 0x0382 textpointer Text0383 ; 0x0383 - textpointer Text0384 ; 0x0384 - textpointer Text0385 ; 0x0385 - textpointer Text0386 ; 0x0386 + textpointer SPRText ; 0x0384 + textpointer WinLosePrizesDuelWithText ; 0x0385 + textpointer UseDuelistsDeckText ; 0x0386 textpointer ReceivedBoosterPackText ; 0x0387 textpointer AndAnotherBoosterPackText ; 0x0388 textpointer CheckedCardsInBoosterPackText ; 0x0389 |