(Manual conflict res) merged main into ttm/joker-scope-joker-1

2025-08-17 11:03:27 +03:00
parent 376309a9ef 8524a78271
commit 04515839dc
9 changed files with 199 additions and 71 deletions
@@ -34,11 +34,16 @@
 #define SE_COL_LEN 32

 // Since y direction goes from the top of the screen to the bottom
-#define SE_UP	-1
-#define SE_DOWN 1
+#define SCREEN_UP 	-1
+#define SCREEN_DOWN 1
+#define SCREEN_LEFT -1
+#define SCREEN_RIGHT 1

-#define OVERFLOW_LEFT	-1
-#define OVERFLOW_RIGHT	1
+#define SE_UP	SCREEN_UP
+#define SE_DOWN SCREEN_DOWN
+
+#define OVERFLOW_LEFT	SCREEN_LEFT
+#define OVERFLOW_RIGHT	SCREEN_RIGHT

 // Tile size in pixels, both height and width as tiles are square
 #define TILE_SIZE 8