diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/joypad.asm | 9 | ||||
| -rw-r--r-- | home/text.asm | 4 | ||||
| -rw-r--r-- | home/util.asm | 1 | ||||
| -rw-r--r-- | home/vcopy.asm | 12 |
4 files changed, 8 insertions, 18 deletions
diff --git a/home/joypad.asm b/home/joypad.asm index 31d6b04..af38bc7 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -166,7 +166,6 @@ GetJoypadDebounced:: ld a, $05 ld [wVBlankJoyFrameCounter], a ret -; 0x8ad TextboxWaitPressAorB_BlinkCursor: ; Show a blinking cursor in the lower right-hand @@ -183,7 +182,7 @@ TextboxWaitPressAorB_BlinkCursor: xor a ldh [hTextBoxCursorBlinkInterval], a ld a, $06 - ldh [hTextBoxCursorBlinkInterval + 1], a ; initially, 0x600 iterations + ldh [hTextBoxCursorBlinkInterval + 1], a ; initially, $600 iterations .loop push hl coord hl, (TEXTBOX_WIDTH - 2), (TEXTBOX_Y + TEXTBOX_HEIGHT - 1) @@ -249,7 +248,7 @@ TextboxBlinkCursor:: ; frame tile. ; hl - address of cursor ; hTextBoxCursorBlinkInterval - initial delay between toggling -; subsequent delays will be 0x6FF +; subsequent delays will be $6FF ; calls of this function ; CAUTION: if the cursor is not shown initially, even initial ; hTextBoxCursorBlinkInterval values will cause no cursor @@ -273,7 +272,7 @@ TextboxBlinkCursor:: ld a, $ff ldh [hTextBoxCursorBlinkInterval], a ld a, $06 - ldh [hTextBoxCursorBlinkInterval + 1], a ; reset to 0x6FF iterations + ldh [hTextBoxCursorBlinkInterval + 1], a ; reset to $6FF iterations ret .showCursorCountdown ldh a, [hTextBoxCursorBlinkInterval] @@ -289,7 +288,7 @@ TextboxBlinkCursor:: ldh [hTextBoxCursorBlinkInterval + 1], a ret nz ld a, $06 - ldh [hTextBoxCursorBlinkInterval + 1], a ; reset to 0x6FF iterations + ldh [hTextBoxCursorBlinkInterval + 1], a ; reset to $6FF iterations ld a, "▼" ld [hl], a ret diff --git a/home/text.asm b/home/text.asm index 0585b96..29a916d 100644 --- a/home/text.asm +++ b/home/text.asm @@ -526,7 +526,6 @@ Text_TX_LOW:: pop hl coord bc, TEXTBOX_INNERX, TEXTBOX_INNERY + 2 jp NextTextCommand -; 0x1124 Text_WAIT_BUTTON:: ; TX_WAITBUTTON @@ -594,7 +593,6 @@ Text_TX_NUM:: ld c, l pop hl jp NextTextCommand -; 0x1175 Text_TX_EXIT: ; TX_EXIT @@ -610,7 +608,6 @@ Text_TX_EXIT: pop bc pop hl jp NextTextCommand -; 0x1189 Text_PlaySound:: ; Text_PlaySound @@ -702,7 +699,6 @@ Text_TX_LINK_WAIT_BUTTON:: pop bc pop hl jp NextTextCommand -; 0x120c TextCommands:: dw Text_TX diff --git a/home/util.asm b/home/util.asm index 410a331..8bf1ed7 100644 --- a/home/util.asm +++ b/home/util.asm @@ -69,7 +69,6 @@ AddNTimes:: dec a jr nz, .loop ret -; 0x3430 memcmp:: ; TODO: rename ; Compare c bytes at hl and de diff --git a/home/vcopy.asm b/home/vcopy.asm index e4ddfeb..260c2c4 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -138,7 +138,6 @@ RedrawFlashlightColumn1:: ld d, a call _RedrawFlashlightColumnBlack ret -; 0x12e8 RedrawFlashlightColumn2:: ldh a, [hSCX] @@ -187,7 +186,6 @@ RedrawFlashlightRow1:: ld d, a call _RedrawFlashlightRowBlack ret -; 0x12e8 RedrawFlashlightRow2:: ldh a, [hSCY] @@ -415,7 +413,7 @@ endr VBlankCopyDouble:: ; Copy [wVBCopyDoubleSize] 1bpp tiles ; from wVBCopyDoubleSrc to wVBCopyDoubleDst. -; wVBCopyDoubleDst must be aligned to 0x10 bytes. +; wVBCopyDoubleDst must be aligned to $10 bytes. ; While we're here, convert to 2bpp. ; The process is straightforward: @@ -477,7 +475,7 @@ endr VBlankCopy:: ; Copy 16 * [wVBCopySize] bytes ; from wVBCopySrc to wVBCopyDst. -; wVBCopyDst must be aligned to 0x10 bytes. +; wVBCopyDst must be aligned to $10 bytes. ; Source and destination addresses are updated, ; so transfer can continue in subsequent calls. @@ -535,14 +533,12 @@ AnimateTileset:: call AnimateTilesetImpl pop af jp Bankswitch -; 0x1531 EnableSprites:: nop ld hl, rLCDC set rLCDC_SPRITES_ENABLE, [hl] ret -; 0x1538 TransferToolgearRow: ; TransferToolgearRow @@ -564,9 +560,9 @@ TransferToolgearRow: jp TransferBgRows VBlankCopyFar:: -; Copy 0x10 * [wVBCopyFarSize] bytes +; Copy $10 * [wVBCopyFarSize] bytes ; from wVBCopyFarSrcBank::wVBCopyFarSrc to wVBCopyFarDst. -; wVBCopyFarDst must be aligned to 0x10 bytes. +; wVBCopyFarDst must be aligned to $10 bytes. ; Source and destination addresses are updated, ; so transfer can continue in subsequent calls. |