From: Lukas Krickl Date: Sat, 10 Jan 2026 04:14:16 +0000 (+0100) Subject: map: reverted render buffer to use 14x20 tiles X-Git-Url: https://git.krickl.dev/?a=commitdiff_plain;h=f4df076a7c34f1c793c963cbd855e87e2ccf40c5;p=gbrg%2F.git map: reverted render buffer to use 14x20 tiles --- diff --git a/src/defs.s b/src/defs.s index 79414fb..4c9cdd8 100644 --- a/src/defs.s +++ b/src/defs.s @@ -31,10 +31,8 @@ #define MAP_H 14 #define MAP_TILES (MAP_W * MAP_H) -#define RENDER_BUF_W 16 -#define RENDER_BUF_H 10 - ; 16 bytes per tile -#define RENDER_BUF_TILE_SIZE 16 +#define RENDER_BUF_W 20 +#define RENDER_BUF_H 14 #define RENDER_BUF_TILES (RENDER_BUF_W * RENDER_BUF_H) ; actor type enum diff --git a/src/map.s b/src/map.s index 1fb2f5a..93379cd 100644 --- a/src/map.s +++ b/src/map.s @@ -465,7 +465,7 @@ map_full_draw_ceiling: ; draws floor tiles map_full_draw_floor: ld hl, render_buffer + RENDER_BUF_W * 5 - ld bc, RENDER_BUF_W * 5 + ld bc, RENDER_BUF_W * 9 ld d, 0x02 jp memset diff --git a/src/render.s b/src/render.s index 777eb8d..a6423a6 100644 --- a/src/render.s +++ b/src/render.s @@ -1,19 +1,7 @@ - ; pseudo 3d rendering code - ; draws based on player position into a frame buffer (tiles) - ; the frame buffer is then copied to the correct tileset - - ; draws a pixel into the frame buffer - ; inputs: - ; hl: ptr into buffer - ; $1: color (0-3) -#macro render_draw_pixel - -#endmacro + ; renders the visible tiles around the player into the render buffer - ; inits the viewport - ; by placing a unique tile in each position - ; this tile diretly corresponds to the frame buffer + ; inits the render view render_init_view: ; TODO: ret diff --git a/src/update.s b/src/update.s index 2052c71..8a3518e 100644 --- a/src/update.s +++ b/src/update.s @@ -91,8 +91,7 @@ update_render: ld b, RENDER_BUF_H ; loop counter ld de, render_buffer - ; start 2 rows down 1 tile over - ld hl, SCRN0+2+32*2 + ld hl, SCRN0 call next_vblank_wait ; copy buffer into SCRN0 @@ -114,11 +113,15 @@ update_render: update_render_draw update_render_draw update_render_draw + update_render_draw + update_render_draw + update_render_draw + update_render_draw call next_vblank_wait push de - ld de, 20 - RENDER_BUF_W + 12 ; next row + ld de, 12 ; next row add hl, de pop de diff --git a/src/wram.s b/src/wram.s index 94995ca..300aa23 100644 --- a/src/wram.s +++ b/src/wram.s @@ -136,6 +136,5 @@ dir_tfs_end: ; combat data combat: .adv combat_size -.org 0xD000 -render_buffer: .adv RENDER_BUF_TILES * RENDER_BUF_TILE_SIZE +render_buffer: .adv RENDER_BUF_TILES render_canary: .adv 4