map: Added inner wall tile type

diff --git a/assets b/assets
index fe8d4478a5657dba33c4bfc9f715a0e25f9fcc28..703bdcebe95341277c3f59ab0589b98954551836 160000 (submodule)
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit fe8d4478a5657dba33c4bfc9f715a0e25f9fcc28
+Subproject commit 703bdcebe95341277c3f59ab0589b98954551836

diff --git a/maps/l1.inc b/maps/l1.inc
index 56e9459915229df11684355df141741c1b3019a9..76af6ef1f3f463f655bf81c590b5bd659c4c401c 100644 (file)
--- 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 abfc2ef7d7f4a64f4b5556322b691648c46f1ef0..bf4369dd4b5813198eeb23951a26a945363cb8a0 100644 (file)
--- 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 c395889c2ddd76da8270d242022a147e1c790d18..03be90f092b6608e38e6b81d5e35c24a502764f5 100644 (file)
--- 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