Changes backported from f3d048e

* [png2c] add definition for number of generated sprites * [ResetSprites] Reset sprite priorities as well.
cahirwpz · Dec 16, 2023 · 11d671b · 11d671b
1 parent a39b2bf
commit 11d671b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/lib/libgfx/Makefile b/lib/libgfx/Makefile
@@ -37,6 +37,7 @@ SOURCES := \
 	NullSprData.c \
 	PixmapScramble_4_1.c \
 	PixmapScramble_4_2.c \
+	ResetSprites.c \
 	SetupBitplaneFetch.c \
 	SetupDisplayWindow.c \
 	SetupMode.c \

diff --git a/lib/libgfx/ResetSprites.c b/lib/libgfx/ResetSprites.c
@@ -0,0 +1,17 @@
+#include <custom.h>
+#include <sprite.h>
+
+void ResetSprites(void) {
+  short i;
+
+  DisableDMA(DMAF_SPRITE);
+
+  /* Move sprites into foreground. */
+  custom->bplcon2 = BPLCON2_PF1P2|BPLCON2_PF2P2;
+
+  for (i = 0; i < 8; i++) {
+    custom->sprpt[i] = NullSprData;
+    custom->spr[i].datab = 0;
+    custom->spr[i].dataa = 0;
+  }
+}
diff --git a/tools/png2c.py b/tools/png2c.py
@@ -259,13 +259,14 @@ def do_sprite(im, desc):
     stride = ((width + 15) & ~15) // 16
     bpl = planar(pix, width, height, depth)
 
-    print(f'static const short {name}_height = {height};')
-    print('')
-
     n = width // 16
     if attached:
         n *= 2
 
+    print(f'#define {name}_height {height}')
+    print(f'#define {name}_sprites {n}')
+    print('')
+
     sprites = []
 
     for i in range(n):