From e47f7fa198229b8598b8ab03ef8b2483f7c685bc Mon Sep 17 00:00:00 2001
From: Flenk008 <frenk_0_0@hotmail.com>
Date: Mon, 13 Mar 2023 13:24:44 +0100
Subject: Background collision

Added background collision for player and other entities. Added gravity and jump functionailty
---
 .vscode/c_cpp_properties.json |   3 +-
 .vscode/launch.json           |   2 +-
 .vscode/tasks.json            |  69 +++++++++++---
 src/demo.c                    | 208 +++++++++++++++++++++++++++++++++---------
 src/entity.h                  |  17 +++-
 src/ppusim/input.c            |   1 +
 6 files changed, 241 insertions(+), 59 deletions(-)

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 51f5ad0..3a0c430 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -2,7 +2,8 @@
     "configurations": [
         {
             "name": "src",
-            "compileCommands": "${workspaceFolder}/src/compile_commands.json"
+            "compileCommands": "${workspaceFolder}/src/compile_commands.json",
+            "configurationProvider": "ms-vscode.makefile-tools"
         }
     ],
     "version": 4
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2f7561c..4ff91bb 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,7 +12,7 @@
             "environment": [],
             "externalConsole": false,
             "MIMode": "gdb",
-            "preLaunchTask": "client/build",
+            "preLaunchTask": "build",
             "setupCommands": [
                 {
                     "description": "Enable pretty-printing for gdb",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 53a235e..a670b0f 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -16,13 +16,19 @@
 				"isDefault": false,
 				"kind": "build"
 			},
-			"options": { "cwd": "${workspaceFolder}/src" },
+			"options": {
+				"cwd": "${workspaceFolder}/src"
+			},
 			"windows": {
 				"command": "make -j",
-				"args": [ "" ],
+				"args": [
+					""
+				]
 			},
 			"command": "make",
-			"args": [ "-j" ],
+			"args": [
+				"-j"
+			],
 			"type": "shell"
 		},
 		{
@@ -32,13 +38,20 @@
 				"isDefault": false,
 				"kind": "test"
 			},
-			"options": { "cwd": "${workspaceFolder}/src" },
+			"options": {
+				"cwd": "${workspaceFolder}/src"
+			},
 			"windows": {
 				"command": "make -j flash",
-				"args": [ "" ],
+				"args": [
+					""
+				]
 			},
 			"command": "make",
-			"args": [ "-j", "flash" ],
+			"args": [
+				"-j",
+				"flash"
+			],
 			"type": "shell"
 		},
 		{
@@ -48,13 +61,19 @@
 				"isDefault": false,
 				"kind": "test"
 			},
-			"options": { "cwd": "${workspaceFolder}/src" },
+			"options": {
+				"cwd": "${workspaceFolder}/src"
+			},
 			"windows": {
 				"command": "make compile_commands.json",
-				"args": [ "" ],
+				"args": [
+					""
+				]
 			},
 			"command": "make",
-			"args": [ "compile_commands" ],
+			"args": [
+				"compile_commands"
+			],
 			"type": "shell"
 		},
 		{
@@ -64,14 +83,40 @@
 				"isDefault": false,
 				"kind": "test"
 			},
-			"options": { "cwd": "${workspaceFolder}" },
+			"options": {
+				"cwd": "${workspaceFolder}"
+			},
 			"windows": {
 				"command": "make clean",
-				"args": [ "" ],
+				"args": [
+					""
+				]
 			},
 			"command": "make",
-			"args": [ "clean" ],
+			"args": [
+				"clean"
+			],
 			"type": "shell"
+		},
+		{
+			"type": "cppbuild",
+			"label": "C/C++: gcc.exe build active file",
+			"command": "C:\\msys64\\mingw64\\bin\\gcc.exe",
+			"args": [
+				"-fdiagnostics-color=always",
+				"-g",
+				"${file}",
+				"-o",
+				"${fileDirname}\\${fileBasenameNoExtension}.exe"
+			],
+			"options": {
+				"cwd": "C:\\msys64\\mingw64\\bin"
+			},
+			"problemMatcher": [
+				"$gcc"
+			],
+			"group": "build",
+			"detail": "compiler: C:\\msys64\\mingw64\\bin\\gcc.exe"
 		}
 	]
 }
diff --git a/src/demo.c b/src/demo.c
index baaf73d..f5d2e71 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -5,21 +5,36 @@
 #include "input.h"
 #include "ppu/ppu.h"
 
-#define HH_DEMO_BALL_COUNT 1
+#define HH_DEMO_BALL_COUNT 2
 hh_s_ppu_loc_fam_entry g_hh_demo_balls[HH_DEMO_BALL_COUNT];
 
 hh_s_entity_player g_hh_player_1 = {
-	.pos_x		 = 31000, // 0b0000 0001 0011 0110
-	.pos_y		 = 21000,
-	.radius		 = 8,
+	.pos_x		 = 11000, 
+	.pos_y		 = 5000,
+	.radius		 = 4,
 	.speed		 = 100,
+	.air_speed   = 80,
 	.direction_x = 1,
+	.accelY 		 = 0,
 	.rotation	 = 8,
 	.in_air		 = false,
 };
 
+hh_s_entity_enemy g_hh_enemy_1 = {
+	.pos_x		 = 16000, 
+	.pos_y		 = 20000,
+	.radius		 = 4,
+	.speed		 = 100,
+	.direction_x = 1,
+	.accelY 		 = 0,
+	.in_air		 = false,
+};
+
 void hh_player_movement();
 
+int hh_background_collision_x(hh_s_entity_player tempEntity);
+hh_s_entity_player hh_background_collision_y_player(hh_s_entity_player tempEntity);
+
 uint16_t g_hh_pos_x; // 0b0000 0001 0011 0110
 uint16_t g_hh_pos_y;
 uint8_t g_hh_left  = 0;
@@ -68,7 +83,7 @@ void hh_demo_loop(unsigned long frame) {
 	hh_player_movement();
 	// input testing (no hitbox stuff)
 	// g_hh_player_1.pos_x  += ((-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right)) * g_hh_player_1.speed; // -1 = L || 1 == R
-	// g_hh_player_1.pos_y  += ((-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down)) * g_hh_player_1.speed; // -1 = D || 1 == U
+	g_hh_player_1.pos_y  += ((-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down)) * g_hh_player_1.speed; // -1 = D || 1 == U
 
 
 	// adjust map size
@@ -76,12 +91,14 @@ void hh_demo_loop(unsigned long frame) {
 	g_hh_pos_y = g_hh_player_1.pos_y / 100;
 
 
-
-
 	// update player sprite on ppu
 	g_hh_demo_balls[0].position_x = g_hh_pos_x;
 	g_hh_demo_balls[0].position_y = g_hh_pos_y;
+
+	g_hh_demo_balls[1].position_x = 220;
+	g_hh_demo_balls[1].position_y = 220;
 	hh_ppu_update_foreground(0, g_hh_demo_balls[0]);
+	hh_ppu_update_foreground(1, g_hh_demo_balls[1]);
 
 	// set background pattern position
 	hh_ppu_update_aux((hh_s_ppu_loc_aux){
@@ -107,6 +124,12 @@ void hh_player_movement() {
 	int8_t directionX = (-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right); // -1 = L || 1 == R
 	int8_t directionY = (-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down);	   // -1 = D || 1 == U
 
+	if(g_hh_controller_p1.button_primary == 1 && g_hh_player_1.accelY == 0 && g_hh_player_1.in_air == false)
+	{
+		g_hh_player_1.accelY = 25;
+	}
+
+
 	uint8_t i, j;
 	uint8_t rotation = 0; // 0-7
 
@@ -124,63 +147,162 @@ void hh_player_movement() {
 			rotation++;
 		}
 	}
-	// direction calc
-	if (directionX != 0) // update direction if player is not idle
+	// X-axis calc
+	if (directionX != 0) // update direction and position if player is not idle 
 	{
 		g_hh_player_1.direction_x = directionX;
+		g_hh_player_1.pos_x = hh_background_collision_x(g_hh_player_1);
 	}
-	// collision map x-axis
 
+	
+	g_hh_player_1 = hh_background_collision_y_player(g_hh_player_1);
+
+}
+
+
+int hh_background_collision_x(hh_s_entity_player tempEntity){
 	// tile calc including radius and direction for background coliision
 
 	uint16_t tileColX;
-	uint16_t tileColY = (g_hh_player_1.pos_y / 100) / 16;
+	uint16_t tileColY = (tempEntity.pos_y / 100) / 8;
 	;
 
 	// remaining space between grid and exact
 	uint8_t modTileX;
-	uint8_t modTileY;
-
-	if (g_hh_player_1.in_air == false && directionX != 0) {
-		if (directionX == 1) {
-			tileColX = ((g_hh_player_1.pos_x / 100) + g_hh_player_1.radius) / 16;
-			modTileX = (g_hh_player_1.pos_x + (100 * g_hh_player_1.radius)) % 1600;
-		} else if (directionX == -1) {
-			tileColX = ((g_hh_player_1.pos_x / 100) - g_hh_player_1.radius) / 16;
-			modTileX = (g_hh_player_1.pos_x - (100 * g_hh_player_1.radius)) % 1600;
-		}
 
-		if (HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + directionX] != 1) {
-			g_hh_player_1.pos_x = g_hh_player_1.pos_x + (directionX * g_hh_player_1.speed); // NEW x set
-		}
 
-		else if (HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + directionX] == 1) {
+		
+	if (tempEntity.direction_x == 1) {
+		tileColX = ((tempEntity.pos_x / 100) + tempEntity.radius) / 8;
+		modTileX = 800 -((tempEntity.pos_x + (100 * tempEntity.radius)) % 800);
+	} else if (tempEntity.direction_x == -1) {
+		tileColX = ((tempEntity.pos_x / 100) - tempEntity.radius )/ 8;
+		modTileX = (tempEntity.pos_x - (100 * tempEntity.radius)) % 800;
+	}
+	
+	tileColY = (( tempEntity.pos_y / 100) + tempEntity.radius) / 8; //bottom of player box
+	
+	if (HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + tempEntity.direction_x] != 1) {
+		tileColY = (( tempEntity.pos_y / 100) - tempEntity.radius) / 8; //bottom of player box
+		if (HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + tempEntity.direction_x] != 1) {
+			if(tempEntity.in_air== true){
+				tempEntity.pos_x= tempEntity.pos_x + (tempEntity.direction_x * tempEntity.air_speed); // 80% of max speed if in air
+			} else {
+				tempEntity.pos_x= tempEntity.pos_x + (tempEntity.direction_x * tempEntity.speed); // 80% of max speed if in air
+			}
+		} else {
+			if(tempEntity.in_air == true){
+				if (modTileX < tempEntity.air_speed) {
+					tempEntity.pos_x = tempEntity.pos_x + (tempEntity.direction_x * modTileX); // NEW x set
+				} else {
+					tempEntity.pos_x= tempEntity.pos_x + (tempEntity.direction_x * tempEntity.air_speed); //
+				}
+			} else {
+				if (modTileX < g_hh_player_1.speed) {
+					tempEntity.pos_x= tempEntity.pos_x + (tempEntity.direction_x * modTileX); // NEW x set
+				} else {
+					tempEntity.pos_x = tempEntity.pos_x + (tempEntity.direction_x * tempEntity.speed); // 
+				}
+			}
+		}
+	} else if (HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + tempEntity.direction_x] == 1) {
+		if(tempEntity.in_air == true){
+			if (modTileX < tempEntity.air_speed) {
+				tempEntity.pos_x = tempEntity.pos_x + (tempEntity.direction_x * modTileX); // NEW x set
+			} else {
+				tempEntity.pos_x = tempEntity.pos_x + (tempEntity.direction_x * tempEntity.air_speed); //
+			}
+		} else {
 			if (modTileX < g_hh_player_1.speed) {
-				g_hh_player_1.pos_x = g_hh_player_1.pos_x + (directionX * modTileX); // NEW x set
+				tempEntity.pos_x = tempEntity.pos_x + (tempEntity.direction_x * modTileX); // NEW x set
 			} else {
-				g_hh_player_1.pos_x = g_hh_player_1.pos_x + (directionX * g_hh_player_1.speed); // NEW x set
+				tempEntity.pos_x= tempEntity.pos_x + (tempEntity.direction_x * tempEntity.speed); // 
 			}
 		}
-
-	} else // if in air different all borders have to be checked
-	{
 	}
 
+	
+	return tempEntity.pos_x;
+
+}
+
+hh_s_entity_player hh_background_collision_y_player(hh_s_entity_player tempEntity){
+
+	uint16_t tileColX;
+	uint16_t tileColY;
+	
+
+	// remaining space between grid and exact
+		uint8_t modTileY;
 
-	if(directionY != 0)
+	if(g_hh_controller_p1.button_primary == 1 && tempEntity.accelY == 0 && tempEntity.in_air == false)
 	{
-	//	g_hh_player_1.pos_y = g_hh_player_1.pos_y + (directionY * g_hh_player_1.speed * 2); // NEW x set
+//		tempEntity.accelY = 25;
 	}
-	// collision map floor (y-axis) (falling)
-	//  if falling no jump press (implement)
-	/*
-	tileColY = (( g_hh_player_1.pos_y / 100) + g_hh_player_1.radius) / 16; //bottom of player box
-	modTileY = 1;
-	if(HH_DEMO_HITBOX_TILEMAP[tileColY+1][tileColX] != 1) //rework after jumping
-	{
-		g_hh_player_1.pos_y = g_hh_player_1.pos_y + 5 ;// NEW y set //makew var gravity
-		//playerStat = falling; //for later use of graphics/sound
+	
+	tileColY = (( tempEntity.pos_y / 100) + tempEntity.radius) / 8; //bottom of player box
+	tileColX = ((tempEntity.pos_x / 100) + tempEntity.radius) / 8; //right of player
+	modTileY = ((tempEntity.pos_y + (100 * tempEntity.radius)) % 800); //bottom of box
+
+	//rework arfter jumping
+	if(tempEntity.accelY <= 0){ //falling
+		if(HH_DEMO_HITBOX_TILEMAP[tileColY+1][tileColX] != 1) {//check bottom right first
+			tileColX = ((tempEntity.pos_x / 100) - tempEntity.radius) / 8;
+			if(HH_DEMO_HITBOX_TILEMAP[tileColY+1][tileColX] != 1)	{
+				tempEntity.in_air = true;
+				tempEntity.pos_y = tempEntity.pos_y - (tempEntity.accelY * 8) ;// NEW y set 
+				if (tempEntity.accelY > -35){
+					tempEntity.accelY--;
+				}
+			}
+			else	{
+				if(modTileY < tempEntity.accelY * -8) {
+					tempEntity.pos_y = tempEntity.pos_y + (modTileY) ;// NEW y set 
+				} else {
+					tempEntity.pos_y = tempEntity.pos_y - (tempEntity.accelY * 8) ;// NEW y set 
+				}
+				tempEntity.in_air = false;
+				tempEntity.accelY = 0;
+			}
+		}
+		else	{
+			if(modTileY < tempEntity.accelY * -8) {
+				tempEntity.pos_y = tempEntity.pos_y + (modTileY) ;// NEW y set 
+			} else {
+				tempEntity.pos_y = tempEntity.pos_y - (tempEntity.accelY * 8) ;// NEW y set 
+			}
+			tempEntity.in_air = false;
+			tempEntity.accelY = 0;
+		}
 	}
-	*/
-	// else if(HH_DEMO_HITBOX_TILEMAP[])
+	else{ //jumping
+		tileColY = (( tempEntity.pos_y / 100) - tempEntity.radius) / 8; //top of player box
+		modTileY = 800 -((tempEntity.pos_y + (100 * tempEntity.radius)) % 800); //top of box
+			if(HH_DEMO_HITBOX_TILEMAP[tileColY-1][tileColX] != 1) {//check bottom right first
+				tileColX = ((tempEntity.pos_x / 100) - tempEntity.radius) / 8;
+				if(HH_DEMO_HITBOX_TILEMAP[tileColY-1][tileColX] != 1)	{
+					tempEntity.pos_y = tempEntity.pos_y - (tempEntity.accelY * 8) ;// NEW y set 
+					tempEntity.in_air = true;
+					tempEntity.accelY--;
+				}	else	{
+				if(modTileY < tempEntity.accelY * -8) {
+					tempEntity.pos_y = tempEntity.pos_y - (modTileY) ;// NEW y set 
+				} else {
+					tempEntity.pos_y = tempEntity.pos_y - (tempEntity.accelY * 8) ;
+				}
+				tempEntity.accelY = 0;
+				}
+			}
+			else	{
+				if(modTileY < tempEntity.accelY * -8) {
+					tempEntity.pos_y = tempEntity.pos_y - (modTileY) ;// NEW y set //makew var gravity
+				} else {
+					tempEntity.pos_y = tempEntity.pos_y - (tempEntity.accelY * 8) ;// NEW y set //makew var gravity
+				}
+				tempEntity.accelY = 0;
+			}
+		
+	}
+
+	return tempEntity;
 }
diff --git a/src/entity.h b/src/entity.h
index 181182b..3684252 100644
--- a/src/entity.h
+++ b/src/entity.h
@@ -8,7 +8,20 @@ typedef struct {
 	uint16_t pos_y;
 	uint8_t radius;
 	uint8_t rotation; //45 degrees steps 0 == right 2 == down 4 == left 6 == up
-	uint8_t direction_x; //direction where its looking at in case no input;
-	int8_t speed;	//10 default L/R MODifier
+	int8_t direction_x; //direction where its looking at in case no input;
+	int8_t accelY;
+	int16_t speed;	// default L/R MODifier
+	int16_t air_speed; // air L/R MODifier
 	bool in_air;
 } hh_s_entity_player;
+
+typedef struct {
+	uint16_t pos_x;
+	uint16_t pos_y;
+	uint8_t radius;
+	uint8_t direction_x; //direction where its walking towards;
+	int8_t accelY;
+	int16_t speed;	// default L/R MODifier
+	int16_t air_speed;
+	bool in_air;
+} hh_s_entity_enemy;
diff --git a/src/ppusim/input.c b/src/ppusim/input.c
index 08bc382..4491a63 100644
--- a/src/ppusim/input.c
+++ b/src/ppusim/input.c
@@ -12,4 +12,5 @@ void hh_input_read() {
 	g_hh_controller_p1.dpad_down  = kb[SDL_SCANCODE_S];
 	g_hh_controller_p1.dpad_left  = kb[SDL_SCANCODE_A];
 	g_hh_controller_p1.dpad_right = kb[SDL_SCANCODE_D];
+	g_hh_controller_p1.button_primary = kb[SDL_SCANCODE_K];
 }
-- 
cgit v1.2.3


From a9ad8e0a8ac5346108f1e2c1a0bf9360fadc20da Mon Sep 17 00:00:00 2001
From: Flenk008 <frenk_0_0@hotmail.com>
Date: Mon, 13 Mar 2023 18:02:59 +0100
Subject: Revert "Merge branch 'dev' of
 https://github.com/Flenk008/avans-arcade into dev"

This reverts commit 4f489426e05fb3b296998b17859d8702cc4f37e1, reversing
changes made to e47f7fa198229b8598b8ab03ef8b2483f7c685bc.
---
 features.md                         |  72 -----
 src/.gitignore                      |   1 -
 src/engine/TODO/entity.c            |  41 +++
 src/engine/TODO/entity.h            |  24 ++
 src/engine/TODO/player_controller.h |   4 +
 src/engine/TODO/sprite_controller.h |   6 +
 src/engine/camera.c                 |  34 ---
 src/engine/camera.h                 |   6 -
 src/engine/draw_screen.c            |  62 -----
 src/engine/draw_screen.h            |  16 +-
 src/engine/engine.c                 |   1 -
 src/engine/entity.c                 |  46 ----
 src/engine/entity.h                 |  57 ----
 src/engine/maths.c                  |  19 --
 src/engine/maths.h                  |   7 +-
 src/engine/player_controller.c      | 167 ------------
 src/engine/player_controller.h      |   7 -
 src/engine/sprite_controller.c      |  22 --
 src/engine/sprite_controller.h      | 106 --------
 src/makefile                        |   8 +-
 src/ppusim/sim.c                    |  11 +-
 test/bin/exportingPalettes.md       |   4 -
 test/bin/test_file_read.c           |  13 +-
 test/bin/tilemap.pip                | 512 ------------------------------------
 24 files changed, 89 insertions(+), 1157 deletions(-)
 delete mode 100644 features.md
 create mode 100644 src/engine/TODO/entity.c
 create mode 100644 src/engine/TODO/entity.h
 create mode 100644 src/engine/TODO/player_controller.h
 create mode 100644 src/engine/TODO/sprite_controller.h
 delete mode 100644 src/engine/camera.c
 delete mode 100644 src/engine/camera.h
 delete mode 100644 src/engine/draw_screen.c
 delete mode 100644 src/engine/entity.c
 delete mode 100644 src/engine/entity.h
 delete mode 100644 src/engine/maths.c
 delete mode 100644 src/engine/player_controller.c
 delete mode 100644 src/engine/player_controller.h
 delete mode 100644 src/engine/sprite_controller.c
 delete mode 100644 src/engine/sprite_controller.h
 delete mode 100644 test/bin/exportingPalettes.md
 delete mode 100644 test/bin/tilemap.pip

diff --git a/features.md b/features.md
deleted file mode 100644
index d044232..0000000
--- a/features.md
+++ /dev/null
@@ -1,72 +0,0 @@
-Af/Cancelled/Implement in sprint 3
-Done
-## Checkpoint room (shop)
-| feature | status |
-|-|-|
-|Upgrade abilities|Implement in sprint 3|
-|Interaction with shopkeeper|Implement in sprint 3|
-
-## Upgrades abilities
-| feature | status |
-|-|-|
-|HP boost|Implement in sprint 3|
-|Jump boost|Implement in sprint 3|
-|Speed boost|Implement in sprint 3|
-|Regular dash|Implement in sprint 3|
-|Super punch|Implement in sprint 3|
-|Smoke bomb|Implement in sprint 3|
-
-## Levels
-| feature | status |
-|-|-|
-|Breakable blocks|Implement in sprint 3|
-|Hidden secrets|Implement in sprint 3|
-|Boss fights|Implement in sprint 3|
-|Enemies|Implement in sprint 3|
-|audio|Implement in sprint 3|
-
-## player (Gozer)
-| feature | status |
-|-|-|
-|Move X-as|Done|
-|Jump|Done|
-|Special ability|Implement in sprint 3|
-|Health|Implement in sprint 3|
-|Currency/Scoreboard|Implement in sprint 3|
-
-## Enemy (Menneke)
-| feature | status |
-|-|-|
-|Move X-as|Implement in sprint 3|
-|Jump|Implement in sprint 3|
-|Hunt player|Implement in sprint 3|
-|Health (1 HP)|Implement in sprint 3|
-|Currency/Scoreboard|Implement in sprint 3|
-
-## Enemy (Ventje)
-| feature | status |
-|-|-|
-|Move X-as|Implement in sprint 3|
-|Jump|Implement in sprint 3|
-|Hunt player|Implement in sprint 3|
-|Health (2 HP) |Implement in sprint 3|
-|Splitting upon defeat|Implement in sprint 3|
-|Currency/Scoreboard|Implement in sprint 3|
-
-## Enemy (Terror uil)
-| feature | status |
-|-|-|
-|Movement|Implement in sprint 3|
-|Hunt player|Implement in sprint 3|
-|Health (1 HP) |Implement in sprint 3|
-|Splitting upon defeat|Implement in sprint 3|
-|Currency/Scoreboard|Implement in sprint 3|
-
-## Could have additions if time is enough
-| feature | status |
-|-|-|
-|Multiplayer|Implement in sprint 3|
-|Shared HP|Implement in sprint 3|
-|Special ability|Implement in sprint 3|
-|Health|Implement in sprint 3|
-|Currency/Scoreboard|Implement in sprint 3|
diff --git a/src/.gitignore b/src/.gitignore
index 504b995..d8325cf 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -4,4 +4,3 @@ main.bin
 main
 main.exe
 static/
-*.bin
diff --git a/src/engine/TODO/entity.c b/src/engine/TODO/entity.c
new file mode 100644
index 0000000..fa550d5
--- /dev/null
+++ b/src/engine/TODO/entity.c
@@ -0,0 +1,41 @@
+#include <stdbool.h>
+
+#include "hh_entity.h"
+#include "maths.h"
+
+/*
+    PLAYER: (pos on X)
+    ,___,
+    |   |
+    | X |
+    |___|
+
+*/
+
+bool hh_collision(vec2* pos1, vec2* pos2){
+    if (pos2->x == CLAMP(pos2->x,pos1->x,pos1->x+1.0f)){// hit x
+        return true;
+    }
+
+    if (pos2->y == CLAMP(pos2->y,pos1->y,pos1->y+0.99f)){// hit y
+        return true;
+    }
+    return false;
+}
+
+void hh_solve_collision(vec2* pos_environment, hh_entity* entity){
+    if (entity->vec.x > 0.0f){
+        entity->pos.x = MIN(entity->pos.x,pos_environment->x-1.0f);
+        entity->vec.x = 0.0f;
+    } else if (entity->vec.x < 0.0f){
+        entity->pos.x = MAX(entity->pos.x,pos_environment->x+1.0f);
+        entity->vec.x = 0.0f;
+    } else if (entity->vec.y > 0.0f){
+        entity->pos.x = MIN(entity->pos.x,pos_environment->x-1.0f);
+        entity->vec.x = 0.0f;
+    } else if (entity->vec.y < 0.0f){
+        entity->pos.x = MAX(entity->pos.x,pos_environment->x+1.0f);
+        entity->vec.x = 0.0f;
+    }
+}
+
diff --git a/src/engine/TODO/entity.h b/src/engine/TODO/entity.h
new file mode 100644
index 0000000..fdbeb8a
--- /dev/null
+++ b/src/engine/TODO/entity.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <stdint.h>
+
+#include "maths.h"
+
+typedef struct {
+    vec2 pos, vec;
+    bool is_grounded;
+    int8_t hp;
+    //armor/block?
+}hh_entity;
+
+/// @brief detect for collision enity and eviroment
+/// @param pos1 position of environment tile to be checked
+/// @param pos2 position entity
+/// @return true if collision between enity and environment
+bool hh_collision(vec2* pos1, vec2* pos2);
+
+/// @brief solve collisions
+/// @param environment position
+/// @param entity position
+/// @return solved new entity position
+void hh_solve_collision(vec2* pos_environment, hh_entity* entity);
diff --git a/src/engine/TODO/player_controller.h b/src/engine/TODO/player_controller.h
new file mode 100644
index 0000000..1e9b86c
--- /dev/null
+++ b/src/engine/TODO/player_controller.h
@@ -0,0 +1,4 @@
+#include "maths.h"
+#include "hh_entity.h"
+
+// inputs
diff --git a/src/engine/TODO/sprite_controller.h b/src/engine/TODO/sprite_controller.h
new file mode 100644
index 0000000..c1fadff
--- /dev/null
+++ b/src/engine/TODO/sprite_controller.h
@@ -0,0 +1,6 @@
+// handles sprites
+
+// Bg sprites
+
+
+// Fg or entity sprites
diff --git a/src/engine/camera.c b/src/engine/camera.c
deleted file mode 100644
index e756bd4..0000000
--- a/src/engine/camera.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "engine/camera.h"
-
-#include "ppu/consts.h"
-
-
-vec_cor hh_update_camera(vec_cen new, vec2 min, vec2 max){
-
-	//TODO: change floating point math to fix point math
-	//TODO: fix buggy y-axis ??
-
-	// new = vec_cen2cor(new,(vec2){.x=max.x/2,.y=max.y/2});
-	new = vec_cen2cor((vec2){.x=new.x+(HH_PPU_SPRITE_WIDTH/2),.y=(new.y+(HH_PPU_SPRITE_HEIGHT/2))*2},(vec2){.x=max.x/2,.y=max.y/2});
-	// new.x = new.x << HH_MATH_FIXED_POINT;
-	// new.y = new.y << HH_MATH_FIXED_POINT;
-	static vec_cor old;
-	// old.x = old.x << HH_MATH_FIXED_POINT;
-	// old.y = old.y << HH_MATH_FIXED_POINT;
-
-	// int16_t some = 0;
-	// some = some <<= HH_MATH_FIXED_POINT-1;
-
-	new.x = (int)((float)new.x*0.1f + (float)old.x*0.9f);
-	new.y = (int)((float)new.y*0.1f + (float)old.y*0.9f);
-
-	// old.x = old.x >> HH_MATH_FIXED_POINT;
-	// old.y = old.y >> HH_MATH_FIXED_POINT;
-
-
-	old.x = CLAMP(new.x,min.x,max.x);
-	old.y = CLAMP(new.y,min.y,max.y);
-
-	return old;
-}
-
diff --git a/src/engine/camera.h b/src/engine/camera.h
deleted file mode 100644
index b3ffb52..0000000
--- a/src/engine/camera.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "engine/maths.h"
-
-vec_cor hh_update_camera(vec_cor new, vec2 min, vec2 max);
-
diff --git a/src/engine/draw_screen.c b/src/engine/draw_screen.c
deleted file mode 100644
index c4f3389..0000000
--- a/src/engine/draw_screen.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "engine/draw_screen.h"
-#include "engine/sprite_controller.h"
-
-uint8_t hh_world_to_tile(vec2 pos){
-	
-    FILE* level = fopen("../test/bin/level1_test.bin", "rb"); /* open binary file */
-    if (!level) { /* check if file opened successfully */
-        fprintf(stderr, "Error: Failed to open file.\n");
-        return 0;
-    }
-	int index = ((pos.y/16)*40 + pos.x/16);//TODO: remove magic number(s)
-	fseek(level, (index * sizeof(int)) + sizeof(int), SEEK_SET);
-	int tile;// = (int*)malloc(sizeof(int));
-   fread(&tile, sizeof(int), 1, level); // read 1 tile from binary
-
-	fclose(level);
-	// int val = tile;
-	// free(tile);
-	return tile;
-}
-
-
-// remeber old value to know which part to update.
-vec2 previousViewport = { .x = 0, .y = 0 };
-void hh_draw_screen(vec_cor viewport){
-	if (viewport.x == previousViewport.x && viewport.y == previousViewport.y) return;
-	
-	hh_ppu_update_aux((hh_s_ppu_loc_aux){
-		.bg_shift_x = viewport.x,
-		.bg_shift_y = viewport.y,
-		.fg_fetch	= 0,
-		.sysreset	= 0,
-	});
-
-	// update previous viewport values
-	previousViewport = viewport;
-}
-
-void hh_setup_screen(){
-	//(HH_map_size_X*HH_map_size_Y)
-	int size = 2400; // max X = 40 en max Y = 80
-	FILE* level = fopen("../test/bin/level1_test.bin", "rb"); /* open binary file */
-	if (!level) { /* check if file opened successfully */
-		fprintf(stderr, "Error: Failed to open file.\n");
-		return;
-	}
-	fseek(level, (0* sizeof(int)) + sizeof(int), SEEK_SET);
-	int* tile = (int*)malloc(size*sizeof(int));
-   fread(tile, sizeof(int), size, level); // read 1 tile from binary
-
-	fclose(level);
-
-	for(int BAM_index = 0; BAM_index < size; BAM_index++){
-		hh_ppu_update_background(BAM_index, (hh_s_ppu_loc_bam_entry){
-			.horizontal_flip = false,
-			.vertical_flip   = false,
-			.palette_index   = hh_get_palette(tile[BAM_index]),
-			.tilemap_index   = tile[BAM_index],
-		});
-	}
-	free(tile);
-}
diff --git a/src/engine/draw_screen.h b/src/engine/draw_screen.h
index b181108..4af5865 100644
--- a/src/engine/draw_screen.h
+++ b/src/engine/draw_screen.h
@@ -3,19 +3,7 @@
 
 // every function call for drawing the screen goes here.
 #include "engine/maths.h"
-#include "ppu/ppu.h"
 
-#include <stdio.h>
 #include <stdint.h>
-#include <stdlib.h>
-
-
-#define HH_map_size_X 80
-#define HH_map_size_Y 60
-
-/** @brief return a single tile from world binary */
-uint8_t hh_world_to_tile(vec2 pos);
-/** @brief shift to level if viewport changed position */
-void hh_draw_screen(vec2 viewport);
-/** @brief send data to BAM memory from binary level */
-void hh_setup_screen();
+uint16_t hh_world_to_tile(vec2 pos);
+void hh_draw_screen(vec2 viewport);
\ No newline at end of file
diff --git a/src/engine/engine.c b/src/engine/engine.c
index 799ee7c..f3410a4 100644
--- a/src/engine/engine.c
+++ b/src/engine/engine.c
@@ -1,4 +1,3 @@
 #include "engine/draw_screen.h"
 #include "engine/level.h"
 #include "engine/maths.h"
-#include "engine/sprite_controller.h"
diff --git a/src/engine/entity.c b/src/engine/entity.c
deleted file mode 100644
index 153e7e1..0000000
--- a/src/engine/entity.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <stdbool.h>
-
-#include "engine/entity.h"
-#include "engine/maths.h"
-
-/*
-    PLAYER: (pos on X)
-    ,___,
-    |   |
-    | X |
-    |___|
-
-*/
-
-bool hh_collision(vec_cor pos1, vec2 pos2){
-    if (pos2.x == CLAMP(pos2.x, pos1.x, pos1.x+16)){// hit x
-        return true;
-    }
-
-    if (pos2.y == CLAMP(pos2.y, pos1.y, pos1.y+16)){// hit y
-        return true;
-    }
-    return false;
-}
-
-void hh_solve_collision(vec2 pos_environment, hh_entity* entity){
-	if (!hh_collision(pos_environment,entity->pos))
-		return;
-
-	printf("BONK!/n");
-	// if (entity->vel.y > 0){
-	// 	entity->pos.y = MAX(entity->pos.y,pos_environment.y);
-	// 	entity->vel.y = 0;
-	// } else {
-	// 	entity->pos.y = MIN(entity->pos.y,pos_environment.y);
-	// 	entity->vel.y = 0;
-	// }
-	// if (entity->vel.x <= 0){
-	// 	entity->pos.x = MIN(entity->pos.x,pos_environment.x-16);
-	// 	entity->vel.x = 0;
-	// } else {
-	// 	entity->pos.x = MAX(entity->pos.x,pos_environment.x+16);
-	// 	entity->vel.x = 0;
-	// } 
-}
-
diff --git a/src/engine/entity.h b/src/engine/entity.h
deleted file mode 100644
index f45dae2..0000000
--- a/src/engine/entity.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "ppu/types.h"
-
-#include "engine/maths.h"
-
-typedef uint8_t hh_idx_t;
-
-typedef enum {
-	fire, ice, poison
-}hh_e_damage_t;
-
-typedef struct {
-	hh_s_ppu_loc_fam_entry fam; //screen
-	hh_idx_t frame0;
-	hh_idx_t palette;
-	
-}hh_s_rendering;
-
-typedef struct {
-	int8_t hp;
-	int8_t dmg;
-	hh_e_damage_t dmg_type;
-	int8_t speed_x, speed_y;
-
-} hh_s_atributes;
-
-
-typedef struct {
-    vec2 pos, vel, vec;
-    bool is_grounded;
-    int8_t hp;
-    int8_t speed;
-	 hh_s_rendering render;
-    //armor/block?
-}hh_entity;
-
-typedef struct {
-	hh_entity p;
-	hh_s_atributes atr;
-}hh_s_player;
-
-
-/// @brief detect for collision enity and eviroment
-/// @param pos1 position of environment tile to be checked
-/// @param pos2 position entity
-/// @return true if collision between enity and environment
-bool hh_collision(vec2 pos1, vec2 pos2);
-
-/// @brief solve collisions
-/// @param environment position
-/// @param entity position
-/// @return solved new entity position
-void hh_solve_collision(vec2 pos_environment, hh_entity* entity);
diff --git a/src/engine/maths.c b/src/engine/maths.c
deleted file mode 100644
index 475bba2..0000000
--- a/src/engine/maths.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "engine/maths.h"
-
-vec2 vec_add(vec2 a, vec2 b){
-	return (vec2){a.x + b.x, a.y + b.y};
-}
-
-vec_cor vec_cen2cor(vec_cen in, vec2 halfDistance){
-	return (vec_cor){
-		.x = in.x - halfDistance.x,
-		.y = in.y - halfDistance.y,
-	};
-}
-
-vec_cen vec_cor2cen(vec_cor in, vec2 halfDistance){
-	return (vec_cen){
-		.x = in.x + halfDistance.x,
-		.y = in.y + halfDistance.y,
-	};
-}
diff --git a/src/engine/maths.h b/src/engine/maths.h
index bef287e..c7f1b44 100644
--- a/src/engine/maths.h
+++ b/src/engine/maths.h
@@ -3,17 +3,12 @@
 // #include <math.h>
 
 typedef struct {
-	int32_t x,y;
+    uint32_t x,y;
 } vec2;
 
 typedef vec2 vec_cen;//centered
 typedef vec2 vec_cor;//left upper corner
 
-vec2 vec_add(vec2 a, vec2 b);
-
-vec_cor vec_cen2cor(vec_cen in, vec2 halfDistance);
-vec_cor vec_cor2cen(vec_cen in, vec2 halfDistance);
-
 //fixed point at decimal 7lsb (world positions in pixels (with fixed decimal point))
 #define HH_MATH_FIXED_POINT 7
 
diff --git a/src/engine/player_controller.c b/src/engine/player_controller.c
deleted file mode 100644
index 6735620..0000000
--- a/src/engine/player_controller.c
+++ /dev/null
@@ -1,167 +0,0 @@
-#include "ppu/types.h"
-#include "engine/camera.h"
-#include "engine/draw_screen.h"
-#include "engine/sprite_controller.h"
-#include "engine/player_controller.h"
-
-#include "demo.h"
-#include <stdio.h>
-
-#include "input.h"
-
-void hh_player_actions() {
-	static hh_entity player={
-		.hp = 4,
-		.speed = 6,
-		.is_grounded = false,
-		.pos = (vec2){32,32},
-		.vel = (vec2){0,0},
-		.vec = (vec2){0,0},
-		.render = {
-			.frame0 = 20,
-			.palette = 7,
-			.fam = (hh_s_ppu_loc_fam_entry){
-				.horizontal_flip = false,
-				.vertical_flip = false,
-				.palette_index = 7,
-				.tilemap_index = 2,
-			}
-		}
-	}, player_new = {0};
-
-	// hh_input_read();
-	player.vel = (vec2){.x = (-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right),
-	.y = (-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down) };
-	// const int8_t maa = 3;
-	// const int8_t mbb = -3;
-	// if (g_hh_controller_p1.dpad_up)
-	//
-	// if (g_hh_controller_p1.dpad_down)
-	//
-	// if (g_hh_controller_p1.dpad_left) {
-	// 	player.vel.x += mbb;
-	// 	// g_hh_demo_balls[0].horizontal_flip = true;
-	// }
-	// if (g_hh_controller_p1.dpad_right) {
-	// 	player.vel.x += maa;
-	// 	// g_hh_demo_balls[0].horizontal_flip = true;
-	// }
-	// if (g_hh_controller_p1.button_primary /*&& player.is_grounded*/) //JUMP
-	// 	player.vel.y += -6;
-	// // // if (g_hh_controller_p1.button_secondary)
-
-	// player.render.fam.palette_index = 7;
-	// player.render.fam.tilemap_index = 7;
-
-	// printf("%x ",player.render.fam.palette_index);
-
-	// player.vel.y += 1; //gravity
-
-
-	//END OF VECTOR CHANGES
-	// player.vel.y = CLAMP(player.vel.y,-32,32);
-	// player.vel.x = CLAMP(player.vel.x,-32,32);
-
-	player_new.pos = (vec2){
-		.x = player.pos.x + player.vel.x,
-		.y = player.pos.y + player.vel.y,
-	};
-
-
-
-	// const uint8_t empty = 0;
-	// hh_s_tiles tiles[9];
-	// const vec2 tile_offset[9] = {
-	// 	(vec2){-16,-16},(vec2){0,-16},(vec2){+16,-16},
-	// 	(vec2){-16,0},  (vec2){0,0},  (vec2){+16,0},
-	// 	(vec2){-16,+16},(vec2){0,+16},(vec2){+16,+16},
-	// };
-	// for (int i = 0; i < 9; i++) {
-	// 	vec2 temp_pos = vec_add(player.pos, tile_offset[i]);
-	// 	temp_pos =(vec2){
-	// 		.x = temp_pos.x,
-	// 		.y = temp_pos.y,
-	// 	};
-	// 	hh_s_tiles tile = {
-	// 		.pos = temp_pos,
-	// 		.idx = hh_world_to_tile(temp_pos)
-	// 	};
-	// 	if(hh_colidable(tile.idx)) {
-	// 		tiles[i]=tile;
-	// 		// printf(" collidable near!");
-	// 	} else {
-	// 		tiles[i].idx = 0;
-	// 	}
-	// }
-	/*
-	012
-	345
-	678
-	*/
-	// for (int i = 0; i < 9; i++)
-	// {
-	// 	if (tiles[i].idx != 0){
-	// 		hh_solve_collision(tiles[i].pos, &player);
-	// 	}
-	// }
-
-	player_new.is_grounded = false;
-
-	// solves x collision
-	if (player.vel.x <= 0) {
-		if (hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player.pos.y + 0})) || 
-			hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player.pos.y + 15}))) {
-			player_new.pos.x = (player_new.pos.x & ~15) + 16,
-			player_new.vel.x = 0;
-		}
-	} else {
-		if (hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 16, .y=player.pos.y + 0})) || 
-			hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 16, .y=player.pos.y + 15}))) {
-			player_new.pos.x = player_new.pos.x & ~15, // <-- magic comma, NOT TOUCHY
-			player_new.vel.x = 0;
-		}
-	}
-
-	//solves y collision
-	if (player.vel.y <= 0) {
-		if (hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player_new.pos.y + 0})) || 
-			hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player_new.pos.y + 15}))) {
-			player_new.pos.y = (player_new.pos.y & ~15) + 16,
-			player_new.vel.y = 0;
-		}
-	} else {
-		if (hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player_new.pos.y + 16})) || 
-			hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 16, .y=player_new.pos.y + 15}))) {
-			player_new.pos.y = player_new.pos.y & ~15,
-			player_new.vel.y = 0;
-			player_new.is_grounded = true;
-		}
-	}
-
-	player = player_new;
-
-	vec_cor cam_pos;//value in tiles
-	// cam_pos = (vec2){0,0};
-	cam_pos = hh_update_camera(player.pos,(vec2){0,0},(vec2){.x=20*16,.y=30*16});//TODO: remove magic number(s)
-	// printf("%i, %i:%i, %i\n",player.pos.x,player.pos.y,cam_pos.x,cam_pos.y);
-	hh_draw_screen(cam_pos);
-	// update player sprite on ppu
-	player.render.fam.position_x = (player.pos.x-cam_pos.x);
-	player.render.fam.position_y = (player.pos.y-cam_pos.y);
-
-
-	player.render.fam.tilemap_index = 2;//TODO: these two lines should be redundant
-	player.render.fam.palette_index = 7;
-	hh_ppu_update_foreground(0, player.render.fam);
-
-
-	hh_s_ppu_loc_fam_entry sprite = {
-		.position_x = 16,
-		.position_y = 16,
-		.palette_index = 7,
-		.tilemap_index = 2,
-	};
-	hh_ppu_update_foreground(1, sprite);
-
-}
-
diff --git a/src/engine/player_controller.h b/src/engine/player_controller.h
deleted file mode 100644
index 400c18e..0000000
--- a/src/engine/player_controller.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "engine/maths.h"
-#include "engine/entity.h"
-// inputs
-
-void hh_player_actions();
diff --git a/src/engine/sprite_controller.c b/src/engine/sprite_controller.c
deleted file mode 100644
index 5d93cf8..0000000
--- a/src/engine/sprite_controller.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <stdint.h>
-
-#include "engine/sprite_controller.h"
-#include "ppu/types.h"
-#include "ppu/consts.h"
-#include "ppu/ppu.h"
-
-uint8_t hh_get_palette(uint8_t tile_idx) {
-	return hh_g_sprite_palette[tile_idx];
-}
-
-void hh_setup_palettes(){
-	for (int idx = 0; idx < HH_PPU_PALETTE_COUNT; idx++) {
-		for (int col = 0; col < HH_PPU_PALETTE_COLOR_COUNT; col++) {
-			hh_ppu_update_color(idx,col,hh_g_palette[idx][col]);
-		}
-	}	
-}
-
-bool hh_colidable(uint8_t tile_idx){
-	return (hh_get_palette(tile_idx) != 0);
-}
diff --git a/src/engine/sprite_controller.h b/src/engine/sprite_controller.h
deleted file mode 100644
index 001a459..0000000
--- a/src/engine/sprite_controller.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#pragma once
-#include <stdint.h>
-
-#include "ppu/types.h"
-
-// handles sprites
-
-// Bg sprites
-
-// Fg or entity sprites
-
-//TODO: pack data inside of sprite_palette LUT
-//HH_PPU_PALETTE_COUNT
-#define HH_SPRITE_COUNT 40
-#define HH_PAL_IDX_SKY 0
-#define HH_PAL_IDX_BRICK 1
-const static uint8_t hh_g_sprite_palette[HH_SPRITE_COUNT] = {
-	0,1,1,1,1,1,1,1,1,1, //1+9
-	1,1,1,1,1,1,1,1,1,1, //6+4
-	1,1,1,1,1,1,1,1,1,	//9
-	7,7,7,2,7,7,1,2,7
-	//other palettes here:
-};
-
-
-const static hh_ppu_loc_palette_table_t hh_g_palette = {
-	{//palette info here
-		{0x1,0x2,0x3},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0}},
-	{//Bricks
-		{0x1,0x2,0x3},//01
-		{0xd,0x8,0xa},//24
-		{0x0,0x0,0x1},//25
-		{0x1,0x1,0x1},//26
-		{0x1,0x1,0x2},//27
-		{0x2,0x2,0x3},//28
-		{0x3,0x4,0x5},//29
-		{0x5,0x1,0x7}},
-	{//slime
-		{0x1,0x2,0x3},
-		{0x1,0x3,0x2},
-		{0x4,0x8,0x3},
-		{0x7,0xa,0x4},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0}},
-	{
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0}},
-	{
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0}},
-	{
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0}},
-	{
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0}},
-	{
-		{0x0,0xf,0xf},
-		{0xf,0xf,0xf},
-		{0xf,0x0,0xf},
-		{0xf,0xf,0x0},
-		{0xf,0x0,0x0},
-		{0x0,0xf,0x0},
-		{0x0,0x0,0xf},
-		{0x0,0x0,0x0}}
-};
-
-void hh_setup_palettes();
-
-/** @brief return palette index that belongs to tilemap index */
-uint8_t hh_get_palette(uint8_t tile_idx);
-
-bool hh_colidable(uint8_t tile_idx);
diff --git a/src/makefile b/src/makefile
index d7d9087..96751fb 100644
--- a/src/makefile
+++ b/src/makefile
@@ -31,13 +31,7 @@ LOCAL_SRCS += main.c \
 							ppu/internals.c \
 							ppu/ppu.c \
 							demo.c \
-							engine/engine.c \
-							engine/sprite_controller.c \
-							engine/player_controller.c \
-							engine/draw_screen.c \
-							engine/camera.c \
-							engine/maths.c \
-							engine/entity.c
+							engine/engine.c
 
 CFLAGS += $(SHARED_FLAGS)
 LFLAGS += $(SHARED_FLAGS)
diff --git a/src/ppusim/sim.c b/src/ppusim/sim.c
index a5fec45..1fceb82 100644
--- a/src/ppusim/sim.c
+++ b/src/ppusim/sim.c
@@ -29,21 +29,20 @@ void hh_ppu_init() {
 }
 
 void hh_ppu_load_tilemap() {
-	char* filename = "../test/bin/tiles.bin";
+	char* filename = "tiles.bin";
 	FILE* fp = fopen(filename,"rb");
 	if (!fp){
-		fprintf(stderr,"Error: Failed to load tiles.");
 		return;//error
 	}
-	int sprite_size = (HH_PPU_SPRITE_WIDTH * HH_PPU_SPRITE_HEIGHT);
+
 	fseek(fp, 0, SEEK_END);//goto EOF
-	int _size = ftell(fp)/sprite_size;
+	int _size = ftell(fp)/HH_PPU_VRAM_TMM_SPRITE_SIZE;
 	fseek(fp, 0, 0);//goto start of file
 
 	for (int i = 0; i < _size; i++) {
-		uint8_t data[sprite_size];
+		uint8_t data[HH_PPU_VRAM_TMM_SPRITE_SIZE];
 
-		fread(data,sizeof(uint8_t),sprite_size,fp);
+		fread(data,HH_PPU_VRAM_TMM_SPRITE_SIZE,1,fp);
 		
 		hh_s_ppu_vram_data sprite = hh_ppu_2nat_sprite(data);
 		sprite.offset = i*HH_PPU_VRAM_TMM_SPRITE_SIZE;
diff --git a/test/bin/exportingPalettes.md b/test/bin/exportingPalettes.md
deleted file mode 100644
index be4a354..0000000
--- a/test/bin/exportingPalettes.md
+++ /dev/null
@@ -1,4 +0,0 @@
-```sh
-cat test.src|head -n 46 | awk '{printf "%02x: {0x%x,0x%x,0x%x}\n",NR,$1/2,$2/2,$3/2 }' > hex_palettes
-```
-
diff --git a/test/bin/test_file_read.c b/test/bin/test_file_read.c
index df93395..b3357ce 100644
--- a/test/bin/test_file_read.c
+++ b/test/bin/test_file_read.c
@@ -16,22 +16,19 @@ void printData(uint8_t* in) {
 }
 
 void hh_ppu_load_tilemap() {
-
-	
-	char* filename = "slime.bin";
+	char* filename = "tiles.bin";
 	FILE* fp = fopen(filename,"rb");
 	if (!fp){
 		return;//error
 	}
 
-	int sprite_size = (16 * 16);
 	fseek(fp, 0, SEEK_END);
-	int _size = ftell(fp)/sprite_size;
-	rewind(fp);
+	int _size = ftell(fp)/HH_PPU_VRAM_TMM_SPRITE_SIZE;
+	fseek(fp, 0, 0);
 	// printf("%i",_size);
 	for (int i = 0; i < _size; i++) {
-		uint8_t data[sprite_size];
-		fread(data,1,sprite_size,fp);
+		uint8_t data[HH_PPU_VRAM_TMM_SPRITE_SIZE];
+		fread(data,HH_PPU_VRAM_TMM_SPRITE_SIZE,1,fp);
 		
 		printData(data);
 	}
diff --git a/test/bin/tilemap.pip b/test/bin/tilemap.pip
deleted file mode 100644
index c0c646e..0000000
--- a/test/bin/tilemap.pip
+++ /dev/null
@@ -1,512 +0,0 @@
-0000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-0090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-00a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-00b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-00c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-00d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-00e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-00f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-0100: 06 06 06 06 06 05 06 06 06 06 06 05 06 06 06 06 
-0110: 06 05 05 05 05 03 05 05 05 05 05 03 05 05 05 05 
-0120: 06 05 04 04 04 03 05 05 05 05 05 03 05 05 05 05 
-0130: 06 04 04 04 04 02 02 02 02 02 02 02 02 02 02 02 
-0140: 06 04 04 04 04 02 02 03 03 03 03 03 03 02 03 03 
-0150: 05 04 04 04 04 02 03 03 03 03 03 03 03 02 03 03 
-0160: 05 04 04 04 04 02 03 03 03 03 03 03 03 02 03 03 
-0170: 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 02 
-0180: 06 06 04 04 04 04 04 02 02 02 03 03 03 03 02 02 
-0190: 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
-01a0: 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 02 
-01b0: 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 
-01c0: 00 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 
-01d0: 00 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 
-01e0: 00 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 
-01f0: 06 06 06 05 05 05 02 02 02 02 02 02 02 02 02 02 
-0200: 06 06 06 05 06 06 06 06 06 06 06 05 06 06 06 06 
-0210: 05 05 05 03 05 05 05 05 05 05 05 03 05 05 05 05 
-0220: 05 05 05 03 05 05 05 05 05 05 05 03 05 05 05 05 
-0230: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-0240: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
-0250: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
-0260: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
-0270: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-0280: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
-0290: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
-02a0: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
-02b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-02c0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
-02d0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
-02e0: 02 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
-02f0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-0300: 06 06 06 05 06 06 06 06 06 06 05 06 06 06 06 06 
-0310: 05 05 05 03 05 05 05 05 05 05 03 05 05 05 05 06 
-0320: 05 05 05 03 05 05 05 05 05 05 03 04 04 05 05 06 
-0330: 02 02 02 02 02 02 02 02 02 02 02 04 04 04 04 06 
-0340: 03 03 03 03 03 02 03 03 03 03 02 04 04 04 04 06 
-0350: 03 03 03 03 03 02 03 03 03 03 02 04 04 04 04 05 
-0360: 03 03 03 03 03 02 03 03 03 03 02 04 04 04 04 05 
-0370: 02 02 02 02 02 02 02 02 02 02 02 03 03 03 03 05 
-0380: 03 03 03 03 03 03 03 02 04 04 04 04 04 05 05 00 
-0390: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
-03a0: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
-03b0: 02 02 02 02 02 02 02 02 02 02 02 05 05 06 06 06 
-03c0: 03 02 03 03 03 03 03 03 03 02 04 04 04 04 04 06 
-03d0: 03 02 03 03 03 03 03 03 03 02 04 04 04 04 04 06 
-03e0: 03 02 03 03 03 03 03 03 03 02 04 04 04 04 04 05 
-03f0: 02 02 02 02 02 02 02 02 02 02 02 02 03 03 03 05 
-0400: 06 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
-0410: 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
-0420: 05 04 04 04 04 04 04 02 02 03 03 03 03 03 02 02 
-0430: 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 
-0440: 00 05 04 04 04 03 02 03 03 03 03 03 03 02 03 03 
-0450: 00 05 04 04 04 02 03 03 03 03 03 03 03 02 03 03 
-0460: 00 04 04 04 04 02 03 03 03 03 03 02 02 02 02 03 
-0470: 06 06 05 05 02 02 02 02 02 02 02 02 02 02 02 02 
-0480: 06 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
-0490: 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
-04a0: 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 02 
-04b0: 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 
-04c0: 00 05 05 04 04 04 04 03 02 03 03 03 03 03 03 03 
-04d0: 00 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 
-04e0: 00 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 
-04f0: 00 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 
-0500: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
-0510: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
-0520: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
-0530: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-0540: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
-0550: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
-0560: 03 03 03 03 03 02 03 03 03 03 03 03 02 02 02 03 
-0570: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-0580: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
-0590: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
-05a0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
-05b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-05c0: 02 02 02 03 03 03 03 03 03 02 03 03 03 03 03 03 
-05d0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
-05e0: 03 02 03 03 03 03 03 03 02 02 02 03 03 03 03 03 
-05f0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-0600: 03 03 03 02 03 03 03 03 03 03 03 02 04 04 05 00 
-0610: 03 03 03 02 03 03 03 03 03 03 03 02 04 04 05 00 
-0620: 03 03 02 02 03 03 03 03 03 03 03 02 04 04 04 00 
-0630: 02 02 02 02 02 02 02 02 02 02 02 02 02 06 06 06 
-0640: 03 03 03 03 03 02 03 03 03 02 04 04 04 04 04 06 
-0650: 03 03 03 03 03 02 03 03 03 02 04 04 04 04 04 05 
-0660: 03 03 03 03 03 02 03 03 03 02 04 04 04 04 04 05 
-0670: 02 02 02 02 02 02 02 02 02 02 02 03 03 03 03 05 
-0680: 03 03 03 03 03 03 03 02 04 04 04 04 04 05 05 00 
-0690: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
-06a0: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
-06b0: 02 02 02 02 02 02 02 02 02 02 02 03 03 06 06 06 
-06c0: 03 02 03 03 03 03 03 03 03 02 04 04 04 04 04 06 
-06d0: 03 02 03 03 03 03 03 03 03 02 04 04 04 04 04 05 
-06e0: 03 02 03 03 03 03 03 03 03 02 04 04 04 04 04 05 
-06f0: 02 02 02 02 02 02 02 02 02 02 02 02 03 03 03 05 
-0700: 06 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
-0710: 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
-0720: 05 04 04 04 04 04 04 02 02 03 03 03 03 03 02 02 
-0730: 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 
-0740: 00 05 04 04 04 03 02 03 03 03 03 03 03 02 03 03 
-0750: 00 05 04 04 04 02 03 03 03 03 03 03 03 02 03 03 
-0760: 00 04 04 04 04 02 03 03 03 03 03 02 02 02 02 03 
-0770: 06 06 05 05 02 02 02 02 02 02 02 02 02 02 02 02 
-0780: 06 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
-0790: 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
-07a0: 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 02 
-07b0: 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 
-07c0: 00 05 05 04 04 04 04 04 04 04 04 02 02 02 02 04 
-07d0: 00 05 05 04 04 04 04 04 04 04 04 04 02 04 04 04 
-07e0: 00 06 05 05 05 04 04 04 04 04 04 04 03 04 04 04 
-07f0: 00 06 06 06 05 05 05 05 05 05 05 05 03 05 05 05 
-0800: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
-0810: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
-0820: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
-0830: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-0840: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
-0850: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
-0860: 03 03 03 03 03 02 03 03 03 03 03 03 02 02 02 03 
-0870: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-0880: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
-0890: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
-08a0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
-08b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-08c0: 04 04 04 04 04 04 04 04 03 03 03 04 04 04 04 04 
-08d0: 04 04 04 04 04 04 04 04 04 03 03 04 04 04 04 04 
-08e0: 04 04 04 04 04 04 04 04 04 03 04 04 04 04 04 04 
-08f0: 05 05 05 05 05 05 05 05 05 03 05 05 05 05 05 05 
-0900: 03 03 03 02 03 03 03 03 03 03 03 02 04 04 05 00 
-0910: 03 03 03 02 03 03 03 03 03 03 03 02 04 04 05 00 
-0920: 03 03 02 02 03 03 03 03 03 03 03 02 04 04 04 00 
-0930: 02 02 02 02 02 02 02 02 02 02 02 02 02 06 06 06 
-0940: 03 03 03 03 03 02 03 03 03 02 04 04 04 04 04 06 
-0950: 03 03 03 03 03 02 03 03 03 02 04 04 04 04 04 05 
-0960: 03 03 03 03 03 02 03 03 03 02 04 04 04 04 04 05 
-0970: 02 02 02 02 02 02 02 02 02 02 02 03 03 03 03 05 
-0980: 03 03 03 03 03 03 03 02 04 04 04 04 04 05 05 00 
-0990: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
-09a0: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
-09b0: 02 02 02 02 02 02 03 03 03 03 03 03 03 06 06 06 
-09c0: 04 04 03 03 03 04 04 04 04 04 04 04 04 04 05 06 
-09d0: 04 04 04 03 03 04 04 04 04 04 04 04 04 05 05 05 
-09e0: 04 04 04 03 04 04 04 04 04 04 04 05 05 05 05 06 
-09f0: 05 05 05 03 05 05 05 05 05 05 05 05 05 06 06 06 
-0a00: 06 06 06 06 06 05 06 06 06 06 06 05 06 06 06 06 
-0a10: 06 05 05 05 05 03 05 05 05 05 05 03 05 05 05 05 
-0a20: 06 05 04 04 04 03 05 05 05 05 05 03 05 05 05 05 
-0a30: 06 04 04 04 04 02 02 02 02 02 02 02 02 02 02 02 
-0a40: 06 04 04 04 04 02 02 03 03 03 03 03 03 02 03 03 
-0a50: 05 04 04 04 04 02 03 03 03 03 03 03 03 02 03 03 
-0a60: 05 04 04 04 04 02 03 03 03 03 03 03 03 02 03 03 
-0a70: 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 02 
-0a80: 06 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
-0a90: 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
-0aa0: 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 02 
-0ab0: 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 
-0ac0: 00 05 05 04 04 04 04 04 04 04 04 02 02 02 02 04 
-0ad0: 00 05 05 04 04 04 04 04 04 04 04 04 02 04 04 04 
-0ae0: 00 06 05 05 05 04 04 04 04 04 04 04 03 04 04 04 
-0af0: 00 06 06 06 05 05 05 05 05 05 05 05 03 05 05 05 
-0b00: 06 06 06 05 06 06 06 06 06 06 06 05 06 06 06 06 
-0b10: 05 05 05 03 05 05 05 05 05 05 05 03 05 05 05 05 
-0b20: 05 05 05 03 05 05 05 05 05 05 05 03 05 05 05 05 
-0b30: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-0b40: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
-0b50: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
-0b60: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
-0b70: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-0b80: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
-0b90: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
-0ba0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
-0bb0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-0bc0: 04 04 04 04 04 04 04 04 03 03 03 04 04 04 04 04 
-0bd0: 04 04 04 04 04 04 04 04 04 03 03 04 04 04 04 04 
-0be0: 04 04 04 04 04 04 04 04 04 03 04 04 04 04 04 04 
-0bf0: 05 05 05 05 05 05 05 05 05 03 05 05 05 05 05 05 
-0c00: 06 06 06 05 06 06 06 06 06 06 05 06 06 06 06 06 
-0c10: 05 05 05 03 05 05 05 05 05 05 03 05 05 05 05 06 
-0c20: 05 05 05 03 05 05 05 05 05 05 03 04 04 05 05 06 
-0c30: 02 02 02 02 02 02 02 02 02 02 02 04 04 04 04 06 
-0c40: 03 03 03 03 03 02 03 03 03 03 02 04 04 04 04 06 
-0c50: 03 03 03 03 03 02 03 03 03 03 02 04 04 04 04 05 
-0c60: 03 03 03 03 03 02 03 03 03 03 02 04 04 04 04 05 
-0c70: 02 02 02 02 02 02 02 02 02 02 02 03 03 03 03 05 
-0c80: 03 03 03 03 03 03 03 02 04 04 04 04 04 05 05 00 
-0c90: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
-0ca0: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
-0cb0: 02 02 02 02 02 02 03 03 03 03 03 03 03 06 06 06 
-0cc0: 04 04 03 03 03 04 04 04 04 04 04 04 04 04 05 06 
-0cd0: 04 04 04 03 03 04 04 04 04 04 04 04 04 05 05 05 
-0ce0: 04 04 04 03 04 04 04 04 04 04 04 05 05 05 05 06 
-0cf0: 05 05 05 03 05 05 05 05 05 05 05 05 05 06 06 06 
-0d00: 06 06 06 06 06 05 06 06 06 06 05 06 06 06 06 06 
-0d10: 06 05 05 05 05 03 05 05 05 05 03 05 05 05 05 06 
-0d20: 06 05 04 04 04 03 05 05 05 05 03 04 04 05 05 06 
-0d30: 06 04 04 04 04 02 02 02 02 02 02 04 04 04 04 06 
-0d40: 06 04 04 04 04 02 02 03 03 03 02 04 04 04 04 06 
-0d50: 05 04 04 04 04 02 03 03 03 03 02 04 04 04 04 05 
-0d60: 05 04 04 04 04 02 03 03 03 03 02 04 04 04 04 05 
-0d70: 03 03 03 03 03 02 02 02 02 02 02 03 03 03 03 05 
-0d80: 06 06 04 04 04 04 04 02 04 04 04 04 04 05 05 00 
-0d90: 05 04 04 04 04 04 04 02 04 04 04 04 04 04 05 00 
-0da0: 05 04 04 04 04 04 04 02 04 04 04 04 04 04 05 00 
-0db0: 05 03 03 03 03 03 02 02 02 02 02 05 05 06 06 06 
-0dc0: 00 05 04 04 04 04 04 04 03 02 04 04 04 04 04 06 
-0dd0: 00 05 04 04 04 04 04 04 03 02 04 04 04 04 04 06 
-0de0: 00 05 04 04 04 04 04 04 03 02 04 04 04 04 04 05 
-0df0: 06 06 06 05 05 05 02 02 02 02 02 02 03 03 03 05 
-0e00: 06 04 04 04 04 04 04 02 03 03 03 02 04 04 05 00 
-0e10: 05 04 04 04 04 04 04 02 03 03 03 02 04 04 05 00 
-0e20: 05 04 04 04 04 04 04 02 03 03 03 02 04 04 04 00 
-0e30: 05 03 03 03 03 03 02 02 02 02 02 02 02 06 06 06 
-0e40: 00 05 04 04 04 03 02 03 03 02 04 04 04 04 04 06 
-0e50: 00 05 04 04 04 02 03 03 03 02 04 04 04 04 04 05 
-0e60: 00 04 04 04 04 02 03 03 03 02 03 04 04 04 04 05 
-0e70: 06 06 05 05 02 02 02 02 02 02 02 03 03 03 03 05 
-0e80: 06 04 04 04 04 04 04 02 04 04 04 04 04 05 05 00 
-0e90: 05 04 04 04 04 04 04 02 04 04 04 04 04 04 05 00 
-0ea0: 05 04 04 04 04 04 04 02 04 04 04 04 04 04 05 00 
-0eb0: 05 03 03 03 03 03 02 02 02 02 02 03 03 06 06 06 
-0ec0: 00 05 05 04 04 04 03 03 03 03 03 04 04 04 04 06 
-0ed0: 00 05 04 04 04 04 03 03 03 03 04 04 04 04 04 05 
-0ee0: 00 05 04 04 04 03 03 03 03 03 04 04 04 04 04 05 
-0ef0: 00 05 03 03 03 03 03 02 02 02 02 02 03 03 03 05 
-0f00: 06 04 04 04 04 04 04 02 03 03 03 02 04 04 05 00 
-0f10: 05 04 04 04 04 04 04 02 03 03 03 02 04 04 05 00 
-0f20: 05 04 04 04 04 04 04 02 03 03 03 02 04 04 04 00 
-0f30: 05 03 03 03 03 03 02 02 02 02 02 02 02 06 06 06 
-0f40: 00 05 04 04 04 03 02 03 03 02 04 04 04 04 04 06 
-0f50: 00 05 04 04 04 02 03 03 03 02 04 04 04 04 04 05 
-0f60: 00 04 04 04 04 02 03 03 03 02 04 04 04 04 04 05 
-0f70: 06 06 05 05 02 02 02 02 02 02 02 03 03 03 03 05 
-0f80: 06 04 04 04 04 04 04 02 04 04 04 04 04 05 05 00 
-0f90: 05 04 04 04 04 04 04 02 04 04 04 04 04 04 05 00 
-0fa0: 05 04 04 04 04 04 04 02 04 04 04 04 04 04 05 00 
-0fb0: 05 03 03 03 03 03 02 02 03 03 03 03 03 06 06 06 
-0fc0: 00 05 05 04 04 04 04 04 04 04 04 04 04 04 05 06 
-0fd0: 00 05 05 04 04 04 04 04 04 04 04 04 04 05 05 05 
-0fe0: 00 06 05 05 05 04 04 04 04 04 04 05 05 05 05 06 
-0ff0: 00 06 06 06 05 05 05 05 05 05 05 05 05 06 06 06 
-1000: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
-1010: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
-1020: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
-1030: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1040: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
-1050: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
-1060: 03 03 03 03 03 02 03 03 03 03 03 03 02 02 02 03 
-1070: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1080: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
-1090: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
-10a0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
-10b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-10c0: 02 02 02 03 03 03 03 03 03 02 03 03 03 04 04 04 
-10d0: 03 02 03 03 03 03 03 03 03 02 03 03 04 04 04 04 
-10e0: 03 02 03 03 03 03 03 03 02 02 02 03 04 04 04 04 
-10f0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1100: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
-1110: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
-1120: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
-1130: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1140: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
-1150: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
-1160: 03 03 03 03 03 02 03 03 03 03 03 03 02 02 02 03 
-1170: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1180: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
-1190: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
-11a0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
-11b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-11c0: 02 02 02 04 04 03 03 03 03 02 03 03 03 03 03 03 
-11d0: 04 02 04 04 04 04 03 03 03 02 03 03 03 03 03 03 
-11e0: 04 02 04 04 04 04 03 03 02 02 02 03 03 03 03 03 
-11f0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1200: 03 03 02 02 02 03 03 03 03 03 03 02 02 05 05 05 
-1210: 03 03 03 02 03 03 03 03 03 03 03 02 03 05 05 05 
-1220: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 05 05 
-1230: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1240: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
-1250: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
-1260: 03 03 03 03 03 02 03 03 03 03 03 03 02 02 02 03 
-1270: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1280: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
-1290: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
-12a0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
-12b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-12c0: 02 02 02 03 03 03 03 03 03 02 03 03 03 03 03 03 
-12d0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
-12e0: 03 02 03 03 03 03 03 03 02 02 02 03 03 03 03 03 
-12f0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1300: 06 05 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
-1310: 05 05 05 02 03 03 03 03 03 03 03 02 03 03 03 03 
-1320: 05 05 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
-1330: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1340: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
-1350: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
-1360: 03 03 03 03 03 02 03 03 03 03 03 03 02 02 02 03 
-1370: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1380: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
-1390: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
-13a0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
-13b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-13c0: 02 02 02 03 03 03 03 03 03 02 03 03 03 03 03 03 
-13d0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
-13e0: 03 02 03 03 03 03 03 03 02 02 02 03 03 03 03 03 
-13f0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1400: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1410: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1420: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1430: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1440: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1450: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1460: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1470: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1480: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1490: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-14a0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-14b0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-14c0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-14d0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-14e0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-14f0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1500: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
-1510: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
-1520: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
-1530: 02 02 02 02 02 02 02 02 02 02 02 02 02 01 01 01 
-1540: 03 03 03 03 02 02 03 03 02 02 02 02 02 01 02 02 
-1550: 03 03 03 03 03 02 02 02 02 02 02 02 02 01 02 02 
-1560: 03 03 03 03 03 01 02 02 02 02 02 02 01 01 01 02 
-1570: 02 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 
-1580: 02 03 03 03 02 02 02 01 02 02 02 02 02 02 01 01 
-1590: 03 03 03 03 02 02 02 01 02 02 02 02 02 02 02 01 
-15a0: 03 03 03 03 02 02 01 01 01 01 02 02 02 02 01 01 
-15b0: 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 01 
-15c0: 02 02 02 03 03 02 02 02 02 01 02 02 02 01 01 01 
-15d0: 03 02 03 03 03 02 02 02 02 01 02 02 01 01 01 01 
-15e0: 03 02 03 03 03 03 02 02 01 01 01 02 01 01 01 01 
-15f0: 02 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 
-1600: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
-1610: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
-1620: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
-1630: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1640: 02 02 02 02 01 01 02 02 02 02 02 02 02 01 02 02 
-1650: 02 02 02 02 02 01 02 02 02 02 02 02 02 01 02 02 
-1660: 02 02 02 02 02 01 02 02 02 02 02 02 01 01 01 02 
-1670: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1680: 01 02 02 02 02 02 02 01 02 02 02 02 02 02 01 01 
-1690: 01 02 02 02 02 02 02 01 02 02 02 02 02 02 02 01 
-16a0: 01 02 02 02 01 01 01 01 01 01 02 02 02 02 02 01 
-16b0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-16c0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-16d0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-16e0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-16f0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1700: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
-1710: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
-1720: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
-1730: 01 01 01 01 02 02 02 02 02 02 02 02 02 02 02 02 
-1740: 02 02 02 02 01 01 03 03 03 03 03 03 03 02 03 03 
-1750: 02 02 02 02 02 01 02 02 03 03 03 03 03 02 03 03 
-1760: 02 02 02 02 02 01 02 02 02 03 03 03 02 02 02 03 
-1770: 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 02 
-1780: 01 02 02 02 02 02 02 01 02 02 03 03 03 03 02 02 
-1790: 02 02 02 02 02 02 02 01 02 02 02 03 03 03 03 02 
-17a0: 02 02 02 02 02 02 01 01 01 01 02 03 03 03 03 02 
-17b0: 01 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 
-17c0: 01 01 01 02 02 02 02 02 02 01 02 03 03 03 03 03 
-17d0: 01 01 02 02 02 02 02 02 02 01 02 03 03 03 03 03 
-17e0: 01 01 02 02 02 02 02 02 01 01 01 03 03 03 03 03 
-17f0: 01 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 
-1800: 03 03 02 02 02 02 02 02 02 02 02 01 01 01 01 01 
-1810: 03 03 03 02 03 02 02 02 02 02 02 01 01 01 01 01 
-1820: 03 03 03 02 03 02 02 02 02 02 01 01 01 01 01 01 
-1830: 02 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 
-1840: 03 03 03 03 02 01 02 02 02 02 02 02 01 01 01 01 
-1850: 03 03 03 03 02 01 02 02 02 02 02 02 01 01 01 01 
-1860: 03 03 03 03 02 01 02 02 02 02 02 01 01 01 01 01 
-1870: 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 01 
-1880: 02 03 03 03 02 02 02 01 02 02 02 01 01 01 01 01 
-1890: 03 03 03 03 02 02 02 01 02 02 02 01 01 01 01 01 
-18a0: 03 03 03 03 02 02 01 01 01 01 02 01 01 01 01 01 
-18b0: 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 01 
-18c0: 02 02 02 03 02 02 02 02 02 01 02 02 01 01 01 01 
-18d0: 03 02 03 03 03 02 02 02 02 01 02 02 02 01 01 01 
-18e0: 03 02 03 03 02 02 02 02 01 01 01 02 02 01 01 01 
-18f0: 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 01 
-1900: 01 01 01 01 01 02 02 02 02 02 02 02 02 03 03 03 
-1910: 01 01 01 01 02 02 02 02 02 02 02 02 03 03 03 03 
-1920: 01 01 01 01 02 02 02 02 02 02 02 02 02 03 03 03 
-1930: 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 02 
-1940: 01 01 01 01 01 02 02 02 02 02 03 03 03 02 03 03 
-1950: 01 01 01 01 01 02 02 02 02 02 03 03 03 02 03 03 
-1960: 01 01 01 01 01 01 02 02 02 02 03 03 02 02 02 03 
-1970: 01 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 
-1980: 01 01 01 01 02 02 02 01 02 02 02 03 03 03 02 02 
-1990: 01 01 01 01 02 02 02 01 02 02 02 03 03 03 03 02 
-19a0: 01 01 01 01 01 02 01 01 01 01 02 03 03 03 03 02 
-19b0: 01 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 
-19c0: 01 01 01 01 01 02 02 02 02 01 02 03 03 03 03 03 
-19d0: 01 01 01 01 02 02 02 02 02 01 02 03 03 03 03 03 
-19e0: 01 01 01 01 02 02 02 02 01 01 02 03 03 03 03 03 
-19f0: 01 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 
-1a00: 03 03 02 02 01 02 02 02 02 02 02 01 01 02 01 01 
-1a10: 03 03 03 02 02 02 02 02 02 02 02 01 02 02 02 01 
-1a20: 03 03 03 02 02 02 02 02 02 02 01 01 01 02 02 02 
-1a30: 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 01 
-1a40: 03 03 03 03 01 01 02 02 02 02 02 02 02 01 02 02 
-1a50: 03 03 03 03 02 01 02 02 02 02 02 02 02 01 02 02 
-1a60: 03 03 03 03 03 01 02 02 02 02 02 02 01 01 01 02 
-1a70: 02 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 
-1a80: 02 03 03 03 03 03 02 01 02 02 02 02 02 02 01 01 
-1a90: 03 03 03 03 03 03 03 02 02 02 02 02 02 02 02 01 
-1aa0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
-1ab0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1ac0: 02 02 02 03 03 03 03 03 03 02 03 03 03 03 03 03 
-1ad0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
-1ae0: 03 02 03 03 03 03 03 03 02 02 02 03 03 03 03 03 
-1af0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1b00: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1b10: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1b20: 02 01 01 01 01 01 01 01 01 01 01 01 01 01 02 02 
-1b30: 01 01 01 01 01 01 01 01 02 02 02 02 01 01 01 01 
-1b40: 02 02 02 02 01 01 02 02 02 02 02 02 02 01 02 02 
-1b50: 02 02 02 02 02 01 02 02 02 02 02 02 02 01 02 02 
-1b60: 02 02 02 02 02 01 02 02 02 02 02 02 01 01 01 02 
-1b70: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
-1b80: 01 02 02 02 02 02 02 01 02 02 02 02 02 02 01 01 
-1b90: 02 02 02 02 02 02 02 01 02 02 02 02 02 02 02 01 
-1ba0: 03 03 02 02 02 02 01 01 01 01 02 02 02 02 02 01 
-1bb0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1bc0: 02 02 02 03 03 03 03 03 03 02 03 03 03 03 03 03 
-1bd0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
-1be0: 03 02 03 03 03 03 03 03 02 02 02 03 03 03 03 03 
-1bf0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1c00: 01 01 01 01 01 02 02 02 02 02 02 02 02 03 03 03 
-1c10: 02 02 02 01 02 02 02 02 02 02 02 02 03 03 03 03 
-1c20: 02 02 02 01 02 02 02 02 02 02 01 02 02 03 03 03 
-1c30: 01 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 
-1c40: 02 02 02 02 01 01 02 02 02 02 02 03 03 02 03 03 
-1c50: 02 02 02 02 02 01 02 02 02 02 02 03 03 02 03 03 
-1c60: 02 02 02 02 02 01 02 02 02 02 02 03 02 02 02 03 
-1c70: 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 02 
-1c80: 01 02 02 02 02 02 02 01 02 02 03 03 03 03 02 02 
-1c90: 02 02 02 02 02 02 02 01 02 03 03 03 03 03 03 02 
-1ca0: 02 02 02 02 02 02 01 02 02 02 03 03 03 03 03 02 
-1cb0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1cc0: 02 02 02 03 03 03 03 03 03 02 03 03 03 03 03 03 
-1cd0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
-1ce0: 03 02 03 03 03 03 03 03 02 02 02 03 03 03 03 03 
-1cf0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
-1d00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-1d10: 00 00 01 01 01 01 01 00 00 00 01 01 01 00 00 00 
-1d20: 00 00 00 00 01 00 00 00 00 01 00 00 00 01 00 00 
-1d30: 00 00 00 00 01 00 00 00 00 01 00 00 00 01 00 00 
-1d40: 00 00 00 00 01 00 00 00 00 01 00 00 00 01 00 00 
-1d50: 00 00 00 00 01 00 00 00 00 01 00 00 00 01 00 00 
-1d60: 00 00 00 00 01 00 00 00 00 00 01 01 01 00 00 00 
-1d70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-1d80: 00 00 01 01 01 01 00 00 00 00 01 01 01 00 00 00 
-1d90: 00 00 01 00 00 00 01 00 00 01 00 00 00 01 00 00 
-1da0: 00 00 01 00 00 00 01 00 00 01 00 00 00 01 00 00 
-1db0: 00 00 01 00 00 00 01 00 00 01 00 00 00 01 00 00 
-1dc0: 00 00 01 00 00 00 01 00 00 01 00 00 00 01 00 00 
-1dd0: 00 00 01 01 01 01 00 00 00 00 01 01 01 00 00 00 
-1de0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-1df0: 00 00 01 01 01 01 01 01 01 01 01 01 01 01 01 00 
-1e00: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 
-1e10: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 
-1e20: 00 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 
-1e30: 00 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 
-1e40: 00 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 
-1e50: 00 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 
-1e60: 00 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 
-1e70: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 
-1e80: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 
-1e90: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 
-1ea0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-1eb0: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 
-1ec0: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 
-1ed0: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 
-1ee0: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 
-1ef0: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 
-1f00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-1f10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-1f20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-1f30: 00 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 
-1f40: 00 00 00 00 00 01 00 00 00 00 01 00 00 00 00 00 
-1f50: 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 
-1f60: 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 
-1f70: 00 00 00 00 00 00 00 00 00 01 01 00 00 00 00 00 
-1f80: 00 00 00 00 00 00 00 00 01 01 00 00 00 00 00 00 
-1f90: 00 00 00 00 00 00 00 01 01 00 00 00 00 00 00 00 
-1fa0: 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 
-1fb0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-1fc0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-1fd0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-1fe0: 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 
-1ff0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-- 
cgit v1.2.3


From 91c9d1c9fc13cf163c6262437de16c992dadaa5b Mon Sep 17 00:00:00 2001
From: Flenk008 <frenk_0_0@hotmail.com>
Date: Mon, 13 Mar 2023 18:03:21 +0100
Subject: Revert "Background collision"

This reverts commit e47f7fa198229b8598b8ab03ef8b2483f7c685bc.
---
 .vscode/c_cpp_properties.json |   3 +-
 .vscode/launch.json           |   2 +-
 .vscode/tasks.json            |  69 +++-----------
 src/demo.c                    | 208 +++++++++---------------------------------
 src/entity.h                  |  17 +---
 src/ppusim/input.c            |   1 -
 6 files changed, 59 insertions(+), 241 deletions(-)

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 3a0c430..51f5ad0 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -2,8 +2,7 @@
     "configurations": [
         {
             "name": "src",
-            "compileCommands": "${workspaceFolder}/src/compile_commands.json",
-            "configurationProvider": "ms-vscode.makefile-tools"
+            "compileCommands": "${workspaceFolder}/src/compile_commands.json"
         }
     ],
     "version": 4
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 4ff91bb..2f7561c 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,7 +12,7 @@
             "environment": [],
             "externalConsole": false,
             "MIMode": "gdb",
-            "preLaunchTask": "build",
+            "preLaunchTask": "client/build",
             "setupCommands": [
                 {
                     "description": "Enable pretty-printing for gdb",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index a670b0f..53a235e 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -16,19 +16,13 @@
 				"isDefault": false,
 				"kind": "build"
 			},
-			"options": {
-				"cwd": "${workspaceFolder}/src"
-			},
+			"options": { "cwd": "${workspaceFolder}/src" },
 			"windows": {
 				"command": "make -j",
-				"args": [
-					""
-				]
+				"args": [ "" ],
 			},
 			"command": "make",
-			"args": [
-				"-j"
-			],
+			"args": [ "-j" ],
 			"type": "shell"
 		},
 		{
@@ -38,20 +32,13 @@
 				"isDefault": false,
 				"kind": "test"
 			},
-			"options": {
-				"cwd": "${workspaceFolder}/src"
-			},
+			"options": { "cwd": "${workspaceFolder}/src" },
 			"windows": {
 				"command": "make -j flash",
-				"args": [
-					""
-				]
+				"args": [ "" ],
 			},
 			"command": "make",
-			"args": [
-				"-j",
-				"flash"
-			],
+			"args": [ "-j", "flash" ],
 			"type": "shell"
 		},
 		{
@@ -61,19 +48,13 @@
 				"isDefault": false,
 				"kind": "test"
 			},
-			"options": {
-				"cwd": "${workspaceFolder}/src"
-			},
+			"options": { "cwd": "${workspaceFolder}/src" },
 			"windows": {
 				"command": "make compile_commands.json",
-				"args": [
-					""
-				]
+				"args": [ "" ],
 			},
 			"command": "make",
-			"args": [
-				"compile_commands"
-			],
+			"args": [ "compile_commands" ],
 			"type": "shell"
 		},
 		{
@@ -83,40 +64,14 @@
 				"isDefault": false,
 				"kind": "test"
 			},
-			"options": {
-				"cwd": "${workspaceFolder}"
-			},
+			"options": { "cwd": "${workspaceFolder}" },
 			"windows": {
 				"command": "make clean",
-				"args": [
-					""
-				]
+				"args": [ "" ],
 			},
 			"command": "make",
-			"args": [
-				"clean"
-			],
+			"args": [ "clean" ],
 			"type": "shell"
-		},
-		{
-			"type": "cppbuild",
-			"label": "C/C++: gcc.exe build active file",
-			"command": "C:\\msys64\\mingw64\\bin\\gcc.exe",
-			"args": [
-				"-fdiagnostics-color=always",
-				"-g",
-				"${file}",
-				"-o",
-				"${fileDirname}\\${fileBasenameNoExtension}.exe"
-			],
-			"options": {
-				"cwd": "C:\\msys64\\mingw64\\bin"
-			},
-			"problemMatcher": [
-				"$gcc"
-			],
-			"group": "build",
-			"detail": "compiler: C:\\msys64\\mingw64\\bin\\gcc.exe"
 		}
 	]
 }
diff --git a/src/demo.c b/src/demo.c
index f5d2e71..baaf73d 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -5,36 +5,21 @@
 #include "input.h"
 #include "ppu/ppu.h"
 
-#define HH_DEMO_BALL_COUNT 2
+#define HH_DEMO_BALL_COUNT 1
 hh_s_ppu_loc_fam_entry g_hh_demo_balls[HH_DEMO_BALL_COUNT];
 
 hh_s_entity_player g_hh_player_1 = {
-	.pos_x		 = 11000, 
-	.pos_y		 = 5000,
-	.radius		 = 4,
+	.pos_x		 = 31000, // 0b0000 0001 0011 0110
+	.pos_y		 = 21000,
+	.radius		 = 8,
 	.speed		 = 100,
-	.air_speed   = 80,
 	.direction_x = 1,
-	.accelY 		 = 0,
 	.rotation	 = 8,
 	.in_air		 = false,
 };
 
-hh_s_entity_enemy g_hh_enemy_1 = {
-	.pos_x		 = 16000, 
-	.pos_y		 = 20000,
-	.radius		 = 4,
-	.speed		 = 100,
-	.direction_x = 1,
-	.accelY 		 = 0,
-	.in_air		 = false,
-};
-
 void hh_player_movement();
 
-int hh_background_collision_x(hh_s_entity_player tempEntity);
-hh_s_entity_player hh_background_collision_y_player(hh_s_entity_player tempEntity);
-
 uint16_t g_hh_pos_x; // 0b0000 0001 0011 0110
 uint16_t g_hh_pos_y;
 uint8_t g_hh_left  = 0;
@@ -83,7 +68,7 @@ void hh_demo_loop(unsigned long frame) {
 	hh_player_movement();
 	// input testing (no hitbox stuff)
 	// g_hh_player_1.pos_x  += ((-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right)) * g_hh_player_1.speed; // -1 = L || 1 == R
-	g_hh_player_1.pos_y  += ((-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down)) * g_hh_player_1.speed; // -1 = D || 1 == U
+	// g_hh_player_1.pos_y  += ((-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down)) * g_hh_player_1.speed; // -1 = D || 1 == U
 
 
 	// adjust map size
@@ -91,14 +76,12 @@ void hh_demo_loop(unsigned long frame) {
 	g_hh_pos_y = g_hh_player_1.pos_y / 100;
 
 
+
+
 	// update player sprite on ppu
 	g_hh_demo_balls[0].position_x = g_hh_pos_x;
 	g_hh_demo_balls[0].position_y = g_hh_pos_y;
-
-	g_hh_demo_balls[1].position_x = 220;
-	g_hh_demo_balls[1].position_y = 220;
 	hh_ppu_update_foreground(0, g_hh_demo_balls[0]);
-	hh_ppu_update_foreground(1, g_hh_demo_balls[1]);
 
 	// set background pattern position
 	hh_ppu_update_aux((hh_s_ppu_loc_aux){
@@ -124,12 +107,6 @@ void hh_player_movement() {
 	int8_t directionX = (-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right); // -1 = L || 1 == R
 	int8_t directionY = (-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down);	   // -1 = D || 1 == U
 
-	if(g_hh_controller_p1.button_primary == 1 && g_hh_player_1.accelY == 0 && g_hh_player_1.in_air == false)
-	{
-		g_hh_player_1.accelY = 25;
-	}
-
-
 	uint8_t i, j;
 	uint8_t rotation = 0; // 0-7
 
@@ -147,162 +124,63 @@ void hh_player_movement() {
 			rotation++;
 		}
 	}
-	// X-axis calc
-	if (directionX != 0) // update direction and position if player is not idle 
+	// direction calc
+	if (directionX != 0) // update direction if player is not idle
 	{
 		g_hh_player_1.direction_x = directionX;
-		g_hh_player_1.pos_x = hh_background_collision_x(g_hh_player_1);
 	}
+	// collision map x-axis
 
-	
-	g_hh_player_1 = hh_background_collision_y_player(g_hh_player_1);
-
-}
-
-
-int hh_background_collision_x(hh_s_entity_player tempEntity){
 	// tile calc including radius and direction for background coliision
 
 	uint16_t tileColX;
-	uint16_t tileColY = (tempEntity.pos_y / 100) / 8;
+	uint16_t tileColY = (g_hh_player_1.pos_y / 100) / 16;
 	;
 
 	// remaining space between grid and exact
 	uint8_t modTileX;
+	uint8_t modTileY;
+
+	if (g_hh_player_1.in_air == false && directionX != 0) {
+		if (directionX == 1) {
+			tileColX = ((g_hh_player_1.pos_x / 100) + g_hh_player_1.radius) / 16;
+			modTileX = (g_hh_player_1.pos_x + (100 * g_hh_player_1.radius)) % 1600;
+		} else if (directionX == -1) {
+			tileColX = ((g_hh_player_1.pos_x / 100) - g_hh_player_1.radius) / 16;
+			modTileX = (g_hh_player_1.pos_x - (100 * g_hh_player_1.radius)) % 1600;
+		}
 
-
-		
-	if (tempEntity.direction_x == 1) {
-		tileColX = ((tempEntity.pos_x / 100) + tempEntity.radius) / 8;
-		modTileX = 800 -((tempEntity.pos_x + (100 * tempEntity.radius)) % 800);
-	} else if (tempEntity.direction_x == -1) {
-		tileColX = ((tempEntity.pos_x / 100) - tempEntity.radius )/ 8;
-		modTileX = (tempEntity.pos_x - (100 * tempEntity.radius)) % 800;
-	}
-	
-	tileColY = (( tempEntity.pos_y / 100) + tempEntity.radius) / 8; //bottom of player box
-	
-	if (HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + tempEntity.direction_x] != 1) {
-		tileColY = (( tempEntity.pos_y / 100) - tempEntity.radius) / 8; //bottom of player box
-		if (HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + tempEntity.direction_x] != 1) {
-			if(tempEntity.in_air== true){
-				tempEntity.pos_x= tempEntity.pos_x + (tempEntity.direction_x * tempEntity.air_speed); // 80% of max speed if in air
-			} else {
-				tempEntity.pos_x= tempEntity.pos_x + (tempEntity.direction_x * tempEntity.speed); // 80% of max speed if in air
-			}
-		} else {
-			if(tempEntity.in_air == true){
-				if (modTileX < tempEntity.air_speed) {
-					tempEntity.pos_x = tempEntity.pos_x + (tempEntity.direction_x * modTileX); // NEW x set
-				} else {
-					tempEntity.pos_x= tempEntity.pos_x + (tempEntity.direction_x * tempEntity.air_speed); //
-				}
-			} else {
-				if (modTileX < g_hh_player_1.speed) {
-					tempEntity.pos_x= tempEntity.pos_x + (tempEntity.direction_x * modTileX); // NEW x set
-				} else {
-					tempEntity.pos_x = tempEntity.pos_x + (tempEntity.direction_x * tempEntity.speed); // 
-				}
-			}
+		if (HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + directionX] != 1) {
+			g_hh_player_1.pos_x = g_hh_player_1.pos_x + (directionX * g_hh_player_1.speed); // NEW x set
 		}
-	} else if (HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + tempEntity.direction_x] == 1) {
-		if(tempEntity.in_air == true){
-			if (modTileX < tempEntity.air_speed) {
-				tempEntity.pos_x = tempEntity.pos_x + (tempEntity.direction_x * modTileX); // NEW x set
-			} else {
-				tempEntity.pos_x = tempEntity.pos_x + (tempEntity.direction_x * tempEntity.air_speed); //
-			}
-		} else {
+
+		else if (HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + directionX] == 1) {
 			if (modTileX < g_hh_player_1.speed) {
-				tempEntity.pos_x = tempEntity.pos_x + (tempEntity.direction_x * modTileX); // NEW x set
+				g_hh_player_1.pos_x = g_hh_player_1.pos_x + (directionX * modTileX); // NEW x set
 			} else {
-				tempEntity.pos_x= tempEntity.pos_x + (tempEntity.direction_x * tempEntity.speed); // 
+				g_hh_player_1.pos_x = g_hh_player_1.pos_x + (directionX * g_hh_player_1.speed); // NEW x set
 			}
 		}
-	}
-
-	
-	return tempEntity.pos_x;
-
-}
-
-hh_s_entity_player hh_background_collision_y_player(hh_s_entity_player tempEntity){
-
-	uint16_t tileColX;
-	uint16_t tileColY;
-	
-
-	// remaining space between grid and exact
-		uint8_t modTileY;
 
-	if(g_hh_controller_p1.button_primary == 1 && tempEntity.accelY == 0 && tempEntity.in_air == false)
+	} else // if in air different all borders have to be checked
 	{
-//		tempEntity.accelY = 25;
 	}
-	
-	tileColY = (( tempEntity.pos_y / 100) + tempEntity.radius) / 8; //bottom of player box
-	tileColX = ((tempEntity.pos_x / 100) + tempEntity.radius) / 8; //right of player
-	modTileY = ((tempEntity.pos_y + (100 * tempEntity.radius)) % 800); //bottom of box
 
-	//rework arfter jumping
-	if(tempEntity.accelY <= 0){ //falling
-		if(HH_DEMO_HITBOX_TILEMAP[tileColY+1][tileColX] != 1) {//check bottom right first
-			tileColX = ((tempEntity.pos_x / 100) - tempEntity.radius) / 8;
-			if(HH_DEMO_HITBOX_TILEMAP[tileColY+1][tileColX] != 1)	{
-				tempEntity.in_air = true;
-				tempEntity.pos_y = tempEntity.pos_y - (tempEntity.accelY * 8) ;// NEW y set 
-				if (tempEntity.accelY > -35){
-					tempEntity.accelY--;
-				}
-			}
-			else	{
-				if(modTileY < tempEntity.accelY * -8) {
-					tempEntity.pos_y = tempEntity.pos_y + (modTileY) ;// NEW y set 
-				} else {
-					tempEntity.pos_y = tempEntity.pos_y - (tempEntity.accelY * 8) ;// NEW y set 
-				}
-				tempEntity.in_air = false;
-				tempEntity.accelY = 0;
-			}
-		}
-		else	{
-			if(modTileY < tempEntity.accelY * -8) {
-				tempEntity.pos_y = tempEntity.pos_y + (modTileY) ;// NEW y set 
-			} else {
-				tempEntity.pos_y = tempEntity.pos_y - (tempEntity.accelY * 8) ;// NEW y set 
-			}
-			tempEntity.in_air = false;
-			tempEntity.accelY = 0;
-		}
+
+	if(directionY != 0)
+	{
+	//	g_hh_player_1.pos_y = g_hh_player_1.pos_y + (directionY * g_hh_player_1.speed * 2); // NEW x set
 	}
-	else{ //jumping
-		tileColY = (( tempEntity.pos_y / 100) - tempEntity.radius) / 8; //top of player box
-		modTileY = 800 -((tempEntity.pos_y + (100 * tempEntity.radius)) % 800); //top of box
-			if(HH_DEMO_HITBOX_TILEMAP[tileColY-1][tileColX] != 1) {//check bottom right first
-				tileColX = ((tempEntity.pos_x / 100) - tempEntity.radius) / 8;
-				if(HH_DEMO_HITBOX_TILEMAP[tileColY-1][tileColX] != 1)	{
-					tempEntity.pos_y = tempEntity.pos_y - (tempEntity.accelY * 8) ;// NEW y set 
-					tempEntity.in_air = true;
-					tempEntity.accelY--;
-				}	else	{
-				if(modTileY < tempEntity.accelY * -8) {
-					tempEntity.pos_y = tempEntity.pos_y - (modTileY) ;// NEW y set 
-				} else {
-					tempEntity.pos_y = tempEntity.pos_y - (tempEntity.accelY * 8) ;
-				}
-				tempEntity.accelY = 0;
-				}
-			}
-			else	{
-				if(modTileY < tempEntity.accelY * -8) {
-					tempEntity.pos_y = tempEntity.pos_y - (modTileY) ;// NEW y set //makew var gravity
-				} else {
-					tempEntity.pos_y = tempEntity.pos_y - (tempEntity.accelY * 8) ;// NEW y set //makew var gravity
-				}
-				tempEntity.accelY = 0;
-			}
-		
+	// collision map floor (y-axis) (falling)
+	//  if falling no jump press (implement)
+	/*
+	tileColY = (( g_hh_player_1.pos_y / 100) + g_hh_player_1.radius) / 16; //bottom of player box
+	modTileY = 1;
+	if(HH_DEMO_HITBOX_TILEMAP[tileColY+1][tileColX] != 1) //rework after jumping
+	{
+		g_hh_player_1.pos_y = g_hh_player_1.pos_y + 5 ;// NEW y set //makew var gravity
+		//playerStat = falling; //for later use of graphics/sound
 	}
-
-	return tempEntity;
+	*/
+	// else if(HH_DEMO_HITBOX_TILEMAP[])
 }
diff --git a/src/entity.h b/src/entity.h
index 3684252..181182b 100644
--- a/src/entity.h
+++ b/src/entity.h
@@ -8,20 +8,7 @@ typedef struct {
 	uint16_t pos_y;
 	uint8_t radius;
 	uint8_t rotation; //45 degrees steps 0 == right 2 == down 4 == left 6 == up
-	int8_t direction_x; //direction where its looking at in case no input;
-	int8_t accelY;
-	int16_t speed;	// default L/R MODifier
-	int16_t air_speed; // air L/R MODifier
+	uint8_t direction_x; //direction where its looking at in case no input;
+	int8_t speed;	//10 default L/R MODifier
 	bool in_air;
 } hh_s_entity_player;
-
-typedef struct {
-	uint16_t pos_x;
-	uint16_t pos_y;
-	uint8_t radius;
-	uint8_t direction_x; //direction where its walking towards;
-	int8_t accelY;
-	int16_t speed;	// default L/R MODifier
-	int16_t air_speed;
-	bool in_air;
-} hh_s_entity_enemy;
diff --git a/src/ppusim/input.c b/src/ppusim/input.c
index 4491a63..08bc382 100644
--- a/src/ppusim/input.c
+++ b/src/ppusim/input.c
@@ -12,5 +12,4 @@ void hh_input_read() {
 	g_hh_controller_p1.dpad_down  = kb[SDL_SCANCODE_S];
 	g_hh_controller_p1.dpad_left  = kb[SDL_SCANCODE_A];
 	g_hh_controller_p1.dpad_right = kb[SDL_SCANCODE_D];
-	g_hh_controller_p1.button_primary = kb[SDL_SCANCODE_K];
 }
-- 
cgit v1.2.3


From 47c76e5eabd2b7aa4eb0de7ca34b4ef9ac78f395 Mon Sep 17 00:00:00 2001
From: Flenk008 <frenk_0_0@hotmail.com>
Date: Mon, 13 Mar 2023 18:04:59 +0100
Subject: Revert "Revert "Merge branch 'dev' of
 https://github.com/Flenk008/avans-arcade into dev""

This reverts commit a9ad8e0a8ac5346108f1e2c1a0bf9360fadc20da.
---
 features.md                         |  72 +++++
 src/.gitignore                      |   1 +
 src/engine/TODO/entity.c            |  41 ---
 src/engine/TODO/entity.h            |  24 --
 src/engine/TODO/player_controller.h |   4 -
 src/engine/TODO/sprite_controller.h |   6 -
 src/engine/camera.c                 |  34 +++
 src/engine/camera.h                 |   6 +
 src/engine/draw_screen.c            |  62 +++++
 src/engine/draw_screen.h            |  16 +-
 src/engine/engine.c                 |   1 +
 src/engine/entity.c                 |  46 ++++
 src/engine/entity.h                 |  57 ++++
 src/engine/maths.c                  |  19 ++
 src/engine/maths.h                  |   7 +-
 src/engine/player_controller.c      | 167 ++++++++++++
 src/engine/player_controller.h      |   7 +
 src/engine/sprite_controller.c      |  22 ++
 src/engine/sprite_controller.h      | 106 ++++++++
 src/makefile                        |   8 +-
 src/ppusim/sim.c                    |  11 +-
 test/bin/exportingPalettes.md       |   4 +
 test/bin/test_file_read.c           |  13 +-
 test/bin/tilemap.pip                | 512 ++++++++++++++++++++++++++++++++++++
 24 files changed, 1157 insertions(+), 89 deletions(-)
 create mode 100644 features.md
 delete mode 100644 src/engine/TODO/entity.c
 delete mode 100644 src/engine/TODO/entity.h
 delete mode 100644 src/engine/TODO/player_controller.h
 delete mode 100644 src/engine/TODO/sprite_controller.h
 create mode 100644 src/engine/camera.c
 create mode 100644 src/engine/camera.h
 create mode 100644 src/engine/draw_screen.c
 create mode 100644 src/engine/entity.c
 create mode 100644 src/engine/entity.h
 create mode 100644 src/engine/maths.c
 create mode 100644 src/engine/player_controller.c
 create mode 100644 src/engine/player_controller.h
 create mode 100644 src/engine/sprite_controller.c
 create mode 100644 src/engine/sprite_controller.h
 create mode 100644 test/bin/exportingPalettes.md
 create mode 100644 test/bin/tilemap.pip

diff --git a/features.md b/features.md
new file mode 100644
index 0000000..d044232
--- /dev/null
+++ b/features.md
@@ -0,0 +1,72 @@
+Af/Cancelled/Implement in sprint 3
+Done
+## Checkpoint room (shop)
+| feature | status |
+|-|-|
+|Upgrade abilities|Implement in sprint 3|
+|Interaction with shopkeeper|Implement in sprint 3|
+
+## Upgrades abilities
+| feature | status |
+|-|-|
+|HP boost|Implement in sprint 3|
+|Jump boost|Implement in sprint 3|
+|Speed boost|Implement in sprint 3|
+|Regular dash|Implement in sprint 3|
+|Super punch|Implement in sprint 3|
+|Smoke bomb|Implement in sprint 3|
+
+## Levels
+| feature | status |
+|-|-|
+|Breakable blocks|Implement in sprint 3|
+|Hidden secrets|Implement in sprint 3|
+|Boss fights|Implement in sprint 3|
+|Enemies|Implement in sprint 3|
+|audio|Implement in sprint 3|
+
+## player (Gozer)
+| feature | status |
+|-|-|
+|Move X-as|Done|
+|Jump|Done|
+|Special ability|Implement in sprint 3|
+|Health|Implement in sprint 3|
+|Currency/Scoreboard|Implement in sprint 3|
+
+## Enemy (Menneke)
+| feature | status |
+|-|-|
+|Move X-as|Implement in sprint 3|
+|Jump|Implement in sprint 3|
+|Hunt player|Implement in sprint 3|
+|Health (1 HP)|Implement in sprint 3|
+|Currency/Scoreboard|Implement in sprint 3|
+
+## Enemy (Ventje)
+| feature | status |
+|-|-|
+|Move X-as|Implement in sprint 3|
+|Jump|Implement in sprint 3|
+|Hunt player|Implement in sprint 3|
+|Health (2 HP) |Implement in sprint 3|
+|Splitting upon defeat|Implement in sprint 3|
+|Currency/Scoreboard|Implement in sprint 3|
+
+## Enemy (Terror uil)
+| feature | status |
+|-|-|
+|Movement|Implement in sprint 3|
+|Hunt player|Implement in sprint 3|
+|Health (1 HP) |Implement in sprint 3|
+|Splitting upon defeat|Implement in sprint 3|
+|Currency/Scoreboard|Implement in sprint 3|
+
+## Could have additions if time is enough
+| feature | status |
+|-|-|
+|Multiplayer|Implement in sprint 3|
+|Shared HP|Implement in sprint 3|
+|Special ability|Implement in sprint 3|
+|Health|Implement in sprint 3|
+|Currency/Scoreboard|Implement in sprint 3|
diff --git a/src/.gitignore b/src/.gitignore
index d8325cf..504b995 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -4,3 +4,4 @@ main.bin
 main
 main.exe
 static/
+*.bin
diff --git a/src/engine/TODO/entity.c b/src/engine/TODO/entity.c
deleted file mode 100644
index fa550d5..0000000
--- a/src/engine/TODO/entity.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <stdbool.h>
-
-#include "hh_entity.h"
-#include "maths.h"
-
-/*
-    PLAYER: (pos on X)
-    ,___,
-    |   |
-    | X |
-    |___|
-
-*/
-
-bool hh_collision(vec2* pos1, vec2* pos2){
-    if (pos2->x == CLAMP(pos2->x,pos1->x,pos1->x+1.0f)){// hit x
-        return true;
-    }
-
-    if (pos2->y == CLAMP(pos2->y,pos1->y,pos1->y+0.99f)){// hit y
-        return true;
-    }
-    return false;
-}
-
-void hh_solve_collision(vec2* pos_environment, hh_entity* entity){
-    if (entity->vec.x > 0.0f){
-        entity->pos.x = MIN(entity->pos.x,pos_environment->x-1.0f);
-        entity->vec.x = 0.0f;
-    } else if (entity->vec.x < 0.0f){
-        entity->pos.x = MAX(entity->pos.x,pos_environment->x+1.0f);
-        entity->vec.x = 0.0f;
-    } else if (entity->vec.y > 0.0f){
-        entity->pos.x = MIN(entity->pos.x,pos_environment->x-1.0f);
-        entity->vec.x = 0.0f;
-    } else if (entity->vec.y < 0.0f){
-        entity->pos.x = MAX(entity->pos.x,pos_environment->x+1.0f);
-        entity->vec.x = 0.0f;
-    }
-}
-
diff --git a/src/engine/TODO/entity.h b/src/engine/TODO/entity.h
deleted file mode 100644
index fdbeb8a..0000000
--- a/src/engine/TODO/entity.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#include "maths.h"
-
-typedef struct {
-    vec2 pos, vec;
-    bool is_grounded;
-    int8_t hp;
-    //armor/block?
-}hh_entity;
-
-/// @brief detect for collision enity and eviroment
-/// @param pos1 position of environment tile to be checked
-/// @param pos2 position entity
-/// @return true if collision between enity and environment
-bool hh_collision(vec2* pos1, vec2* pos2);
-
-/// @brief solve collisions
-/// @param environment position
-/// @param entity position
-/// @return solved new entity position
-void hh_solve_collision(vec2* pos_environment, hh_entity* entity);
diff --git a/src/engine/TODO/player_controller.h b/src/engine/TODO/player_controller.h
deleted file mode 100644
index 1e9b86c..0000000
--- a/src/engine/TODO/player_controller.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "maths.h"
-#include "hh_entity.h"
-
-// inputs
diff --git a/src/engine/TODO/sprite_controller.h b/src/engine/TODO/sprite_controller.h
deleted file mode 100644
index c1fadff..0000000
--- a/src/engine/TODO/sprite_controller.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// handles sprites
-
-// Bg sprites
-
-
-// Fg or entity sprites
diff --git a/src/engine/camera.c b/src/engine/camera.c
new file mode 100644
index 0000000..e756bd4
--- /dev/null
+++ b/src/engine/camera.c
@@ -0,0 +1,34 @@
+#include "engine/camera.h"
+
+#include "ppu/consts.h"
+
+
+vec_cor hh_update_camera(vec_cen new, vec2 min, vec2 max){
+
+	//TODO: change floating point math to fix point math
+	//TODO: fix buggy y-axis ??
+
+	// new = vec_cen2cor(new,(vec2){.x=max.x/2,.y=max.y/2});
+	new = vec_cen2cor((vec2){.x=new.x+(HH_PPU_SPRITE_WIDTH/2),.y=(new.y+(HH_PPU_SPRITE_HEIGHT/2))*2},(vec2){.x=max.x/2,.y=max.y/2});
+	// new.x = new.x << HH_MATH_FIXED_POINT;
+	// new.y = new.y << HH_MATH_FIXED_POINT;
+	static vec_cor old;
+	// old.x = old.x << HH_MATH_FIXED_POINT;
+	// old.y = old.y << HH_MATH_FIXED_POINT;
+
+	// int16_t some = 0;
+	// some = some <<= HH_MATH_FIXED_POINT-1;
+
+	new.x = (int)((float)new.x*0.1f + (float)old.x*0.9f);
+	new.y = (int)((float)new.y*0.1f + (float)old.y*0.9f);
+
+	// old.x = old.x >> HH_MATH_FIXED_POINT;
+	// old.y = old.y >> HH_MATH_FIXED_POINT;
+
+
+	old.x = CLAMP(new.x,min.x,max.x);
+	old.y = CLAMP(new.y,min.y,max.y);
+
+	return old;
+}
+
diff --git a/src/engine/camera.h b/src/engine/camera.h
new file mode 100644
index 0000000..b3ffb52
--- /dev/null
+++ b/src/engine/camera.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "engine/maths.h"
+
+vec_cor hh_update_camera(vec_cor new, vec2 min, vec2 max);
+
diff --git a/src/engine/draw_screen.c b/src/engine/draw_screen.c
new file mode 100644
index 0000000..c4f3389
--- /dev/null
+++ b/src/engine/draw_screen.c
@@ -0,0 +1,62 @@
+#include "engine/draw_screen.h"
+#include "engine/sprite_controller.h"
+
+uint8_t hh_world_to_tile(vec2 pos){
+	
+    FILE* level = fopen("../test/bin/level1_test.bin", "rb"); /* open binary file */
+    if (!level) { /* check if file opened successfully */
+        fprintf(stderr, "Error: Failed to open file.\n");
+        return 0;
+    }
+	int index = ((pos.y/16)*40 + pos.x/16);//TODO: remove magic number(s)
+	fseek(level, (index * sizeof(int)) + sizeof(int), SEEK_SET);
+	int tile;// = (int*)malloc(sizeof(int));
+   fread(&tile, sizeof(int), 1, level); // read 1 tile from binary
+
+	fclose(level);
+	// int val = tile;
+	// free(tile);
+	return tile;
+}
+
+
+// remeber old value to know which part to update.
+vec2 previousViewport = { .x = 0, .y = 0 };
+void hh_draw_screen(vec_cor viewport){
+	if (viewport.x == previousViewport.x && viewport.y == previousViewport.y) return;
+	
+	hh_ppu_update_aux((hh_s_ppu_loc_aux){
+		.bg_shift_x = viewport.x,
+		.bg_shift_y = viewport.y,
+		.fg_fetch	= 0,
+		.sysreset	= 0,
+	});
+
+	// update previous viewport values
+	previousViewport = viewport;
+}
+
+void hh_setup_screen(){
+	//(HH_map_size_X*HH_map_size_Y)
+	int size = 2400; // max X = 40 en max Y = 80
+	FILE* level = fopen("../test/bin/level1_test.bin", "rb"); /* open binary file */
+	if (!level) { /* check if file opened successfully */
+		fprintf(stderr, "Error: Failed to open file.\n");
+		return;
+	}
+	fseek(level, (0* sizeof(int)) + sizeof(int), SEEK_SET);
+	int* tile = (int*)malloc(size*sizeof(int));
+   fread(tile, sizeof(int), size, level); // read 1 tile from binary
+
+	fclose(level);
+
+	for(int BAM_index = 0; BAM_index < size; BAM_index++){
+		hh_ppu_update_background(BAM_index, (hh_s_ppu_loc_bam_entry){
+			.horizontal_flip = false,
+			.vertical_flip   = false,
+			.palette_index   = hh_get_palette(tile[BAM_index]),
+			.tilemap_index   = tile[BAM_index],
+		});
+	}
+	free(tile);
+}
diff --git a/src/engine/draw_screen.h b/src/engine/draw_screen.h
index 4af5865..b181108 100644
--- a/src/engine/draw_screen.h
+++ b/src/engine/draw_screen.h
@@ -3,7 +3,19 @@
 
 // every function call for drawing the screen goes here.
 #include "engine/maths.h"
+#include "ppu/ppu.h"
 
+#include <stdio.h>
 #include <stdint.h>
-uint16_t hh_world_to_tile(vec2 pos);
-void hh_draw_screen(vec2 viewport);
\ No newline at end of file
+#include <stdlib.h>
+
+
+#define HH_map_size_X 80
+#define HH_map_size_Y 60
+
+/** @brief return a single tile from world binary */
+uint8_t hh_world_to_tile(vec2 pos);
+/** @brief shift to level if viewport changed position */
+void hh_draw_screen(vec2 viewport);
+/** @brief send data to BAM memory from binary level */
+void hh_setup_screen();
diff --git a/src/engine/engine.c b/src/engine/engine.c
index f3410a4..799ee7c 100644
--- a/src/engine/engine.c
+++ b/src/engine/engine.c
@@ -1,3 +1,4 @@
 #include "engine/draw_screen.h"
 #include "engine/level.h"
 #include "engine/maths.h"
+#include "engine/sprite_controller.h"
diff --git a/src/engine/entity.c b/src/engine/entity.c
new file mode 100644
index 0000000..153e7e1
--- /dev/null
+++ b/src/engine/entity.c
@@ -0,0 +1,46 @@
+#include <stdbool.h>
+
+#include "engine/entity.h"
+#include "engine/maths.h"
+
+/*
+    PLAYER: (pos on X)
+    ,___,
+    |   |
+    | X |
+    |___|
+
+*/
+
+bool hh_collision(vec_cor pos1, vec2 pos2){
+    if (pos2.x == CLAMP(pos2.x, pos1.x, pos1.x+16)){// hit x
+        return true;
+    }
+
+    if (pos2.y == CLAMP(pos2.y, pos1.y, pos1.y+16)){// hit y
+        return true;
+    }
+    return false;
+}
+
+void hh_solve_collision(vec2 pos_environment, hh_entity* entity){
+	if (!hh_collision(pos_environment,entity->pos))
+		return;
+
+	printf("BONK!/n");
+	// if (entity->vel.y > 0){
+	// 	entity->pos.y = MAX(entity->pos.y,pos_environment.y);
+	// 	entity->vel.y = 0;
+	// } else {
+	// 	entity->pos.y = MIN(entity->pos.y,pos_environment.y);
+	// 	entity->vel.y = 0;
+	// }
+	// if (entity->vel.x <= 0){
+	// 	entity->pos.x = MIN(entity->pos.x,pos_environment.x-16);
+	// 	entity->vel.x = 0;
+	// } else {
+	// 	entity->pos.x = MAX(entity->pos.x,pos_environment.x+16);
+	// 	entity->vel.x = 0;
+	// } 
+}
+
diff --git a/src/engine/entity.h b/src/engine/entity.h
new file mode 100644
index 0000000..f45dae2
--- /dev/null
+++ b/src/engine/entity.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "ppu/types.h"
+
+#include "engine/maths.h"
+
+typedef uint8_t hh_idx_t;
+
+typedef enum {
+	fire, ice, poison
+}hh_e_damage_t;
+
+typedef struct {
+	hh_s_ppu_loc_fam_entry fam; //screen
+	hh_idx_t frame0;
+	hh_idx_t palette;
+	
+}hh_s_rendering;
+
+typedef struct {
+	int8_t hp;
+	int8_t dmg;
+	hh_e_damage_t dmg_type;
+	int8_t speed_x, speed_y;
+
+} hh_s_atributes;
+
+
+typedef struct {
+    vec2 pos, vel, vec;
+    bool is_grounded;
+    int8_t hp;
+    int8_t speed;
+	 hh_s_rendering render;
+    //armor/block?
+}hh_entity;
+
+typedef struct {
+	hh_entity p;
+	hh_s_atributes atr;
+}hh_s_player;
+
+
+/// @brief detect for collision enity and eviroment
+/// @param pos1 position of environment tile to be checked
+/// @param pos2 position entity
+/// @return true if collision between enity and environment
+bool hh_collision(vec2 pos1, vec2 pos2);
+
+/// @brief solve collisions
+/// @param environment position
+/// @param entity position
+/// @return solved new entity position
+void hh_solve_collision(vec2 pos_environment, hh_entity* entity);
diff --git a/src/engine/maths.c b/src/engine/maths.c
new file mode 100644
index 0000000..475bba2
--- /dev/null
+++ b/src/engine/maths.c
@@ -0,0 +1,19 @@
+#include "engine/maths.h"
+
+vec2 vec_add(vec2 a, vec2 b){
+	return (vec2){a.x + b.x, a.y + b.y};
+}
+
+vec_cor vec_cen2cor(vec_cen in, vec2 halfDistance){
+	return (vec_cor){
+		.x = in.x - halfDistance.x,
+		.y = in.y - halfDistance.y,
+	};
+}
+
+vec_cen vec_cor2cen(vec_cor in, vec2 halfDistance){
+	return (vec_cen){
+		.x = in.x + halfDistance.x,
+		.y = in.y + halfDistance.y,
+	};
+}
diff --git a/src/engine/maths.h b/src/engine/maths.h
index c7f1b44..bef287e 100644
--- a/src/engine/maths.h
+++ b/src/engine/maths.h
@@ -3,12 +3,17 @@
 // #include <math.h>
 
 typedef struct {
-    uint32_t x,y;
+	int32_t x,y;
 } vec2;
 
 typedef vec2 vec_cen;//centered
 typedef vec2 vec_cor;//left upper corner
 
+vec2 vec_add(vec2 a, vec2 b);
+
+vec_cor vec_cen2cor(vec_cen in, vec2 halfDistance);
+vec_cor vec_cor2cen(vec_cen in, vec2 halfDistance);
+
 //fixed point at decimal 7lsb (world positions in pixels (with fixed decimal point))
 #define HH_MATH_FIXED_POINT 7
 
diff --git a/src/engine/player_controller.c b/src/engine/player_controller.c
new file mode 100644
index 0000000..6735620
--- /dev/null
+++ b/src/engine/player_controller.c
@@ -0,0 +1,167 @@
+#include "ppu/types.h"
+#include "engine/camera.h"
+#include "engine/draw_screen.h"
+#include "engine/sprite_controller.h"
+#include "engine/player_controller.h"
+
+#include "demo.h"
+#include <stdio.h>
+
+#include "input.h"
+
+void hh_player_actions() {
+	static hh_entity player={
+		.hp = 4,
+		.speed = 6,
+		.is_grounded = false,
+		.pos = (vec2){32,32},
+		.vel = (vec2){0,0},
+		.vec = (vec2){0,0},
+		.render = {
+			.frame0 = 20,
+			.palette = 7,
+			.fam = (hh_s_ppu_loc_fam_entry){
+				.horizontal_flip = false,
+				.vertical_flip = false,
+				.palette_index = 7,
+				.tilemap_index = 2,
+			}
+		}
+	}, player_new = {0};
+
+	// hh_input_read();
+	player.vel = (vec2){.x = (-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right),
+	.y = (-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down) };
+	// const int8_t maa = 3;
+	// const int8_t mbb = -3;
+	// if (g_hh_controller_p1.dpad_up)
+	//
+	// if (g_hh_controller_p1.dpad_down)
+	//
+	// if (g_hh_controller_p1.dpad_left) {
+	// 	player.vel.x += mbb;
+	// 	// g_hh_demo_balls[0].horizontal_flip = true;
+	// }
+	// if (g_hh_controller_p1.dpad_right) {
+	// 	player.vel.x += maa;
+	// 	// g_hh_demo_balls[0].horizontal_flip = true;
+	// }
+	// if (g_hh_controller_p1.button_primary /*&& player.is_grounded*/) //JUMP
+	// 	player.vel.y += -6;
+	// // // if (g_hh_controller_p1.button_secondary)
+
+	// player.render.fam.palette_index = 7;
+	// player.render.fam.tilemap_index = 7;
+
+	// printf("%x ",player.render.fam.palette_index);
+
+	// player.vel.y += 1; //gravity
+
+
+	//END OF VECTOR CHANGES
+	// player.vel.y = CLAMP(player.vel.y,-32,32);
+	// player.vel.x = CLAMP(player.vel.x,-32,32);
+
+	player_new.pos = (vec2){
+		.x = player.pos.x + player.vel.x,
+		.y = player.pos.y + player.vel.y,
+	};
+
+
+
+	// const uint8_t empty = 0;
+	// hh_s_tiles tiles[9];
+	// const vec2 tile_offset[9] = {
+	// 	(vec2){-16,-16},(vec2){0,-16},(vec2){+16,-16},
+	// 	(vec2){-16,0},  (vec2){0,0},  (vec2){+16,0},
+	// 	(vec2){-16,+16},(vec2){0,+16},(vec2){+16,+16},
+	// };
+	// for (int i = 0; i < 9; i++) {
+	// 	vec2 temp_pos = vec_add(player.pos, tile_offset[i]);
+	// 	temp_pos =(vec2){
+	// 		.x = temp_pos.x,
+	// 		.y = temp_pos.y,
+	// 	};
+	// 	hh_s_tiles tile = {
+	// 		.pos = temp_pos,
+	// 		.idx = hh_world_to_tile(temp_pos)
+	// 	};
+	// 	if(hh_colidable(tile.idx)) {
+	// 		tiles[i]=tile;
+	// 		// printf(" collidable near!");
+	// 	} else {
+	// 		tiles[i].idx = 0;
+	// 	}
+	// }
+	/*
+	012
+	345
+	678
+	*/
+	// for (int i = 0; i < 9; i++)
+	// {
+	// 	if (tiles[i].idx != 0){
+	// 		hh_solve_collision(tiles[i].pos, &player);
+	// 	}
+	// }
+
+	player_new.is_grounded = false;
+
+	// solves x collision
+	if (player.vel.x <= 0) {
+		if (hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player.pos.y + 0})) || 
+			hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player.pos.y + 15}))) {
+			player_new.pos.x = (player_new.pos.x & ~15) + 16,
+			player_new.vel.x = 0;
+		}
+	} else {
+		if (hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 16, .y=player.pos.y + 0})) || 
+			hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 16, .y=player.pos.y + 15}))) {
+			player_new.pos.x = player_new.pos.x & ~15, // <-- magic comma, NOT TOUCHY
+			player_new.vel.x = 0;
+		}
+	}
+
+	//solves y collision
+	if (player.vel.y <= 0) {
+		if (hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player_new.pos.y + 0})) || 
+			hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player_new.pos.y + 15}))) {
+			player_new.pos.y = (player_new.pos.y & ~15) + 16,
+			player_new.vel.y = 0;
+		}
+	} else {
+		if (hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player_new.pos.y + 16})) || 
+			hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 16, .y=player_new.pos.y + 15}))) {
+			player_new.pos.y = player_new.pos.y & ~15,
+			player_new.vel.y = 0;
+			player_new.is_grounded = true;
+		}
+	}
+
+	player = player_new;
+
+	vec_cor cam_pos;//value in tiles
+	// cam_pos = (vec2){0,0};
+	cam_pos = hh_update_camera(player.pos,(vec2){0,0},(vec2){.x=20*16,.y=30*16});//TODO: remove magic number(s)
+	// printf("%i, %i:%i, %i\n",player.pos.x,player.pos.y,cam_pos.x,cam_pos.y);
+	hh_draw_screen(cam_pos);
+	// update player sprite on ppu
+	player.render.fam.position_x = (player.pos.x-cam_pos.x);
+	player.render.fam.position_y = (player.pos.y-cam_pos.y);
+
+
+	player.render.fam.tilemap_index = 2;//TODO: these two lines should be redundant
+	player.render.fam.palette_index = 7;
+	hh_ppu_update_foreground(0, player.render.fam);
+
+
+	hh_s_ppu_loc_fam_entry sprite = {
+		.position_x = 16,
+		.position_y = 16,
+		.palette_index = 7,
+		.tilemap_index = 2,
+	};
+	hh_ppu_update_foreground(1, sprite);
+
+}
+
diff --git a/src/engine/player_controller.h b/src/engine/player_controller.h
new file mode 100644
index 0000000..400c18e
--- /dev/null
+++ b/src/engine/player_controller.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include "engine/maths.h"
+#include "engine/entity.h"
+// inputs
+
+void hh_player_actions();
diff --git a/src/engine/sprite_controller.c b/src/engine/sprite_controller.c
new file mode 100644
index 0000000..5d93cf8
--- /dev/null
+++ b/src/engine/sprite_controller.c
@@ -0,0 +1,22 @@
+#include <stdint.h>
+
+#include "engine/sprite_controller.h"
+#include "ppu/types.h"
+#include "ppu/consts.h"
+#include "ppu/ppu.h"
+
+uint8_t hh_get_palette(uint8_t tile_idx) {
+	return hh_g_sprite_palette[tile_idx];
+}
+
+void hh_setup_palettes(){
+	for (int idx = 0; idx < HH_PPU_PALETTE_COUNT; idx++) {
+		for (int col = 0; col < HH_PPU_PALETTE_COLOR_COUNT; col++) {
+			hh_ppu_update_color(idx,col,hh_g_palette[idx][col]);
+		}
+	}	
+}
+
+bool hh_colidable(uint8_t tile_idx){
+	return (hh_get_palette(tile_idx) != 0);
+}
diff --git a/src/engine/sprite_controller.h b/src/engine/sprite_controller.h
new file mode 100644
index 0000000..001a459
--- /dev/null
+++ b/src/engine/sprite_controller.h
@@ -0,0 +1,106 @@
+#pragma once
+#include <stdint.h>
+
+#include "ppu/types.h"
+
+// handles sprites
+
+// Bg sprites
+
+// Fg or entity sprites
+
+//TODO: pack data inside of sprite_palette LUT
+//HH_PPU_PALETTE_COUNT
+#define HH_SPRITE_COUNT 40
+#define HH_PAL_IDX_SKY 0
+#define HH_PAL_IDX_BRICK 1
+const static uint8_t hh_g_sprite_palette[HH_SPRITE_COUNT] = {
+	0,1,1,1,1,1,1,1,1,1, //1+9
+	1,1,1,1,1,1,1,1,1,1, //6+4
+	1,1,1,1,1,1,1,1,1,	//9
+	7,7,7,2,7,7,1,2,7
+	//other palettes here:
+};
+
+
+const static hh_ppu_loc_palette_table_t hh_g_palette = {
+	{//palette info here
+		{0x1,0x2,0x3},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0}},
+	{//Bricks
+		{0x1,0x2,0x3},//01
+		{0xd,0x8,0xa},//24
+		{0x0,0x0,0x1},//25
+		{0x1,0x1,0x1},//26
+		{0x1,0x1,0x2},//27
+		{0x2,0x2,0x3},//28
+		{0x3,0x4,0x5},//29
+		{0x5,0x1,0x7}},
+	{//slime
+		{0x1,0x2,0x3},
+		{0x1,0x3,0x2},
+		{0x4,0x8,0x3},
+		{0x7,0xa,0x4},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0}},
+	{
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0}},
+	{
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0}},
+	{
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0}},
+	{
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0}},
+	{
+		{0x0,0xf,0xf},
+		{0xf,0xf,0xf},
+		{0xf,0x0,0xf},
+		{0xf,0xf,0x0},
+		{0xf,0x0,0x0},
+		{0x0,0xf,0x0},
+		{0x0,0x0,0xf},
+		{0x0,0x0,0x0}}
+};
+
+void hh_setup_palettes();
+
+/** @brief return palette index that belongs to tilemap index */
+uint8_t hh_get_palette(uint8_t tile_idx);
+
+bool hh_colidable(uint8_t tile_idx);
diff --git a/src/makefile b/src/makefile
index 96751fb..d7d9087 100644
--- a/src/makefile
+++ b/src/makefile
@@ -31,7 +31,13 @@ LOCAL_SRCS += main.c \
 							ppu/internals.c \
 							ppu/ppu.c \
 							demo.c \
-							engine/engine.c
+							engine/engine.c \
+							engine/sprite_controller.c \
+							engine/player_controller.c \
+							engine/draw_screen.c \
+							engine/camera.c \
+							engine/maths.c \
+							engine/entity.c
 
 CFLAGS += $(SHARED_FLAGS)
 LFLAGS += $(SHARED_FLAGS)
diff --git a/src/ppusim/sim.c b/src/ppusim/sim.c
index 1fceb82..a5fec45 100644
--- a/src/ppusim/sim.c
+++ b/src/ppusim/sim.c
@@ -29,20 +29,21 @@ void hh_ppu_init() {
 }
 
 void hh_ppu_load_tilemap() {
-	char* filename = "tiles.bin";
+	char* filename = "../test/bin/tiles.bin";
 	FILE* fp = fopen(filename,"rb");
 	if (!fp){
+		fprintf(stderr,"Error: Failed to load tiles.");
 		return;//error
 	}
-
+	int sprite_size = (HH_PPU_SPRITE_WIDTH * HH_PPU_SPRITE_HEIGHT);
 	fseek(fp, 0, SEEK_END);//goto EOF
-	int _size = ftell(fp)/HH_PPU_VRAM_TMM_SPRITE_SIZE;
+	int _size = ftell(fp)/sprite_size;
 	fseek(fp, 0, 0);//goto start of file
 
 	for (int i = 0; i < _size; i++) {
-		uint8_t data[HH_PPU_VRAM_TMM_SPRITE_SIZE];
+		uint8_t data[sprite_size];
 
-		fread(data,HH_PPU_VRAM_TMM_SPRITE_SIZE,1,fp);
+		fread(data,sizeof(uint8_t),sprite_size,fp);
 		
 		hh_s_ppu_vram_data sprite = hh_ppu_2nat_sprite(data);
 		sprite.offset = i*HH_PPU_VRAM_TMM_SPRITE_SIZE;
diff --git a/test/bin/exportingPalettes.md b/test/bin/exportingPalettes.md
new file mode 100644
index 0000000..be4a354
--- /dev/null
+++ b/test/bin/exportingPalettes.md
@@ -0,0 +1,4 @@
+```sh
+cat test.src|head -n 46 | awk '{printf "%02x: {0x%x,0x%x,0x%x}\n",NR,$1/2,$2/2,$3/2 }' > hex_palettes
+```
+
diff --git a/test/bin/test_file_read.c b/test/bin/test_file_read.c
index b3357ce..df93395 100644
--- a/test/bin/test_file_read.c
+++ b/test/bin/test_file_read.c
@@ -16,19 +16,22 @@ void printData(uint8_t* in) {
 }
 
 void hh_ppu_load_tilemap() {
-	char* filename = "tiles.bin";
+
+	
+	char* filename = "slime.bin";
 	FILE* fp = fopen(filename,"rb");
 	if (!fp){
 		return;//error
 	}
 
+	int sprite_size = (16 * 16);
 	fseek(fp, 0, SEEK_END);
-	int _size = ftell(fp)/HH_PPU_VRAM_TMM_SPRITE_SIZE;
-	fseek(fp, 0, 0);
+	int _size = ftell(fp)/sprite_size;
+	rewind(fp);
 	// printf("%i",_size);
 	for (int i = 0; i < _size; i++) {
-		uint8_t data[HH_PPU_VRAM_TMM_SPRITE_SIZE];
-		fread(data,HH_PPU_VRAM_TMM_SPRITE_SIZE,1,fp);
+		uint8_t data[sprite_size];
+		fread(data,1,sprite_size,fp);
 		
 		printData(data);
 	}
diff --git a/test/bin/tilemap.pip b/test/bin/tilemap.pip
new file mode 100644
index 0000000..c0c646e
--- /dev/null
+++ b/test/bin/tilemap.pip
@@ -0,0 +1,512 @@
+0000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+0090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+00a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+00b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+00c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+00d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+00e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+00f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+0100: 06 06 06 06 06 05 06 06 06 06 06 05 06 06 06 06 
+0110: 06 05 05 05 05 03 05 05 05 05 05 03 05 05 05 05 
+0120: 06 05 04 04 04 03 05 05 05 05 05 03 05 05 05 05 
+0130: 06 04 04 04 04 02 02 02 02 02 02 02 02 02 02 02 
+0140: 06 04 04 04 04 02 02 03 03 03 03 03 03 02 03 03 
+0150: 05 04 04 04 04 02 03 03 03 03 03 03 03 02 03 03 
+0160: 05 04 04 04 04 02 03 03 03 03 03 03 03 02 03 03 
+0170: 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 02 
+0180: 06 06 04 04 04 04 04 02 02 02 03 03 03 03 02 02 
+0190: 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
+01a0: 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 02 
+01b0: 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 
+01c0: 00 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 
+01d0: 00 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 
+01e0: 00 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 
+01f0: 06 06 06 05 05 05 02 02 02 02 02 02 02 02 02 02 
+0200: 06 06 06 05 06 06 06 06 06 06 06 05 06 06 06 06 
+0210: 05 05 05 03 05 05 05 05 05 05 05 03 05 05 05 05 
+0220: 05 05 05 03 05 05 05 05 05 05 05 03 05 05 05 05 
+0230: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+0240: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
+0250: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
+0260: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
+0270: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+0280: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
+0290: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
+02a0: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
+02b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+02c0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
+02d0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
+02e0: 02 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
+02f0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+0300: 06 06 06 05 06 06 06 06 06 06 05 06 06 06 06 06 
+0310: 05 05 05 03 05 05 05 05 05 05 03 05 05 05 05 06 
+0320: 05 05 05 03 05 05 05 05 05 05 03 04 04 05 05 06 
+0330: 02 02 02 02 02 02 02 02 02 02 02 04 04 04 04 06 
+0340: 03 03 03 03 03 02 03 03 03 03 02 04 04 04 04 06 
+0350: 03 03 03 03 03 02 03 03 03 03 02 04 04 04 04 05 
+0360: 03 03 03 03 03 02 03 03 03 03 02 04 04 04 04 05 
+0370: 02 02 02 02 02 02 02 02 02 02 02 03 03 03 03 05 
+0380: 03 03 03 03 03 03 03 02 04 04 04 04 04 05 05 00 
+0390: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
+03a0: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
+03b0: 02 02 02 02 02 02 02 02 02 02 02 05 05 06 06 06 
+03c0: 03 02 03 03 03 03 03 03 03 02 04 04 04 04 04 06 
+03d0: 03 02 03 03 03 03 03 03 03 02 04 04 04 04 04 06 
+03e0: 03 02 03 03 03 03 03 03 03 02 04 04 04 04 04 05 
+03f0: 02 02 02 02 02 02 02 02 02 02 02 02 03 03 03 05 
+0400: 06 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
+0410: 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
+0420: 05 04 04 04 04 04 04 02 02 03 03 03 03 03 02 02 
+0430: 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 
+0440: 00 05 04 04 04 03 02 03 03 03 03 03 03 02 03 03 
+0450: 00 05 04 04 04 02 03 03 03 03 03 03 03 02 03 03 
+0460: 00 04 04 04 04 02 03 03 03 03 03 02 02 02 02 03 
+0470: 06 06 05 05 02 02 02 02 02 02 02 02 02 02 02 02 
+0480: 06 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
+0490: 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
+04a0: 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 02 
+04b0: 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 
+04c0: 00 05 05 04 04 04 04 03 02 03 03 03 03 03 03 03 
+04d0: 00 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 
+04e0: 00 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 
+04f0: 00 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 
+0500: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
+0510: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
+0520: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
+0530: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+0540: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
+0550: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
+0560: 03 03 03 03 03 02 03 03 03 03 03 03 02 02 02 03 
+0570: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+0580: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
+0590: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
+05a0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
+05b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+05c0: 02 02 02 03 03 03 03 03 03 02 03 03 03 03 03 03 
+05d0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
+05e0: 03 02 03 03 03 03 03 03 02 02 02 03 03 03 03 03 
+05f0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+0600: 03 03 03 02 03 03 03 03 03 03 03 02 04 04 05 00 
+0610: 03 03 03 02 03 03 03 03 03 03 03 02 04 04 05 00 
+0620: 03 03 02 02 03 03 03 03 03 03 03 02 04 04 04 00 
+0630: 02 02 02 02 02 02 02 02 02 02 02 02 02 06 06 06 
+0640: 03 03 03 03 03 02 03 03 03 02 04 04 04 04 04 06 
+0650: 03 03 03 03 03 02 03 03 03 02 04 04 04 04 04 05 
+0660: 03 03 03 03 03 02 03 03 03 02 04 04 04 04 04 05 
+0670: 02 02 02 02 02 02 02 02 02 02 02 03 03 03 03 05 
+0680: 03 03 03 03 03 03 03 02 04 04 04 04 04 05 05 00 
+0690: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
+06a0: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
+06b0: 02 02 02 02 02 02 02 02 02 02 02 03 03 06 06 06 
+06c0: 03 02 03 03 03 03 03 03 03 02 04 04 04 04 04 06 
+06d0: 03 02 03 03 03 03 03 03 03 02 04 04 04 04 04 05 
+06e0: 03 02 03 03 03 03 03 03 03 02 04 04 04 04 04 05 
+06f0: 02 02 02 02 02 02 02 02 02 02 02 02 03 03 03 05 
+0700: 06 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
+0710: 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
+0720: 05 04 04 04 04 04 04 02 02 03 03 03 03 03 02 02 
+0730: 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 
+0740: 00 05 04 04 04 03 02 03 03 03 03 03 03 02 03 03 
+0750: 00 05 04 04 04 02 03 03 03 03 03 03 03 02 03 03 
+0760: 00 04 04 04 04 02 03 03 03 03 03 02 02 02 02 03 
+0770: 06 06 05 05 02 02 02 02 02 02 02 02 02 02 02 02 
+0780: 06 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
+0790: 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
+07a0: 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 02 
+07b0: 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 
+07c0: 00 05 05 04 04 04 04 04 04 04 04 02 02 02 02 04 
+07d0: 00 05 05 04 04 04 04 04 04 04 04 04 02 04 04 04 
+07e0: 00 06 05 05 05 04 04 04 04 04 04 04 03 04 04 04 
+07f0: 00 06 06 06 05 05 05 05 05 05 05 05 03 05 05 05 
+0800: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
+0810: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
+0820: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
+0830: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+0840: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
+0850: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
+0860: 03 03 03 03 03 02 03 03 03 03 03 03 02 02 02 03 
+0870: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+0880: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
+0890: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
+08a0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
+08b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+08c0: 04 04 04 04 04 04 04 04 03 03 03 04 04 04 04 04 
+08d0: 04 04 04 04 04 04 04 04 04 03 03 04 04 04 04 04 
+08e0: 04 04 04 04 04 04 04 04 04 03 04 04 04 04 04 04 
+08f0: 05 05 05 05 05 05 05 05 05 03 05 05 05 05 05 05 
+0900: 03 03 03 02 03 03 03 03 03 03 03 02 04 04 05 00 
+0910: 03 03 03 02 03 03 03 03 03 03 03 02 04 04 05 00 
+0920: 03 03 02 02 03 03 03 03 03 03 03 02 04 04 04 00 
+0930: 02 02 02 02 02 02 02 02 02 02 02 02 02 06 06 06 
+0940: 03 03 03 03 03 02 03 03 03 02 04 04 04 04 04 06 
+0950: 03 03 03 03 03 02 03 03 03 02 04 04 04 04 04 05 
+0960: 03 03 03 03 03 02 03 03 03 02 04 04 04 04 04 05 
+0970: 02 02 02 02 02 02 02 02 02 02 02 03 03 03 03 05 
+0980: 03 03 03 03 03 03 03 02 04 04 04 04 04 05 05 00 
+0990: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
+09a0: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
+09b0: 02 02 02 02 02 02 03 03 03 03 03 03 03 06 06 06 
+09c0: 04 04 03 03 03 04 04 04 04 04 04 04 04 04 05 06 
+09d0: 04 04 04 03 03 04 04 04 04 04 04 04 04 05 05 05 
+09e0: 04 04 04 03 04 04 04 04 04 04 04 05 05 05 05 06 
+09f0: 05 05 05 03 05 05 05 05 05 05 05 05 05 06 06 06 
+0a00: 06 06 06 06 06 05 06 06 06 06 06 05 06 06 06 06 
+0a10: 06 05 05 05 05 03 05 05 05 05 05 03 05 05 05 05 
+0a20: 06 05 04 04 04 03 05 05 05 05 05 03 05 05 05 05 
+0a30: 06 04 04 04 04 02 02 02 02 02 02 02 02 02 02 02 
+0a40: 06 04 04 04 04 02 02 03 03 03 03 03 03 02 03 03 
+0a50: 05 04 04 04 04 02 03 03 03 03 03 03 03 02 03 03 
+0a60: 05 04 04 04 04 02 03 03 03 03 03 03 03 02 03 03 
+0a70: 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 02 
+0a80: 06 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
+0a90: 05 04 04 04 04 04 04 02 03 03 03 03 03 03 03 02 
+0aa0: 05 04 04 04 04 04 04 02 02 03 03 03 03 03 03 02 
+0ab0: 05 03 03 03 03 03 02 02 02 02 02 02 02 02 02 02 
+0ac0: 00 05 05 04 04 04 04 04 04 04 04 02 02 02 02 04 
+0ad0: 00 05 05 04 04 04 04 04 04 04 04 04 02 04 04 04 
+0ae0: 00 06 05 05 05 04 04 04 04 04 04 04 03 04 04 04 
+0af0: 00 06 06 06 05 05 05 05 05 05 05 05 03 05 05 05 
+0b00: 06 06 06 05 06 06 06 06 06 06 06 05 06 06 06 06 
+0b10: 05 05 05 03 05 05 05 05 05 05 05 03 05 05 05 05 
+0b20: 05 05 05 03 05 05 05 05 05 05 05 03 05 05 05 05 
+0b30: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+0b40: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
+0b50: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
+0b60: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
+0b70: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+0b80: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
+0b90: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
+0ba0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
+0bb0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+0bc0: 04 04 04 04 04 04 04 04 03 03 03 04 04 04 04 04 
+0bd0: 04 04 04 04 04 04 04 04 04 03 03 04 04 04 04 04 
+0be0: 04 04 04 04 04 04 04 04 04 03 04 04 04 04 04 04 
+0bf0: 05 05 05 05 05 05 05 05 05 03 05 05 05 05 05 05 
+0c00: 06 06 06 05 06 06 06 06 06 06 05 06 06 06 06 06 
+0c10: 05 05 05 03 05 05 05 05 05 05 03 05 05 05 05 06 
+0c20: 05 05 05 03 05 05 05 05 05 05 03 04 04 05 05 06 
+0c30: 02 02 02 02 02 02 02 02 02 02 02 04 04 04 04 06 
+0c40: 03 03 03 03 03 02 03 03 03 03 02 04 04 04 04 06 
+0c50: 03 03 03 03 03 02 03 03 03 03 02 04 04 04 04 05 
+0c60: 03 03 03 03 03 02 03 03 03 03 02 04 04 04 04 05 
+0c70: 02 02 02 02 02 02 02 02 02 02 02 03 03 03 03 05 
+0c80: 03 03 03 03 03 03 03 02 04 04 04 04 04 05 05 00 
+0c90: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
+0ca0: 03 03 03 03 03 03 03 02 04 04 04 04 04 04 05 00 
+0cb0: 02 02 02 02 02 02 03 03 03 03 03 03 03 06 06 06 
+0cc0: 04 04 03 03 03 04 04 04 04 04 04 04 04 04 05 06 
+0cd0: 04 04 04 03 03 04 04 04 04 04 04 04 04 05 05 05 
+0ce0: 04 04 04 03 04 04 04 04 04 04 04 05 05 05 05 06 
+0cf0: 05 05 05 03 05 05 05 05 05 05 05 05 05 06 06 06 
+0d00: 06 06 06 06 06 05 06 06 06 06 05 06 06 06 06 06 
+0d10: 06 05 05 05 05 03 05 05 05 05 03 05 05 05 05 06 
+0d20: 06 05 04 04 04 03 05 05 05 05 03 04 04 05 05 06 
+0d30: 06 04 04 04 04 02 02 02 02 02 02 04 04 04 04 06 
+0d40: 06 04 04 04 04 02 02 03 03 03 02 04 04 04 04 06 
+0d50: 05 04 04 04 04 02 03 03 03 03 02 04 04 04 04 05 
+0d60: 05 04 04 04 04 02 03 03 03 03 02 04 04 04 04 05 
+0d70: 03 03 03 03 03 02 02 02 02 02 02 03 03 03 03 05 
+0d80: 06 06 04 04 04 04 04 02 04 04 04 04 04 05 05 00 
+0d90: 05 04 04 04 04 04 04 02 04 04 04 04 04 04 05 00 
+0da0: 05 04 04 04 04 04 04 02 04 04 04 04 04 04 05 00 
+0db0: 05 03 03 03 03 03 02 02 02 02 02 05 05 06 06 06 
+0dc0: 00 05 04 04 04 04 04 04 03 02 04 04 04 04 04 06 
+0dd0: 00 05 04 04 04 04 04 04 03 02 04 04 04 04 04 06 
+0de0: 00 05 04 04 04 04 04 04 03 02 04 04 04 04 04 05 
+0df0: 06 06 06 05 05 05 02 02 02 02 02 02 03 03 03 05 
+0e00: 06 04 04 04 04 04 04 02 03 03 03 02 04 04 05 00 
+0e10: 05 04 04 04 04 04 04 02 03 03 03 02 04 04 05 00 
+0e20: 05 04 04 04 04 04 04 02 03 03 03 02 04 04 04 00 
+0e30: 05 03 03 03 03 03 02 02 02 02 02 02 02 06 06 06 
+0e40: 00 05 04 04 04 03 02 03 03 02 04 04 04 04 04 06 
+0e50: 00 05 04 04 04 02 03 03 03 02 04 04 04 04 04 05 
+0e60: 00 04 04 04 04 02 03 03 03 02 03 04 04 04 04 05 
+0e70: 06 06 05 05 02 02 02 02 02 02 02 03 03 03 03 05 
+0e80: 06 04 04 04 04 04 04 02 04 04 04 04 04 05 05 00 
+0e90: 05 04 04 04 04 04 04 02 04 04 04 04 04 04 05 00 
+0ea0: 05 04 04 04 04 04 04 02 04 04 04 04 04 04 05 00 
+0eb0: 05 03 03 03 03 03 02 02 02 02 02 03 03 06 06 06 
+0ec0: 00 05 05 04 04 04 03 03 03 03 03 04 04 04 04 06 
+0ed0: 00 05 04 04 04 04 03 03 03 03 04 04 04 04 04 05 
+0ee0: 00 05 04 04 04 03 03 03 03 03 04 04 04 04 04 05 
+0ef0: 00 05 03 03 03 03 03 02 02 02 02 02 03 03 03 05 
+0f00: 06 04 04 04 04 04 04 02 03 03 03 02 04 04 05 00 
+0f10: 05 04 04 04 04 04 04 02 03 03 03 02 04 04 05 00 
+0f20: 05 04 04 04 04 04 04 02 03 03 03 02 04 04 04 00 
+0f30: 05 03 03 03 03 03 02 02 02 02 02 02 02 06 06 06 
+0f40: 00 05 04 04 04 03 02 03 03 02 04 04 04 04 04 06 
+0f50: 00 05 04 04 04 02 03 03 03 02 04 04 04 04 04 05 
+0f60: 00 04 04 04 04 02 03 03 03 02 04 04 04 04 04 05 
+0f70: 06 06 05 05 02 02 02 02 02 02 02 03 03 03 03 05 
+0f80: 06 04 04 04 04 04 04 02 04 04 04 04 04 05 05 00 
+0f90: 05 04 04 04 04 04 04 02 04 04 04 04 04 04 05 00 
+0fa0: 05 04 04 04 04 04 04 02 04 04 04 04 04 04 05 00 
+0fb0: 05 03 03 03 03 03 02 02 03 03 03 03 03 06 06 06 
+0fc0: 00 05 05 04 04 04 04 04 04 04 04 04 04 04 05 06 
+0fd0: 00 05 05 04 04 04 04 04 04 04 04 04 04 05 05 05 
+0fe0: 00 06 05 05 05 04 04 04 04 04 04 05 05 05 05 06 
+0ff0: 00 06 06 06 05 05 05 05 05 05 05 05 05 06 06 06 
+1000: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
+1010: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
+1020: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
+1030: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1040: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
+1050: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
+1060: 03 03 03 03 03 02 03 03 03 03 03 03 02 02 02 03 
+1070: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1080: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
+1090: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
+10a0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
+10b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+10c0: 02 02 02 03 03 03 03 03 03 02 03 03 03 04 04 04 
+10d0: 03 02 03 03 03 03 03 03 03 02 03 03 04 04 04 04 
+10e0: 03 02 03 03 03 03 03 03 02 02 02 03 04 04 04 04 
+10f0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1100: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
+1110: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
+1120: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
+1130: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1140: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
+1150: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
+1160: 03 03 03 03 03 02 03 03 03 03 03 03 02 02 02 03 
+1170: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1180: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
+1190: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
+11a0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
+11b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+11c0: 02 02 02 04 04 03 03 03 03 02 03 03 03 03 03 03 
+11d0: 04 02 04 04 04 04 03 03 03 02 03 03 03 03 03 03 
+11e0: 04 02 04 04 04 04 03 03 02 02 02 03 03 03 03 03 
+11f0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1200: 03 03 02 02 02 03 03 03 03 03 03 02 02 05 05 05 
+1210: 03 03 03 02 03 03 03 03 03 03 03 02 03 05 05 05 
+1220: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 05 05 
+1230: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1240: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
+1250: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
+1260: 03 03 03 03 03 02 03 03 03 03 03 03 02 02 02 03 
+1270: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1280: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
+1290: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
+12a0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
+12b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+12c0: 02 02 02 03 03 03 03 03 03 02 03 03 03 03 03 03 
+12d0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
+12e0: 03 02 03 03 03 03 03 03 02 02 02 03 03 03 03 03 
+12f0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1300: 06 05 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
+1310: 05 05 05 02 03 03 03 03 03 03 03 02 03 03 03 03 
+1320: 05 05 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
+1330: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1340: 03 03 03 03 02 02 03 03 03 03 03 03 03 02 03 03 
+1350: 03 03 03 03 03 02 03 03 03 03 03 03 03 02 03 03 
+1360: 03 03 03 03 03 02 03 03 03 03 03 03 02 02 02 03 
+1370: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1380: 02 03 03 03 03 03 03 02 03 03 03 03 03 03 02 02 
+1390: 03 03 03 03 03 03 03 02 03 03 03 03 03 03 03 02 
+13a0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
+13b0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+13c0: 02 02 02 03 03 03 03 03 03 02 03 03 03 03 03 03 
+13d0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
+13e0: 03 02 03 03 03 03 03 03 02 02 02 03 03 03 03 03 
+13f0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1400: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1410: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1420: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1430: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1440: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1450: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1460: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1470: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1480: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1490: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+14a0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+14b0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+14c0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+14d0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+14e0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+14f0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1500: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
+1510: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
+1520: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
+1530: 02 02 02 02 02 02 02 02 02 02 02 02 02 01 01 01 
+1540: 03 03 03 03 02 02 03 03 02 02 02 02 02 01 02 02 
+1550: 03 03 03 03 03 02 02 02 02 02 02 02 02 01 02 02 
+1560: 03 03 03 03 03 01 02 02 02 02 02 02 01 01 01 02 
+1570: 02 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 
+1580: 02 03 03 03 02 02 02 01 02 02 02 02 02 02 01 01 
+1590: 03 03 03 03 02 02 02 01 02 02 02 02 02 02 02 01 
+15a0: 03 03 03 03 02 02 01 01 01 01 02 02 02 02 01 01 
+15b0: 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 01 
+15c0: 02 02 02 03 03 02 02 02 02 01 02 02 02 01 01 01 
+15d0: 03 02 03 03 03 02 02 02 02 01 02 02 01 01 01 01 
+15e0: 03 02 03 03 03 03 02 02 01 01 01 02 01 01 01 01 
+15f0: 02 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 
+1600: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
+1610: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
+1620: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
+1630: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1640: 02 02 02 02 01 01 02 02 02 02 02 02 02 01 02 02 
+1650: 02 02 02 02 02 01 02 02 02 02 02 02 02 01 02 02 
+1660: 02 02 02 02 02 01 02 02 02 02 02 02 01 01 01 02 
+1670: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1680: 01 02 02 02 02 02 02 01 02 02 02 02 02 02 01 01 
+1690: 01 02 02 02 02 02 02 01 02 02 02 02 02 02 02 01 
+16a0: 01 02 02 02 01 01 01 01 01 01 02 02 02 02 02 01 
+16b0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+16c0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+16d0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+16e0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+16f0: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1700: 03 03 02 02 02 03 03 03 03 03 03 02 02 03 03 03 
+1710: 03 03 03 02 03 03 03 03 03 03 03 02 03 03 03 03 
+1720: 03 03 03 02 03 03 03 03 03 03 02 02 02 03 03 03 
+1730: 01 01 01 01 02 02 02 02 02 02 02 02 02 02 02 02 
+1740: 02 02 02 02 01 01 03 03 03 03 03 03 03 02 03 03 
+1750: 02 02 02 02 02 01 02 02 03 03 03 03 03 02 03 03 
+1760: 02 02 02 02 02 01 02 02 02 03 03 03 02 02 02 03 
+1770: 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 02 
+1780: 01 02 02 02 02 02 02 01 02 02 03 03 03 03 02 02 
+1790: 02 02 02 02 02 02 02 01 02 02 02 03 03 03 03 02 
+17a0: 02 02 02 02 02 02 01 01 01 01 02 03 03 03 03 02 
+17b0: 01 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 
+17c0: 01 01 01 02 02 02 02 02 02 01 02 03 03 03 03 03 
+17d0: 01 01 02 02 02 02 02 02 02 01 02 03 03 03 03 03 
+17e0: 01 01 02 02 02 02 02 02 01 01 01 03 03 03 03 03 
+17f0: 01 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 
+1800: 03 03 02 02 02 02 02 02 02 02 02 01 01 01 01 01 
+1810: 03 03 03 02 03 02 02 02 02 02 02 01 01 01 01 01 
+1820: 03 03 03 02 03 02 02 02 02 02 01 01 01 01 01 01 
+1830: 02 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 
+1840: 03 03 03 03 02 01 02 02 02 02 02 02 01 01 01 01 
+1850: 03 03 03 03 02 01 02 02 02 02 02 02 01 01 01 01 
+1860: 03 03 03 03 02 01 02 02 02 02 02 01 01 01 01 01 
+1870: 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 01 
+1880: 02 03 03 03 02 02 02 01 02 02 02 01 01 01 01 01 
+1890: 03 03 03 03 02 02 02 01 02 02 02 01 01 01 01 01 
+18a0: 03 03 03 03 02 02 01 01 01 01 02 01 01 01 01 01 
+18b0: 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 01 
+18c0: 02 02 02 03 02 02 02 02 02 01 02 02 01 01 01 01 
+18d0: 03 02 03 03 03 02 02 02 02 01 02 02 02 01 01 01 
+18e0: 03 02 03 03 02 02 02 02 01 01 01 02 02 01 01 01 
+18f0: 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 01 
+1900: 01 01 01 01 01 02 02 02 02 02 02 02 02 03 03 03 
+1910: 01 01 01 01 02 02 02 02 02 02 02 02 03 03 03 03 
+1920: 01 01 01 01 02 02 02 02 02 02 02 02 02 03 03 03 
+1930: 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 02 
+1940: 01 01 01 01 01 02 02 02 02 02 03 03 03 02 03 03 
+1950: 01 01 01 01 01 02 02 02 02 02 03 03 03 02 03 03 
+1960: 01 01 01 01 01 01 02 02 02 02 03 03 02 02 02 03 
+1970: 01 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 
+1980: 01 01 01 01 02 02 02 01 02 02 02 03 03 03 02 02 
+1990: 01 01 01 01 02 02 02 01 02 02 02 03 03 03 03 02 
+19a0: 01 01 01 01 01 02 01 01 01 01 02 03 03 03 03 02 
+19b0: 01 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 
+19c0: 01 01 01 01 01 02 02 02 02 01 02 03 03 03 03 03 
+19d0: 01 01 01 01 02 02 02 02 02 01 02 03 03 03 03 03 
+19e0: 01 01 01 01 02 02 02 02 01 01 02 03 03 03 03 03 
+19f0: 01 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 
+1a00: 03 03 02 02 01 02 02 02 02 02 02 01 01 02 01 01 
+1a10: 03 03 03 02 02 02 02 02 02 02 02 01 02 02 02 01 
+1a20: 03 03 03 02 02 02 02 02 02 02 01 01 01 02 02 02 
+1a30: 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 01 
+1a40: 03 03 03 03 01 01 02 02 02 02 02 02 02 01 02 02 
+1a50: 03 03 03 03 02 01 02 02 02 02 02 02 02 01 02 02 
+1a60: 03 03 03 03 03 01 02 02 02 02 02 02 01 01 01 02 
+1a70: 02 02 02 02 02 01 01 01 01 01 01 01 01 01 01 01 
+1a80: 02 03 03 03 03 03 02 01 02 02 02 02 02 02 01 01 
+1a90: 03 03 03 03 03 03 03 02 02 02 02 02 02 02 02 01 
+1aa0: 03 03 03 03 03 03 02 02 02 02 03 03 03 03 03 02 
+1ab0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1ac0: 02 02 02 03 03 03 03 03 03 02 03 03 03 03 03 03 
+1ad0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
+1ae0: 03 02 03 03 03 03 03 03 02 02 02 03 03 03 03 03 
+1af0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1b00: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1b10: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1b20: 02 01 01 01 01 01 01 01 01 01 01 01 01 01 02 02 
+1b30: 01 01 01 01 01 01 01 01 02 02 02 02 01 01 01 01 
+1b40: 02 02 02 02 01 01 02 02 02 02 02 02 02 01 02 02 
+1b50: 02 02 02 02 02 01 02 02 02 02 02 02 02 01 02 02 
+1b60: 02 02 02 02 02 01 02 02 02 02 02 02 01 01 01 02 
+1b70: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
+1b80: 01 02 02 02 02 02 02 01 02 02 02 02 02 02 01 01 
+1b90: 02 02 02 02 02 02 02 01 02 02 02 02 02 02 02 01 
+1ba0: 03 03 02 02 02 02 01 01 01 01 02 02 02 02 02 01 
+1bb0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1bc0: 02 02 02 03 03 03 03 03 03 02 03 03 03 03 03 03 
+1bd0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
+1be0: 03 02 03 03 03 03 03 03 02 02 02 03 03 03 03 03 
+1bf0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1c00: 01 01 01 01 01 02 02 02 02 02 02 02 02 03 03 03 
+1c10: 02 02 02 01 02 02 02 02 02 02 02 02 03 03 03 03 
+1c20: 02 02 02 01 02 02 02 02 02 02 01 02 02 03 03 03 
+1c30: 01 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 
+1c40: 02 02 02 02 01 01 02 02 02 02 02 03 03 02 03 03 
+1c50: 02 02 02 02 02 01 02 02 02 02 02 03 03 02 03 03 
+1c60: 02 02 02 02 02 01 02 02 02 02 02 03 02 02 02 03 
+1c70: 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 02 
+1c80: 01 02 02 02 02 02 02 01 02 02 03 03 03 03 02 02 
+1c90: 02 02 02 02 02 02 02 01 02 03 03 03 03 03 03 02 
+1ca0: 02 02 02 02 02 02 01 02 02 02 03 03 03 03 03 02 
+1cb0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1cc0: 02 02 02 03 03 03 03 03 03 02 03 03 03 03 03 03 
+1cd0: 03 02 03 03 03 03 03 03 03 02 03 03 03 03 03 03 
+1ce0: 03 02 03 03 03 03 03 03 02 02 02 03 03 03 03 03 
+1cf0: 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 
+1d00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+1d10: 00 00 01 01 01 01 01 00 00 00 01 01 01 00 00 00 
+1d20: 00 00 00 00 01 00 00 00 00 01 00 00 00 01 00 00 
+1d30: 00 00 00 00 01 00 00 00 00 01 00 00 00 01 00 00 
+1d40: 00 00 00 00 01 00 00 00 00 01 00 00 00 01 00 00 
+1d50: 00 00 00 00 01 00 00 00 00 01 00 00 00 01 00 00 
+1d60: 00 00 00 00 01 00 00 00 00 00 01 01 01 00 00 00 
+1d70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+1d80: 00 00 01 01 01 01 00 00 00 00 01 01 01 00 00 00 
+1d90: 00 00 01 00 00 00 01 00 00 01 00 00 00 01 00 00 
+1da0: 00 00 01 00 00 00 01 00 00 01 00 00 00 01 00 00 
+1db0: 00 00 01 00 00 00 01 00 00 01 00 00 00 01 00 00 
+1dc0: 00 00 01 00 00 00 01 00 00 01 00 00 00 01 00 00 
+1dd0: 00 00 01 01 01 01 00 00 00 00 01 01 01 00 00 00 
+1de0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+1df0: 00 00 01 01 01 01 01 01 01 01 01 01 01 01 01 00 
+1e00: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 
+1e10: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 
+1e20: 00 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 
+1e30: 00 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 
+1e40: 00 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 
+1e50: 00 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 
+1e60: 00 00 00 00 00 01 01 01 01 01 01 01 00 00 00 00 
+1e70: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 
+1e80: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 
+1e90: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 
+1ea0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+1eb0: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 
+1ec0: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 
+1ed0: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 
+1ee0: 00 00 00 00 00 00 01 01 01 01 01 00 00 00 00 00 
+1ef0: 00 00 00 00 00 00 00 01 01 01 00 00 00 00 00 00 
+1f00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+1f10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+1f20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+1f30: 00 00 00 00 00 01 01 01 01 01 01 00 00 00 00 00 
+1f40: 00 00 00 00 00 01 00 00 00 00 01 00 00 00 00 00 
+1f50: 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 
+1f60: 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 
+1f70: 00 00 00 00 00 00 00 00 00 01 01 00 00 00 00 00 
+1f80: 00 00 00 00 00 00 00 00 01 01 00 00 00 00 00 00 
+1f90: 00 00 00 00 00 00 00 01 01 00 00 00 00 00 00 00 
+1fa0: 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 
+1fb0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+1fc0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+1fd0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+1fe0: 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 
+1ff0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-- 
cgit v1.2.3


From 0ede5beef926151dd6c6ce8b0810b26225dae895 Mon Sep 17 00:00:00 2001
From: "U-DESKTOP-MR3JJV2\\niels" <nielsstunnebrink1@gmail.com>
Date: Wed, 15 Mar 2023 10:01:50 +0100
Subject: precautions

---
 src/.gitignore                 |  14 +--
 src/engine/sprite_controller.h | 212 ++++++++++++++++++++---------------------
 2 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/src/.gitignore b/src/.gitignore
index 504b995..b0126dd 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,7 +1,7 @@
-*.o
-main.elf
-main.bin
-main
-main.exe
-static/
-*.bin
+*.o
+main.elf
+main.bin
+main
+main.exe
+static/
+*.bin
diff --git a/src/engine/sprite_controller.h b/src/engine/sprite_controller.h
index 001a459..bb7e8d1 100644
--- a/src/engine/sprite_controller.h
+++ b/src/engine/sprite_controller.h
@@ -1,106 +1,106 @@
-#pragma once
-#include <stdint.h>
-
-#include "ppu/types.h"
-
-// handles sprites
-
-// Bg sprites
-
-// Fg or entity sprites
-
-//TODO: pack data inside of sprite_palette LUT
-//HH_PPU_PALETTE_COUNT
-#define HH_SPRITE_COUNT 40
-#define HH_PAL_IDX_SKY 0
-#define HH_PAL_IDX_BRICK 1
-const static uint8_t hh_g_sprite_palette[HH_SPRITE_COUNT] = {
-	0,1,1,1,1,1,1,1,1,1, //1+9
-	1,1,1,1,1,1,1,1,1,1, //6+4
-	1,1,1,1,1,1,1,1,1,	//9
-	7,7,7,2,7,7,1,2,7
-	//other palettes here:
-};
-
-
-const static hh_ppu_loc_palette_table_t hh_g_palette = {
-	{//palette info here
-		{0x1,0x2,0x3},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0}},
-	{//Bricks
-		{0x1,0x2,0x3},//01
-		{0xd,0x8,0xa},//24
-		{0x0,0x0,0x1},//25
-		{0x1,0x1,0x1},//26
-		{0x1,0x1,0x2},//27
-		{0x2,0x2,0x3},//28
-		{0x3,0x4,0x5},//29
-		{0x5,0x1,0x7}},
-	{//slime
-		{0x1,0x2,0x3},
-		{0x1,0x3,0x2},
-		{0x4,0x8,0x3},
-		{0x7,0xa,0x4},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0}},
-	{
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0}},
-	{
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0}},
-	{
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0}},
-	{
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0},
-		{0x0,0x0,0x0}},
-	{
-		{0x0,0xf,0xf},
-		{0xf,0xf,0xf},
-		{0xf,0x0,0xf},
-		{0xf,0xf,0x0},
-		{0xf,0x0,0x0},
-		{0x0,0xf,0x0},
-		{0x0,0x0,0xf},
-		{0x0,0x0,0x0}}
-};
-
-void hh_setup_palettes();
-
-/** @brief return palette index that belongs to tilemap index */
-uint8_t hh_get_palette(uint8_t tile_idx);
-
-bool hh_colidable(uint8_t tile_idx);
+#pragma once
+#include <stdint.h>
+
+#include "ppu/types.h"
+
+// handles sprites
+
+// Bg sprites
+
+// Fg or entity sprites
+
+//TODO: pack data inside of sprite_palette LUT
+//HH_PPU_PALETTE_COUNT
+#define HH_SPRITE_COUNT 40
+#define HH_PAL_IDX_SKY 0
+#define HH_PAL_IDX_BRICK 1
+const static uint8_t hh_g_sprite_palette[HH_SPRITE_COUNT] = {
+	0,1,1,1,1,1,1,1,1,1, //1+9
+	1,1,1,1,1,1,1,1,1,1, //6+4
+	1,1,1,1,1,1,1,1,1,	//9
+	7,7,7,2,7,7,1,2,7
+	//other palettes here:
+};
+
+
+const static hh_ppu_loc_palette_table_t hh_g_palette = {
+	{//palette info here
+		{0x1,0x2,0x3},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0}},
+	{//Bricks
+		{0x1,0x2,0x3},//01
+		{0xd,0x8,0xa},//24
+		{0x0,0x0,0x1},//25
+		{0x1,0x1,0x1},//26
+		{0x1,0x1,0x2},//27
+		{0x2,0x2,0x3},//28
+		{0x3,0x4,0x5},//29
+		{0x5,0x1,0x7}},
+	{//slime
+		{0x1,0x2,0x3},
+		{0x1,0x3,0x2},
+		{0x4,0x8,0x3},
+		{0x7,0xa,0x4},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0}},
+	{
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0}},
+	{
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0}},
+	{
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0}},
+	{
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0},
+		{0x0,0x0,0x0}},
+	{
+		{0x0,0xf,0xf},
+		{0xf,0xf,0xf},
+		{0xf,0x0,0xf},
+		{0xf,0xf,0x0},
+		{0xf,0x0,0x0},
+		{0x0,0xf,0x0},
+		{0x0,0x0,0xf},
+		{0x0,0x0,0x0}}
+};
+
+void hh_setup_palettes();
+
+/** @brief return palette index that belongs to tilemap index */
+uint8_t hh_get_palette(uint8_t tile_idx);
+
+bool hh_colidable(uint8_t tile_idx);
-- 
cgit v1.2.3


From 3891486b368f4cdd1c5e00019a2a66ca05e656e6 Mon Sep 17 00:00:00 2001
From: NielsCoding <48092678+heavydemon21@users.noreply.github.com>
Date: Wed, 15 Mar 2023 15:37:21 +0100
Subject: game loop and bullet

TODO game loop:
-(startingscreen) read correct indexes
-(shop) read correct indexes
-gameplay still needs alot with different levels etc..
rest not yet done
bullet needs testing and correct PAL and tilemap reading
---
 src/GameLoop/shop.c            | 28 +++++++++++++++++++
 src/GameLoop/shop.h            | 15 ++++++++++
 src/GameLoop/startingScreen.c  | 30 ++++++++++++++++++++
 src/GameLoop/startingScreen.h  | 14 ++++++++++
 src/demo.c                     | 62 ++++++++++++++++++++++++++++++++++++++----
 src/engine/bullet.c            | 39 ++++++++++++++++++++++++++
 src/engine/bullet.h            | 14 ++++++++++
 src/engine/draw_screen.c       | 49 ++++++++++++++++++++++++++++++++-
 src/engine/draw_screen.h       |  5 ++++
 src/engine/engine.c            |  1 +
 src/engine/player_controller.c | 13 ++++++++-
 src/makefile                   |  6 +++-
 12 files changed, 268 insertions(+), 8 deletions(-)
 create mode 100644 src/GameLoop/shop.c
 create mode 100644 src/GameLoop/shop.h
 create mode 100644 src/GameLoop/startingScreen.c
 create mode 100644 src/GameLoop/startingScreen.h
 create mode 100644 src/engine/bullet.c
 create mode 100644 src/engine/bullet.h

diff --git a/src/GameLoop/shop.c b/src/GameLoop/shop.c
new file mode 100644
index 0000000..31ff5ce
--- /dev/null
+++ b/src/GameLoop/shop.c
@@ -0,0 +1,28 @@
+#include "shop.h"
+
+
+bool hh_show_Shop(){
+	static hh_e_ShopStates hh_e_Shop = hh_e_STATE_SHOW;
+	
+	switch (hh_e_Shop)
+	{
+	case hh_e_STATE_SHOW:
+		hh_setup_startingScreen();
+		hh_e_Shop = hh_e_STATE_Input;
+		return false;
+		break;
+	case hh_e_STATE_Input:
+		if(g_hh_controller_p1.dpad_right){
+			hh_e_Shop = hh_e_STATE_END;
+		}
+		break;
+	case hh_e_STATE_END:
+		hh_e_Shop = hh_e_STATE_SHOW;
+		return true;
+		break;
+	default:
+		hh_e_Shop = hh_e_STATE_SHOW;
+		break;
+	}
+	return false;
+}
diff --git a/src/GameLoop/shop.h b/src/GameLoop/shop.h
new file mode 100644
index 0000000..35bb780
--- /dev/null
+++ b/src/GameLoop/shop.h
@@ -0,0 +1,15 @@
+#include "input.h"
+#include "engine/draw_screen.h"
+
+
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef enum {
+	hh_e_STATE_SHOW,
+	hh_e_STATE_Input,
+	hh_e_STATE_END
+} hh_e_ShopStates;
+
+
+bool hh_show_Shop();
diff --git a/src/GameLoop/startingScreen.c b/src/GameLoop/startingScreen.c
new file mode 100644
index 0000000..a0cd283
--- /dev/null
+++ b/src/GameLoop/startingScreen.c
@@ -0,0 +1,30 @@
+#include "startingScreen.h"
+#include "input.h"
+#include "engine/draw_screen.h"
+// #include "engine/player_controller.h"
+
+bool hh_show_startingScreen(){
+	static hh_e_screenStates hh_e_startingScreen = hh_e_STATE_SHOW;
+	
+	switch (hh_e_startingScreen)
+	{
+	case hh_e_STATE_SHOW:
+		hh_setup_startingScreen();
+		hh_e_startingScreen = hh_e_STATE_Input;
+		return false;
+		break;
+	case hh_e_STATE_Input:
+		if(g_hh_controller_p1.dpad_left){
+			hh_e_startingScreen = hh_e_STATE_END;
+		}
+		break;
+	case hh_e_STATE_END:
+		hh_e_startingScreen = hh_e_STATE_SHOW;
+		return true;
+		break;
+	default:
+		hh_e_startingScreen = hh_e_STATE_SHOW;
+		break;
+	}
+	return false;
+}
diff --git a/src/GameLoop/startingScreen.h b/src/GameLoop/startingScreen.h
new file mode 100644
index 0000000..f51cc66
--- /dev/null
+++ b/src/GameLoop/startingScreen.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef enum {
+	hh_e_STATE_SHOW,
+	hh_e_STATE_Input,
+	hh_e_STATE_END
+} hh_e_screenStates;
+
+
+bool hh_show_startingScreen();
+
diff --git a/src/demo.c b/src/demo.c
index 95347cb..f5b5c29 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -13,6 +13,17 @@
 #include "engine/sprite_controller.h"
 
 
+#include "GameLoop/startingScreen.h"
+#include "GameLoop/shop.h"
+// states
+typedef enum {
+	hh_e_STATE_startingScreen,
+	hh_e_STATE_Shop,
+	hh_e_STATE_Gameplay,
+	hh_e_STATE_GameOver,
+	hh_e_STATE_HighScore
+} hh_e_GameState;
+hh_e_GameState hh_gameStates;
 
 hh_s_entity_player g_hh_player_1 = {
 	.pos_x		 = 31000, // 0b0000 0001 0011 0110
@@ -45,18 +56,59 @@ typedef struct {
 
 
 hh_entity hh_g_player, hh_g_player_new;
-void hh_demo_setup() {
-
+void hh_demo_setup() {	
 	hh_setup_palettes();
-	hh_setup_screen();
 
+	//hh_setup_screen();
 }
-
 void hh_demo_loop(unsigned long frame) {
 
 	// hh_player_movement();
+	switch (hh_gameStates)
+	{
+	case hh_e_STATE_startingScreen:
 
-	hh_player_actions();
+		if(hh_show_startingScreen()){
+			hh_gameStates = hh_e_STATE_Shop;
+		}	
+		break;
+	case hh_e_STATE_Shop:
+		// TODO:
+
+		if(hh_show_Shop()){
+			hh_gameStates = hh_e_STATE_Gameplay;
+		}
+		// function: new level is chosen goto level
+		break;
+	case hh_e_STATE_Gameplay:
+		static int run_test=0;
+		if(!run_test){
+			hh_setup_screen();
+			run_test=1;
+
+		}
+		else{
+			hh_player_actions();
+		}
+		// TODO:
+		// function: if level complete goto shop
+		// function: if player is dead goto game over
+		break;
+	case hh_e_STATE_GameOver:
+		// TODO:
+		// function: show game over screen
+		// function: after time goto high score
+		break;
+	case hh_e_STATE_HighScore:
+		// TODO:
+		// fucntion: show all previously scored points
+		// function: button pressed goto starting screen
+		break;
+	default:
+			hh_gameStates = hh_e_STATE_startingScreen;
+		break;
+	}
+	
 
 }
 
diff --git a/src/engine/bullet.c b/src/engine/bullet.c
new file mode 100644
index 0000000..eafd4e7
--- /dev/null
+++ b/src/engine/bullet.c
@@ -0,0 +1,39 @@
+#include "bullet.h"
+#include "engine/sprite_controller.h"
+
+void shootBullet(vec2 playerPos, Bullet* bullet){
+	// Set bullet's x and y coordinates to player's coordinates
+    bullet->x = playerPos.x;
+    bullet->y = playerPos.y;
+    // Set bullet's velocity to a fixed value
+    bullet->velocity = 1;
+    // Set bullet's status to active
+    bullet->isActive = true;
+}
+void updateBullet(Bullet* bullet, int deltaTime){
+    // Only update bullet if it is active
+	 static int latestLocationBullet = 0;
+    if (bullet->isActive) {
+        // Move bullet based on velocity and deltaTime
+        bullet->x += bullet->velocity * deltaTime;
+		  drawBullet(bullet);
+        // Check if bullet has moved 16 pixels
+        if (bullet->x - latestLocationBullet > 16) {
+            // Set bullet's status to inactive
+            bullet->isActive = false;
+        }
+    }
+	 else{
+		latestLocationBullet = bullet->x;
+	 }
+}
+void drawBullet(Bullet* bullet){
+
+	hh_ppu_update_foreground(1, (hh_s_ppu_loc_fam_entry)
+			{
+				.horizontal_flip = false,
+				.vertical_flip = false,
+				.palette_index = 7,
+				.tilemap_index = 2, // change tilemap to the correct foreground index;
+			});
+}
diff --git a/src/engine/bullet.h b/src/engine/bullet.h
new file mode 100644
index 0000000..f119829
--- /dev/null
+++ b/src/engine/bullet.h
@@ -0,0 +1,14 @@
+#pragma once
+#include "player_controller.h"
+
+typedef struct {
+    int x;
+    int y;
+    int velocity;
+    int isActive;
+} Bullet;
+
+//Bullet* createBullet(float x, float y, float velocity, float direction);
+void shootBullet(vec2 playerPos, Bullet* bullet);
+void updateBullet(Bullet* bullet, int deltaTime);
+void drawBullet(Bullet* bullet);
diff --git a/src/engine/draw_screen.c b/src/engine/draw_screen.c
index c4f3389..205d4b6 100644
--- a/src/engine/draw_screen.c
+++ b/src/engine/draw_screen.c
@@ -19,7 +19,6 @@ uint8_t hh_world_to_tile(vec2 pos){
 	return tile;
 }
 
-
 // remeber old value to know which part to update.
 vec2 previousViewport = { .x = 0, .y = 0 };
 void hh_draw_screen(vec_cor viewport){
@@ -60,3 +59,51 @@ void hh_setup_screen(){
 	}
 	free(tile);
 }
+
+void hh_setup_startingScreen(){
+	int size = 300; // 40 x as tiles 30 y as tiles
+	FILE* level = fopen("../test/bin/startingScreen.bin", "rb"); /* open binary file */
+	if (!level) { /* check if file opened successfully */
+		fprintf(stderr, "Error: Failed to open file.\n");
+		return;
+	}
+	fseek(level, (0* sizeof(int)) + sizeof(int), SEEK_SET);
+	int* tile = (int*)malloc(size*sizeof(int));
+   fread(tile, sizeof(int), size, level); // read 1 tile from binary
+
+	fclose(level);
+
+	for(int BAM_index = 0; BAM_index < size; BAM_index++){
+		hh_ppu_update_background(BAM_index, (hh_s_ppu_loc_bam_entry){
+			.horizontal_flip = false,
+			.vertical_flip   = false,
+			.palette_index   = hh_get_palette(tile[BAM_index]),
+			.tilemap_index   = tile[BAM_index],
+		});
+	}
+	free(tile);
+}
+
+void hh_setup_shopScreen(){
+	int size = 300; // 40 x as tiles 30 y as tiles
+	FILE* level = fopen("../test/bin/shopScreen.bin", "rb"); /* open binary file */
+	if (!level) { /* check if file opened successfully */
+		fprintf(stderr, "Error: Failed to open file.\n");
+		return;
+	}
+	fseek(level, (0* sizeof(int)) + sizeof(int), SEEK_SET);
+	int* tile = (int*)malloc(size*sizeof(int));
+   fread(tile, sizeof(int), size, level); // read 1 tile from binary
+
+	fclose(level);
+
+	for(int BAM_index = 0; BAM_index < size; BAM_index++){
+		hh_ppu_update_background(BAM_index, (hh_s_ppu_loc_bam_entry){
+			.horizontal_flip = false,
+			.vertical_flip   = false,
+			.palette_index   = hh_get_palette(tile[BAM_index]),
+			.tilemap_index   = tile[BAM_index],
+		});
+	}
+	free(tile);
+}
diff --git a/src/engine/draw_screen.h b/src/engine/draw_screen.h
index b181108..bfe8bf8 100644
--- a/src/engine/draw_screen.h
+++ b/src/engine/draw_screen.h
@@ -19,3 +19,8 @@ uint8_t hh_world_to_tile(vec2 pos);
 void hh_draw_screen(vec2 viewport);
 /** @brief send data to BAM memory from binary level */
 void hh_setup_screen();
+/** @brief send starting screen data to BAM memory from binary level */
+void hh_setup_startingScreen();
+
+/** @brief send shop screen data to BAM memory from binary level */
+void hh_setup_shopScreen();
diff --git a/src/engine/engine.c b/src/engine/engine.c
index 799ee7c..3280892 100644
--- a/src/engine/engine.c
+++ b/src/engine/engine.c
@@ -1,4 +1,5 @@
 #include "engine/draw_screen.h"
+#include "engine/bullet.h""
 #include "engine/level.h"
 #include "engine/maths.h"
 #include "engine/sprite_controller.h"
diff --git a/src/engine/player_controller.c b/src/engine/player_controller.c
index 22f6eb6..f938844 100644
--- a/src/engine/player_controller.c
+++ b/src/engine/player_controller.c
@@ -3,7 +3,7 @@
 #include "engine/draw_screen.h"
 #include "engine/sprite_controller.h"
 #include "engine/player_controller.h"
-
+#include "engine/bullet.h"
 #include "input.h"
 
 void hh_player_actions() {
@@ -29,6 +29,17 @@ void hh_player_actions() {
 	// hh_input_read();
 	player.vel = (vec2){.x = (-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right),
 	.y = (-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down) };
+
+	// shooting code
+	static Bullet bullet;
+	if(g_hh_controller_p1.button_primary){
+			bullet.isActive = false;
+			shootBullet(player.vel, &bullet);
+	}
+	else{
+		updateBullet(&bullet, 1);
+
+	}
 	// const int8_t maa = 3;
 	// const int8_t mbb = -3;
 	// if (g_hh_controller_p1.dpad_up)
diff --git a/src/makefile b/src/makefile
index d7d9087..94406ca 100644
--- a/src/makefile
+++ b/src/makefile
@@ -37,7 +37,11 @@ LOCAL_SRCS += main.c \
 							engine/draw_screen.c \
 							engine/camera.c \
 							engine/maths.c \
-							engine/entity.c
+							engine/bullet.c \
+							engine/entity.c \
+							GameLoop/shop.c \
+							GameLoop/startingScreen.c
+			
 
 CFLAGS += $(SHARED_FLAGS)
 LFLAGS += $(SHARED_FLAGS)
-- 
cgit v1.2.3


From 2588df5f89da62b857287344d6a7f2cc6951e938 Mon Sep 17 00:00:00 2001
From: NielsCoding <48092678+heavydemon21@users.noreply.github.com>
Date: Wed, 15 Mar 2023 18:56:15 +0100
Subject: architecture docu

---
 .vscode/settings.json     |  15 ++++++++++++++-
 assets/TopLevelArchi      |   1 +
 assets/hh_introScreen.png | Bin 0 -> 130932 bytes
 docs/architecture.md      |  35 +++++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 assets/TopLevelArchi
 create mode 100644 assets/hh_introScreen.png

diff --git a/.vscode/settings.json b/.vscode/settings.json
index d027762..7f37ba0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,5 +8,18 @@
 		}
 	},
 	"cmake.configureOnOpen": false,
-	"files.eol": "\n"
+	"files.eol": "\n",
+	"nrf-connect.topdir": "${nrf-connect.sdk:2.1.2}",
+	"nrf-connect.toolchain.path": "${nrf-connect.toolchain:2.1.2}",
+	"files.associations": {
+		"input.h": "c",
+		"draw_screen.h": "c",
+		"camera.h": "c",
+		"entity.h": "c",
+		"stdint.h": "c",
+		"player_controller.h": "c",
+		"sprite_controller.h": "c",
+		"types.h": "c",
+		"startingscreen.h": "c"
+	}
 }
diff --git a/assets/TopLevelArchi b/assets/TopLevelArchi
new file mode 100644
index 0000000..bd8c538
--- /dev/null
+++ b/assets/TopLevelArchi
@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2023-03-15T17:55:17.853Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/12.6.5 Chrome/80.0.3987.86 Electron/8.0.0 Safari/537.36" etag="2E6lyVvDi6oZnLAlj2-s" version="12.6.5" type="device"><diagram id="lFYth94ipJO3Ot3r_wOE" name="Page-1">zVdNc5swEP01PrYDFlD76NhpOtN0yowPSY8KbECtYD3y4o/++kpGfDuJkzp1fTG72hXSe29XYsTm2e5G8VX6DWOQo7ET70ZsMRqPXT9w9J/x7EvP1JuUjkSJ2AY1jqX4DdZp85JCxLDuBBKiJLHqOiPMc4io4+NK4bYb9oiy+9YVT2DgWEZcDr13IqbUet1g2gx8AZGk9tWT8adyIONVsN3JOuUxblsudj1ic4VI5VO2m4M04FW4lHmfnxitF6Ygp1MSvPAuyxcOfL1NQr8QyfebOPzg27XRvtowxHr/1kRFKSaYc3ndeK8UFnkMZlZHW03MLeJKO13t/AlEe0smLwi1K6VM2lG9YLW/t/kH44cxPvqVudi1Bxd7a5VrNQt8EgLrWmOhInhm38xKiasE6Jk4ryZKKxwwA70enadAchKb7jq4lVpSxzVs6AdLyCvIsYvccFnYN4WS70ENONPSWpnHIpOziFBprDagSGgZ3/IHkCGuBQnMdcgDEmGmA6QZuOLRr+TA5xylydOzscfDrzXHTIrE5JLht00kFiRFDvO69hqWTC7snudpiKtN8G3J2J7hVSW0bVWgY31pq/jcKvHsVHgDKnTDIYVSHqGjWyDbVBAsV/ygx63ukl0MzwAXG3fx8t0hXpNjcLnvBdf0om3F7bYV1vu90GUOVghKaChAnb/1BCe2HnbJ1hMM9L6MFED+32md+ZMLa72auIXVghO/OFK+00OKHemi4yNQ1fidH6rhiTZsFHk8M/c2bUWSr9ci6lX5TtB967l1ddBWU9PGeIeLg3di9brOcXJa4PtHsK98J1e5fUOIQu+k5t7rnaBBn9JynzarfWnsTdQXUcB6E5VADCY6yKPe9l8oZnjwvl4xT5wL//C6WfWIF2UTXFI1bp/s6RtV4/bl551LNdpsvpjK8Oa7k13/AQ==</diagram></mxfile>
\ No newline at end of file
diff --git a/assets/hh_introScreen.png b/assets/hh_introScreen.png
new file mode 100644
index 0000000..8b6e192
Binary files /dev/null and b/assets/hh_introScreen.png differ
diff --git a/docs/architecture.md b/docs/architecture.md
index 5001eed..94f17a4 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -1,3 +1,38 @@
+# Hooded Havic: Miniboss Mania
+![intro arcade game](../assets/hh_introScreen.png)
+
+# introduction
+Welcome to Hooded Havoc: Miniboss Mania, an exciting 2D platformer game created by our team Joshua, Loek, Bjorn, Frenk and Niels! This game was developed using the STM32 microcontroller as the game engine and the FPGA as the Picture Processing Unit (PPU).
+
+In Hooded Havoc: Miniboss Mania, you will take on the role of a brave hero who must battle through multiple levels filled with challenging obstacles and formidable minibosses. With smooth gameplay and engaging graphics, you will feel immersed in a world of adventure and excitement.
+
+Our use of the STM32 microcontroller and FPGA PPU allowed us to create a unique and innovative gaming experience. The STM32 provides efficient and reliable processing power, while the FPGA ensures that our graphics are rendered smoothly and accurately.
+
+So get ready to embark on a thrilling journey through Hooded Havoc: Miniboss Mania, and see how far you can make it!
+## Objective
+The objective of Hooded Havoc: Miniboss Mania is to guide the hero through multiple levels, defeating minibosses and overcoming obstacles along the way. The ultimate goal is to reach the final boss and defeat them to retrieve the stolen staff.
+
+To achieve this objective, the player must use their platforming skills to jump, run, and dodge obstacles while also battling enemies and minibosses. Each level presents a unique challenge that will require the player to adapt and strategize to overcome.
+
+As the player progresses through the game, they will unlock new abilities and power-ups that will aid them in their journey. The player must use these abilities wisely to defeat the minibosses and ultimately save the world.
+
+So, the objective of Hooded Havoc: Miniboss Mania is not only to provide an exciting and engaging gaming experience but also to challenge players to use their skills and strategic thinking to overcome obstacles and emerge victorious.
+## Problem statement
+One potential problem that could arise in the development of Hooded Havoc: Miniboss Mania is related to the PPU and communication between the STM32 and PPU.
+
+The PPU is responsible for rendering the graphics and displaying them on the screen, while the STM32 is responsible for processing the game logic and input from the player. However, if there is a problem with the communication between these two components, it could lead to synchronization issues and graphical glitches that could affect the player's experience.
+
+For example, if the PPU is unable to keep up with the processing speed of the STM32, the graphics may lag or appear distorted, causing the game to become unplayable. Similarly, if there is a delay in communication between the STM32 and PPU, it could result in a mismatch between the game logic and the displayed graphics, leading to confusion for the player.
+
+To ensure a smooth and enjoyable gaming experience, it is essential to address any potential issues with the PPU and communication between the STM32 and PPU during the development process. This may involve optimizing the code for both components, adjusting the communication protocol, or adding buffer systems to prevent lag or synchronization issues.
+### architecture ( top level)
+![Top level architecture](../assets/TopLevelArchi);
+
+
+
+
+### design document (mid-low level)
+
 # General system architecture
 
 ![Top-down system architecture diagram](../assets/architecture-level-1.svg)
-- 
cgit v1.2.3


From e79c36460f400991caa82598499c0ea7c37ebb90 Mon Sep 17 00:00:00 2001
From: Flenk008 <frenk_0_0@hotmail.com>
Date: Wed, 15 Mar 2023 18:58:25 +0100
Subject: Player-Enemy collision

Added player with enemy collision. Also changed input system to a vector system with friction and gravity. Jump also works. Enemy is 1 stationary object.
---
 src/demo.c                     | 175 +++++++----------------------------------
 src/engine/entity.c            |  81 +++++++++++++++++++
 src/engine/entity.h            |  25 ++++++
 src/engine/player_controller.c | 155 +++++++++++++++++++++++++++---------
 src/ppusim/input.c             |   1 +
 5 files changed, 253 insertions(+), 184 deletions(-)

diff --git a/src/demo.c b/src/demo.c
index baaf73d..d4d1bf7 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -1,26 +1,21 @@
 #include <math.h>
 
 #include "demo.h"
-#include "entity.h"
 #include "input.h"
+#include "entity.h"
 #include "ppu/ppu.h"
 
-#define HH_DEMO_BALL_COUNT 1
-hh_s_ppu_loc_fam_entry g_hh_demo_balls[HH_DEMO_BALL_COUNT];
+#include "engine/maths.h"
+#include "engine/camera.h"
+#include "engine/entity.h"
+#include "engine/draw_screen.h"
+#include "engine/player_controller.h"
+#include "engine/sprite_controller.h"
 
-hh_s_entity_player g_hh_player_1 = {
-	.pos_x		 = 31000, // 0b0000 0001 0011 0110
-	.pos_y		 = 21000,
-	.radius		 = 8,
-	.speed		 = 100,
-	.direction_x = 1,
-	.rotation	 = 8,
-	.in_air		 = false,
-};
 
-void hh_player_movement();
 
-uint16_t g_hh_pos_x; // 0b0000 0001 0011 0110
+
+uint16_t g_hh_pos_x = 1000; // 0b0000 0001 0011 0110
 uint16_t g_hh_pos_y;
 uint8_t g_hh_left  = 0;
 uint8_t g_hh_right = 0;
@@ -29,67 +24,29 @@ uint8_t g_hh_down  = 0;
 uint8_t g_hh_pos_x_bit[2];
 uint8_t g_hh_pos_y_bit[2];
 uint8_t g_hh_data_send[3];
-int g_hh_tile_x;
+int g_hh_tile_size = 8;
 int g_hh_tile_y;
 
-void hh_demo_setup() {
-	// load sprites
-	hh_ppu_update_sprite(0, HH_DBG_SPRITE_BALL);
-	hh_ppu_update_sprite(1, HH_DBG_SPRITE_CHECKERBOARD);
-
-	// background pattern
-	hh_ppu_update_color(0, 1, (hh_ppu_rgb_color_t){0x4, 0x4, 0x4});
-	for (unsigned i = 0; i < HH_PPU_BG_CANVAS_TILES_H * HH_PPU_BG_CANVAS_TILES_V; i++) {
-		hh_ppu_update_background(i, (hh_s_ppu_loc_bam_entry){
-										.horizontal_flip = false,
-										.vertical_flip	 = false,
-										.palette_index	 = 0,
-										.tilemap_index	 = 1,
-									});
-	}
-
-	// cool colors
-	hh_ppu_update_color(1, 1, (hh_ppu_rgb_color_t){0xf, 0x0, 0xf});
-	hh_ppu_update_color(2, 1, (hh_ppu_rgb_color_t){0xf, 0xf, 0xf});
-	hh_ppu_update_color(3, 1, (hh_ppu_rgb_color_t){0xf, 0x0, 0x0});
-	hh_ppu_update_color(4, 1, (hh_ppu_rgb_color_t){0x0, 0xf, 0xf});
-	hh_ppu_update_color(5, 1, (hh_ppu_rgb_color_t){0x0, 0x0, 0xf});
-
-	// balls
-	for (unsigned i = 0; i < HH_DEMO_BALL_COUNT; i++) {
-		g_hh_demo_balls[i].horizontal_flip = false;
-		g_hh_demo_balls[i].vertical_flip   = false;
-		g_hh_demo_balls[i].palette_index   = i + 1;
-		g_hh_demo_balls[i].tilemap_index   = 0;
-	}
-}
-
-void hh_demo_loop(unsigned long frame) {
-	hh_player_movement();
-	// input testing (no hitbox stuff)
-	// g_hh_player_1.pos_x  += ((-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right)) * g_hh_player_1.speed; // -1 = L || 1 == R
-	// g_hh_player_1.pos_y  += ((-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down)) * g_hh_player_1.speed; // -1 = D || 1 == U
+typedef struct {
+	vec2 pos;
+	uint8_t idx;
+}hh_s_tiles;
 
 
-	// adjust map size
-	g_hh_pos_x = g_hh_player_1.pos_x / 100;
-	g_hh_pos_y = g_hh_player_1.pos_y / 100;
+hh_entity hh_g_player, hh_g_player_new;
+void hh_demo_setup() {
 
+	hh_setup_palettes();
+	hh_setup_screen();
 
 
+}
 
-	// update player sprite on ppu
-	g_hh_demo_balls[0].position_x = g_hh_pos_x;
-	g_hh_demo_balls[0].position_y = g_hh_pos_y;
-	hh_ppu_update_foreground(0, g_hh_demo_balls[0]);
+void hh_demo_loop(unsigned long frame) {
 
-	// set background pattern position
-	hh_ppu_update_aux((hh_s_ppu_loc_aux){
-		.bg_shift_x = (frame / 2) % HH_PPU_SPRITE_WIDTH,
-		.bg_shift_y = (frame / 8) % HH_PPU_SPRITE_HEIGHT,
-		.fg_fetch	= 0,
-		.sysreset	= 0,
-	});
+	
+	hh_player_actions();
+	
 }
 
 // void sendData(uint8_t address, uint16_t data) {
@@ -103,84 +60,8 @@ void hh_demo_loop(unsigned long frame) {
 // 	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_9, GPIO_PIN_SET);
 // }
 
-void hh_player_movement() {
-	int8_t directionX = (-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right); // -1 = L || 1 == R
-	int8_t directionY = (-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down);	   // -1 = D || 1 == U
-
-	uint8_t i, j;
-	uint8_t rotation = 0; // 0-7
-
-	// rotation calc
-	for (i = -1; i < 2; i++) {
-		for (j = -1; j < 2; j++) {
-			if (directionX == i) {
-				if (directionY == j) {
-					if (i != 0 && j != 0) // dont update when player idle
-					{
-						g_hh_player_1.rotation = rotation;
-					}
-				}
-			}
-			rotation++;
-		}
-	}
-	// direction calc
-	if (directionX != 0) // update direction if player is not idle
-	{
-		g_hh_player_1.direction_x = directionX;
-	}
-	// collision map x-axis
-
-	// tile calc including radius and direction for background coliision
-
-	uint16_t tileColX;
-	uint16_t tileColY = (g_hh_player_1.pos_y / 100) / 16;
-	;
-
-	// remaining space between grid and exact
-	uint8_t modTileX;
-	uint8_t modTileY;
-
-	if (g_hh_player_1.in_air == false && directionX != 0) {
-		if (directionX == 1) {
-			tileColX = ((g_hh_player_1.pos_x / 100) + g_hh_player_1.radius) / 16;
-			modTileX = (g_hh_player_1.pos_x + (100 * g_hh_player_1.radius)) % 1600;
-		} else if (directionX == -1) {
-			tileColX = ((g_hh_player_1.pos_x / 100) - g_hh_player_1.radius) / 16;
-			modTileX = (g_hh_player_1.pos_x - (100 * g_hh_player_1.radius)) % 1600;
-		}
-
-		if (HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + directionX] != 1) {
-			g_hh_player_1.pos_x = g_hh_player_1.pos_x + (directionX * g_hh_player_1.speed); // NEW x set
-		}
-
-		else if (HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + directionX] == 1) {
-			if (modTileX < g_hh_player_1.speed) {
-				g_hh_player_1.pos_x = g_hh_player_1.pos_x + (directionX * modTileX); // NEW x set
-			} else {
-				g_hh_player_1.pos_x = g_hh_player_1.pos_x + (directionX * g_hh_player_1.speed); // NEW x set
-			}
-		}
-
-	} else // if in air different all borders have to be checked
-	{
-	}
-
-
-	if(directionY != 0)
-	{
-	//	g_hh_player_1.pos_y = g_hh_player_1.pos_y + (directionY * g_hh_player_1.speed * 2); // NEW x set
-	}
-	// collision map floor (y-axis) (falling)
-	//  if falling no jump press (implement)
-	/*
-	tileColY = (( g_hh_player_1.pos_y / 100) + g_hh_player_1.radius) / 16; //bottom of player box
-	modTileY = 1;
-	if(HH_DEMO_HITBOX_TILEMAP[tileColY+1][tileColX] != 1) //rework after jumping
-	{
-		g_hh_player_1.pos_y = g_hh_player_1.pos_y + 5 ;// NEW y set //makew var gravity
-		//playerStat = falling; //for later use of graphics/sound
-	}
-	*/
-	// else if(HH_DEMO_HITBOX_TILEMAP[])
-}
+
+
+
+
+
diff --git a/src/engine/entity.c b/src/engine/entity.c
index 153e7e1..535759d 100644
--- a/src/engine/entity.c
+++ b/src/engine/entity.c
@@ -43,4 +43,85 @@ void hh_solve_collision(vec2 pos_environment, hh_entity* entity){
 	// 	entity->vel.x = 0;
 	// } 
 }
+hh_entity hh_background_collision (hh_entity temp_old_entity,hh_entity temp_new_entity){
 
+		temp_old_entity.is_grounded = false;
+ 
+// solves x collision
+	if (temp_old_entity.vel.x <= 0) {
+		if (hh_colidable(hh_world_to_tile((vec2){.x=temp_new_entity.pos.x + 0, .y=temp_old_entity.pos.y + 0})) || 
+			hh_colidable(hh_world_to_tile((vec2){.x=temp_new_entity.pos.x + 0, .y=temp_old_entity.pos.y + 15}))) {
+			temp_new_entity.pos.x = (temp_new_entity.pos.x & ~15) + 16,
+			temp_new_entity.vel.x = 0;
+		}
+	} else {
+		if (hh_colidable(hh_world_to_tile((vec2){.x=temp_new_entity.pos.x + 16, .y=temp_old_entity.pos.y + 0})) || 
+			hh_colidable(hh_world_to_tile((vec2){.x=temp_new_entity.pos.x + 16, .y=temp_old_entity.pos.y + 15}))) {
+			temp_new_entity.pos.x = temp_new_entity.pos.x & ~15, // <-- magic comma, NOT TOUCHY
+			temp_new_entity.vel.x = 0;
+		}
+	}
+
+	//solves y collision
+	if (temp_old_entity.vel.y <= 0) {
+		if (hh_colidable(hh_world_to_tile((vec2){.x=temp_new_entity.pos.x + 0, .y=temp_new_entity.pos.y + 0})) || 
+			hh_colidable(hh_world_to_tile((vec2){.x=temp_new_entity.pos.x + 15, .y=temp_new_entity.pos.y + 0}))) {
+			temp_new_entity.pos.y = (temp_new_entity.pos.y & ~15) + 16,
+			temp_new_entity.vel.y = 0;
+		}
+	} else {
+		if (hh_colidable(hh_world_to_tile((vec2){.x=temp_new_entity.pos.x + 0, .y=temp_new_entity.pos.y + 15})) || 
+			hh_colidable(hh_world_to_tile((vec2){.x=temp_new_entity.pos.x + 15, .y=temp_new_entity.pos.y + 15}))) {
+			temp_new_entity.pos.y = temp_new_entity.pos.y & ~15,
+			temp_new_entity.vel.y = 0;
+			temp_old_entity.is_grounded = true;
+		}
+	}
+	temp_old_entity.pos = temp_new_entity.pos; 
+	temp_old_entity.vel = temp_new_entity.vel;
+	return temp_old_entity;
+}
+
+hh_entity hh_enemy_collision(hh_entity temp_player, hh_entity temp_enemy){
+	
+	bool collide = hh_distance_circles( temp_player.pos,  temp_enemy.pos, temp_player.radius, temp_enemy.radius);
+
+	if (collide == true && temp_player.is_hit == false)
+	{
+		temp_player.is_hit = true;
+		//angle = atan2( tempEntity.pos_y - tempPlayer.pos_y, tempEntity.pos_x - tempPlayer.pos_x);
+		if(temp_player.pos.x <= temp_enemy.pos.x) //player left of enemy -- creates flinch movement L or R
+		{
+		//	printf("BONK-left!/n");
+			temp_player.vel.y = -5;
+			temp_player.vel.x = -8;
+		}	else {
+		//	printf("BONK-right!/n");
+			temp_player.vel.y = -5;
+			temp_player.vel.x = 8;
+		}
+		// ghost mode / invulnerable or other things on hit
+		//	temp_player.hp--;
+			
+	} else {
+		temp_player.is_hit = false;
+		
+	}
+
+
+return temp_player;
+}
+
+
+bool hh_distance_circles (vec2 object_1, vec2 object_2, int radius_1, int radius_2){
+	int a_squared = (object_1.x - object_2.x) * (object_1.x - object_2.x);
+	int b_squared = (object_1.y - object_2.y) * (object_1.y - object_2.y);
+	int c_squared = a_squared + b_squared; 
+	int radius = ( radius_1 + radius_2) * ( radius_1 + radius_2 );
+
+		if( c_squared <= radius ){
+			return true;
+		} else {
+			return false;
+		}
+}
diff --git a/src/engine/entity.h b/src/engine/entity.h
index f45dae2..cad6ba4 100644
--- a/src/engine/entity.h
+++ b/src/engine/entity.h
@@ -2,6 +2,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <stdio.h>
 
 #include "ppu/types.h"
 
@@ -32,6 +33,8 @@ typedef struct {
 typedef struct {
     vec2 pos, vel, vec;
     bool is_grounded;
+	 bool is_hit;
+	 uint8_t radius;
     int8_t hp;
     int8_t speed;
 	 hh_s_rendering render;
@@ -55,3 +58,25 @@ bool hh_collision(vec2 pos1, vec2 pos2);
 /// @param entity position
 /// @return solved new entity position
 void hh_solve_collision(vec2 pos_environment, hh_entity* entity);
+
+/// @brief solve collision of entity with background tiles
+/// @param temp_old_entity old data of entity 
+/// @param temp_new_entity new data of entity where it wants to go to
+/// @return updated new entity where it actually can go to
+hh_entity hh_background_collision (hh_entity temp_old_entity, hh_entity temp_new_entity);
+
+/// @brief solve collision of player with enemy 
+/// @param temp_player data of player 
+/// @param temp_enemy data of enemy
+/// @return updated player with new stats if hitted with enemy
+hh_entity hh_enemy_collision(hh_entity temp_player, hh_entity temp_enemy);
+
+/// @brief calculate if circles (entity) hit each other 
+/// @param object_1 position of first object (entity)
+/// @param object_2 position of second object (entity)
+/// @param radius_1 radius of first object (entity)
+/// @param radius_2 radius of second object (entity)
+/// @return true if objects collids
+bool hh_distance_circles (vec2 object_1, vec2 object_2, int radius_1, int radius_2);
+
+
diff --git a/src/engine/player_controller.c b/src/engine/player_controller.c
index 22f6eb6..d351bee 100644
--- a/src/engine/player_controller.c
+++ b/src/engine/player_controller.c
@@ -11,6 +11,8 @@ void hh_player_actions() {
 		.hp = 4,
 		.speed = 6,
 		.is_grounded = false,
+		.is_hit = false,
+		.radius = 8,
 		.pos = (vec2){32,32},
 		.vel = (vec2){0,0},
 		.vec = (vec2){0,0},
@@ -26,9 +28,113 @@ void hh_player_actions() {
 		}
 	}, player_new = {0};
 
+
+	static hh_entity enemy={
+		.hp = 4,
+		.speed = 6,
+		.is_grounded = false,
+		.is_hit = false,
+		.radius = 8,
+		.pos = (vec2){128,48},
+		.vel = (vec2){0,0},
+		.vec = (vec2){0,0},
+		.render = {
+			.frame0 = 20,
+			.palette = 7,
+			.fam = (hh_s_ppu_loc_fam_entry){
+				.horizontal_flip = false,
+				.vertical_flip = false,
+				.palette_index = 7,
+				.tilemap_index = 1,
+			}
+		}
+	};
+	player_new = player;
 	// hh_input_read();
+	static uint8_t hit = 0;
+	int8_t hit_timer = 0;
+	int8_t direction_x = (-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right);
+	int8_t direction_y = (-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down);
+
+	if(player.is_hit == true){
+		hit_timer = 9;
+		player.is_hit = false;	
+	} 
+	if(hit_timer > -10){
+			hit_timer--;
+	}
+
+	if(hit_timer <= 0){
+		if(direction_x != 0){
+			if(player.vel.x > -1 * player.speed && player.vel.x < player.speed) {
+				player.vel.x = player.vel.x + direction_x;
+			} else {
+				if (player.vel.x > 0) {
+					player.vel.x--;
+				} else if(player.vel.x < 0) {
+					player.vel.x++; 
+				}
+			}
+		} else {
+			if (player.vel.x > 0) {
+				player.vel.x--;
+			} else if(player.vel.x < 0) {
+			player.vel.x++; 
+			}
+		}
+		
+		/* // movement Y (w-s) disable gravity to use this
+		if(direction_y != 0){
+			if(player.vel.y > -4 && player.vel.y < 4 ) {
+				player.vel.y =  player.vel.y + direction_y;
+			}
+		} else {
+			if (player.vel.y > 0) {
+				player.vel.y--;
+			} else if(player.vel.y < 0) {
+				player.vel.y++; 
+			}
+		}		
+		
+		*/
+	} else {
+		if (player.vel.x > 0) {
+			player.vel.x--;
+		} else if(player.vel.x < 0) {
+			player.vel.x++; 
+		}
+			player.vel.y++;
+	}
+	
+
+	if (g_hh_controller_p1.button_primary && player.is_grounded == true) {//JUMP
+	 	player.vel.y = -10;
+		player.is_grounded = false;
+	} else if (player.vel.y < 6){
+		 player.vel.y += 1; //gravity
+	}
+
+
+
+	
+/*
 	player.vel = (vec2){.x = (-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right),
 	.y = (-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down) };
+
+		player_new.vel = (vec2){
+		.x = player.vel.x,
+		.y = player.vel.y,
+	};
+*/
+
+		player_new.vel = (vec2){
+		.x = player.vel.x,
+		.y = player.vel.y,
+	};
+
+		player_new = hh_enemy_collision(player, enemy);
+	
+	
 	// const int8_t maa = 3;
 	// const int8_t mbb = -3;
 	// if (g_hh_controller_p1.dpad_up)
@@ -55,8 +161,8 @@ void hh_player_actions() {
 	// player.vel.x = CLAMP(player.vel.x,-32,32);
 
 	player_new.pos = (vec2){
-		.x = player.pos.x + player.vel.x,
-		.y = player.pos.y + player.vel.y,
+		.x = player.pos.x + player_new.vel.x,
+		.y = player.pos.y + player_new.vel.y,
 	};
 
 
@@ -96,41 +202,10 @@ void hh_player_actions() {
 	// 		hh_solve_collision(tiles[i].pos, &player);
 	// 	}
 	// }
-
-	player_new.is_grounded = false;
-
-	// solves x collision
-	if (player.vel.x <= 0) {
-		if (hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player.pos.y + 0})) || 
-			hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player.pos.y + 15}))) {
-			player_new.pos.x = (player_new.pos.x & ~15) + 16,
-			player_new.vel.x = 0;
-		}
-	} else {
-		if (hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 16, .y=player.pos.y + 0})) || 
-			hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 16, .y=player.pos.y + 15}))) {
-			player_new.pos.x = player_new.pos.x & ~15, // <-- magic comma, NOT TOUCHY
-			player_new.vel.x = 0;
-		}
-	}
-
-	//solves y collision
-	if (player.vel.y <= 0) {
-		if (hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player_new.pos.y + 0})) || 
-			hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player_new.pos.y + 15}))) {
-			player_new.pos.y = (player_new.pos.y & ~15) + 16,
-			player_new.vel.y = 0;
-		}
-	} else {
-		if (hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 0, .y=player_new.pos.y + 16})) || 
-			hh_colidable(hh_world_to_tile((vec2){.x=player_new.pos.x + 16, .y=player_new.pos.y + 15}))) {
-			player_new.pos.y = player_new.pos.y & ~15,
-			player_new.vel.y = 0;
-			player_new.is_grounded = true;
-		}
-	}
-
-	player = player_new;
+	
+	player =  hh_background_collision ( player, player_new);
+	
+	//player = player_new;
 
 	vec_cor cam_pos;//value in tiles
 	// cam_pos = (vec2){0,0};
@@ -141,10 +216,16 @@ void hh_player_actions() {
 	player.render.fam.position_x = (player.pos.x-cam_pos.x);
 	player.render.fam.position_y = (player.pos.y-cam_pos.y);
 
+	enemy.render.fam.position_x = (enemy.pos.x-cam_pos.x);
+	enemy.render.fam.position_y = (enemy.pos.y-cam_pos.y);
 
 	player.render.fam.tilemap_index = 2;//TODO: these two lines should be redundant
 	player.render.fam.palette_index = 7;
 	hh_ppu_update_foreground(0, player.render.fam);
 
+	hh_ppu_update_foreground(1, enemy.render.fam);
+
 }
 
+
+
diff --git a/src/ppusim/input.c b/src/ppusim/input.c
index 08bc382..5323fb1 100644
--- a/src/ppusim/input.c
+++ b/src/ppusim/input.c
@@ -12,4 +12,5 @@ void hh_input_read() {
 	g_hh_controller_p1.dpad_down  = kb[SDL_SCANCODE_S];
 	g_hh_controller_p1.dpad_left  = kb[SDL_SCANCODE_A];
 	g_hh_controller_p1.dpad_right = kb[SDL_SCANCODE_D];
+	g_hh_controller_p1.button_primary = kb[SDL_SCANCODE_SPACE];
 }
-- 
cgit v1.2.3


From 2346a009fefb6e880bd7a36bb132cad833185080 Mon Sep 17 00:00:00 2001
From: NielsCoding <48092678+heavydemon21@users.noreply.github.com>
Date: Wed, 15 Mar 2023 19:46:54 +0100
Subject: bob

---
 assets/TopLevel.PNG  | Bin 0 -> 13919 bytes
 assets/TopLevelArchi |   1 -
 docs/BobSprint2.md   |  19 +++++++++++++++++++
 docs/architecture.md |   3 ++-
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 assets/TopLevel.PNG
 delete mode 100644 assets/TopLevelArchi
 create mode 100644 docs/BobSprint2.md

diff --git a/assets/TopLevel.PNG b/assets/TopLevel.PNG
new file mode 100644
index 0000000..2a7b16d
Binary files /dev/null and b/assets/TopLevel.PNG differ
diff --git a/assets/TopLevelArchi b/assets/TopLevelArchi
deleted file mode 100644
index bd8c538..0000000
--- a/assets/TopLevelArchi
+++ /dev/null
@@ -1 +0,0 @@
-<mxfile host="Electron" modified="2023-03-15T17:55:17.853Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/12.6.5 Chrome/80.0.3987.86 Electron/8.0.0 Safari/537.36" etag="2E6lyVvDi6oZnLAlj2-s" version="12.6.5" type="device"><diagram id="lFYth94ipJO3Ot3r_wOE" name="Page-1">zVdNc5swEP01PrYDFlD76NhpOtN0yowPSY8KbECtYD3y4o/++kpGfDuJkzp1fTG72hXSe29XYsTm2e5G8VX6DWOQo7ET70ZsMRqPXT9w9J/x7EvP1JuUjkSJ2AY1jqX4DdZp85JCxLDuBBKiJLHqOiPMc4io4+NK4bYb9oiy+9YVT2DgWEZcDr13IqbUet1g2gx8AZGk9tWT8adyIONVsN3JOuUxblsudj1ic4VI5VO2m4M04FW4lHmfnxitF6Ygp1MSvPAuyxcOfL1NQr8QyfebOPzg27XRvtowxHr/1kRFKSaYc3ndeK8UFnkMZlZHW03MLeJKO13t/AlEe0smLwi1K6VM2lG9YLW/t/kH44cxPvqVudi1Bxd7a5VrNQt8EgLrWmOhInhm38xKiasE6Jk4ryZKKxwwA70enadAchKb7jq4lVpSxzVs6AdLyCvIsYvccFnYN4WS70ENONPSWpnHIpOziFBprDagSGgZ3/IHkCGuBQnMdcgDEmGmA6QZuOLRr+TA5xylydOzscfDrzXHTIrE5JLht00kFiRFDvO69hqWTC7snudpiKtN8G3J2J7hVSW0bVWgY31pq/jcKvHsVHgDKnTDIYVSHqGjWyDbVBAsV/ygx63ukl0MzwAXG3fx8t0hXpNjcLnvBdf0om3F7bYV1vu90GUOVghKaChAnb/1BCe2HnbJ1hMM9L6MFED+32md+ZMLa72auIXVghO/OFK+00OKHemi4yNQ1fidH6rhiTZsFHk8M/c2bUWSr9ci6lX5TtB967l1ddBWU9PGeIeLg3di9brOcXJa4PtHsK98J1e5fUOIQu+k5t7rnaBBn9JynzarfWnsTdQXUcB6E5VADCY6yKPe9l8oZnjwvl4xT5wL//C6WfWIF2UTXFI1bp/s6RtV4/bl551LNdpsvpjK8Oa7k13/AQ==</diagram></mxfile>
\ No newline at end of file
diff --git a/docs/BobSprint2.md b/docs/BobSprint2.md
new file mode 100644
index 0000000..6fff8fc
--- /dev/null
+++ b/docs/BobSprint2.md
@@ -0,0 +1,19 @@
+
+
+# Proud of
+Simulation: We're proud of the simulation that we created to test our game because it allows us to identify and address potential issues before the game is released. This helps ensure that the game is as polished and bug-free as possible.
+
+PPU: Our use of an FPGA-based PPU (Picture Processing Unit) in our game engine allows us to achieve high-quality graphics and smooth animation. This is important because it helps create an immersive and engaging gaming experience.
+
+Upscaling: We've implemented a sophisticated upscaling that allows us to scale up our game. This Ensures that our game runs smoothly and without any
+
+Collisions: We've put a lot of effort into making sure that our collision detection system is accurate and reliable. This ensures that the game mechanics work as intended and that players are able to navigate the game world without frustration.
+
+Artwork: We're proud of the artwork that was created which is stunning and imaginative artwork that brings the game world to life. From character designs to background artwork, every aspect of the game has been given careful attention to ensure that it looks as good as it plays. And more is coming!
+# Challegens
+Upscaling: While our upscaling algorithm is sophisticated, one of the challenges we faced was synchronization. Because we're upscaling in real-time, we had to ensure that the upscaling process didn't cause any lag or delay in the game. This required careful optimization of the algorithm and synchronization with other game components.
+
+PPU: While the use of an FPGA-based PPU allowed us to achieve high-quality graphics, it also presented some challenges. Specifically, the limited resources of the FPGA required us to optimize the PPU code to ensure that it could handle the demands of real-time gameplay.
+
+Communication bug fixes on the STM32: As with any complex system, we encountered some bugs in the communication between the STM32 microcontroller and the other components of the system. This required careful debugging and troubleshooting to identify and fix the issues.
+
diff --git a/docs/architecture.md b/docs/architecture.md
index 94f17a4..d4632b5 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -25,8 +25,9 @@ The PPU is responsible for rendering the graphics and displaying them on the scr
 For example, if the PPU is unable to keep up with the processing speed of the STM32, the graphics may lag or appear distorted, causing the game to become unplayable. Similarly, if there is a delay in communication between the STM32 and PPU, it could result in a mismatch between the game logic and the displayed graphics, leading to confusion for the player.
 
 To ensure a smooth and enjoyable gaming experience, it is essential to address any potential issues with the PPU and communication between the STM32 and PPU during the development process. This may involve optimizing the code for both components, adjusting the communication protocol, or adding buffer systems to prevent lag or synchronization issues.
+
 ### architecture ( top level)
-![Top level architecture](../assets/TopLevelArchi);
+![Top level architecture](../assets/TopLevel.PNG.);
 
 
 
-- 
cgit v1.2.3


From 6a70bf52bc2ed5d28b7d08854fabfaee27be3e84 Mon Sep 17 00:00:00 2001
From: NielsCoding <48092678+heavydemon21@users.noreply.github.com>
Date: Wed, 15 Mar 2023 20:08:12 +0100
Subject: architecture and design

---
 docs/architecture.md | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/docs/architecture.md b/docs/architecture.md
index d4632b5..cf4440f 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -26,14 +26,40 @@ For example, if the PPU is unable to keep up with the processing speed of the ST
 
 To ensure a smooth and enjoyable gaming experience, it is essential to address any potential issues with the PPU and communication between the STM32 and PPU during the development process. This may involve optimizing the code for both components, adjusting the communication protocol, or adding buffer systems to prevent lag or synchronization issues.
 
-### architecture ( top level)
+# architecture ( top level)
 ![Top level architecture](../assets/TopLevel.PNG.);
 
-
-
-
-### design document (mid-low level)
-
+## STM32
+### game engine
+### user input
+### PPU communication
+### APU communication
+### level editing pipeline
+
+## FPGA (PPU)
+### PPU
+### SPI
+### APU
+
+## Screen
+### VGA
+
+
+# design document (mid-low level)
+## STM32
+### game engine
+### user input
+### PPU communication
+### APU communication
+### level editing pipeline
+
+## FPGA (PPU)
+### PPU
+### SPI
+### APU
+
+## Screen
+### VGA
 # General system architecture
 
 ![Top-down system architecture diagram](../assets/architecture-level-1.svg)
-- 
cgit v1.2.3


From 1c0cb0d1cf8c9cb6a11aa404d8c31def1087a586 Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Wed, 15 Mar 2023 21:57:44 +0100
Subject: (UNCLEAN) partial merge of #37

---
 .vscode/settings.json         | 15 +--------------
 src/GameLoop/shop.h           |  4 ++--
 src/GameLoop/startingScreen.h |  8 +++-----
 src/engine/draw_screen.c      |  3 ++-
 src/engine/engine.c           |  2 +-
 src/engine/entity.c           |  4 ++++
 6 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7f37ba0..d027762 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,18 +8,5 @@
 		}
 	},
 	"cmake.configureOnOpen": false,
-	"files.eol": "\n",
-	"nrf-connect.topdir": "${nrf-connect.sdk:2.1.2}",
-	"nrf-connect.toolchain.path": "${nrf-connect.toolchain:2.1.2}",
-	"files.associations": {
-		"input.h": "c",
-		"draw_screen.h": "c",
-		"camera.h": "c",
-		"entity.h": "c",
-		"stdint.h": "c",
-		"player_controller.h": "c",
-		"sprite_controller.h": "c",
-		"types.h": "c",
-		"startingscreen.h": "c"
-	}
+	"files.eol": "\n"
 }
diff --git a/src/GameLoop/shop.h b/src/GameLoop/shop.h
index 35bb780..39db9fd 100644
--- a/src/GameLoop/shop.h
+++ b/src/GameLoop/shop.h
@@ -1,7 +1,8 @@
+#pragma once
+
 #include "input.h"
 #include "engine/draw_screen.h"
 
-
 #include <stdint.h>
 #include <stdbool.h>
 
@@ -11,5 +12,4 @@ typedef enum {
 	hh_e_STATE_END
 } hh_e_ShopStates;
 
-
 bool hh_show_Shop();
diff --git a/src/GameLoop/startingScreen.h b/src/GameLoop/startingScreen.h
index f51cc66..5b4f15a 100644
--- a/src/GameLoop/startingScreen.h
+++ b/src/GameLoop/startingScreen.h
@@ -1,13 +1,11 @@
 #pragma once
 
+#include "GameLoop/shop.h"
 #include <stdint.h>
 #include <stdbool.h>
 
-typedef enum {
-	hh_e_STATE_SHOW,
-	hh_e_STATE_Input,
-	hh_e_STATE_END
-} hh_e_screenStates;
+// TODO: fix naming of enum consts
+typedef hh_e_ShopStates hh_e_screenStates;
 
 
 bool hh_show_startingScreen();
diff --git a/src/engine/draw_screen.c b/src/engine/draw_screen.c
index 205d4b6..43d3cd4 100644
--- a/src/engine/draw_screen.c
+++ b/src/engine/draw_screen.c
@@ -61,10 +61,11 @@ void hh_setup_screen(){
 }
 
 void hh_setup_startingScreen(){
+	return;
 	int size = 300; // 40 x as tiles 30 y as tiles
 	FILE* level = fopen("../test/bin/startingScreen.bin", "rb"); /* open binary file */
 	if (!level) { /* check if file opened successfully */
-		fprintf(stderr, "Error: Failed to open file.\n");
+		fprintf(stderr, "Error: Failed to open file. AAAA\n");
 		return;
 	}
 	fseek(level, (0* sizeof(int)) + sizeof(int), SEEK_SET);
diff --git a/src/engine/engine.c b/src/engine/engine.c
index 3280892..d852a99 100644
--- a/src/engine/engine.c
+++ b/src/engine/engine.c
@@ -1,5 +1,5 @@
 #include "engine/draw_screen.h"
-#include "engine/bullet.h""
+#include "engine/bullet.h"
 #include "engine/level.h"
 #include "engine/maths.h"
 #include "engine/sprite_controller.h"
diff --git a/src/engine/entity.c b/src/engine/entity.c
index 153e7e1..888539a 100644
--- a/src/engine/entity.c
+++ b/src/engine/entity.c
@@ -3,6 +3,10 @@
 #include "engine/entity.h"
 #include "engine/maths.h"
 
+#ifdef HH_TARGET_DESKTOP
+#include <stdio.h>
+#endif
+
 /*
     PLAYER: (pos on X)
     ,___,
-- 
cgit v1.2.3


From 7b44ae05a17b544dfcddd8db322bbd916d2d2df3 Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Wed, 15 Mar 2023 22:17:56 +0100
Subject: architecture document update

---
 assets/ppu-level-1.svg |   2 +-
 assets/ppu-level-2.svg |   2 +-
 docs/architecture.md   | 119 +++++++++++++++++++++++++++++++------------------
 docs/ppu.drawio        |   2 +-
 4 files changed, 78 insertions(+), 47 deletions(-)

diff --git a/assets/ppu-level-1.svg b/assets/ppu-level-1.svg
index e0d1949..6b3a2ab 100644
--- a/assets/ppu-level-1.svg
+++ b/assets/ppu-level-1.svg
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="499px" height="212px" viewBox="-0.5 -0.5 499 212" style="background-color: rgb(255, 255, 255);"><defs/><g><rect x="177" y="47" width="160" height="130" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 262px; height: 1px; padding-top: 182px; margin-left: 126px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Basys3 FPGA<br />PPU</div></div></div></foreignObject><text x="257" y="194" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Basys3 FPGA...</text></switch></g><rect x="417" y="47" width="80" height="130" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 182px; height: 1px; padding-top: 182px; margin-left: 366px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Display output<br />(VGA)</div></div></div></foreignObject><text x="457" y="194" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Display output...</text></switch></g><path d="M 137 61.97 L 167 61.97 L 170.63 61.97" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 175.88 61.97 L 168.88 65.47 L 170.63 61.97 L 168.88 58.47 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 137 121.97 L 147 121.97 L 170.63 121.97" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 175.88 121.97 L 168.88 125.47 L 170.63 121.97 L 168.88 118.47 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><rect x="56.97" y="47" width="80.03" height="130" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 182px; height: 1px; padding-top: 182px; margin-left: 6px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">STM32F091RC<br />CPU</div></div></div></foreignObject><text x="97" y="194" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">STM32F091RC...</text></switch></g><path d="M 137.5 164.03 L 137.5 160.03 L 157 160.03 L 169.5 160.03 L 169.5 156.53 L 176.5 162.03 L 169.5 167.53 L 169.5 164.03 L 157 164.03 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 169.5 160.03 L 169.5 156.53 L 176.5 162.03 L 169.5 167.53 L 169.5 164.03" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><path d="M 337 112 L 413.63 112" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 415.88 112 L 412.88 113.5 L 413.63 112 L 412.88 110.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 337 62 L 357 61.97 L 357 37 L 37 37 L 37 61.97 L 50.6 61.99" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 55.85 62 L 48.85 65.49 L 50.6 61.99 L 48.86 58.49 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 337 121.97 L 397 121.97 L 413.63 121.97" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 415.88 121.97 L 412.88 123.47 L 413.63 121.97 L 412.88 120.47 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 337 72 L 367 71.97 L 367 27 L 27 27 L 27 71.97 L 50.6 71.99" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 55.85 72 L 48.85 75.49 L 50.6 71.99 L 48.86 68.49 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 51px; height: 1px; padding-top: 62px; margin-left: 179px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">RESET</div></div></div></foreignObject><text x="179" y="66" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">RESET</text></switch></g><path d="M 337 151.97 L 357 151.97 L 413.63 151.97" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 415.88 151.97 L 412.88 153.47 L 413.63 151.97 L 412.88 150.47 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 101px; height: 1px; padding-top: 142px; margin-left: 179px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">VRAM-ADDR</div></div></div></foreignObject><text x="179" y="146" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">VRAM-ADDR</text></switch></g><path d="M 337 162.03 L 357 162.03 L 413.63 162.03" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 415.88 162.03 L 412.88 163.53 L 413.63 162.03 L 412.88 160.53 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 101px; height: 1px; padding-top: 162px; margin-left: 179px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">VRAM-DATA</div></div></div></foreignObject><text x="179" y="166" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">VRAM-DATA</text></switch></g><path d="M 337 141.97 L 357 141.97 L 413.63 141.97" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 415.88 141.97 L 412.88 143.47 L 413.63 141.97 L 412.88 140.47 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 137.5 143.97 L 137.5 139.97 L 157 139.97 L 169.5 139.97 L 169.5 136.47 L 176.5 141.97 L 169.5 147.47 L 169.5 143.97 L 157 143.97 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 169.5 139.97 L 169.5 136.47 L 176.5 141.97 L 169.5 147.47 L 169.5 143.97" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 101px; height: 1px; padding-top: 122px; margin-left: 179px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">VRAM-WEN</div></div></div></foreignObject><text x="179" y="126" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">VRAM-WEN</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 152px; margin-left: 334px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">G</div></div></div></foreignObject><text x="336" y="156" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">G</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 162px; margin-left: 334px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">B</div></div></div></foreignObject><text x="336" y="166" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">B</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 142px; margin-left: 334px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">R</div></div></div></foreignObject><text x="336" y="146" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">R</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 112px; margin-left: 334px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">NVSYNC</div></div></div></foreignObject><text x="336" y="116" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">NVSYNC</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 122px; margin-left: 334px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">NHSYNC</div></div></div></foreignObject><text x="336" y="126" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">NHSYNC</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 62px; margin-left: 334px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">TVSYNC</div></div></div></foreignObject><text x="336" y="66" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">TVSYNC</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 72px; margin-left: 334px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">THSYNC</div></div></div></foreignObject><text x="336" y="76" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">THSYNC</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 82px; margin-left: 334px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">TVBLANK</div></div></div></foreignObject><text x="336" y="86" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">TVBLANK</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 92px; margin-left: 334px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">THBLANK</div></div></div></foreignObject><text x="336" y="96" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">THBLANK</text></switch></g><rect x="56.97" y="97" width="0.03" height="10" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 2px; height: 1px; padding-top: 102px; margin-left: 59px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">HBLANK</div></div></div></foreignObject><text x="59" y="106" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">HBLANK</text></switch></g><rect x="56.97" y="87" width="0.03" height="10" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 2px; height: 1px; padding-top: 92px; margin-left: 59px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">VBLANK</div></div></div></foreignObject><text x="59" y="96" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">VBLANK</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 2px; height: 1px; padding-top: 62px; margin-left: 59px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">VSYNC</div></div></div></foreignObject><text x="59" y="66" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">VSYNC</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 2px; height: 1px; padding-top: 72px; margin-left: 59px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;">HSYNC</div></div></div></foreignObject><text x="59" y="76" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">HSYNC</text></switch></g><path d="M 337 81.97 L 377 81.97 L 377 17 L 17 17 L 17 91.97 L 50.6 91.99" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="none"/><path d="M 55.85 92 L 48.85 95.49 L 50.6 91.99 L 48.86 88.49 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="none"/><path d="M 337 91.97 L 387 91.97 L 387 7 L 7 7 L 7 101.97 L 50.6 102" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="none"/><path d="M 55.85 102 L 48.85 105.49 L 50.6 102 L 48.85 98.49 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="none"/></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot display</text></a></switch></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="498px" height="192px" viewBox="-0.5 -0.5 498 192" style="background-color: rgb(255, 255, 255);"><defs/><g><rect x="177" y="47" width="160" height="110" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 262px; height: 1px; padding-top: 162px; margin-left: 126px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Basys3 FPGA<br />PPU</div></div></div></foreignObject><text x="257" y="174" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Basys3 FPGA...</text></switch></g><rect x="417" y="47" width="80" height="110" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 182px; height: 1px; padding-top: 162px; margin-left: 366px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Display output<br />(VGA)</div></div></div></foreignObject><text x="457" y="174" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Display output...</text></switch></g><path d="M 137 102 L 147 102 L 170.63 102" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 175.88 102 L 168.88 105.5 L 170.63 102 L 168.88 98.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><rect x="56.97" y="47" width="80.03" height="110" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 182px; height: 1px; padding-top: 162px; margin-left: 6px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">STM32F091RC<br />CPU</div></div></div></foreignObject><text x="97" y="174" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">STM32F091RC...</text></switch></g><path d="M 137.5 144 L 137.5 140 L 157 140 L 169.5 140 L 169.5 136.5 L 176.5 142 L 169.5 147.5 L 169.5 144 L 157 144 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 169.5 140 L 169.5 136.5 L 176.5 142 L 169.5 147.5 L 169.5 144" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><path d="M 337 92 L 387 92 L 413.63 92" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 415.88 92 L 412.88 93.5 L 413.63 92 L 412.88 90.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 337 102 L 397 102 L 413.63 102" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 415.88 102 L 412.88 103.5 L 413.63 102 L 412.88 100.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 337 132 L 357 132 L 413.63 132" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 415.88 132 L 412.88 133.5 L 413.63 132 L 412.88 130.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 100px; height: 1px; padding-top: 122px; margin-left: 179px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">VRAM-ADDR</div></div></div></foreignObject><text x="179" y="126" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">VRAM-ADDR</text></switch></g><path d="M 337 142 L 357 142 L 413.63 142" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 415.88 142 L 412.88 143.5 L 413.63 142 L 412.88 140.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 100px; height: 1px; padding-top: 142px; margin-left: 179px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">VRAM-DATA</div></div></div></foreignObject><text x="179" y="146" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">VRAM-DATA</text></switch></g><path d="M 337 122 L 357 122 L 413.63 122" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 415.88 122 L 412.88 123.5 L 413.63 122 L 412.88 120.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 137.5 124 L 137.5 120 L 157 120 L 169.5 120 L 169.5 116.5 L 176.5 122 L 169.5 127.5 L 169.5 124 L 157 124 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 169.5 120 L 169.5 116.5 L 176.5 122 L 169.5 127.5 L 169.5 124" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 100px; height: 1px; padding-top: 102px; margin-left: 179px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">VRAM-WEN</div></div></div></foreignObject><text x="179" y="106" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">VRAM-WEN</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 132px; margin-left: 333px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">G</div></div></div></foreignObject><text x="335" y="136" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">G</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 142px; margin-left: 333px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">B</div></div></div></foreignObject><text x="335" y="146" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">B</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 122px; margin-left: 333px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">R</div></div></div></foreignObject><text x="335" y="126" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">R</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 92px; margin-left: 333px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">NVSYNC</div></div></div></foreignObject><text x="335" y="96" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">NVSYNC</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 102px; margin-left: 333px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">NHSYNC</div></div></div></foreignObject><text x="335" y="106" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">NHSYNC</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 62px; margin-left: 333px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">TVBLANK</div></div></div></foreignObject><text x="335" y="66" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">TVBLANK</text></switch></g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 2px; height: 1px; padding-top: 72px; margin-left: 333px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">THBLANK</div></div></div></foreignObject><text x="335" y="76" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">THBLANK</text></switch></g><rect x="57.03" y="67" width="0.03" height="10" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 2px; height: 1px; padding-top: 72px; margin-left: 59px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">HBLANK</div></div></div></foreignObject><text x="59" y="76" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">HBLANK</text></switch></g><rect x="57" y="57" width="0.03" height="10" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 2px; height: 1px; padding-top: 62px; margin-left: 59px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">VBLANK</div></div></div></foreignObject><text x="59" y="66" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">VBLANK</text></switch></g><path d="M 337 62 L 377 62 L 377 17 L 17 17 L 17 62 L 50.63 62" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 55.88 62 L 48.88 65.5 L 50.63 62 L 48.88 58.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 337 72 L 387 72 L 387 7 L 7 7 L 7 72 L 50.66 72" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 55.91 72 L 48.91 75.5 L 50.66 72 L 48.91 68.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot display</text></a></switch></svg>
\ No newline at end of file
diff --git a/assets/ppu-level-2.svg b/assets/ppu-level-2.svg
index a7f343f..303e95a 100644
--- a/assets/ppu-level-2.svg
+++ b/assets/ppu-level-2.svg
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="632px" height="596px" viewBox="-0.5 -0.5 632 596" style="background-color: rgb(255, 255, 255);"><defs/><g><path d="M 0 117 L 630 117" fill="none" stroke="rgb(0, 0, 0)" stroke-opacity="0.5" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-end; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 114px; margin-left: 628px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">pipeline stage 1-2</div></div></div></foreignObject><text x="628" y="114" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="end">pipeline s...</text></switch></g><path d="M 0 357 L 630 357" fill="none" stroke="rgb(0, 0, 0)" stroke-opacity="0.5" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-end; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 354px; margin-left: 628px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">pipeline stage 5</div></div></div></foreignObject><text x="628" y="354" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="end">pipeline s...</text></switch></g><path d="M 0 207 L 630 207" fill="none" stroke="rgb(0, 0, 0)" stroke-opacity="0.5" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-end; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 204px; margin-left: 628px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">pipeline stage 3-4</div></div></div></foreignObject><text x="628" y="204" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="end">pipeline s...</text></switch></g><path d="M 280 107 L 280 140.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280 145.88 L 276.5 138.88 L 280 140.63 L 283.5 138.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-end; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 136px; margin-left: 280px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">sprite info</div></div></div></foreignObject><text x="280" y="136" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">sprite info</text></switch></g><path d="M 339.5 172 L 339.5 182.5 L 320.5 167 L 339.5 151.5 L 339.5 162 L 350 162 L 399.5 162 L 399.5 172 L 350 172 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 339.5 172 L 339.5 182.5 L 320.5 167 L 339.5 151.5 L 339.5 162" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 167px; margin-left: 360px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">TMM</div></div></div></foreignObject><text x="360" y="170" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">TMM</text></switch></g><rect x="240" y="27" width="80" height="80" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 67px; margin-left: 241px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Background sprite info</div></div></div></foreignObject><text x="280" y="71" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Background sp...</text></switch></g><path d="M 190 67 L 190 140.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 190 145.88 L 186.5 138.88 L 190 140.63 L 193.5 138.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-end; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 136px; margin-left: 190px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">sprite info</div></div></div></foreignObject><text x="190" y="136" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">sprite info</text></switch></g><path d="M 70.5 172 L 70.5 162 L 110 162 L 130.5 162 L 130.5 151.5 L 149.5 167 L 130.5 182.5 L 130.5 172 L 110 172 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" stroke-dasharray="3 3" pointer-events="all"/><path d="M 130.5 162 L 130.5 151.5 L 149.5 167 L 130.5 182.5 L 130.5 172" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" stroke-dasharray="3 3" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 167px; margin-left: 110px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">TMM</div></div></div></foreignObject><text x="110" y="170" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">TMM</text></switch></g><rect x="150" y="27" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 47px; margin-left: 151px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Foreground sprite info</div></div></div></foreignObject><text x="190" y="51" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Foreground sp...</text></switch></g><path d="M 280 267 L 280 300.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280 305.88 L 276.5 298.88 L 280 300.63 L 283.5 298.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 287px; margin-left: 280px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">global palette index</div></div></div></foreignObject><text x="280" y="290" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">global palette index</text></switch></g><rect x="240" y="227" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 247px; margin-left: 241px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Compositor</div></div></div></foreignObject><text x="280" y="251" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Compositor</text></switch></g><path d="M 260 447 L 260 467 L 20 467 L 20 7 L 190 7 L 190 20.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 190 25.88 L 186.5 18.88 L 190 20.63 L 193.5 18.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 260 447 L 260 467 L 20 467 L 20 7 L 280 7 L 280 20.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280 25.88 L 276.5 18.88 L 280 20.63 L 283.5 18.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 300 447 L 300 487 L 300 490.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 300 495.88 L 296.5 488.88 L 300 490.63 L 303.5 488.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 472px; margin-left: 300px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">VGA signal</div></div></div></foreignObject><text x="300" y="475" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">VGA signal</text></switch></g><rect x="240" y="387" width="80" height="60" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 417px; margin-left: 241px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">tiny VGA signal generator</div></div></div></foreignObject><text x="280" y="421" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">tiny VGA sign...</text></switch></g><path d="M 280 347 L 280 380.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280 385.88 L 276.5 378.88 L 280 380.63 L 283.5 378.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 280 347 L 280 380.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280 385.88 L 276.5 378.88 L 280 380.63 L 283.5 378.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 367px; margin-left: 280px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">rgb value</div></div></div></foreignObject><text x="280" y="370" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">rgb value</text></switch></g><path d="M 339.5 332 L 339.5 342.5 L 320.5 327 L 339.5 311.5 L 339.5 322 L 360 322 L 380.5 322 L 380.5 311.5 L 399.5 327 L 380.5 342.5 L 380.5 332 L 360 332 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 339.5 332 L 339.5 342.5 L 320.5 327 L 339.5 311.5 L 339.5 322" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><path d="M 380.5 322 L 380.5 311.5 L 399.5 327 L 380.5 342.5 L 380.5 332" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 327px; margin-left: 360px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">PAL</div></div></div></foreignObject><text x="360" y="330" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">PAL</text></switch></g><rect x="240" y="307" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 327px; margin-left: 241px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Palette lookup</div></div></div></foreignObject><text x="280" y="331" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Palette lookup</text></switch></g><path d="M 280 187 L 280 220.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280 225.88 L 276.5 218.88 L 280 220.63 L 283.5 218.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 399.5 42 L 399.5 52 L 340 52 L 339.5 52 L 339.5 62.5 L 320.5 47 L 339.5 31.5 L 339.5 42 L 340 42 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 339.5 52 L 339.5 62.5 L 320.5 47 L 339.5 31.5 L 339.5 42" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 47px; margin-left: 360px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">BAM</div></div></div></foreignObject><text x="360" y="50" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">BAM</text></switch></g><path d="M 339.5 92 L 339.5 102.5 L 320.5 87 L 339.5 71.5 L 339.5 82 L 360 82 L 380.5 82 L 380.5 71.5 L 399.5 87 L 380.5 102.5 L 380.5 92 L 360 92 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 339.5 92 L 339.5 102.5 L 320.5 87 L 339.5 71.5 L 339.5 82" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><path d="M 380.5 82 L 380.5 71.5 L 399.5 87 L 380.5 102.5 L 380.5 92" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 87px; margin-left: 360px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">AUX</div></div></div></foreignObject><text x="360" y="90" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">AUX</text></switch></g><rect x="240" y="147" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 167px; margin-left: 241px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Sprite render</div></div></div></foreignObject><text x="280" y="171" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Sprite render</text></switch></g><path d="M 220 187 L 220 197 L 280 197 L 280 220.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280 225.88 L 276.5 218.88 L 280 220.63 L 283.5 218.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 197px; margin-left: 250px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">pixel data</div></div></div></foreignObject><text x="250" y="200" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">pixel data</text></switch></g><path d="M 130.5 42 L 130.5 31.5 L 149.5 47 L 130.5 62.5 L 130.5 52 L 90 52 L 89.5 52 L 89.5 62.5 L 70.5 47 L 89.5 31.5 L 89.5 42 L 90 42 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 130.5 42 L 130.5 31.5 L 149.5 47 L 130.5 62.5 L 130.5 52" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><path d="M 89.5 52 L 89.5 62.5 L 70.5 47 L 89.5 31.5 L 89.5 42" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 47px; margin-left: 110px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">FAM</div></div></div></foreignObject><text x="110" y="50" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">FAM</text></switch></g><rect x="150" y="147" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 167px; margin-left: 151px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Sprite render</div></div></div></foreignObject><text x="190" y="171" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Sprite render</text></switch></g><path d="M 490.5 162 L 490.5 151.5 L 509.5 167 L 490.5 182.5 L 490.5 172 L 490 172 L 430.5 172 L 430.5 162 L 490 162 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 490.5 162 L 490.5 151.5 L 509.5 167 L 490.5 182.5 L 490.5 172" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 167px; margin-left: 470px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">TMM</div></div></div></foreignObject><text x="470" y="170" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">TMM</text></switch></g><rect x="510" y="147" width="120" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 167px; margin-left: 511px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Tilemap memory</div></div></div></foreignObject><text x="570" y="171" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Tilemap memory</text></switch></g><path d="M 430.5 52 L 430.5 42 L 460 42 L 490.5 42 L 490.5 31.5 L 509.5 47 L 490.5 62.5 L 490.5 52 L 460 52 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 490.5 42 L 490.5 31.5 L 509.5 47 L 490.5 62.5 L 490.5 52" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 47px; margin-left: 470px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">BAM</div></div></div></foreignObject><text x="470" y="50" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">BAM</text></switch></g><rect x="510" y="27" width="120" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 47px; margin-left: 511px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Background attribute memory</div></div></div></foreignObject><text x="570" y="51" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Background attribute...</text></switch></g><rect x="160" y="457" width="100" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 467px; margin-left: 161px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: normal; overflow-wrap: normal;">screen position</div></div></div></foreignObject><text x="210" y="471" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">screen position</text></switch></g><rect x="400" y="27" width="30" height="320" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" transform="rotate(180,415,187)" pointer-events="all"/><g transform="translate(-0.5 -0.5)rotate(-90 407 37)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-end; width: 310px; height: 1px; padding-top: 37px; margin-left: 97px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">PPU RAM bus</div></div></div></foreignObject><text x="407" y="49" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">PPU RAM bus</text></switch></g><rect x="40" y="27" width="30" height="160" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" transform="rotate(180,55,107)" pointer-events="all"/><g transform="translate(-0.5 -0.5)rotate(-90 47 37)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-end; width: 150px; height: 1px; padding-top: 37px; margin-left: -103px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">PPU RAM bus</div></div></div></foreignObject><text x="47" y="49" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">PPU RAM bus</text></switch></g><rect x="240" y="497" width="80" height="50" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 522px; margin-left: 241px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">native VGA signal generator</div></div></div></foreignObject><text x="280" y="526" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">native VGA si...</text></switch></g><path d="M 280 547 L 280 577 L 280 580.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280 585.88 L 276.5 578.88 L 280 580.63 L 283.5 578.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 567px; margin-left: 280px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">VGA signal</div></div></div></foreignObject><text x="280" y="570" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">VGA signal</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot display</text></a></switch></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="632px" height="476px" viewBox="-0.5 -0.5 632 476" style="background-color: rgb(255, 255, 255);"><defs/><g><path d="M 0 117 L 630 117" fill="none" stroke="rgb(0, 0, 0)" stroke-opacity="0.5" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-end; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 114px; margin-left: 628px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">pipeline stage 1-2</div></div></div></foreignObject><text x="628" y="114" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="end">pipeline s...</text></switch></g><path d="M 0 357 L 630 357" fill="none" stroke="rgb(0, 0, 0)" stroke-opacity="0.5" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-end; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 354px; margin-left: 628px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">pipeline stage 5</div></div></div></foreignObject><text x="628" y="354" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="end">pipeline s...</text></switch></g><path d="M 0 207 L 630 207" fill="none" stroke="rgb(0, 0, 0)" stroke-opacity="0.5" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-end; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 204px; margin-left: 628px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">pipeline stage 3-4</div></div></div></foreignObject><text x="628" y="204" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="end">pipeline s...</text></switch></g><path d="M 280 107 L 280 140.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280 145.88 L 276.5 138.88 L 280 140.63 L 283.5 138.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-end; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 136px; margin-left: 280px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">sprite info</div></div></div></foreignObject><text x="280" y="136" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">sprite info</text></switch></g><path d="M 339.5 172 L 339.5 182.5 L 320.5 167 L 339.5 151.5 L 339.5 162 L 350.03 162 L 399.5 162 L 399.5 172 L 350.03 172 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 339.5 172 L 339.5 182.5 L 320.5 167 L 339.5 151.5 L 339.5 162" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 167px; margin-left: 360px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">TMM</div></div></div></foreignObject><text x="360" y="170" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">TMM</text></switch></g><rect x="240" y="27" width="80" height="80" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 67px; margin-left: 241px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Background sprite info</div></div></div></foreignObject><text x="280" y="71" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Background sp...</text></switch></g><path d="M 190 67 L 190 140.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 190 145.88 L 186.5 138.88 L 190 140.63 L 193.5 138.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-end; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 136px; margin-left: 190px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">sprite info</div></div></div></foreignObject><text x="190" y="136" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">sprite info</text></switch></g><path d="M 70.5 172 L 70.5 162 L 110.03 162 L 130.5 162 L 130.5 151.5 L 149.5 167 L 130.5 182.5 L 130.5 172 L 110.03 172 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" stroke-dasharray="3 3" pointer-events="all"/><path d="M 130.5 162 L 130.5 151.5 L 149.5 167 L 130.5 182.5 L 130.5 172" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" stroke-dasharray="3 3" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 167px; margin-left: 110px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">TMM</div></div></div></foreignObject><text x="110" y="170" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">TMM</text></switch></g><rect x="150" y="27" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 47px; margin-left: 151px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Foreground sprite info</div></div></div></foreignObject><text x="190" y="51" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Foreground sp...</text></switch></g><path d="M 280 267 L 280 300.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280 305.88 L 276.5 298.88 L 280 300.63 L 283.5 298.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 287px; margin-left: 280px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">global palette index</div></div></div></foreignObject><text x="280" y="290" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">global palette index</text></switch></g><rect x="240" y="227" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 247px; margin-left: 241px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Compositor</div></div></div></foreignObject><text x="280" y="251" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Compositor</text></switch></g><path d="M 260 427 L 260.03 447 L 20.03 447 L 20.03 7 L 190.03 7 L 190.03 20.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 190.03 25.88 L 186.53 18.88 L 190.03 20.63 L 193.53 18.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 260 427 L 260.03 447 L 20.03 447 L 20.03 7 L 280.03 7 L 280.03 20.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280.03 25.88 L 276.53 18.88 L 280.03 20.63 L 283.53 18.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 280 347 L 280 380.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280 385.88 L 276.5 378.88 L 280 380.63 L 283.5 378.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 280 347 L 280 380.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280 385.88 L 276.5 378.88 L 280 380.63 L 283.5 378.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 367px; margin-left: 280px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">rgb value</div></div></div></foreignObject><text x="280" y="370" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">rgb value</text></switch></g><path d="M 339.5 332 L 339.5 342.5 L 320.5 327 L 339.5 311.5 L 339.5 322 L 360.03 322 L 380.5 322 L 380.5 311.5 L 399.5 327 L 380.5 342.5 L 380.5 332 L 360.03 332 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 339.5 332 L 339.5 342.5 L 320.5 327 L 339.5 311.5 L 339.5 322" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><path d="M 380.5 322 L 380.5 311.5 L 399.5 327 L 380.5 342.5 L 380.5 332" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 327px; margin-left: 360px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">PAL</div></div></div></foreignObject><text x="360" y="330" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">PAL</text></switch></g><rect x="240" y="307" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 327px; margin-left: 241px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Palette lookup</div></div></div></foreignObject><text x="280" y="331" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Palette lookup</text></switch></g><path d="M 280 187 L 280 220.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280 225.88 L 276.5 218.88 L 280 220.63 L 283.5 218.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 399.5 42 L 399.5 52 L 340.03 52 L 339.5 52 L 339.5 62.5 L 320.5 47 L 339.5 31.5 L 339.5 42 L 340.03 42 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 339.5 52 L 339.5 62.5 L 320.5 47 L 339.5 31.5 L 339.5 42" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 47px; margin-left: 360px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">BAM</div></div></div></foreignObject><text x="360" y="50" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">BAM</text></switch></g><path d="M 339.5 92 L 339.5 102.5 L 320.5 87 L 339.5 71.5 L 339.5 82 L 360.03 82 L 380.5 82 L 380.5 71.5 L 399.5 87 L 380.5 102.5 L 380.5 92 L 360.03 92 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 339.5 92 L 339.5 102.5 L 320.5 87 L 339.5 71.5 L 339.5 82" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><path d="M 380.5 82 L 380.5 71.5 L 399.5 87 L 380.5 102.5 L 380.5 92" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 87px; margin-left: 360px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">AUX</div></div></div></foreignObject><text x="360" y="90" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">AUX</text></switch></g><rect x="240" y="147" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 167px; margin-left: 241px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Sprite render</div></div></div></foreignObject><text x="280" y="171" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Sprite render</text></switch></g><path d="M 220.03 187 L 220.03 197 L 280.03 197 L 280.03 220.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 280.03 225.88 L 276.53 218.88 L 280.03 220.63 L 283.53 218.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 197px; margin-left: 250px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">pixel data</div></div></div></foreignObject><text x="250" y="200" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">pixel data</text></switch></g><path d="M 130.5 42 L 130.5 31.5 L 149.5 47 L 130.5 62.5 L 130.5 52 L 90.03 52 L 89.5 52 L 89.5 62.5 L 70.5 47 L 89.5 31.5 L 89.5 42 L 90.03 42 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 130.5 42 L 130.5 31.5 L 149.5 47 L 130.5 62.5 L 130.5 52" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><path d="M 89.5 52 L 89.5 62.5 L 70.5 47 L 89.5 31.5 L 89.5 42" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 47px; margin-left: 110px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">FAM</div></div></div></foreignObject><text x="110" y="50" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">FAM</text></switch></g><rect x="150" y="147" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 167px; margin-left: 151px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Sprite render</div></div></div></foreignObject><text x="190" y="171" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Sprite render</text></switch></g><path d="M 490.5 162 L 490.5 151.5 L 509.5 167 L 490.5 182.5 L 490.5 172 L 490.03 172 L 430.5 172 L 430.5 162 L 490.03 162 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 490.5 162 L 490.5 151.5 L 509.5 167 L 490.5 182.5 L 490.5 172" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 167px; margin-left: 470px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">TMM</div></div></div></foreignObject><text x="470" y="170" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">TMM</text></switch></g><rect x="510" y="147" width="120" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 167px; margin-left: 511px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Tilemap memory</div></div></div></foreignObject><text x="570" y="171" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Tilemap memory</text></switch></g><path d="M 430.5 52 L 430.5 42 L 460.03 42 L 490.5 42 L 490.5 31.5 L 509.5 47 L 490.5 62.5 L 490.5 52 L 460.03 52 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="1.42" pointer-events="all"/><path d="M 490.5 42 L 490.5 31.5 L 509.5 47 L 490.5 62.5 L 490.5 52" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="4" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 47px; margin-left: 470px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">BAM</div></div></div></foreignObject><text x="470" y="50" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">BAM</text></switch></g><rect x="510" y="27" width="120" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 47px; margin-left: 511px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Background attribute memory</div></div></div></foreignObject><text x="570" y="51" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Background attribute...</text></switch></g><rect x="90" y="437" width="100" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 447px; margin-left: 91px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: normal; overflow-wrap: normal;">screen position</div></div></div></foreignObject><text x="140" y="451" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">screen position</text></switch></g><rect x="400" y="27" width="30" height="320" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" transform="rotate(180,415,187)" pointer-events="all"/><g transform="translate(-0.5 -0.5)rotate(-90 407 37)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-end; width: 310px; height: 1px; padding-top: 37px; margin-left: 97px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">PPU RAM bus</div></div></div></foreignObject><text x="407" y="49" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">PPU RAM bus</text></switch></g><rect x="40" y="27" width="30" height="160" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" transform="rotate(180,55,107)" pointer-events="all"/><g transform="translate(-0.5 -0.5)rotate(-90 47.000000000000114 37)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-end; width: 150px; height: 1px; padding-top: 37px; margin-left: -103px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: right;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">PPU RAM bus</div></div></div></foreignObject><text x="47" y="49" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">PPU RAM bus</text></switch></g><rect x="240" y="387" width="80" height="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 407px; margin-left: 241px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Display controller</div></div></div></foreignObject><text x="280" y="411" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Display contr...</text></switch></g><path d="M 300 427 L 300 460.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 300 465.88 L 296.5 458.88 L 300 460.63 L 303.5 458.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 447px; margin-left: 300px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">VGA signal</div></div></div></foreignObject><text x="300" y="450" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">VGA signal</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot display</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/architecture.md b/docs/architecture.md
index 5001eed..9be6751 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -1,12 +1,35 @@
 # General system architecture
 
-![Top-down system architecture diagram](../assets/architecture-level-1.svg)
+The existing hardware components available for building this project consists
+of:
+
+- Raspberry Pi
+- Nucleo STM32 development board
+- Basys3 FPGA development board
+- Arduino Uno R3
+
+The Raspberry Pi is by far the most powerful component out of these 4, but
+because one of the project requirements is that no general-purpose operating
+system is used, utilizing the Raspberry Pi will involve writing low-level
+drivers for its interfaces, which will likely cost a lot of effort.
+
+As to not risk project failure due to hardware constraints, the decision was
+made to use the STM32 microcontroller and FPGA in combination, as these two are
+both familiar and still relatively powerful platforms. Because audio and video
+consist of data streams that require constant output, the audio and graphics
+processing is outsourced to the FPGA. All other game logic processing such as
+world loading, or map and entity interactions is done on the STM32
+microcontroller.
+
+Our game also supports an optional second player, as is shown in the following
+diagram.
 
-Important notes:
+![Top-down system architecture diagram](../assets/architecture-level-1.svg)
 
-- Gamepad 2 is optionally connected
-- The PPU and APU are implemented on the FPGA
-- The game logic and PPU/APU control logic runs on the STM32 only
+In the above diagram, the "display" and "speaker" components are included to
+show what the complete system looks like. The scope of this project only
+includes the components inside the area marked "game console" and the gamepad
+components.
 
 # Game controllers
 
@@ -60,7 +83,13 @@ The state machine will be designed with the following states:
 
 # PPU
 
-Here's a list of features our PPU has:
+As mentioned in the [research document](research.md#graphics), the PPU designed
+for this project is heavily inspired by the NES's PPU. Because our game does
+need slightly different graphical capabilities, the differences between the NES
+PPU and our custom PPU are highlighted here. Readers of this section are
+expected to know basic operation of the NES's PPU.
+
+PPU features:
 
 - 320x240 @ 60Hz VGA output (upscaled to 640x480)
 - single tilemap with room for 1024 tiles of 16x16 pixels
@@ -71,8 +100,7 @@ Here's a list of features our PPU has:
 - sprites are always drawn on top of the background layer
 - PPU control using DMA (dual-port asynchronous RAM)
 - tiles can be flipped using FAM or BAM
-- no frame buffer
-- vertical and horizontal sync and blank output
+- vertical and horizontal blank output
 
 Notable differences:
 
@@ -80,60 +108,63 @@ Notable differences:
 - NES OAM equivalent is called FAM (foreground attribute register)
 - 320x240 @ 60Hz output
   
-  Since we're using VGA, we can't use custom resolutions without an
-  upscaler/downscaler. This resolution was chosen because it's exactly half of
-  the lowest standard VGA resolution 640x480.
+  Since the FPGA board we're using has a VGA port, the PPU outputs VGA. VGA
+  does not support custom resolutions. This resolution was chosen because it's
+  exactly half of the lowest standard VGA resolution 640x480. This allows the
+  PPU to use nearest-neighbor upscaling, which will lead to a simpler hardware
+  implementation.
 - No scanline sprite limit  
   
-  Unless not imposing any sprite limit makes the hardware implementation
-  impossible, or much more difficult, this is a restriction that will likely
-  lead to frustrating debugging sessions, so will not be replicated in our
-  custom PPU.
+  This was a hardware limitation of the original NES, which our PPU design does
+  not have.
 - Sprites are 16x16
   
   Most NES games already tile multiple 8x8 tiles together into "metatiles" to
-  create the illusion of larger sprites. This was likely done to save on memory
-  costs as RAM was expensive in the '80s, but since we're running on an FPGA
-  cost is irrelevant.
+  create the illusion of larger sprites. This however is wasteful of the
+  available foreground sprites, so this PPU has 16x16 pixel sprites by default.
 - Single 1024 sprite tilemap shared between foreground and background sprites
   
   The NES OAM registers contain a bit to select which tilemap to use (of two),
   which effectively expands each tile's index address by one byte. Instead of
   creating the illusion of two separate memory areas for tiles, having one
-  large tilemap seems like a more sensible solution to indexed tiles.
+  large tilemap is a simpler solution.
 - 8 total palettes, with 8 colors each
   
-  More colors is better. Increasing the total palette count is a very memory
-  intensive operation, while increasing the palette color count is likely slower
-  when looking up color values for each pixel on real hardware.
+  More colors allows for nicer looking graphics. Increasing the palette color
+  count is a very memory intensive operation as this inflates the entire
+  tilemap, while increasing the total palette count increases FPGA utilization.
+  Keeping in mind that these palettes can be modified at any point during
+  runtime, an 8x8 palette table is likely big enough.
 - Sprites can be positioned partially off-screen on all screen edges using only
   the offset bits in the FAM register
   
   The NES has a separate PPUMASK register to control special color effects, and
   to shift sprites off the left and top screen edges, as the sprite offsets
-  count from 0. Our PPU's FAM sprite offset bits count from -15, so the sprite
+  count from 0. Our PPU's FAM sprite offset bits count from -16, so the sprite
   can shift past the top and left screen edges, as well as the standard bottom
   and right edges.
-- No status line register, only V-sync and H-sync outputs are supplied back to
-  CPU
+- No status line register, only V-blank and H-blank outputs are supplied back
+  to CPU
   
-  The NES status line register contains some handy lines, such as a buggy
-  status line for reaching the max sprite count per scanline, and a status line
-  for detecting collisions between background and foreground sprites. Our PPU
-  doesn't have a scanline limit, and all hitbox detection is done in software.
-  Software hacks involving swapping tiles during a screen draw cycle can still
-  be achieved by counting the V-sync and H-sync pulses using interrupts.
+  The NES status line register contains a buggy status line for reaching the
+  max sprite count per scanline, and a status line for detecting collisions
+  between background and foreground sprites. Our PPU doesn't have a scanline
+  limit, and all hitbox detection is done in software. Software hacks involving
+  swapping tiles during a screen draw cycle can still be achieved by counting
+  the V-blank and H-blank pulses using interrupts.
 - No background scrolling splits
   
   This feature allows only part of the background canvas to be scrolled, while
   another portion stays still. This was used to draw HUD elements on the
   background layer for displaying things like health bars or score counters.
-  Since we are working with a higher foreground sprite limit, we'll use regular
+  Since this PPU has a higher foreground sprite limit, the game uses regular
   foreground sprites to display HUD elements.
 - Sprites are always drawn on top of the background layer
   
-  Our game doesn't need this capability for any visual effects. Leaving this
-  feature out will lead to a simpler hardware design
+  The NES PPU has the capability to draw 'foreground' sprites both behind and
+  in front of the background layer. Our game doesn't need this capability for
+  any visual effects. Leaving this feature out will lead to a simpler hardware
+  design.
 - Sprites are positioned relative to the viewport, not the background layer
   
   This leads to a simpler hardware architecture for the foreground sprite
@@ -149,20 +180,18 @@ Notable differences:
 
 Important notes:
 
-- The STM32 can reset the PPU. This line will also be connected to a physical
-  button on the FPGA.
 - The STM32 uses direct memory access to control the PPU.
 - The PPU's native resolution is 320x240. It works in this resolution as if it
   is a valid VGA signal. The STM32 is also only aware of this resolution. This
   resolution is referred to as "tiny" resolution. Because VGA-compatible LCD's
   likely don't support this resolution due to low clock speed, a built-in
-  pixel-perfect 2X upscaler is chained after the PPU's "tiny" output. This
+  pixel-perfect 2X upscaler is internally connected before the output. This
   means that the display sees the resolution as 640x480, but the PPU and STM32
   only work in 320x240.
-- The STM32 receives the TVSYNC and THSYNC lines from the PPU. These are the
-  VSYNC and HSYNC lines from the tiny VGA signal generator. These lines can be
+- The STM32 receives the TVBLANK and THBLANK lines from the PPU. These are the
+  VBLANK and HBLANK lines from the "tiny" VGA resolution. These lines can be
   used to trigger interrupts for counting frames, and to make sure no
-  read/write conflicts occur for protected memory regions in the PPU.
+  simultanious reads and writes occur in the PPU.
 - NVSYNC, NHSYNC and the RGB signals refer to the output of the native VGA
   signal generator.
 
@@ -181,12 +210,12 @@ Important notes:
      sprite with non-transparent color at current pixel in order, fallback to
      background)
      - (Palette lookup) lookup palette color using palette register
-     - (VGA signal generator) output real color to VGA signal generator
+     - (Display controller) output upscaled tiny display signal
 - The pipeline stages with two clock cycles contain an address set and memory
   read step.
-- The pipeline takes 5 clock ticks in total. About 18 are available during each
-  pixel. For optimal display compatibility, the output color signal should be
-  stable before 50% of the pixel clock pulse width (9 clock ticks).
+- The pipeline takes 5 clock ticks in total. About 16 are available during each
+  pixel. Since each scanline is buffered in the upscaler, all available clock
+  cycles can be used (if necessary).
 - Since the "sprite info" and "sprite render" steps are fundamentally different
   for the foreground and background layer, these components will be combined
   into one for each layer respectively. They are separated in the above diagram
@@ -197,6 +226,7 @@ Important notes:
   the RAM in it's own cache memory. The cache updates are fetched during the
   VBLANK time between each frame.
 
+<!--
 ### Level 3
 
 This diagram has several flaws, but a significant amount of time has already
@@ -227,6 +257,7 @@ Important notes:
   CIDX signal based on the EN signal from the compositor.
 - All DATA and ADDR lines are shared between all RAM ports. WEN inputs are
   controlled by the address decoder.
+-->
 
 ## Registers
 
diff --git a/docs/ppu.drawio b/docs/ppu.drawio
index c0ce0be..f7677be 100644
--- a/docs/ppu.drawio
+++ b/docs/ppu.drawio
@@ -1 +1 @@
-<mxfile host="Electron" modified="2023-02-17T15:42:42.163Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.8.16 Chrome/106.0.5249.199 Electron/21.4.0 Safari/537.36" etag="F4f9xIP4TBzWa1ggQMnZ" version="20.8.16" type="device" pages="3"><diagram name="level-1" id="DBE48RpXtx8JnoEt3ekA">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</diagram><diagram id="MdQQJuunD4ehtDpxKxax" name="level-2">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</diagram><diagram id="lj51MlK96fuJFRP7cw84" name="level-3">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</diagram></mxfile>
\ No newline at end of file
+<mxfile host="Electron" modified="2023-03-15T21:14:25.736Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.8.16 Chrome/106.0.5249.199 Electron/21.4.0 Safari/537.36" etag="djLggK9M9AFY2cF3fK9j" version="20.8.16" type="device" pages="3"><diagram name="level-1" id="DBE48RpXtx8JnoEt3ekA">7Vtbd6I6FP41rnXOg13cRH3ES9sztU6XtRfn5SyUiHQisRCr9tdPkEQJQdAqWmc5D7PIziYm+/v2JSEtqPXx/MYzJ6N7ZAFYUCRrXlAbBUUp6Tr5PxAsQoGqlUOB7TlWKJLXgkfnE1ChRKVTxwI+p4gRgtiZ8MIBcl0wwJzM9Dw049WGCPK/OjFtIAgeByYUpS+OhUehtFKS1vJb4Ngj9suyRHvGJlOmAn9kWmgWEanNglr3EMLh03heBzCwHbNL+N71ht7VxDzg4m1eKC3+w/gVd6dyd9aDqK03pdsiHeXDhFO64JrpL3yVyK4fboyCokMyeK3vkSc7eHp4eKLLwQtmIw9NXQsEPyMRjdnIweBxYg6C3hkhBZGN8BiSlkwefdLjuHYLDINZF0vSWtahduSEdFRo9gF8QL6DHeQS2YCsGnik4wN42CF4tWIKfYQxGhMFEzp24hsG7cAomKJoTmYbog7mERE17w1AY4C9BVGhvQrDnnK9TJuzNXFkncpGPGkoYSlZ7dXQazzJA4V0B3gVAd6G40+gGUwaTfFkikWE/3m+Mf69YLwBY03LxLiSF8R3LeN53Ov1Xu+aVWdufPaR/lJUBaiARSIYbSIPj5CNXBM219IaD6b/G+DBiDbWL7RQYLMlnm8A4wWNzeYUoxjaLLAtB8Omh40g8BKBi1zAZNdOsK6lzkYYiJ4NcMpiKZ+DFaaC5QFoYueDj+FJpl++Sqa79AimMEGOi/3IyA+BYM0BucxzQFZKfOTdTZ88hDPY8LYuXUmRf3LiWKvJ+2jqDQAdI8atlYW+HlFUIaI8du9V5Vqqyp26GEzql3SxMZSUq1fVcnYwuZLUY6YMuSIgLEYY12IuPoCm7zsDHjQe4ex4BGB/ORgzdQQGuAQ+iDGT4P0hBHP60zVmJY2FGFag6cGQrhVr0vilMG3aVrcNSB8ATu6nP+XFXaNzPQbt/oP1oyirW0akOTduBOBSQrZgst3C2K6RQ98ucgjDKjofzrQ4F0OrCQPtHGYrUuKEN4bZdP1NYZZNBw2HPtg3ZiaTpLp3jv5CWuYpv5HiIeops9dFV0irNU+cm1dkZCSQ00mToZ+Rm1Uhs8dc4XDZOBGb1d7yLJlVOS9mKbtVfRn6PLMORoiEZH0+hGC+eCaMUOMJp5TOiAz9fBghi0c8zx3jvmg0Gh2BK6RyxbH6G3voN6gjiEgtzDZ0Q7KXi4li9Vq8aB47lrXkWlK5H9uOcoV8vNYPztfiu4JU0n39+EbWkjbyB6i7kz13/438KT1XOW/PzSgtM/Rz8lxxr7303IbRNS6em+q5iaesuXmuLKBxTp6rnbfnajt6rnYMzy0JnitS5HKGEqtQzvEMRfvqGYrMDyvp/LhKKbE77xOWDGfK0D/KCUvad4F4pnxpti+JMjVRKjklStiGDftNk/ypNarUxj+GnY6d8LFZQMcmhppsv9DVd3+zz0aQUg2g6lvU+GpelQKzbMQCNzkQ1AuXkhtDk8mYCnk2Qxc8+Y5Sucli3Khd8ODwyCtApNaiETzyOKM4SzwODUBZvr2H0tvTe8tQXn7p70/lX/9/ywidFBHix+wHY6AuGKD9/Nhr1/8aFqbCfnwWpn0XiIJwewHhaKly0etPO7jfN94/f8J2tViv9Z++Y2RIumd1iMCQuH6xUug+11pG++6vIWUq7MePDInTEU9Eu7cXFE4cGsSiLTdMct5657bvjtzioghVxateG2565QWbeEaZW0A7X9gSE87pMDvRRSIy9Vf6/rLRCxpXJdZszKOdjUUh45pv9JtEWrKNnhynUfjUF0Nih2qVjHshMXVNylDfQ7ty2I8dycnpRHeQvkbKMHSxzxr8hzR9L9KqW5JW+x6kjd17q+52TU5Np6G6j3Z1L9KS5vpvqkL19R+mqc0/</diagram><diagram id="MdQQJuunD4ehtDpxKxax" name="level-2">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</diagram><diagram id="lj51MlK96fuJFRP7cw84" name="level-3">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</diagram></mxfile>
\ No newline at end of file
-- 
cgit v1.2.3


From f53db3c725838e89a6148b2c629093862d57519c Mon Sep 17 00:00:00 2001
From: UnavailableDev <69792062+UnavailableDev@users.noreply.github.com>
Date: Wed, 15 Mar 2023 22:19:50 +0100
Subject: Update architecture.md

---
 docs/architecture.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/architecture.md b/docs/architecture.md
index 9be6751..36bec75 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -401,7 +401,7 @@ optional:
 
 - envelope (ADSR)
 
-![ADSR envelope](https://upload.wikimedia.org/wikipedia/commons/e/ea/ADSR_parameter.svg)
+<!-- ![ADSR envelope](https://upload.wikimedia.org/wikipedia/commons/e/ea/ADSR_parameter.svg) -->
 
 This image shows an advanced method of generating tones. In our case this is only an indication as to how it could be done, we will actually only be looking at the sustained tone part for simplicity sakes.
 In order to get the correct graph forms, some data points can be stored in a LUT (Look Up Table). This allows the saving of computation power at the cost of some ROM space.
-- 
cgit v1.2.3


From 51ee4672d5f2f734eb40f4312a2aefd2f8c6dc03 Mon Sep 17 00:00:00 2001
From: BjornMartens <113104306+BjornMartens@users.noreply.github.com>
Date: Thu, 16 Mar 2023 09:58:34 +0100
Subject: Added top level stm

---
 docs/architecture.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/architecture.md b/docs/architecture.md
index cf4440f..3b4a877 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -31,6 +31,17 @@ To ensure a smooth and enjoyable gaming experience, it is essential to address a
 
 ## STM32
 ### game engine
+The game engine is designed to run a 2D platformer game. The game engine has to manage all the different game states. To do this it will utilize a finite state machine (FSM). The game engine will also cover de input handling from the player, the game logic for example enemy handling or the powerup handling it will also send out data to the APU (Audio processing unit) so that the right sounds will be played. 
+
+FSM is a useful tool for managing game states and transitions. The game has many different states such as: title screen, shop and gameplay state. Each state represents a particular configuration from the with different logic and variables.  
+
+The state machine is designed to have the following states:
+1.	Initialization: The initialization state will be responsible for initializing all game-related variables and subsystems, including the FPGA-based picture processing unit.
+2.	Title Screen: The title screen state will display the game's title screen and wait for user input to start the game or access the options menu.
+3.	Options: The options state will allow the user to configure game settings, such as sound and graphics options.
+4.	Game Play: The game play state will be responsible for running the game logic and updating the game state.
+5.	Game Over: The game over state will display the game over screen and wait for user input to restart the game or return to the title screen.
+
 ### user input
 ### PPU communication
 ### APU communication
-- 
cgit v1.2.3


From edee448b453c683ca968a8dacaa37508ec649c8c Mon Sep 17 00:00:00 2001
From: Flenk008 <frenk_0_0@hotmail.com>
Date: Thu, 16 Mar 2023 12:46:18 +0100
Subject: Update architecture.md

Added SPI (STM32, BASYS3)
---
 docs/architecture.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/architecture.md b/docs/architecture.md
index 36bec75..bea35be 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -430,3 +430,23 @@ To index tiles from the tilemap, 10 bits will be used for both the foreground
 and background layers of the PPU. This means that the global tilemap can fit up
 to 1024 tiles in total, each being 16x16 pixels (the example uses 4x4 tiles for
 illustration purposes).
+
+
+### PPU communication
+
+To comunicate with the FPGA via the STM32 a protocol is needed. After [research](research.md#Input) of different possible protocols, SPI was the best option for this problem. As there is only one master and one slave, four data lines are needed at maximum. The STM32 will be the master and the FPGA will be the slave. The STM32 has a configurable SPI module that is easily configurable unlike the FPGA. Futhermore, the MISO line is not needed because the FPGA does not send any big data to the STM32. The slave select line will operate as a write enable.
+
+
+
+### SPI
+
+The FPGA will configure as a slave of the SPI protocol. THe FPGA (Basys3) does not have a IP-Core that supports external SPI communication so the SPI slave has to be designed. The module requires three inputs as mentioned before in the [STM32](architecture.md#STM32) section.  
+
+
+### PPU communication
+
+The SPI module will be configured that sends 8 bits per cycle and at a speed of 1.0 MB/s. The STM32 Cube IDE SPI module does not include a slave select line so a pin has to configured manually to fullfill this purpose. Every data transfer consists out of 4 times 8 bits, so 32 bits in total. The first byte is the address and the other 3 bytes consist the data.
+
+
+### SPI
+The FPGA uses 3 JMOD pins to receive the SPI data. The FPGA does not have a IP-Core for SPI. To receive the data the module has 3 synchronisers for the incoming SPI clock, data and slave select. The data will be read via the SPI protocol and shifted untill all 32 bits are read. 
-- 
cgit v1.2.3


From 3b9864c7e6382acc0a6727920ef0f92c33af250d Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Thu, 16 Mar 2023 13:06:27 +0100
Subject: merge niels docs

---
 assets/TopLevel.PNG       | Bin 0 -> 13919 bytes
 assets/hh_introScreen.png | Bin 0 -> 130932 bytes
 docs/BobSprint2.md        |  19 +++++++++++++++++++
 docs/architecture.md      |  38 +++++++++++++++++++++++++++++++++-----
 4 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 assets/TopLevel.PNG
 create mode 100644 assets/hh_introScreen.png
 create mode 100644 docs/BobSprint2.md

diff --git a/assets/TopLevel.PNG b/assets/TopLevel.PNG
new file mode 100644
index 0000000..2a7b16d
Binary files /dev/null and b/assets/TopLevel.PNG differ
diff --git a/assets/hh_introScreen.png b/assets/hh_introScreen.png
new file mode 100644
index 0000000..8b6e192
Binary files /dev/null and b/assets/hh_introScreen.png differ
diff --git a/docs/BobSprint2.md b/docs/BobSprint2.md
new file mode 100644
index 0000000..6fff8fc
--- /dev/null
+++ b/docs/BobSprint2.md
@@ -0,0 +1,19 @@
+
+
+# Proud of
+Simulation: We're proud of the simulation that we created to test our game because it allows us to identify and address potential issues before the game is released. This helps ensure that the game is as polished and bug-free as possible.
+
+PPU: Our use of an FPGA-based PPU (Picture Processing Unit) in our game engine allows us to achieve high-quality graphics and smooth animation. This is important because it helps create an immersive and engaging gaming experience.
+
+Upscaling: We've implemented a sophisticated upscaling that allows us to scale up our game. This Ensures that our game runs smoothly and without any
+
+Collisions: We've put a lot of effort into making sure that our collision detection system is accurate and reliable. This ensures that the game mechanics work as intended and that players are able to navigate the game world without frustration.
+
+Artwork: We're proud of the artwork that was created which is stunning and imaginative artwork that brings the game world to life. From character designs to background artwork, every aspect of the game has been given careful attention to ensure that it looks as good as it plays. And more is coming!
+# Challegens
+Upscaling: While our upscaling algorithm is sophisticated, one of the challenges we faced was synchronization. Because we're upscaling in real-time, we had to ensure that the upscaling process didn't cause any lag or delay in the game. This required careful optimization of the algorithm and synchronization with other game components.
+
+PPU: While the use of an FPGA-based PPU allowed us to achieve high-quality graphics, it also presented some challenges. Specifically, the limited resources of the FPGA required us to optimize the PPU code to ensure that it could handle the demands of real-time gameplay.
+
+Communication bug fixes on the STM32: As with any complex system, we encountered some bugs in the communication between the STM32 microcontroller and the other components of the system. This required careful debugging and troubleshooting to identify and fix the issues.
+
diff --git a/docs/architecture.md b/docs/architecture.md
index 36bec75..c2eb655 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -1,18 +1,46 @@
-# General system architecture
+# Hooded Havic: Miniboss Mania
+
+![intro arcade game](../assets/hh_introScreen.png)
+
+# introduction
+Welcome to Hooded Havoc: Miniboss Mania, an exciting 2D platformer game created by our team Joshua, Loek, Bjorn, Frenk and Niels! This game was developed using the STM32 microcontroller as the game engine and the FPGA as the Picture Processing Unit (PPU).
+
+In Hooded Havoc: Miniboss Mania, you will take on the role of a brave hero who must battle through multiple levels filled with challenging obstacles and formidable minibosses. With smooth gameplay and engaging graphics, you will feel immersed in a world of adventure and excitement.
+
+Our use of the STM32 microcontroller and FPGA PPU allowed us to create a unique and innovative gaming experience. The STM32 provides efficient and reliable processing power, while the FPGA ensures that our graphics are rendered smoothly and accurately.
+
+So get ready to embark on a thrilling journey through Hooded Havoc: Miniboss Mania, and see how far you can make it!
+## Objective
+The objective of Hooded Havoc: Miniboss Mania is to guide the hero through multiple levels, defeating minibosses and overcoming obstacles along the way. The ultimate goal is to reach the final boss and defeat them to retrieve the stolen staff.
+
+To achieve this objective, the player must use their platforming skills to jump, run, and dodge obstacles while also battling enemies and minibosses. Each level presents a unique challenge that will require the player to adapt and strategize to overcome.
+
+As the player progresses through the game, they will unlock new abilities and power-ups that will aid them in their journey. The player must use these abilities wisely to defeat the minibosses and ultimately save the world.
+
+So, the objective of Hooded Havoc: Miniboss Mania is not only to provide an exciting and engaging gaming experience but also to challenge players to use their skills and strategic thinking to overcome obstacles and emerge victorious.
+## Problem statement
+One potential problem that could arise in the development of Hooded Havoc: Miniboss Mania is related to the PPU and communication between the STM32 and PPU.
+
+The PPU is responsible for rendering the graphics and displaying them on the screen, while the STM32 is responsible for processing the game logic and input from the player. However, if there is a problem with the communication between these two components, it could lead to synchronization issues and graphical glitches that could affect the player's experience.
 
 The existing hardware components available for building this project consists
 of:
+For example, if the PPU is unable to keep up with the processing speed of the STM32, the graphics may lag or appear distorted, causing the game to become unplayable. Similarly, if there is a delay in communication between the STM32 and PPU, it could result in a mismatch between the game logic and the displayed graphics, leading to confusion for the player.
 
-- Raspberry Pi
-- Nucleo STM32 development board
-- Basys3 FPGA development board
-- Arduino Uno R3
+To ensure a smooth and enjoyable gaming experience, it is essential to address any potential issues with the PPU and communication between the STM32 and PPU during the development process. This may involve optimizing the code for both components, adjusting the communication protocol, or adding buffer systems to prevent lag or synchronization issues.
+
+# General system architecture
 
 The Raspberry Pi is by far the most powerful component out of these 4, but
 because one of the project requirements is that no general-purpose operating
 system is used, utilizing the Raspberry Pi will involve writing low-level
 drivers for its interfaces, which will likely cost a lot of effort.
 
+- Raspberry Pi
+- Nucleo STM32 development board
+- Basys3 FPGA development board
+- Arduino Uno R3
+
 As to not risk project failure due to hardware constraints, the decision was
 made to use the STM32 microcontroller and FPGA in combination, as these two are
 both familiar and still relatively powerful platforms. Because audio and video
-- 
cgit v1.2.3


From 0fb8c4c52d185244898bac5745df6730a5c6ed5e Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Thu, 16 Mar 2023 17:58:20 +0100
Subject: restructure architecture document

---
 docs/architecture.md | 78 +++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/docs/architecture.md b/docs/architecture.md
index c880b5d..831e6e4 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -1,8 +1,9 @@
-# Hooded Havic: Miniboss Mania
+<!-- # Hooded Havic: Miniboss Mania -->
 
 ![intro arcade game](../assets/hh_introScreen.png)
 
-# introduction
+# Introduction
+
 Welcome to Hooded Havoc: Miniboss Mania, an exciting 2D platformer game created by our team Joshua, Loek, Bjorn, Frenk and Niels! This game was developed using the STM32 microcontroller as the game engine and the FPGA as the Picture Processing Unit (PPU).
 
 In Hooded Havoc: Miniboss Mania, you will take on the role of a brave hero who must battle through multiple levels filled with challenging obstacles and formidable minibosses. With smooth gameplay and engaging graphics, you will feel immersed in a world of adventure and excitement.
@@ -10,7 +11,9 @@ In Hooded Havoc: Miniboss Mania, you will take on the role of a brave hero who m
 Our use of the STM32 microcontroller and FPGA PPU allowed us to create a unique and innovative gaming experience. The STM32 provides efficient and reliable processing power, while the FPGA ensures that our graphics are rendered smoothly and accurately.
 
 So get ready to embark on a thrilling journey through Hooded Havoc: Miniboss Mania, and see how far you can make it!
+
 ## Objective
+
 The objective of Hooded Havoc: Miniboss Mania is to guide the hero through multiple levels, defeating minibosses and overcoming obstacles along the way. The ultimate goal is to reach the final boss and defeat them to retrieve the stolen staff.
 
 To achieve this objective, the player must use their platforming skills to jump, run, and dodge obstacles while also battling enemies and minibosses. Each level presents a unique challenge that will require the player to adapt and strategize to overcome.
@@ -18,29 +21,32 @@ To achieve this objective, the player must use their platforming skills to jump,
 As the player progresses through the game, they will unlock new abilities and power-ups that will aid them in their journey. The player must use these abilities wisely to defeat the minibosses and ultimately save the world.
 
 So, the objective of Hooded Havoc: Miniboss Mania is not only to provide an exciting and engaging gaming experience but also to challenge players to use their skills and strategic thinking to overcome obstacles and emerge victorious.
+
 ## Problem statement
+
 One potential problem that could arise in the development of Hooded Havoc: Miniboss Mania is related to the PPU and communication between the STM32 and PPU.
 
 The PPU is responsible for rendering the graphics and displaying them on the screen, while the STM32 is responsible for processing the game logic and input from the player. However, if there is a problem with the communication between these two components, it could lead to synchronization issues and graphical glitches that could affect the player's experience.
 
-The existing hardware components available for building this project consists
-of:
 For example, if the PPU is unable to keep up with the processing speed of the STM32, the graphics may lag or appear distorted, causing the game to become unplayable. Similarly, if there is a delay in communication between the STM32 and PPU, it could result in a mismatch between the game logic and the displayed graphics, leading to confusion for the player.
 
 To ensure a smooth and enjoyable gaming experience, it is essential to address any potential issues with the PPU and communication between the STM32 and PPU during the development process. This may involve optimizing the code for both components, adjusting the communication protocol, or adding buffer systems to prevent lag or synchronization issues.
 
 # General system architecture
 
-The Raspberry Pi is by far the most powerful component out of these 4, but
-because one of the project requirements is that no general-purpose operating
-system is used, utilizing the Raspberry Pi will involve writing low-level
-drivers for its interfaces, which will likely cost a lot of effort.
+The existing hardware components available for building this project consists
+of:
 
 - Raspberry Pi
 - Nucleo STM32 development board
 - Basys3 FPGA development board
 - Arduino Uno R3
 
+The Raspberry Pi is by far the most powerful component out of these 4, but
+because one of the project requirements is that no general-purpose operating
+system is used, utilizing the Raspberry Pi will involve writing low-level
+drivers for its interfaces, which will likely cost a lot of effort.
+
 As to not risk project failure due to hardware constraints, the decision was
 made to use the STM32 microcontroller and FPGA in combination, as these two are
 both familiar and still relatively powerful platforms. Because audio and video
@@ -59,7 +65,19 @@ show what the complete system looks like. The scope of this project only
 includes the components inside the area marked "game console" and the gamepad
 components.
 
-# Game controllers
+# STM32 software
+
+The game engine will be designed to support 2D games. The engine will use a state machine to manage game states and transitions between them. The state machine will be implemented using a finite state machine (FSM) design pattern. The engine will also include support for handling user input, game logic, and sound.
+
+FSM is a useful tool for managing game states and transitions. A game can have many different states, such as a title screen, a level selection screen, a loading screen, and various gameplay states. Each state represents a particular configuration of the game, with different sets of variables, objects, and logic
+
+The state machine will be designed with the following states:
+
+1. Initialization: The initialization state will be responsible for initializing all game-related variables and subsystems, including the FPGA-based picture processing unit.
+2. Title Screen: The title screen state will display the game's title screen and wait for user input to start the game or access the options menu.
+3. Options: The options state will allow the user to configure game settings, such as sound and graphics options.
+4. Game Play: The game play state will be responsible for running the game logic and updating the game state.
+5. Game Over: The game over state will display the game over screen and wait for user input to restart the game or return to the title screen.
 
 ## Input
 
@@ -95,19 +113,13 @@ The buttons will be connected as follows:
 
 To implement the input in the game, the input should be checked at the start of each game cycle. In this case there are no interrupts needed.
 
-# STM32 software
+## PPU communication
 
-The game engine will be designed to support 2D games. The engine will use a state machine to manage game states and transitions between them. The state machine will be implemented using a finite state machine (FSM) design pattern. The engine will also include support for handling user input, game logic, and sound.
-
-FSM is a useful tool for managing game states and transitions. A game can have many different states, such as a title screen, a level selection screen, a loading screen, and various gameplay states. Each state represents a particular configuration of the game, with different sets of variables, objects, and logic
+The SPI module will be configured that sends 8 bits per cycle and at a speed of 1.0 MB/s. The STM32 Cube IDE SPI module does not include a slave select line so a pin has to configured manually to fullfill this purpose. Every data transfer consists out of 4 times 8 bits, so 32 bits in total. The first byte is the address and the other 3 bytes consist the data.
 
-The state machine will be designed with the following states:
+## SPI
 
-1. Initialization: The initialization state will be responsible for initializing all game-related variables and subsystems, including the FPGA-based picture processing unit.
-2. Title Screen: The title screen state will display the game's title screen and wait for user input to start the game or access the options menu.
-3. Options: The options state will allow the user to configure game settings, such as sound and graphics options.
-4. Game Play: The game play state will be responsible for running the game logic and updating the game state.
-5. Game Over: The game over state will display the game over screen and wait for user input to restart the game or return to the title screen.
+The FPGA uses 3 JMOD pins to receive the SPI data. The FPGA does not have a IP-Core for SPI. To receive the data the module has 3 synchronisers for the incoming SPI clock, data and slave select. The data will be read via the SPI protocol and shifted untill all 32 bits are read. 
 
 # PPU
 
@@ -403,6 +415,15 @@ Format:
 
 [custompputimings]: https://docs.google.com/spreadsheets/d/1MU6K4c4PtMR_JXIpc3I0ZJdLZNnoFO7G2P3olCz6LSc
 
+## PPU communication
+
+To comunicate with the FPGA via the STM32 a protocol is needed. After [research](research.md#Input) of different possible protocols, SPI was the best option for this problem. As there is only one master and one slave, four data lines are needed at maximum. The STM32 will be the master and the FPGA will be the slave. The STM32 has a configurable SPI module that is easily configurable unlike the FPGA. Futhermore, the MISO line is not needed because the FPGA does not send any big data to the STM32. The slave select line will operate as a write enable.
+
+## SPI
+
+The FPGA will configure as a slave of the SPI protocol. The FPGA (Basys3) does not have a IP-Core that supports external SPI communication so the SPI slave has to be designed. The module requires three inputs as mentioned before in the [STM32](architecture.md#STM32) section.  
+
+
 # APU
 
 The Audio Processing Unit (APU) is programmed on the FPGA, here it will produce different signals on the audio output. These signals come in a few forms, as listed below.
@@ -459,22 +480,3 @@ and background layers of the PPU. This means that the global tilemap can fit up
 to 1024 tiles in total, each being 16x16 pixels (the example uses 4x4 tiles for
 illustration purposes).
 
-
-### PPU communication
-
-To comunicate with the FPGA via the STM32 a protocol is needed. After [research](research.md#Input) of different possible protocols, SPI was the best option for this problem. As there is only one master and one slave, four data lines are needed at maximum. The STM32 will be the master and the FPGA will be the slave. The STM32 has a configurable SPI module that is easily configurable unlike the FPGA. Futhermore, the MISO line is not needed because the FPGA does not send any big data to the STM32. The slave select line will operate as a write enable.
-
-
-
-### SPI
-
-The FPGA will configure as a slave of the SPI protocol. THe FPGA (Basys3) does not have a IP-Core that supports external SPI communication so the SPI slave has to be designed. The module requires three inputs as mentioned before in the [STM32](architecture.md#STM32) section.  
-
-
-### PPU communication
-
-The SPI module will be configured that sends 8 bits per cycle and at a speed of 1.0 MB/s. The STM32 Cube IDE SPI module does not include a slave select line so a pin has to configured manually to fullfill this purpose. Every data transfer consists out of 4 times 8 bits, so 32 bits in total. The first byte is the address and the other 3 bytes consist the data.
-
-
-### SPI
-The FPGA uses 3 JMOD pins to receive the SPI data. The FPGA does not have a IP-Core for SPI. To receive the data the module has 3 synchronisers for the incoming SPI clock, data and slave select. The data will be read via the SPI protocol and shifted untill all 32 bits are read. 
-- 
cgit v1.2.3


From 72295b9df9c0de9e585cce3f41437965eb0390cb Mon Sep 17 00:00:00 2001
From: heavydemon21 <nielsstunnebrink1@gmail.com>
Date: Mon, 20 Mar 2023 19:11:41 +0100
Subject: demo version

---
 .vscode/settings.json          |  4 +-
 src/GameLoop/shop.c            | 30 ++++++++++++++
 src/GameLoop/shop.h            | 16 ++++++++
 src/GameLoop/startingScreen.c  | 32 +++++++++++++++
 src/GameLoop/startingScreen.h  | 14 +++++++
 src/demo.c                     | 54 ++++++++++++++++++++++--
 src/engine/bullet.c            | 44 ++++++++++++++++++++
 src/engine/bullet.h            | 16 ++++++++
 src/engine/draw_screen.c       | 26 ++++++++++++
 src/engine/draw_screen.h       |  5 +++
 src/engine/player_controller.c | 35 ++++++++++++----
 src/engine/title_screen.c      | 93 ++++++++++++++++++++++++++++++++++++++++++
 src/engine/title_screen.h      |  3 ++
 src/makefile                   |  6 ++-
 src/ppusim/input.c             |  1 +
 15 files changed, 367 insertions(+), 12 deletions(-)
 create mode 100644 src/GameLoop/shop.c
 create mode 100644 src/GameLoop/shop.h
 create mode 100644 src/GameLoop/startingScreen.c
 create mode 100644 src/GameLoop/startingScreen.h
 create mode 100644 src/engine/bullet.c
 create mode 100644 src/engine/bullet.h
 create mode 100644 src/engine/title_screen.c
 create mode 100644 src/engine/title_screen.h

diff --git a/.vscode/settings.json b/.vscode/settings.json
index d027762..f4d72ed 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,5 +8,7 @@
 		}
 	},
 	"cmake.configureOnOpen": false,
-	"files.eol": "\n"
+	"files.eol": "\n",
+	"nrf-connect.topdir": "${nrf-connect.sdk:2.1.2}",
+	"nrf-connect.toolchain.path": "${nrf-connect.toolchain:2.1.2}"
 }
diff --git a/src/GameLoop/shop.c b/src/GameLoop/shop.c
new file mode 100644
index 0000000..eb6bed5
--- /dev/null
+++ b/src/GameLoop/shop.c
@@ -0,0 +1,30 @@
+#include "shop.h"
+
+
+bool hh_show_Shop(){
+	static hh_e_ShopStates hh_e_Shop = hh_e_STATE_SHOW;
+	
+	switch (hh_e_Shop)
+	{
+	case hh_e_STATE_SHOW:
+		//hh_clear_screen();
+
+		//hh_setup_shop();
+		hh_e_Shop = hh_e_STATE_Input;
+		return false;
+		break;
+	case hh_e_STATE_Input:
+		if(g_hh_controller_p1.button_primary){
+			hh_e_Shop = hh_e_STATE_END;
+		}
+		break;
+	case hh_e_STATE_END:
+		hh_e_Shop = hh_e_STATE_SHOW;
+		return true;
+		break;
+	default:
+		hh_e_Shop = hh_e_STATE_SHOW;
+		break;
+	}
+	return false;
+}
diff --git a/src/GameLoop/shop.h b/src/GameLoop/shop.h
new file mode 100644
index 0000000..4014f58
--- /dev/null
+++ b/src/GameLoop/shop.h
@@ -0,0 +1,16 @@
+#include "input.h"
+#include "engine/draw_screen.h"
+
+
+
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef enum {
+	hh_e_STATE_SHOW,
+	hh_e_STATE_Input,
+	hh_e_STATE_END
+} hh_e_ShopStates;
+
+
+bool hh_show_Shop();
diff --git a/src/GameLoop/startingScreen.c b/src/GameLoop/startingScreen.c
new file mode 100644
index 0000000..4fc5af9
--- /dev/null
+++ b/src/GameLoop/startingScreen.c
@@ -0,0 +1,32 @@
+#include "startingScreen.h"
+#include "input.h"
+#include "engine/title_screen.h"
+#include "engine/draw_screen.h"
+// #include "engine/player_controller.h"
+
+bool hh_show_startingScreen(){
+	static hh_e_screenStates hh_e_startingScreen = hh_e_STATE_SHOW;
+	
+	switch (hh_e_startingScreen)
+	{
+	case hh_e_STATE_SHOW:
+		hh_clear_screen();
+		hh_init_title_screen();
+		hh_e_startingScreen = hh_e_STATE_Input;
+		return false;
+		break;
+	case hh_e_STATE_Input:
+		if(g_hh_controller_p1.button_primary){
+			hh_e_startingScreen = hh_e_STATE_END;
+		}
+		break;
+	case hh_e_STATE_END:
+		hh_e_startingScreen = hh_e_STATE_SHOW;
+		return true;
+		break;
+	default:
+		hh_e_startingScreen = hh_e_STATE_SHOW;
+		break;
+	}
+	return false;
+}
diff --git a/src/GameLoop/startingScreen.h b/src/GameLoop/startingScreen.h
new file mode 100644
index 0000000..f51cc66
--- /dev/null
+++ b/src/GameLoop/startingScreen.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef enum {
+	hh_e_STATE_SHOW,
+	hh_e_STATE_Input,
+	hh_e_STATE_END
+} hh_e_screenStates;
+
+
+bool hh_show_startingScreen();
+
diff --git a/src/demo.c b/src/demo.c
index d4d1bf7..22ee8b7 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -11,8 +11,18 @@
 #include "engine/draw_screen.h"
 #include "engine/player_controller.h"
 #include "engine/sprite_controller.h"
+#include "GameLoop/startingScreen.h"
 
 
+typedef enum {
+	hh_e_STATE_startingScreen,
+	hh_e_STATE_Shop,
+	hh_e_STATE_Gameplay,
+	hh_e_STATE_GameOver,
+	hh_e_STATE_HighScore
+} hh_e_GameState;
+hh_e_GameState hh_gameStates;
+
 
 
 uint16_t g_hh_pos_x = 1000; // 0b0000 0001 0011 0110
@@ -37,7 +47,7 @@ hh_entity hh_g_player, hh_g_player_new;
 void hh_demo_setup() {
 
 	hh_setup_palettes();
-	hh_setup_screen();
+	// hh_setup_screen();
 
 
 }
@@ -45,8 +55,46 @@ void hh_demo_setup() {
 void hh_demo_loop(unsigned long frame) {
 
 	
-	hh_player_actions();
-	
+	switch (hh_gameStates)
+	{
+	case hh_e_STATE_startingScreen:
+		bool ret = hh_show_startingScreen();
+		if(ret){
+			hh_gameStates = hh_e_STATE_Shop;
+		}	
+		break;
+	case hh_e_STATE_Shop:
+		// TODO:
+		//  if(hh_show_Shop()){
+			hh_clear_screen();
+			hh_clear_sprite();
+			hh_setup_screen();
+			hh_clear_sprite();
+			hh_gameStates = hh_e_STATE_Gameplay;
+		// }
+		// function: new level is chosen goto level
+		break;
+	case hh_e_STATE_Gameplay:
+		hh_player_actions();
+
+		// TODO:
+		// function: if level complete goto shop
+		// function: if player is dead goto game over
+		break;
+	case hh_e_STATE_GameOver:
+		// TODO:
+		// function: show game over screen
+		// function: after time goto high score
+		break;
+	case hh_e_STATE_HighScore:
+		// TODO:
+		// fucntion: show all previously scored points
+		// function: button pressed goto starting screen
+		break;
+	default:
+			hh_gameStates = hh_e_STATE_startingScreen;
+		break;
+	}
 }
 
 // void sendData(uint8_t address, uint16_t data) {
diff --git a/src/engine/bullet.c b/src/engine/bullet.c
new file mode 100644
index 0000000..5aa9e51
--- /dev/null
+++ b/src/engine/bullet.c
@@ -0,0 +1,44 @@
+#include "bullet.h"
+#include "engine/sprite_controller.h"
+
+
+void shootBullet(vec2 playerPos, Bullet* bullet){
+	// Set bullet's x and y coordinates to player's coordinates
+    bullet->x = playerPos.x;
+    bullet->y = playerPos.y;
+    // Set bullet's velocity to a fixed value
+    bullet->velocity = 1;
+    // Set bullet's status to active
+    bullet->isActive = true;
+}
+void updateBullet(Bullet* bullet, int deltaTime){
+    // Only update bullet if it is active   
+	 static int latestLocationBullet = 0;
+    if (bullet->isActive) {
+        // Move bullet based on velocity and deltaTime
+        bullet->x += bullet->velocity * deltaTime;
+		drawBullet(bullet);
+        // Check if bullet has moved 16 pixels
+        if (bullet->x - latestLocationBullet > 32) {
+            // Set bullet's status to inactive
+            bullet->isActive = false;
+            drawBullet(&(Bullet){.x = -16,.y = -16.    });
+        }
+    }
+	 else{
+		latestLocationBullet = bullet->x;
+	 }
+}
+void drawBullet(Bullet* bullet){
+
+
+	hh_ppu_update_foreground(10, (hh_s_ppu_loc_fam_entry)
+			{
+                .position_x = bullet->x,
+                .position_y = bullet->y,
+				.horizontal_flip = false,
+				.vertical_flip = false,
+				.palette_index = 7,
+				.tilemap_index = 84, // change tilemap to the correct foreground index;
+			});
+}
diff --git a/src/engine/bullet.h b/src/engine/bullet.h
new file mode 100644
index 0000000..ad67d84
--- /dev/null
+++ b/src/engine/bullet.h
@@ -0,0 +1,16 @@
+#pragma once
+#include "player_controller.h"
+
+typedef struct {
+    int x;
+    int y;
+    int velocity;
+    int isActive;
+    int hit;
+} Bullet;
+
+
+//Bullet* createBullet(float x, float y, float velocity, float direction);
+void shootBullet(vec2 playerPos, Bullet* bullet);
+void updateBullet(Bullet* bullet, int deltaTime);
+void drawBullet(Bullet* bullet);
diff --git a/src/engine/draw_screen.c b/src/engine/draw_screen.c
index c4f3389..fed2cfa 100644
--- a/src/engine/draw_screen.c
+++ b/src/engine/draw_screen.c
@@ -60,3 +60,29 @@ void hh_setup_screen(){
 	}
 	free(tile);
 }
+void hh_clear_screen(){
+	// (HH_PPU_SCREEN_HEIGHT*HH_PPU_SCREEN_WIDTH)/(HH_PPU_SPRITE_HEIGHT*HH_PPU_SPRITE_WIDTH)
+	for (int i = 0; i < HH_PPU_BG_CANVAS_TILES_H*HH_PPU_BG_CANVAS_TILES_V; i++) {
+		hh_s_ppu_loc_bam_entry temp = {
+			.vertical_flip=false,.horizontal_flip = false,
+			.palette_index = 3,.tilemap_index = 0
+		};
+		hh_ppu_update_background(i,temp);
+		hh_ppu_update_color(3,0,(hh_ppu_rgb_color_t){0x0,0x0,0x0});
+	}
+	hh_ppu_update_aux((hh_s_ppu_loc_aux){
+		.bg_shift_x = 0,
+		.bg_shift_y = 0,
+		.fg_fetch	= 0,
+		.sysreset	= 0,
+	});
+}
+
+void hh_clear_sprite(){
+	for (int i = 0; i < HH_PPU_FG_SPRITE_COUNT; i++) {
+		hh_ppu_update_foreground(i,(hh_s_ppu_loc_fam_entry){
+			.position_x = -16,
+			.position_y = -16,
+		});
+	}
+}
diff --git a/src/engine/draw_screen.h b/src/engine/draw_screen.h
index b181108..d3abca6 100644
--- a/src/engine/draw_screen.h
+++ b/src/engine/draw_screen.h
@@ -19,3 +19,8 @@ uint8_t hh_world_to_tile(vec2 pos);
 void hh_draw_screen(vec2 viewport);
 /** @brief send data to BAM memory from binary level */
 void hh_setup_screen();
+
+/** @brief send black screen to background memory */
+void hh_clear_screen();
+/** @brief clears all sprite data */
+void hh_clear_sprite();
diff --git a/src/engine/player_controller.c b/src/engine/player_controller.c
index d351bee..647b00c 100644
--- a/src/engine/player_controller.c
+++ b/src/engine/player_controller.c
@@ -6,7 +6,11 @@
 
 #include "input.h"
 
+#include "engine/bullet.h"
 void hh_player_actions() {
+	static Bullet bullet ={
+		.isActive=false,
+	};
 	static hh_entity player={
 		.hp = 4,
 		.speed = 6,
@@ -17,13 +21,13 @@ void hh_player_actions() {
 		.vel = (vec2){0,0},
 		.vec = (vec2){0,0},
 		.render = {
-			.frame0 = 20,
-			.palette = 7,
+			.frame0 = 80,
+			.palette = 3,
 			.fam = (hh_s_ppu_loc_fam_entry){
 				.horizontal_flip = false,
 				.vertical_flip = false,
-				.palette_index = 7,
-				.tilemap_index = 2,
+				.palette_index = 2,
+				.tilemap_index = 60,
 			}
 		}
 	}, player_new = {0};
@@ -114,6 +118,10 @@ void hh_player_actions() {
 		 player.vel.y += 1; //gravity
 	}
 
+	if(g_hh_controller_p1.button_secondary==true){
+		shootBullet(player.pos,&bullet);
+	}
+	updateBullet(&bullet,5);
 
 
 	
@@ -202,7 +210,7 @@ void hh_player_actions() {
 	// 		hh_solve_collision(tiles[i].pos, &player);
 	// 	}
 	// }
-	
+
 	player =  hh_background_collision ( player, player_new);
 	
 	//player = player_new;
@@ -221,9 +229,22 @@ void hh_player_actions() {
 
 	player.render.fam.tilemap_index = 2;//TODO: these two lines should be redundant
 	player.render.fam.palette_index = 7;
-	hh_ppu_update_foreground(0, player.render.fam);
+	// hh_ppu_update_foreground(0, player.render.fam);
+
+	for (int i = 0; i < 4; i++)
+	{
+		hh_s_ppu_loc_fam_entry temp = player.render.fam;
+		temp.position_x = player.render.fam.position_x+(!(player.vel.x>0)?-1:1)*(i%2?8:-8);
+		temp.position_y = player.render.fam.position_y+(i>1?0:-16);
+		temp.tilemap_index = player.render.frame0 + i;
+		temp.palette_index = player.render.palette;
+		temp.horizontal_flip = !(player.vel.x>0);
+		hh_ppu_update_foreground(i,temp);
+	}
+	
+
 
-	hh_ppu_update_foreground(1, enemy.render.fam);
+	hh_ppu_update_foreground(4, enemy.render.fam);
 
 }
 
diff --git a/src/engine/title_screen.c b/src/engine/title_screen.c
new file mode 100644
index 0000000..9c7ed48
--- /dev/null
+++ b/src/engine/title_screen.c
@@ -0,0 +1,93 @@
+#include "ppu/ppu.h"
+#include "ppu/types.h"
+#include "ppu/consts.h"
+
+
+#include "engine/draw_screen.h"
+#include "engine/entity.h"
+
+void hh_init_title_screen(){
+
+	// hh_clear_screen();
+
+	//send data
+	uint8_t idx = 0;
+	const uint8_t tilemap_offset = 59;
+	int tiles_h = HH_PPU_BG_CANVAS_TILES_H;
+	int vp_h = HH_PPU_SCREEN_WIDTH/HH_PPU_SPRITE_WIDTH; //screen_h in tiles
+	int vert_offset = tiles_h*3;
+
+	const uint8_t arr[4][4] = {
+		{0,1,1,0},
+		{2,3,3,2},
+		{4,0,0,4},
+		{5,6,6,5},
+	};
+	int val, counter =0;
+	hh_ppu_update_color(5, 0, (hh_ppu_rgb_color_t) {0x1, 0x1, 0x1});
+	for (int i = 0; i < 4; i++) {
+		for (int j = 0; j < 4; j++) {
+			val = arr[i][j];
+
+			hh_s_ppu_loc_bam_entry temp = {
+			.vertical_flip=false, .horizontal_flip = ((j % 4 < 2) ? false : true),
+			.palette_index = (counter == 9 || counter == 10? 5:3), .tilemap_index = (val > 0 ? (tilemap_offset + val) : 0)
+			};
+
+			int vert_pos = tiles_h*i;
+			int x_pos = j;
+			idx = vert_offset + vert_pos + x_pos + vp_h/2-2;
+			
+			hh_ppu_update_background(idx,temp);
+			counter++;
+		}
+
+	}
+	
+
+	const uint8_t letters_offset = 66;
+	const int _size_hooded = 7, _size_v = 2;
+
+	// char* hh = "hooded";
+	int hooded_lookup[7][2]={
+		{0,1},{0,2},//H
+		{3,4},{3,4},//oo
+		{5,6},{13,9},//de
+		{5,6}//d
+	};
+
+	counter = 8;
+	for (int i = 0; i < _size_hooded; i++) {
+		for (int vert = 1; vert <= _size_v; vert++) {
+			//TODO: move 'H' a few pixels to the right for a more cohesive font spacing
+			hh_ppu_update_foreground(counter++, (hh_s_ppu_loc_fam_entry) {
+				.vertical_flip = false, .horizontal_flip = false,
+				.palette_index = 6, .tilemap_index = letters_offset + hooded_lookup[i][vert-1],
+				.position_x = (16*i + 64+48), .position_y = (16*(vert > 1 ? 0:1)*-1 + 64+8+16 +(i==2 || i==3 ? 6:0))
+			});	
+		}
+	}
+
+
+	hh_ppu_update_color(5, 1, (hh_ppu_rgb_color_t) {0xa, 0x3, 0x3});
+	hh_ppu_update_color(5, 2, (hh_ppu_rgb_color_t) {0xc, 0x5, 0x3});
+
+	const int _size_havoc = 6;
+	int lookup_havoc[6][2]={
+		{0,1},{0,2},//H
+		{13,10},{7,8},//av
+		{13,11},{13,12}//oc
+	};
+
+	counter = 8 + (_size_hooded * _size_v);
+	for (int i = 0; i < _size_havoc; i++) {
+		for (int vert = 1; vert <= _size_v; vert++) {
+			//TODO: move 'H' a few pixels to the right for a more cohesive font spacing
+			hh_ppu_update_foreground(counter++, (hh_s_ppu_loc_fam_entry) {
+				.vertical_flip = false, .horizontal_flip = (i > 4 && vert==0 ? 1:0),
+				.palette_index = 5, .tilemap_index = letters_offset + lookup_havoc[i][vert-1],
+				.position_x = (16*i +64+32+8), .position_y = (16*(vert > 1 ? 0:1)*-1 + 64+8+48)
+			});	
+		}
+	}
+}
diff --git a/src/engine/title_screen.h b/src/engine/title_screen.h
new file mode 100644
index 0000000..b5eda63
--- /dev/null
+++ b/src/engine/title_screen.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void hh_init_title_screen();
diff --git a/src/makefile b/src/makefile
index d7d9087..cd248e2 100644
--- a/src/makefile
+++ b/src/makefile
@@ -37,7 +37,11 @@ LOCAL_SRCS += main.c \
 							engine/draw_screen.c \
 							engine/camera.c \
 							engine/maths.c \
-							engine/entity.c
+							engine/entity.c \
+							engine/bullet.c \
+							engine/title_screen.c \
+							GameLoop/shop.c \
+							GameLoop/startingScreen.c
 
 CFLAGS += $(SHARED_FLAGS)
 LFLAGS += $(SHARED_FLAGS)
diff --git a/src/ppusim/input.c b/src/ppusim/input.c
index 5323fb1..4bc7018 100644
--- a/src/ppusim/input.c
+++ b/src/ppusim/input.c
@@ -13,4 +13,5 @@ void hh_input_read() {
 	g_hh_controller_p1.dpad_left  = kb[SDL_SCANCODE_A];
 	g_hh_controller_p1.dpad_right = kb[SDL_SCANCODE_D];
 	g_hh_controller_p1.button_primary = kb[SDL_SCANCODE_SPACE];
+	g_hh_controller_p1.button_secondary = kb[SDL_SCANCODE_R];
 }
-- 
cgit v1.2.3