From 9c2a3b1614c6525acd49cccedc02100d94d32a4c Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Fri, 2 Jan 2026 05:49:26 +0100 Subject: [PATCH] map: Added new rendering templates. The new templates are for walls that should be in the viewport to the left and right of the player. --- makefile | 3 ++ maps/far_center_left_wall.inc | 4 ++ maps/far_center_right_wall.inc | 4 ++ maps/far_left_door.inc | 2 +- maps/far_right_door.inc | 2 +- maps/near_left_door.inc | 4 +- maps/near_right_door.inc | 4 +- src/tiles.s | 8 ++++ tiles/bank8000.inc | 88 +++++++++++++++++----------------- tiles/bank9000.inc | 88 +++++++++++++++++----------------- 10 files changed, 113 insertions(+), 94 deletions(-) create mode 100644 maps/far_center_left_wall.inc create mode 100644 maps/far_center_right_wall.inc diff --git a/makefile b/makefile index 8956187..8885b66 100644 --- a/makefile +++ b/makefile @@ -41,3 +41,6 @@ maps: ./tools/tmx2map.py assets/maps/far_left_wall.tmx 1 > maps/far_left_wall.inc ./tools/tmx2map.py assets/maps/far_right_wall.tmx 1 > maps/far_right_wall.inc + + ./tools/tmx2map.py assets/maps/far_center_right_wall.tmx 1 > maps/far_center_right_wall.inc + ./tools/tmx2map.py assets/maps/far_center_left_wall.tmx 1 > maps/far_center_left_wall.inc diff --git a/maps/far_center_left_wall.inc b/maps/far_center_left_wall.inc new file mode 100644 index 0000000..2c38372 --- /dev/null +++ b/maps/far_center_left_wall.inc @@ -0,0 +1,4 @@ +; this map was generated by tmx2map.py + +.db 0x15, 0x21, 0x21, 0x21, 0x10, 0x12, 0x12, 0x12, 0x25, 0x22, 0x22, 0x22 + diff --git a/maps/far_center_right_wall.inc b/maps/far_center_right_wall.inc new file mode 100644 index 0000000..600df44 --- /dev/null +++ b/maps/far_center_right_wall.inc @@ -0,0 +1,4 @@ +; this map was generated by tmx2map.py + +.db 0x21, 0x21, 0x21, 0x16, 0x12, 0x12, 0x12, 0x20, 0x22, 0x22, 0x22, 0x26 + diff --git a/maps/far_left_door.inc b/maps/far_left_door.inc index 9903466..2a67ed2 100644 --- a/maps/far_left_door.inc +++ b/maps/far_left_door.inc @@ -1,4 +1,4 @@ ; this map was generated by tmx2map.py -.db 0x8, 0x9, 0xa, 0x3, 0x17, 0x17, 0x17, 0x1b, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x2b, 0x38, 0x39, 0x3a, 0x33 +.db 0x8, 0x9, 0xa, 0x3, 0x2d, 0x17, 0x17, 0x1b, 0x2d, 0x17, 0x17, 0x17, 0x2d, 0x17, 0x17, 0x2b, 0x38, 0x39, 0x3a, 0x33 diff --git a/maps/far_right_door.inc b/maps/far_right_door.inc index 626b6a9..894bb16 100644 --- a/maps/far_right_door.inc +++ b/maps/far_right_door.inc @@ -1,4 +1,4 @@ ; this map was generated by tmx2map.py -.db 0x4, 0xd, 0xe, 0xf, 0x1c, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x2c, 0x17, 0x17, 0x17, 0x34, 0x3d, 0x3e, 0x3f +.db 0x4, 0xd, 0xe, 0xf, 0x1c, 0x17, 0x17, 0x1d, 0x17, 0x17, 0x17, 0x1d, 0x2c, 0x17, 0x17, 0x1d, 0x34, 0x3d, 0x3e, 0x3f diff --git a/maps/near_left_door.inc b/maps/near_left_door.inc index f66ce06..fcc5247 100644 --- a/maps/near_left_door.inc +++ b/maps/near_left_door.inc @@ -1,5 +1,5 @@ ; this map was generated by tmx2map.py -.db 0x8, 0x9, 0xa, 0x3, 0x17, 0x17, 0x17, 0x1b, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17 -.db 0x17, 0x17, 0x17, 0x2b, 0x38, 0x39, 0x3a, 0x33 +.db 0x8, 0x9, 0xa, 0x3, 0x2d, 0x17, 0x17, 0x1b, 0x2d, 0x17, 0x17, 0x17, 0x2d, 0x17, 0x17, 0x17, 0x2d, 0x17, 0x17, 0x17 +.db 0x2d, 0x17, 0x17, 0x2b, 0x38, 0x39, 0x3a, 0x33 diff --git a/maps/near_right_door.inc b/maps/near_right_door.inc index 61554f3..24cc433 100644 --- a/maps/near_right_door.inc +++ b/maps/near_right_door.inc @@ -1,5 +1,5 @@ ; this map was generated by tmx2map.py -.db 0x4, 0xd, 0xe, 0xf, 0x1c, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17 -.db 0x2c, 0x17, 0x17, 0x17, 0x34, 0x3d, 0x3e, 0x3f +.db 0x4, 0xd, 0xe, 0xf, 0x1c, 0x17, 0x17, 0x1d, 0x17, 0x17, 0x17, 0x1d, 0x17, 0x17, 0x17, 0x1d, 0x17, 0x17, 0x17, 0x1d +.db 0x2c, 0x17, 0x17, 0x1d, 0x34, 0x3d, 0x3e, 0x3f diff --git a/src/tiles.s b/src/tiles.s index 2a18d2c..de49227 100644 --- a/src/tiles.s +++ b/src/tiles.s @@ -63,6 +63,14 @@ far_left_wall: far_right_wall: #include "far_right_wall.inc" + ; 4x3 tiles +far_center_left_wall: +#include "far_center_left_wall.inc" + + ; 4x3 tiles +far_center_right_wall: +#include "far_center_right_wall.inc" + ; copies a row of tiles ; from a linear buffer into a new block ; blocks must be 4 tiles wide diff --git a/tiles/bank8000.inc b/tiles/bank8000.inc index 2531d8a..79a60a0 100644 --- a/tiles/bank8000.inc +++ b/tiles/bank8000.inc @@ -72,13 +72,13 @@ .chr 22222223 ; tile 8 .chr 33111111 -.chr 00333311 -.chr 00000033 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 +.chr 30333311 +.chr 30000033 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 ; tile 9 .chr 11111111 .chr 11111111 @@ -135,13 +135,13 @@ .chr 00000000 ; tile 15 .chr 11111133 -.chr 11333300 -.chr 33000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 +.chr 11333303 +.chr 33000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 ; tile 16 .chr 32222222 .chr 32222222 @@ -260,14 +260,14 @@ .chr 00000000 .chr 00000000 ; tile 29 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 ; tile 30 .chr 00000000 .chr 00000000 @@ -404,14 +404,14 @@ .chr 00000000 .chr 33330000 ; tile 45 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 ; tile 46 .chr 00000000 .chr 00000000 @@ -503,13 +503,13 @@ .chr 00333323 .chr 00000033 ; tile 56 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000033 -.chr 00333300 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000033 +.chr 30333300 .chr 33000000 ; tile 57 .chr 00000000 @@ -566,13 +566,13 @@ .chr 00000000 .chr 00000000 ; tile 63 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 33000000 -.chr 00333300 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 33000003 +.chr 00333303 .chr 00000033 ; tile 64 .chr 03333333 diff --git a/tiles/bank9000.inc b/tiles/bank9000.inc index 2531d8a..79a60a0 100644 --- a/tiles/bank9000.inc +++ b/tiles/bank9000.inc @@ -72,13 +72,13 @@ .chr 22222223 ; tile 8 .chr 33111111 -.chr 00333311 -.chr 00000033 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 +.chr 30333311 +.chr 30000033 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 ; tile 9 .chr 11111111 .chr 11111111 @@ -135,13 +135,13 @@ .chr 00000000 ; tile 15 .chr 11111133 -.chr 11333300 -.chr 33000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 +.chr 11333303 +.chr 33000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 ; tile 16 .chr 32222222 .chr 32222222 @@ -260,14 +260,14 @@ .chr 00000000 .chr 00000000 ; tile 29 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 ; tile 30 .chr 00000000 .chr 00000000 @@ -404,14 +404,14 @@ .chr 00000000 .chr 33330000 ; tile 45 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 ; tile 46 .chr 00000000 .chr 00000000 @@ -503,13 +503,13 @@ .chr 00333323 .chr 00000033 ; tile 56 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000033 -.chr 00333300 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000000 +.chr 30000033 +.chr 30333300 .chr 33000000 ; tile 57 .chr 00000000 @@ -566,13 +566,13 @@ .chr 00000000 .chr 00000000 ; tile 63 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 00000000 -.chr 33000000 -.chr 00333300 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 00000003 +.chr 33000003 +.chr 00333303 .chr 00000033 ; tile 64 .chr 03333333 -- 2.30.2