From 759b7fdafa551eaf22786d6ee8a3d0bfd3b773b1 Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Mon, 12 Jan 2026 17:38:41 +0100 Subject: [PATCH] map: Added inner wall tile type --- assets | 2 +- maps/l1.inc | 4 ++-- src/defs.s | 3 +++ src/tiles.s | 6 ++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/assets b/assets index fe8d447..703bdce 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit fe8d4478a5657dba33c4bfc9f715a0e25f9fcc28 +Subproject commit 703bdcebe95341277c3f59ab0589b98954551836 diff --git a/maps/l1.inc b/maps/l1.inc index 56e9459..76af6ef 100644 --- a/maps/l1.inc +++ b/maps/l1.inc @@ -11,8 +11,8 @@ .db 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 .db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 .db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 -.db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x0, 0x0 -.db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1 +.db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x3, 0x3, 0x3, 0x1, 0x0, 0x1, 0x3, 0x3, 0x1, 0x0, 0x0 +.db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x1, 0x3, 0x3, 0x1 .db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x1, 0x1 .db 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 .db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 diff --git a/src/defs.s b/src/defs.s index abfc2ef..bf4369d 100644 --- a/src/defs.s +++ b/src/defs.s @@ -120,9 +120,12 @@ ; tile type enum .se 0 .de TT_NONE, 1 + ; wall at the edge of a room .de TT_WALL, 1 .de TT_FLOOR, 1 .de TT_DOOR, 1 + ; wall inside of a room +.de TT_INNER_WALL, 1 ; tile flags0 diff --git a/src/tiles.s b/src/tiles.s index c395889..03be90f 100644 --- a/src/tiles.s +++ b/src/tiles.s @@ -8,6 +8,9 @@ tile_null: tile_wall: tiledef TT_WALL, TF0_WALL, 0, 0 +tile_inner_wall: + tiledef TT_INNER_WALL, TF0_WALL, 0, 0 + tile_floor: tiledef TT_FLOOR, 0, 0, 0 @@ -19,6 +22,7 @@ tile_table: dw tile_wall dw tile_floor dw tile_door + dw tile_inner_wall ; map of tile type to gfx ; this is the base tile @@ -35,4 +39,6 @@ tile_gfx_table: .db 0x02 ; door .db 0x03 + ; inner wall + .db 0x01 -- 2.30.2