From 3783a98f95a11c1122877f57b755a14a8b3ff713 Mon Sep 17 00:00:00 2001
From: Robin Chappatte <robin.chappatte@gmail.com>
Date: Sat, 25 Apr 2026 07:35:00 +0200
Subject: [PATCH] use prerendered screen and remove sprite rotation

---
 assets/screen.ppm           | Bin 0 -> 147515 bytes
 build.ts                    |  13 +--
 src/consts/sprites.asm      |  16 +---
 src/init.asm                |  20 +----
 src/lib/drawing.asm         | 139 +++++------------------------
 src/lib/sprite_rotation.asm | 171 ------------------------------------
 src/main.asm                |  31 ++-----
 src/reserved_space.asm      |   5 --
 8 files changed, 44 insertions(+), 351 deletions(-)
 create mode 100644 assets/screen.ppm
 delete mode 100644 src/lib/sprite_rotation.asm

diff --git a/assets/screen.ppm b/assets/screen.ppm
new file mode 100644
index 0000000000000000000000000000000000000000..0ae5dbaa6d1c28784368def7ae6cd9c3b9f12974
GIT binary patch
literal 147515
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

literal 0
HcmV?d00001

diff --git a/build.ts b/build.ts
index 1b97447..81c0ed6 100755
--- a/build.ts
+++ b/build.ts
@@ -9,6 +9,10 @@ if (Deno.args.length !== 0) {
 
 import { TextLineStream } from "jsr:@std/streams@1.1.0";
 
+const instructionLength = 4; // in bytes
+const mapWidth = 15;
+const spriteWidth = 17;
+
 const asmFilePaths = [
   "src/consts/arch.asm",
   "src/consts/game.asm",
@@ -23,14 +27,10 @@ const asmFilePaths = [
 
   "src/lib/game.asm",
   "src/lib/drawing.asm",
-  "src/lib/sprite_rotation.asm",
 ];
+const initialScreenPath = 'assets/screen.ppm';
 const reservedSpacePath = 'src/reserved_space.asm';
 
-const instructionLength = 4; // in bytes
-const mapWidth = 15;
-const spriteWidth = 17;
-
 const mapMatchingStrings = {
   0x00_00_00: '0', // Empty
   0xFF_00_00: '1', // Wall
@@ -104,6 +104,9 @@ console.log(`
 ;
 `);
 
+const screenBytes = await getDataFromPPM(initialScreenPath);
+console.log(bytesToAsmConstU8('screen', screenBytes, spritesMatchingStrings, 1));
+
 console.log(await Deno.readTextFile(reservedSpacePath))
 
 /**
diff --git a/src/consts/sprites.asm b/src/consts/sprites.asm
index 00f48fd..d31bf19 100644
--- a/src/consts/sprites.asm
+++ b/src/consts/sprites.asm
@@ -2,17 +2,9 @@ pub const sprites.width = 17
 pub const sprites.height = 17 ; unused as sprite are all square
 pub const sprites.size = 289 ; height x width
 
-pub const sprites.rotation_0 = 0
-pub const sprites.rotation_90 = 1
-pub const sprites.rotation_180 = 2
-pub const sprites.rotation_270 = 3
-
 pub const sprites.empty = 0
 pub const sprites.unimplemented = 1
-pub const sprites.wall_end = 2
-pub const sprites.wall_straight = 3
-pub const sprites.wall_corner = 4
-pub const sprites.robot = 5
-pub const sprites.ghost = 6
-pub const sprites.coin = 7
-pub const sprites.max = 7 ; for lookup table
+pub const sprites.robot = 2
+pub const sprites.ghost = 3
+pub const sprites.coin = 4
+pub const sprites.max = 4 ; for lookup table
diff --git a/src/init.asm b/src/init.asm
index c5688a2..06ed09b 100644
--- a/src/init.asm
+++ b/src/init.asm
@@ -17,24 +17,6 @@ lsl r2, r1, arch.instruction_increment_shift
 add r2, r2, ptr.textures_addresses
 add r3, zr, sprite_unimplemented
 store_32 [r2], r3
-; sprite_wall_end
-add r1, zr, sprites.wall_end
-lsl r2, r1, arch.instruction_increment_shift
-add r2, r2, ptr.textures_addresses
-add r3, zr, sprite_wall_end
-store_32 [r2], r3
-; sprite_wall_straight
-add r1, zr, sprites.wall_straight
-lsl r2, r1, arch.instruction_increment_shift
-add r2, r2, ptr.textures_addresses
-add r3, zr, sprite_wall_straight
-store_32 [r2], r3
-; sprite_wall_corner
-add r1, zr, sprites.wall_corner
-lsl r2, r1, arch.instruction_increment_shift
-add r2, r2, ptr.textures_addresses
-add r3, zr, sprite_wall_corner
-store_32 [r2], r3
 ; sprite_robot
 add r1, zr, sprites.robot
 lsl r2, r1, arch.instruction_increment_shift
@@ -63,7 +45,7 @@ mov r1, screen.mode_index
 screen r1, screen.mode_value
 
 mov r1, screen.offset_index
-add r2, zr, ptr.screen
+add r2, zr, screen
 screen r1, r2
 
 mov r1, screen.resolution_index
diff --git a/src/lib/drawing.asm b/src/lib/drawing.asm
index 2424274..03cbf44 100644
--- a/src/lib/drawing.asm
+++ b/src/lib/drawing.asm
@@ -5,53 +5,6 @@ include ../consts/scene
 include ../consts/sprites
 include sprite_rotation
 
-; /* Draw the whole (fill the screen memory with the values of the sprites based on the map)
-
-; Inputs:
-
-; Outputs:
-
-; Locals:
-; 	r1: x map coord
-; 	r2: y map coord
-; 	r3: sprite rotation
-; 	r4: sprite id
-; 	r12: rotation (returned by `sprite and rotation`)
-; 	r13: sprite (returned by `get_sprite_id_and_rotation`)
-; */
-pub drawing.draw_whole_map:
-    push r1
-    push r2
-    push r3
-    push r4
-    push r12
-    push r13
-
-    mov r1, 0
-    mov r2, 0
-
-    draw_whole_map_loop:
-        call sprite_rotation.get_sprite_id_and_rotation
-        mov r3, r12
-        mov r4, r13
-        call drawing.draw_sprite_at_map_coord
-        add r1, r1, 1
-        cmp r1, map.width
-        jne draw_whole_map_loop
-        mov r1, 0
-        add r2, r2, 1
-        cmp r2, map.height
-        jne draw_whole_map_loop
-
-    pop r13
-    pop r12
-    pop r4
-    pop r3
-    pop r2
-    pop r1
-
-    ret
-
 ; /* Return the top-left pixel address of the tile at the given map coordinates
 
 ; Inputs:
@@ -77,7 +30,7 @@ get_tile_address:
 		cmp r3, sprites.height
 		jne get_tile_address_offset_per_row_loop
 
-	add r13, zr, ptr.screen
+	add r13, zr, screen
 
 	mov r3, 0
 	get_tile_address_margin_top_loop:
@@ -144,8 +97,7 @@ get_sprite_address:
 ; Inputs:
 ; 	r1: map x coord
 ; 	r2: map y coord
-; 	r3: sprite rotation
-; 	r4: sprite id
+; 	r3: sprite id
 
 ; Outputs:
 
@@ -158,22 +110,20 @@ pub drawing.draw_sprite_at_map_coord:
 	push r1
 	push r2
 	push r3
-	push r4
 	push r13
 
 	call get_tile_address
-	mov r1, r13
-	push r1
+	push r13
 	
-	mov r1, r4
+	mov r1, r3
 	call get_sprite_address
-	mov r2, r13
-	pop r1
 
+	mov r2, r13
+	pop r13
+	mov r1, r13
 	call draw_sprite
 
 	pop r13
-	pop r4
 	pop r3
 	pop r2
 	pop r1
@@ -184,18 +134,15 @@ pub drawing.draw_sprite_at_map_coord:
 ; Inputs:
 ; 	r1: screen address
 ; 	r2: sprite address
-; 	r3: rotation
 
 ; Outputs:
 
 ; Locals:
 ; 	r1: current screen pixel address
-; 	r4: x
-; 	r5: y
-; 	r6: current sprite pixel address
-; 	r7: color
-; 	r8: x increment
-; 	r9: y increment
+;		r2: current sprite pixel address
+; 	r3: x
+; 	r4: color
+;		r5: sprite last pixel address + 1
 ; */
 draw_sprite:
 	push r1
@@ -203,67 +150,25 @@ draw_sprite:
 	push r3
 	push r4
 	push r5
-	push r6
-	push r7
-	push r8
-	push r9
-
-	mov r6, r2
-
-	; rotation
-	draw_sprite_cmp_rotation_0:
-		cmp r3, sprites.rotation_0
-		jne draw_sprite_cmp_rotation_90
-		mov r8, 1
-		mov r9, 0
-		jmp draw_sprite_loop_init
-	draw_sprite_cmp_rotation_90:
-		cmp r3, sprites.rotation_90
-		jne draw_sprite_cmp_rotation_180
-		add r6, r6, sprites.size
-		sub r6, r6, sprites.width
-		sub r8, zr, sprites.width
-		mov r9, sprites.size
-		add r9, r9, 1
-		jmp draw_sprite_loop_init
-	draw_sprite_cmp_rotation_180:
-		cmp r3, sprites.rotation_180
-		jne draw_sprite_cmp_rotation_270
-		add r6, r6, sprites.size
-		sub r6, r6, 1
-		sub r8, zr, 1
-		mov r9, 0
-		jmp draw_sprite_loop_init
-	draw_sprite_cmp_rotation_270:
-		add r6, r6, sprites.width
-		sub r6, r6, 1
-		mov r8, sprites.width
-		sub r9, zr, sprites.size
-		sub r9, r9, 1
 	
-	draw_sprite_loop_init:
-	mov r4, 0
-	mov r5, 0
+	add r5, r2, sprites.size
+
+	mov r3, 0
 	draw_sprite_loop:
-		load_8 r7, [r6]
-		store_8 [r1], r7
-		add r4, r4, 1
+		load_8 r4, [r2]
+		store_8 [r1], r4
+
 		add r1, r1, 1
-		add r6, r6, r8
-		cmp r4, sprites.width
+		add r2, r2, 1
+		add r3, r3, 1
+		cmp r3, sprites.width
 		jne draw_sprite_loop
-		mov r4, 0
-		add r6, r6, r9
+		mov r3, 0
 		add r1, r1, screen.width
 		sub r1, r1, sprites.width
-		add r5, r5, 1
-		cmp r5, sprites.width
+		cmp r5, r2
 		jne draw_sprite_loop
 		
-	pop r9
-	pop r8
-	pop r7
-	pop r6
 	pop r5
 	pop r4
 	pop r3
diff --git a/src/lib/sprite_rotation.asm b/src/lib/sprite_rotation.asm
deleted file mode 100644
index 2d3a1f0..0000000
--- a/src/lib/sprite_rotation.asm
+++ /dev/null
@@ -1,171 +0,0 @@
-include ../consts/offsets
-include ../consts/map
-include ../consts/sprites
-
-; /* Return the sprite id and rotation for the given map coordinates
-
-; Inputs:
-;     r1: x map coord
-;     r2: y map coord
-
-; Outputs:
-;     r12: sprite rotation
-;     r13: sprite id
-
-; Locals:
-;     r3: tile id
-;     r4: map offset
-;     r5: counter
-;     r6: left tile id
-;     r7: up tile id
-;     r8: right tile id
-;     r9: down tile id
-; */
-pub sprite_rotation.get_sprite_id_and_rotation:
-    push r1
-    push r2
-    push r3
-    push r4
-    push r5
-    push r6
-    push r7
-    push r8
-    push r9
-
-    add r4, r1, map
-    mov r5, 0
-    get_sprite_id_and_rotation_map_row_loop:
-        cmp r5, r2
-        je get_sprite_id_and_rotation_map_row_loop_end
-        add r4, r4, map.width
-        add r5, r5, 1
-        jmp get_sprite_id_and_rotation_map_row_loop
-    get_sprite_id_and_rotation_map_row_loop_end:
-
-    mov r12, sprites.rotation_0 ; default rotation
-
-    load_8 r3, [r4]
-    lsl r3, r3, 3 ; 2*instruction_size = *8 = <<3
-    add r3, r3, get_sprite_id_and_rotation_jump_table
-    jmp r3
-
-    get_sprite_id_and_rotation_jump_table:
-    ; tile_empty
-    mov r13, sprites.empty
-    jmp get_sprite_id_and_rotation_return
-    ; tiles_wall
-    jmp get_sprite_id_and_rotation_wall
-    nop
-    ; tile_coin
-    mov r13, sprites.coin
-    jmp get_sprite_id_and_rotation_return
-
-    get_sprite_id_and_rotation_wall:
-    mov r6, 0
-    mov r7, 0
-    mov r8, 0
-    mov r9, 0
-    
-    get_sprite_id_and_rotation_cmp_left:
-        cmp r1, 0
-        je get_sprite_id_and_rotation_cmp_up
-        sub r4, r4, 1
-        load_8 r6, [r4]
-        add r4, r4, 1
-    get_sprite_id_and_rotation_cmp_up:
-        cmp r2, 0
-        je get_sprite_id_and_rotation_cmp_right
-        sub r4, r4, map.width
-        load_8 r7, [r4]
-        add r4, r4, map.width
-    get_sprite_id_and_rotation_cmp_right:
-        cmp r1, map.max_x
-        je get_sprite_id_and_rotation_cmp_down
-        add r4, r4, 1
-        load_8 r8, [r4]
-        sub r4, r4, 1
-    get_sprite_id_and_rotation_cmp_down:
-        cmp r2, map.max_y
-        je get_sprite_id_and_rotation_check_connections
-        add r4, r4, map.width
-        load_8 r9, [r4]
-        sub r4, r4, map.width
-
-    get_sprite_id_and_rotation_check_connections:
-    get_sprite_id_and_rotation_straight_0:
-        cmp r7, map.tiles.wall
-        jne get_sprite_id_and_rotation_straight_90
-        cmp r9, map.tiles.wall
-        jne get_sprite_id_and_rotation_straight_90
-        mov r12, sprites.rotation_0
-        mov r13, sprites.wall_straight
-        jmp get_sprite_id_and_rotation_return
-    get_sprite_id_and_rotation_straight_90:
-        cmp r6, map.tiles.wall
-        jne get_sprite_id_and_rotation_corner_0
-        cmp r8, map.tiles.wall
-        jne get_sprite_id_and_rotation_corner_0
-        mov r12, sprites.rotation_90
-        mov r13, sprites.wall_straight
-        jmp get_sprite_id_and_rotation_return
-
-    get_sprite_id_and_rotation_corner_0:
-        cmp r6, map.tiles.wall
-        jne get_sprite_id_and_rotation_corner_180
-        cmp r9, map.tiles.wall
-        jne get_sprite_id_and_rotation_corner_90
-        mov r12,sprites.rotation_0
-        mov r13, sprites.wall_corner
-        jmp get_sprite_id_and_rotation_return
-    get_sprite_id_and_rotation_corner_90:
-        cmp r7, map.tiles.wall
-        jne get_sprite_id_and_rotation_end_90
-        mov r12,sprites.rotation_90
-        mov r13, sprites.wall_corner
-        jmp get_sprite_id_and_rotation_return
-    get_sprite_id_and_rotation_corner_180:
-        cmp r8, map.tiles.wall
-        jne get_sprite_id_and_rotation_end_0
-        cmp r7, map.tiles.wall
-        jne get_sprite_id_and_rotation_corner_270
-        mov r12,sprites.rotation_180
-        mov r13, sprites.wall_corner
-        jmp get_sprite_id_and_rotation_return
-    get_sprite_id_and_rotation_corner_270:
-        cmp r9, map.tiles.wall
-        jne get_sprite_id_and_rotation_end_270
-        mov r12,sprites.rotation_270
-        mov r13, sprites.wall_corner
-        jmp get_sprite_id_and_rotation_return
-
-    get_sprite_id_and_rotation_end_0:
-        cmp r9, map.tiles.wall
-        jne get_sprite_id_and_rotation_end_180
-        mov r12,sprites.rotation_0
-        mov r13, sprites.wall_end
-        jmp get_sprite_id_and_rotation_return
-    get_sprite_id_and_rotation_end_90:
-        mov r12,sprites.rotation_90
-        mov r13, sprites.wall_end
-        jmp get_sprite_id_and_rotation_return
-    get_sprite_id_and_rotation_end_180:
-        mov r12,sprites.rotation_180
-        mov r13, sprites.wall_end
-        jmp get_sprite_id_and_rotation_return
-    get_sprite_id_and_rotation_end_270:
-        mov r12,sprites.rotation_270
-        mov r13, sprites.wall_end
-        ;jmp get_sprite_id_and_rotation_return
-
-    get_sprite_id_and_rotation_return:
-    pop r9
-    pop r8
-    pop r7
-    pop r6
-    pop r5
-    pop r4
-    pop r3
-    pop r2
-    pop r1
-
-    ret
diff --git a/src/main.asm b/src/main.asm
index be88511..6118fc4 100644
--- a/src/main.asm
+++ b/src/main.asm
@@ -2,8 +2,6 @@ include consts/screen
 
 include init
 
-call drawing.draw_whole_map
-
 ;
 ;   State initialization
 ;
@@ -22,8 +20,7 @@ store_8 [r6], r2
 add r6, r6, 1
 store_8 [r6], r5
 
-mov r3, sprites.rotation_0
-mov r4, sprites.robot
+mov r3, sprites.robot
 call drawing.draw_sprite_at_map_coord
 
 ; Ghost
@@ -41,8 +38,7 @@ store_8 [r6], r2
 add r6, r6, 1
 store_8 [r6], r5
 
-mov r3, sprites.rotation_0
-mov r4, sprites.ghost
+mov r3, sprites.ghost
 call drawing.draw_sprite_at_map_coord
 
 ;
@@ -229,15 +225,13 @@ game_loop:
     ; clear old position
     mov r1, r2
     mov r2, r3
-    mov r3, sprites.rotation_0
-    mov r4, sprites.empty
+    mov r3, sprites.empty
     call drawing.draw_sprite_at_map_coord
 
     ; draw robot on new position
     mov r1, r5
     mov r2, r6
-    mov r3, sprites.rotation_0
-    mov r4, sprites.robot
+    mov r3, sprites.robot
     call drawing.draw_sprite_at_map_coord
 
 
@@ -295,34 +289,27 @@ game_loop:
     store_8 [r1], r8
 
     ; get tile at previous position
-    push r2
     mov r1, r2
     mov r2, r3
     call game.get_tile_address_from_map_coord
-    mov r9, r13
-    pop r2
+    load_8 r13, [r13]
 
     ; draw tile at previous position
-    load_8 r1, [r9]
-    cmp r1, map.tiles.coin
+    cmp r13, map.tiles.coin
     je game_loop_ghost_movement_old_tile_coin
     ; old tile empty
-    mov r4, sprites.empty
+    mov r3, sprites.empty
     jmp game_loop_ghost_movement_draw_old_tile
     game_loop_ghost_movement_old_tile_coin:
-    mov r4, sprites.coin
+    mov r3, sprites.coin
 
     game_loop_ghost_movement_draw_old_tile:
-    mov r1, r2
-    mov r2, r3
-    mov r3, sprites.rotation_0
     call drawing.draw_sprite_at_map_coord
 
     ; draw ghost on new position
     mov r1, r7
     mov r2, r8
-    mov r3, sprites.rotation_0
-    mov r4, sprites.ghost
+    mov r3, sprites.ghost
     call drawing.draw_sprite_at_map_coord
 
     ;
diff --git a/src/reserved_space.asm b/src/reserved_space.asm
index f513191..cda0e83 100644
--- a/src/reserved_space.asm
+++ b/src/reserved_space.asm
@@ -2,9 +2,6 @@
 pub ptr.textures_addresses:
 U32 0 ; empty
 U32 0 ; placeholder
-U32 0 ; wall_end
-U32 0 ; wall_straight
-U32 0 ; wall_corner
 U32 0 ; robot
 U32 0 ; ghost
 U32 0 ; coin
@@ -31,5 +28,3 @@ U8 0 ; x coord
 U8 0 ; y coord
 U8 0 ; direction
 U8 0 ; [padding]
-
-pub ptr.screen:
\ No newline at end of file