diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/bank02.asm | 16 | ||||
| -rw-r--r-- | src/text/text2.asm | 6 | ||||
| -rw-r--r-- | src/text/text_offsets.asm | 6 |
3 files changed, 17 insertions, 11 deletions
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index 8d846db..9ca9cfd 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -60,12 +60,13 @@ DuelCheckMenu_YourPlayArea: ; 8047 (2:4047) call DrawWideTextBox xor a ld [wDuelCursorBlinkCounter], a - lb hl, $41, $69 + ld hl, YourPlayAreaMenuData call PlaceTextItems + .asm_8074 call DoFrame xor a - call DrawByteToTabulatedPositions_FromCursor + call DrawArrowsToTabulatedPositions call Func_86ac jr nc, .asm_8074 call EraseByteFromTabulatedPositions @@ -92,12 +93,17 @@ CheckMenuData: ; (2:4158) textitem 12, 16, OppPlayAreaText db $ff -Func_8169: ; 8169 (2:4169) - INCROM $8169, $818c +YourPlayAreaMenuData: ; (2:4169) + textitem 2, 14, YourPokemonText + textitem 12, 14, YourHandText + textitem 2, 16, YourDiscardPileText2 + db $ff + + INCROM $8176, $818c ; checks if arrows need to be erased in Play Area ; and draws new arrows upon cursor position change -DrawByteToTabulatedPositions_FromCursor: ; 818c (2:418c) +DrawArrowsToTabulatedPositions: ; 818c (2:418c) push af ld b, a add b diff --git a/src/text/text2.asm b/src/text/text2.asm index 7227085..b9c6d01 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -1715,15 +1715,15 @@ Text023e: ; 3bbf8 (e:7bf8) text "No cards chosen." done -Text023f: ; 3bc0a (e:7c0a) +YourPokemonText: ; 3bc0a (e:7c0a) text "Your Pokémon" done -Text0240: ; 3bc18 (e:7c18) +YourDiscardPileText2: ; 3bc18 (e:7c18) text "Your Discard Pile" done -Text0241: ; 3bc2b (e:7c2b) +YourHandText: ; 3bc2b (e:7c2b) text "Your Hand" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index f024288..fc96176 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -576,9 +576,9 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text023c ; 0x023c textpointer Text023d ; 0x023d textpointer Text023e ; 0x023e - textpointer Text023f ; 0x023f - textpointer Text0240 ; 0x0240 - textpointer Text0241 ; 0x0241 + textpointer YourPokemonText ; 0x023f + textpointer YourDiscardPileText2 ; 0x0240 + textpointer YourHandText ; 0x0241 textpointer Text0242 ; 0x0242 textpointer Text0243 ; 0x0243 textpointer Text0244 ; 0x0244 |