diff options
| author | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
| commit | 6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch) | |
| tree | 39736ab1dd8ebcc57f8e981db6103285743d5530 /home/overworld.asm | |
| parent | Identify unnamed functions in map_sprites.asm (#126) (diff) | |
| parent | Fix some label typos, and add some constants instead of raw numbers (#492) (diff) | |
| download | pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'home/overworld.asm')
| -rw-r--r-- | home/overworld.asm | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index a661ec04..4fe60f0f 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1359,12 +1359,12 @@ LoadCurrentMapView:: ld e, a ld a, [wCurrentTileBlockMapViewPointer + 1] ld d, a - ld hl, wTileMapBackup - ld b, $05 + ld hl, wSurroundingTiles + ld b, SCREEN_BLOCK_HEIGHT .rowLoop ; each loop iteration fills in one row of tile blocks push hl push de - ld c, $06 + ld c, SCREEN_BLOCK_WIDTH .rowInnerLoop ; loop to draw each tile block of the current row push bc push de @@ -1393,7 +1393,7 @@ LoadCurrentMapView:: .noCarry ; update tile map pointer to next row's address pop hl - ld a, $60 + ld a, SURROUNDING_WIDTH * BLOCK_HEIGHT add l ld l, a jr nc, .noCarry2 @@ -1401,19 +1401,19 @@ LoadCurrentMapView:: .noCarry2 dec b jr nz, .rowLoop - ld hl, wTileMapBackup - ld bc, $0 + ld hl, wSurroundingTiles + ld bc, 0 .adjustForYCoordWithinTileBlock ld a, [wYBlockCoord] and a jr z, .adjustForXCoordWithinTileBlock - ld bc, $30 + ld bc, SURROUNDING_WIDTH * 2 add hl, bc .adjustForXCoordWithinTileBlock ld a, [wXBlockCoord] and a jr z, .copyToVisibleAreaBuffer - ld bc, $2 + ld bc, BLOCK_WIDTH / 2 add hl, bc .copyToVisibleAreaBuffer decoord 0, 0 ; base address for the tiles that are directly transferred to VRAM during V-blank @@ -1426,7 +1426,7 @@ LoadCurrentMapView:: inc de dec c jr nz, .rowInnerLoop2 - ld a, $04 + ld a, SURROUNDING_WIDTH - SCREEN_WIDTH add l ld l, a jr nc, .noCarry3 @@ -1520,7 +1520,7 @@ ScheduleColumnRedrawHelper:: ld a, [hl] ld [de], a inc de - ld a, 19 + ld a, SCREEN_WIDTH - 1 add l ld l, a jr nc, .noCarry @@ -1561,22 +1561,18 @@ DrawTileBlock:: ld d, h ld e, l ; de = address of the tile block's tiles pop hl - ld c, $04 ; 4 loop iterations + ld c, BLOCK_HEIGHT ; 4 loop iterations .loop ; each loop iteration, write 4 tile numbers push bc +REPT BLOCK_WIDTH - 1 ld a, [de] ld [hli], a inc de - ld a, [de] - ld [hli], a - inc de - ld a, [de] - ld [hli], a - inc de +ENDR ld a, [de] ld [hl], a inc de - ld bc, $15 + ld bc, SURROUNDING_WIDTH - (BLOCK_WIDTH - 1) add hl, bc pop bc dec c |