diff options
Diffstat (limited to 'home')
-rw-r--r-- | home/gfx.asm | 10 | ||||
-rw-r--r-- | home/map_objects.asm | 4 | ||||
-rw-r--r-- | home/math.asm | 4 | ||||
-rw-r--r-- | home/menu.asm | 2 | ||||
-rw-r--r-- | home/text.asm | 5 | ||||
-rw-r--r-- | home/tilemap.asm | 20 | ||||
-rw-r--r-- | home/time.asm | 2 | ||||
-rw-r--r-- | home/trainers.asm | 2 | ||||
-rw-r--r-- | home/video.asm | 6 |
9 files changed, 28 insertions, 27 deletions
diff --git a/home/gfx.asm b/home/gfx.asm index 52facb851..8ae2c759c 100644 --- a/home/gfx.asm +++ b/home/gfx.asm @@ -1,20 +1,20 @@ ; Functions to copy data from ROM. -Get2bpp_2:: +Get2bppViaHDMA:: ldh a, [rLCDC] bit rLCDC_ENABLE, a jp z, Copy2bpp - homecall _Get2bpp + homecall HDMATransfer2bpp ret -Get1bpp_2:: +Get1bppViaHDMA:: ldh a, [rLCDC] bit rLCDC_ENABLE, a jp z, Copy1bpp - homecall _Get1bpp + homecall HDMATransfer1bpp ret @@ -31,7 +31,7 @@ FarCopyBytesDouble_DoubleBankSwitch:: rst Bankswitch ret -OldDMATransfer: +UnreferencedOldDMATransfer: dec c ldh a, [hBGMapMode] push af diff --git a/home/map_objects.asm b/home/map_objects.asm index 64e21e546..667658f0c 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -574,12 +574,12 @@ _GetMovementByte:: ld a, h ret -SetVramState_Bit0:: +UnreferencedSetVramState_Bit0:: ld hl, wVramState set 0, [hl] ret -ResetVramState_Bit0:: +UnreferencedResetVramState_Bit0:: ld hl, wVramState res 0, [hl] ret diff --git a/home/math.asm b/home/math.asm index 3042cc61d..c99214cce 100644 --- a/home/math.asm +++ b/home/math.asm @@ -48,8 +48,8 @@ Divide:: pop hl ret -SubtractSigned:: -; Return a - b, sign in carry. +UnreferencedSubtractAbsolute:: +; Return |a - b|, sign in carry. sub b ret nc cpl diff --git a/home/menu.asm b/home/menu.asm index 12dfc67af..07ce54d48 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -417,7 +417,7 @@ YesNoBox:: PlaceYesNoBox:: jr _YesNoBox -PlaceGenericTwoOptionBox:: +UnreferencedPlaceGenericTwoOptionBox:: call LoadMenuHeader jr InterpretTwoOptionMenu diff --git a/home/text.asm b/home/text.asm index 82fdd7111..abbf12c41 100644 --- a/home/text.asm +++ b/home/text.asm @@ -128,7 +128,7 @@ SpeechTextbox:: ld c, TEXTBOX_INNERW jp Textbox -TestText:: +UnreferencedTestText:: text "ゲームフりーク!" done @@ -172,7 +172,8 @@ PlaceNextChar:: ld c, l pop hl ret - pop de + + pop de ; unused NextChar:: inc de diff --git a/home/tilemap.asm b/home/tilemap.asm index 379b1464a..56e6182ef 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -58,13 +58,13 @@ CGBOnly_CopyTilemapAtOnce:: jr z, WaitBGMap CopyTilemapAtOnce:: - jr .CopyTilemapAtOnce + jr _CopyTilemapAtOnce ; unused farcall HDMATransferAttrmapAndTilemapToWRAMBank3 ret -.CopyTilemapAtOnce: +_CopyTilemapAtOnce: ldh a, [hBGMapMode] push af xor a @@ -77,22 +77,22 @@ CopyTilemapAtOnce:: .wait ldh a, [rLY] - cp $7f + cp $80 - 1 jr c, .wait di - ld a, BANK(vTiles3) + ld a, BANK(vBGMap2) ldh [rVBK], a hlcoord 0, 0, wAttrmap - call .StackPointerMagic - ld a, BANK(vTiles0) + call .CopyBGMapViaStack + ld a, BANK(vBGMap0) ldh [rVBK], a hlcoord 0, 0 - call .StackPointerMagic + call .CopyBGMapViaStack .wait2 ldh a, [rLY] - cp $7f + cp $80 - 1 jr c, .wait2 ei @@ -102,7 +102,7 @@ CopyTilemapAtOnce:: ldh [hBGMapMode], a ret -.StackPointerMagic: +.CopyBGMapViaStack: ; Copy all tiles to vBGMap ld [hSPBuffer], sp ld sp, hl @@ -122,7 +122,7 @@ rept SCREEN_WIDTH / 2 ldh a, [c] and b jr nz, .loop\@ -; load BGMap0 +; load vBGMap ld [hl], e inc l ld [hl], d diff --git a/home/time.asm b/home/time.asm index b708329c5..2a866d6b5 100644 --- a/home/time.asm +++ b/home/time.asm @@ -256,7 +256,7 @@ SetClock:: call CloseSRAM ; unlatch clock, disable clock r/w ret -ClearRTCStatus:: +UnreferencedClearRTCStatus:: ; clear sRTCStatusFlags xor a push af diff --git a/home/trainers.asm b/home/trainers.asm index e9971be3f..00ae5dbcd 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -203,7 +203,7 @@ FacingPlayerDistance:: and a ret -CheckTrainerFlag:: +UnreferencedCheckTrainerFlag:: push bc ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc diff --git a/home/video.asm b/home/video.asm index 008f1057c..5578ad293 100644 --- a/home/video.asm +++ b/home/video.asm @@ -117,7 +117,7 @@ UpdateBGMap:: ; Update the BG Map, in thirds, from wTilemap and wAttrmap. ldh a, [hBGMapMode] - and a + and a ; 0 ret z ; BG Map 0 @@ -127,7 +127,7 @@ UpdateBGMap:: jr z, .Attr ; BG Map 1 - dec a + dec a ; useless ldh a, [hBGMapAddress] ld l, a @@ -232,7 +232,7 @@ THIRD_HEIGHT EQU SCREEN_HEIGHT / 3 ldh [hBGMapThird], a ; Rows of tiles in a third - ld a, SCREEN_HEIGHT / 3 + ld a, THIRD_HEIGHT ; Discrepancy between wTilemap and BGMap ld bc, BG_MAP_WIDTH - (SCREEN_WIDTH - 1) |