add donut chr compression and ((noinline)) some funcs

Author: UserSniper

.gitignore

@@ -1,6 +1,8 @@
 #ew windows
 .vscode
 
+src/chr/dnt/*.bin
+
 *.nes
 *.mlb
 *.bak

makefile

@@ -67,7 +67,7 @@ TMPDIR ?= $(TMPDIR_PREFIX)
 CFG ?= link.ld
 
 CFLAGS = -flto -Os -ffast-math -fnonreentrant -std=gnu23 -Wall -Wextra
-LDFLAGS = -mreserve-zp=9 -T $(CFG)
+LDFLAGS = -mreserve-zp=27 -T $(CFG)
 
 ifneq ($(findstring build,$(MAKECMDGOALS)),)
 ifeq ($(LEVELSET),)
@@ -79,7 +79,7 @@ endif
 
 
 # optimize for code size (the ideal method)
-build: $(TMPDIR) $(OUTDIR) $(OUTDIR)/$(NAME).nes
+build: CHR $(TMPDIR) $(OUTDIR) $(OUTDIR)/$(NAME).nes
 
 
 
@@ -97,6 +97,9 @@ main:
 
 #target: dependencies
 
+CHR:
+	python3 src/chr/donut.py src/chr/uncompressed/ src/chr/dnt -f
+
 $(OUTDIR):
 	$(call mkdir,$(OUTDIR))
 
@@ -109,10 +112,13 @@ $(TMPDIR)/music.o: src/famistudio/music_0_bank*.dmc src/famistudio/*.s src/famis
 #		compile all of the music assets into one giant object file
 	$(CA65) src/famistudio/music_assets.s -o $@
 
-$(TMPDIR)/assets.o: src/chr/uncompressed/*.chr src/assets.c src/assets.h
+$(TMPDIR)/donut.o: src/chr/*.s
+	$(CA65) src/chr/donut.s -o $@
+
+$(TMPDIR)/assets.o: src/chr/dnt/*.bin src/assets.c src/assets.h
 	$(CC) -c src/assets.c $(CFLAGS) -o $@
 
-$(OUTDIR)/$(NAME).nes: $(OUTDIR) $(TMPDIR)/music.o $(TMPDIR)/assets.o src/*.h src/*.c src/gamestates/*.c $(CFG)
+$(OUTDIR)/$(NAME).nes: $(OUTDIR) $(TMPDIR)/music.o $(TMPDIR)/assets.o $(TMPDIR)/donut.o src/*.h src/*.c src/gamestates/*.c $(CFG)
 	$(CC) src/main.c $(TMPDIR)/*.o $(CFLAGS) $(LDFLAGS) -o $@
 
 

src/assets.c

@@ -1,40 +1,35 @@
 #include "assets.h"
 
 file(chr_menu_global, chr_bank_0) = {
-    #embed "./chr/uncompressed/Menu_Global.chr" // 0.50 kb
+    #embed "./chr/dnt/Menu_Global.bin"
 };
 file(chr_font, chr_bank_0) = {
-    #embed "./chr/uncompressed/Font.chr" // 1.50 kb
+    #embed "./chr/dnt/Font.bin"
 };  
 file(chr_logo, chr_bank_0) = {
-    #embed "./chr/uncompressed/Logo.chr" // 1.00 kb
+    #embed "./chr/dnt/Logo.bin"
 };    
 file(chr_famidash, chr_bank_0) = {
-    #embed "./chr/uncompressed/Famidash.chr" // 1.00 kb
+    #embed "./chr/dnt/Famidash.bin"
 };    
 
 
 file(chr_tiles_global, chr_bank_1) = {
-    #embed "./chr/uncompressed/General.chr" // 1.00 kb
+    #embed "./chr/dnt/General.bin"
 };    
 file(chr_tiles_grid, chr_bank_1) = {
-    #embed "./chr/uncompressed/Grid.chr" // 1.00 kb
+    #embed "./chr/dnt/Grid.bin"
 };    
 file(chr_tiles_cross, chr_bank_1) = {
-    #embed "./chr/uncompressed/Cross.chr" // 0.25 kb
+    #embed "./chr/dnt/Cross.bin"
 };
 file(chr_tiles_brick, chr_bank_1) = {
-    #embed "./chr/uncompressed/Brick.chr" // 0.25 kb
+    #embed "./chr/dnt/Brick.bin"
 };
 file(chr_tiles_black, chr_bank_1) = {
-    #embed "./chr/uncompressed/Black.chr" // 0.25 kb
+    #embed "./chr/dnt/Black.bin"
 };
 
-//embed(); // 1.00 kb
-//embed(, );      // 0.25 kb
-//embed(, );    // 0.25 kb
-//embed(, );    // 0.25 kb
-//embed(, );    // 0.25 kb
 
 
 

scripts/donut.py renamed to src/chr/donut.py

@@ -494,6 +494,7 @@ def main(argv=None):
                             ratio = 0
                         else:
                             ratio = float('NaN')
+                    output_file.write(b'\xff')
                     print("{} :{:>6.1%} ({} => {} bytes, {})".format(input_file.file_name, ratio, r, w, output_file.file_name), file=sys.stderr)
                     total_input_bytes += r
                     total_output_bytes += w