diff options
| -rw-r--r-- | src/engine/bank02.asm | 8 | ||||
| -rw-r--r-- | src/engine/bank06.asm | 22 | ||||
| -rw-r--r-- | src/wram.asm | 3 |
3 files changed, 17 insertions, 16 deletions
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index dd72f27..d0a3ea0 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -5,7 +5,7 @@ Func_8000: ; 8000 (2:4000) ld [wce5e], a call DrawWideTextBox xor a - ld [wcea3], a + ld [wDuelCursorBlinkCounter], a ld hl, CheckMenuData call PlaceTextItems .asm_8014 @@ -466,7 +466,7 @@ Func_905a: ; 905a (2:505a) xor a ld [wceaf], a ld [wceb0], a - ld [wcea3], a + ld [wDuelCursorBlinkCounter], a ret Func_9065: ; 9065 (2:5065) @@ -508,7 +508,7 @@ Func_9065: ; 9065 (2:5065) ld a, e ld [wceb0], a xor a - ld [wcea3], a + ld [wDuelCursorBlinkCounter], a .asm_90a6 ldh a, [hKeysPressed] and A_BUTTON | B_BUTTON @@ -531,7 +531,7 @@ Func_9065: ; 9065 (2:5065) jr z, .asm_90ca call PlaySFX .asm_90ca - ld hl, wcea3 + ld hl, wDuelCursorBlinkCounter ld a, [hl] inc [hl] and $f diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index d9cb234..246282e 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -152,7 +152,7 @@ Func_180d5: ; 180d5 (6:40d5) ld [$ce52], a .asm_006_40da xor a - ld [wcea3], a + ld [wDuelCursorBlinkCounter], a farcall $2, $42ce call EnableLCD call IsClairvoyanceActive @@ -509,7 +509,7 @@ Func_006_43bb: ; 183bb (6:43bb) ld a, $01 ld [wcfe3], a xor a - ld [wcea3], a + ld [wDuelCursorBlinkCounter], a .asm_006_446b ldh a, [hKeysPressed] and $03 @@ -533,7 +533,7 @@ Func_006_43bb: ; 183bb (6:43bb) jr z, .asm_006_4494 call PlaySFX .asm_006_4494 - ld hl, wcea3 + ld hl, wDuelCursorBlinkCounter ld a, [hl] inc [hl] and $0f @@ -581,7 +581,7 @@ Func_006_44bf: ; 184bf (6:44bf) ld a, $ff ld [$ce55], a xor a - ld [wcea3], a + ld [wDuelCursorBlinkCounter], a .asm_006_44e5 ld a, $01 ld [wVBlankOAMCopyToggle], a @@ -604,7 +604,7 @@ Func_006_44bf: ; 184bf (6:44bf) call Func_006_4598 call Func_006_452b xor a - ld [wcea3], a + ld [wDuelCursorBlinkCounter], a jr .asm_006_44e5 .asm_006_4518 ld a, $01 @@ -803,7 +803,7 @@ GlossaryData2: ld a, e ld [wceb0], a xor a - ld [wcea3], a + ld [wDuelCursorBlinkCounter], a .asm_006_46a2 ldh a, [hKeysPressed] and $03 @@ -826,7 +826,7 @@ GlossaryData2: jr z, .asm_006_46c6 call PlaySFX .asm_006_46c6 - ld hl, wcea3 + ld hl, wDuelCursorBlinkCounter ld a, [hl] inc [hl] and $0f @@ -1882,7 +1882,7 @@ NamingScreen_CheckButtonState: ld a, h ld [wNamingScreenCursorX], a xor a - ld [wcea3], a + ld [wDuelCursorBlinkCounter], a ld a, $06 cp d jp z, NamingScreen_CheckButtonState @@ -1908,7 +1908,7 @@ NamingScreen_CheckButtonState: jr z, .asm_006_69f8 call PlaySFX .asm_006_69f8 - ld hl, wcea3 + ld hl, wDuelCursorBlinkCounter ld a, [hl] inc [hl] and $0f @@ -2663,7 +2663,7 @@ Func_006_6efb: ld a, h ld [wNamingScreenCursorX], a xor a - ld [wcea3], a + ld [wDuelCursorBlinkCounter], a ld a, $02 cp d jp z, Func_006_6efb @@ -2689,7 +2689,7 @@ Func_006_6efb: jr z, .asm_006_6f92 call PlaySFX .asm_006_6f92 - ld hl, wcea3 + ld hl, wDuelCursorBlinkCounter ld a, [hl] inc [hl] and $0f diff --git a/src/wram.asm b/src/wram.asm index 3af5361..bcc3714 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -1388,7 +1388,8 @@ wcea1:: ; cea1 ds $1 -wcea3:: ; cea3 +; used to blink the cursor in duel menu +wDuelCursorBlinkCounter:: ; cea3 ds $1 wNamingScreenCursorY:: ; cea4 |