sb: split up files

games/sb/Makefile

@@ -12,7 +12,7 @@ all:	sb.dsk
 
 ####
 
-sb.dsk:	QBOOT QLOAD TITLE DUCK_POND SB RAT
+sb.dsk:	QBOOT QLOAD TITLE DUCK_POND ROOF RAT
 	cp $(EMPTY_DISK) sb.dsk
 	$(DOS33_RAW) sb.dsk  0  0 QBOOT      0   1
 	$(DOS33_RAW) sb.dsk  0  2 QBOOT      1   1
@@ -20,7 +20,7 @@ sb.dsk:	QBOOT QLOAD TITLE DUCK_POND SB RAT
 	$(DOS33_RAW) sb.dsk  1  0 QLOAD      0   0
 	$(DOS33_RAW) sb.dsk  2  0 TITLE      0   0
 	$(DOS33_RAW) sb.dsk  5  0 DUCK_POND  0   0
-	$(DOS33_RAW) sb.dsk  8  0 SB         0   0
+	$(DOS33_RAW) sb.dsk  8  0 ROOF         0   0
 	$(DOS33_RAW) sb.dsk 11  0 RAT         0   0
 #	$(DOS33) -y sb.dsk BSAVE -a 0x1000 DUCK_POND
 #	$(DOS33) -y sb.dsk BSAVE -a 0x0c00 SB
@@ -45,12 +45,12 @@ qload.o:	qload.s qboot.inc
 ####
 
 
-SB:	sb.o
-	ld65 -o SB sb.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
+ROOF:	roof.o
+	ld65 -o ROOF roof.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
 
-sb.o:	sb.s zx02_optim.s \
+roof.o:	roof.s zx02_optim.s \
 		zp.inc hardware.inc
-	ca65 -o sb.o sb.s -l sb.lst
+	ca65 -o roof.o roof.s -l roof.lst
 
 
 ####
@@ -80,10 +80,10 @@ title.o:	title.s zx02_optim.s \
 		zp.inc hardware.inc \
 		hgr_logo_scroll.s audio.s hgr_sprite.s \
 		purple.s lc_detect.s \
-		sound/purple.btc.zx02 \
-		graphics/czmg4ap_title.hgr.zx02 \
-		graphics/videlectrix_top.hgr.zx02 \
-		graphics/title_sprites.inc
+		title_sound/purple.btc.zx02 \
+		title_graphics/czmg4ap_title.hgr.zx02 \
+		title_graphics/videlectrix_top.hgr.zx02 \
+		title_graphics/title_sprites.inc
 	ca65 -o title.o title.s -l title.lst
 
 
@@ -96,7 +96,7 @@ duck_pond.o:	duck_pond.s zx02_optim.s \
 		zp.inc hardware.inc \
 		gr_copy.s duck_score.s gr_putsprite_mask.s \
 		draw_ducks.s move_ducks.s \
-		graphics/duck_sprites.inc graphics/num_sprites.inc
+		duck_graphics/duck_sprites.inc duck_graphics/num_sprites.inc
 	ca65 -o duck_pond.o duck_pond.s -l duck_pond.lst
 
 
@@ -108,4 +108,4 @@ HELLO:	hello.bas
 ####
 
 clean:	
-	rm -f *.lst *.o TITLE SB RAT DUCK_POND *~
+	rm -f *.lst *.o TITLE ROOF RAT DUCK_POND *~

games/sb/duck_graphics/Makefile

@@ -10,11 +10,7 @@ PNG2GR = ../../../utils/gr-utils/png2gr
 PNG2SPRITES = ../../../utils/gr-utils/png2sprites
 HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite
 
-all:	strongbad_sample.hgr.zx02 \
-	czmg4ap_title.hgr.zx02 \
-	title_sprites.inc \
-	videlectrix_top.hgr.zx02 \
-	a2_duckpond_title.gr.zx02 \
+all:	a2_duckpond_title.gr.zx02 \
 	a2_duckpond.gr.zx02 \
 	a2_duckpond_twilight.gr.zx02 \
 	a2_duckpond_night.gr.zx02 \
@@ -81,44 +77,6 @@ duck_sprites.inc:	duck1_sprites_left.png duck1_sprites_right.png \
 	$(PNG2SPRITES) duck2_sprites_right.png d2_right2_mask   13 16 11 12 >>  duck_sprites.inc
 	$(PNG2SPRITES) duck2_sprites_right.png d2_right3_mask   13 30 11 12 >>  duck_sprites.inc
 
-
-
-
-
-####
-
-strongbad_sample.hgr.zx02:	strongbad_sample.hgr
-	$(ZX02) strongbad_sample.hgr strongbad_sample.hgr.zx02
-
-strongbad_sample.hgr:	strongbad_sample.png
-	$(PNG_TO_HGR) strongbad_sample.png > strongbad_sample.hgr
-
-####
-
-czmg4ap_title.hgr.zx02:	czmg4ap_title.hgr
-	$(ZX02) czmg4ap_title.hgr czmg4ap_title.hgr.zx02
-
-czmg4ap_title.hgr:	czmg4ap_title.png
-	$(PNG_TO_HGR) czmg4ap_title.png > czmg4ap_title.hgr
-
-####
-
-title_sprites.inc:	czmg4ap_title_sprites.png
-	$(HGR_SPRITE) -s -l empty_sprite czmg4ap_title_sprites.png  105 131 118 138 > title_sprites.inc
-	$(HGR_SPRITE) -s -l arrow_sprite czmg4ap_title_sprites.png  105 111 118  118 >> title_sprites.inc
-	$(HGR_SPRITE) -s -l purple_sprite czmg4ap_title_sprites.png 175  83 230 102 >> title_sprites.inc
-
-
-####
-
-videlectrix_top.hgr.zx02:	videlectrix_top.hgr
-	$(ZX02) videlectrix_top.hgr videlectrix_top.hgr.zx02
-
-videlectrix_top.hgr:	videlectrix_top.png
-	$(PNG_TO_HGR) videlectrix_top.png > videlectrix_top.hgr
-
-
-
 ####
 
 a2_duckpond_title.gr.zx02:	a2_duckpond_title.gr

games/sb/duck_pond.s

@@ -210,10 +210,10 @@ done_loop:
 	.include	"move_ducks.s"
 
 title_data:
-	.incbin "graphics/a2_duckpond_title.gr.zx02"
+	.incbin "duck_graphics/a2_duckpond_title.gr.zx02"
 
 main_data:
-	.incbin "graphics/a2_duckpond.gr.zx02"
+	.incbin "duck_graphics/a2_duckpond.gr.zx02"
 
-	.include "graphics/num_sprites.inc"
-	.include "graphics/duck_sprites.inc"
+	.include "duck_graphics/num_sprites.inc"
+	.include "duck_graphics/duck_sprites.inc"

games/sb/rat_graphics/Makefile

@@ -66,6 +66,15 @@ a2_fortnight_100.hgr.zx02:	a2_fortnight_100.hgr
 a2_fortnight_100.hgr:	a2_fortnight_100.png
 	$(PNG_TO_HGR) a2_fortnight_100.png > a2_fortnight_100.hgr
 
+####
+
+a2_fortnight.hgr.zx02:	a2_fortnight.hgr
+	$(ZX02) a2_fortnight.hgr a2_fortnight.hgr.zx02
+
+a2_fortnight.hgr:	a2_fortnight.png
+	$(PNG_TO_HGR) a2_fortnight.png > a2_fortnight.hgr
+
+
 
 ####
 

games/sb/roof.s

@@ -69,4 +69,4 @@ which_ok:
 
 
 comp_data:
-	.incbin "graphics/strongbad_sample.hgr.zx02"
+	.incbin "roof_graphics/strongbad_sample.hgr.zx02"

games/sb/roof_graphics/Makefile

@@ -0,0 +1,27 @@
+include ../../../Makefile.inc
+
+ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f
+PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr
+LINKER_SCRIPTS = ../../../linker_scripts
+DOS33 = ../../../utils/dos33fs-utils/dos33
+EMPTY_DISK = ../../../empty_disk/empty.dsk
+TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft
+PNG2GR = ../../../utils/gr-utils/png2gr
+PNG2SPRITES = ../../../utils/gr-utils/png2sprites
+HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite
+
+all:	strongbad_sample.hgr.zx02
+
+####
+
+strongbad_sample.hgr.zx02:	strongbad_sample.hgr
+	$(ZX02) strongbad_sample.hgr strongbad_sample.hgr.zx02
+
+strongbad_sample.hgr:	strongbad_sample.png
+	$(PNG_TO_HGR) strongbad_sample.png > strongbad_sample.hgr
+
+####
+
+clean:
+	rm -f *~ *.o *.lst
+

games/sb/title.s

@@ -266,16 +266,16 @@ load_new_program:
 	.include	"audio.s"
 	.include	"purple.s"
 	.include	"lc_detect.s"
-	.include	"graphics/title_sprites.inc"
+	.include	"title_graphics/title_sprites.inc"
 	.include	"hgr_sprite.s"
 
 title_data:
-	.incbin "graphics/czmg4ap_title.hgr.zx02"
+	.incbin "title_graphics/czmg4ap_title.hgr.zx02"
 vid_top:
-	.incbin "graphics/videlectrix_top.hgr.zx02"
+	.incbin "title_graphics/videlectrix_top.hgr.zx02"
 
 purple_data:
-	.incbin "sound/purple.btc.zx02"
+	.incbin "title_sound/purple.btc.zx02"
 
 	; offsets of arrow
 arrow_y:

games/sb/title_graphics/Makefile

@@ -0,0 +1,55 @@
+include ../../../Makefile.inc
+
+ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f
+PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr
+LINKER_SCRIPTS = ../../../linker_scripts
+DOS33 = ../../../utils/dos33fs-utils/dos33
+EMPTY_DISK = ../../../empty_disk/empty.dsk
+TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft
+PNG2GR = ../../../utils/gr-utils/png2gr
+PNG2SPRITES = ../../../utils/gr-utils/png2sprites
+HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite
+
+all:	czmg4ap_title.hgr.zx02 \
+	title_sprites.inc \
+	videlectrix_top.hgr.zx02 \
+	the_cheat_loading.hgr.zx02
+
+####
+
+czmg4ap_title.hgr.zx02:	czmg4ap_title.hgr
+	$(ZX02) czmg4ap_title.hgr czmg4ap_title.hgr.zx02
+
+czmg4ap_title.hgr:	czmg4ap_title.png
+	$(PNG_TO_HGR) czmg4ap_title.png > czmg4ap_title.hgr
+
+####
+
+title_sprites.inc:	czmg4ap_title_sprites.png
+	$(HGR_SPRITE) -s -l empty_sprite czmg4ap_title_sprites.png  105 131 118 138 > title_sprites.inc
+	$(HGR_SPRITE) -s -l arrow_sprite czmg4ap_title_sprites.png  105 111 118  118 >> title_sprites.inc
+	$(HGR_SPRITE) -s -l purple_sprite czmg4ap_title_sprites.png 175  83 230 102 >> title_sprites.inc
+
+
+####
+
+videlectrix_top.hgr.zx02:	videlectrix_top.hgr
+	$(ZX02) videlectrix_top.hgr videlectrix_top.hgr.zx02
+
+videlectrix_top.hgr:	videlectrix_top.png
+	$(PNG_TO_HGR) videlectrix_top.png > videlectrix_top.hgr
+
+####
+
+the_cheat_loading.hgr.zx02:	the_cheat_loading.hgr
+	$(ZX02) the_cheat_loading.hgr the_cheat_loading.hgr.zx02
+
+the_cheat_loading.hgr:	the_cheat_loading.png
+	$(PNG_TO_HGR) the_cheat_loading.png > the_cheat_loading.hgr
+
+
+####
+
+clean:
+	rm -f *~ *.o *.lst
+