diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/bank02.asm | 17 | ||||
| -rw-r--r-- | src/engine/bank06.asm | 2 | ||||
| -rw-r--r-- | src/text/text2.asm | 2 | ||||
| -rw-r--r-- | src/text/text_offsets.asm | 2 |
4 files changed, 15 insertions, 8 deletions
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index 5e79a77..51fe129 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -593,14 +593,16 @@ Func_85aa: ; 85aa (2:45aa) .asm_85b2 ld hl, Data_8635.asm_863b .asm_85b5 +; hand icon and value ld a, [wTurnHolder1] ld d, a ld e, DUELVARS_NUMBER_OF_CARDS_IN_HAND ld a, [de] ld b, a ld a, $d0 - call Func_8676 + call PrintsHandTextAndValue +; deck icon and value ld a, [wTurnHolder1] ld d, a ld e, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK @@ -609,15 +611,16 @@ Func_85aa: ; 85aa (2:45aa) ld a, DECK_SIZE sub b ld b, a - ld a, $d4 + ld a, $d4 ; deck icon call DrawIconWithValue +; discard pile icon and value ld a, [wTurnHolder1] ld d, a ld e, DUELVARS_NUMBER_OF_CARDS_IN_DISCARD_PILE ld a, [de] ld b, a - ld a, $d8 + ld a, $d8 ; discard pile icon call DrawIconWithValue ret @@ -704,19 +707,23 @@ Data_8635 ; 8635 (2:4635) INCROM $864d, $8676 -Func_8676: ; 8676 (2:4676) +; prints text HandText2 and a cross with +; decimal value of b +PrintsHandTextAndValue: ; 8676 (2:4676) ld d, [hl] inc hl ld e, [hl] inc hl +; text push hl push bc call InitTextPrinting - ld hl, $24e + ldtx hl, HandText2 call ProcessTextFromID pop bc +; decimal value ld a, b call CalculateOnesAndTensDigits ld hl, wOnesAndTensPlace diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index 8d7d110..abb4425 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -228,7 +228,7 @@ Func_180d5: ; 180d5 (6:40d5) call ProcessTextFromID ld hl, hffb0 ld [hl], $01 - ldtx hl, Text024e + ldtx hl, HandText2 call ProcessTextFromID ld hl, hffb0 ld [hl], $00 diff --git a/src/text/text2.asm b/src/text/text2.asm index b9c6d01..07c0da8 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -1775,7 +1775,7 @@ Text024d: ; 3bd08 (e:7d08) text "Please choose a Prize." done -Text024e: ; 3bd20 (e:7d20) +HandText2: ; 3bd20 (e:7d20) text "Hand" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index fc96176..4787481 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -591,7 +591,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer GlossaryText ; 0x024b textpointer Text024c ; 0x024c textpointer Text024d ; 0x024d - textpointer Text024e ; 0x024e + textpointer HandText2 ; 0x024e textpointer Text024f ; 0x024f textpointer Text0250 ; 0x0250 textpointer Text0251 ; 0x0251 |