diff options
| -rw-r--r-- | engine/overworld/init_map.asm | 4 | ||||
| -rw-r--r-- | home/vblank.asm | 2 | ||||
| -rw-r--r-- | home/video.asm | 25 | ||||
| -rw-r--r-- | hram.asm | 2 |
4 files changed, 18 insertions, 15 deletions
diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm index 72950ac7..45ad8148 100644 --- a/engine/overworld/init_map.asm +++ b/engine/overworld/init_map.asm @@ -63,10 +63,10 @@ ReanchorBGMap_NoOAMUpdate:: ld a, 1 ldh [hOAMUpdate], a ld a, 3 - ldh [hFF9E], a + ldh [hBlackOutBGMapThird], a .asm_65bc call DelayFrame - ldh a, [hFF9E] + ldh a, [hBlackOutBGMapThird] and a jr nz, .asm_65bc pop af diff --git a/home/vblank.asm b/home/vblank.asm index d6dfc825..c1c4bbfe 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -98,7 +98,7 @@ VBlank0:: call Serve2bppRequest call Serve1bppRequest call AnimateTileset - call Function1642 + call BlackOutBGMap .done diff --git a/home/video.asm b/home/video.asm index e4e9fa78..ebb085f7 100644 --- a/home/video.asm +++ b/home/video.asm @@ -392,9 +392,9 @@ AnimateTileset:: set 1, [hl] ret -Function1642:: +BlackOutBGMap:: nop - ldh a, [hFF9E] + ldh a, [hBlackOutBGMapThird] and a ret z @@ -403,8 +403,9 @@ Function1642:: dec a jr z, .two +; Black out the 18 BG Map rows right of the screen area ld a, 2 - ldh [hFF9E], a + ldh [hBlackOutBGMapThird], a ld hl, hBGMapAddress ld a, [hli] ld h, [hl] @@ -412,9 +413,9 @@ Function1642:: ld de, SCREEN_WIDTH add hl, de ld b, SCREEN_HEIGHT - ld a, $60 + ld a, "■" .loop1 -rept 12 +rept BG_MAP_WIDTH - SCREEN_WIDTH ld [hli], a endr add hl, de @@ -423,25 +424,27 @@ endr ret .two +; Black out the top 7 BG Map rows below the screen area ld a, 1 - ld de, $240 + ld de, BG_MAP_WIDTH * SCREEN_HEIGHT jr .go .one +; Black out the bottom 7 BG Map rows below the screen area xor a - ld de, $320 + ld de, BG_MAP_WIDTH * (SCREEN_HEIGHT + 7) .go - ldh [hFF9E], a + ldh [hBlackOutBGMapThird], a ld hl, hBGMapAddress ld a, [hli] ld h, [hl] ld l, a add hl, de - ld b, $e - ld a, $60 + ld b, 7 * 2 + ld a, "■" .loop2 -rept 16 +rept BG_MAP_WIDTH / 2 ld [hli], a endr dec b @@ -22,7 +22,7 @@ hSeconds:: db ; ff9a hVBlankCounter:: db ; ff9d -hFF9E:: db ; ff9e +hBlackOutBGMapThird:: db ; ff9e hROMBank:: db ; ff9f hVBlank:: db ; ffa0 |