sb: finish moving things to own directories

games/sb/Makefile

@@ -12,21 +12,24 @@ all:	sb.dsk
 
 ####
 
-sb.dsk:	QBOOT QLOAD TITLE ./duck_pond/DUCK_POND ROOF ASPLODE BACK_OFF \
+sb.dsk:	QBOOT QLOAD ./title/TITLE \
+	./duck_pond/DUCK_POND \
+	./roof/ROOF \
+	strongbadzone/ASPLODE strongbadzone/BACK_OFF \
 	./fish/FISH ./rat/RAT ./dating/DATING_XR
 	cp $(EMPTY_DISK) sb.dsk
 	$(DOS33_RAW) sb.dsk  0  0 QBOOT      0   1
 	$(DOS33_RAW) sb.dsk  0  2 QBOOT      1   1
 	$(DOS33_RAW) sb.dsk  0  4 QBOOT      2   1
 	$(DOS33_RAW) sb.dsk  1  0 QLOAD      0   0
-	$(DOS33_RAW) sb.dsk  2  0 TITLE      0   0
+	$(DOS33_RAW) sb.dsk  2  0 ./title/TITLE      0   0
 	$(DOS33_RAW) sb.dsk  5  0 ./duck_pond/DUCK_POND  0   0
-	$(DOS33_RAW) sb.dsk  8  0 ROOF       0   0
+	$(DOS33_RAW) sb.dsk  8  0 ./roof/ROOF       0   0
-	$(DOS33_RAW) sb.dsk  9  0 ASPLODE    0   0
+	$(DOS33_RAW) sb.dsk  9  0 ./strongbadzone/ASPLODE    0   0
 #	$(DOS33_RAW) sb.dsk  20 0 TARGET     0   0
 	$(DOS33_RAW) sb.dsk  14 0 ./fish/FISH      0   0
 	$(DOS33_RAW) sb.dsk  20 0 ./rat/RAT        0   0
-	$(DOS33_RAW) sb.dsk  22 0 BACK_OFF   0   0
+	$(DOS33_RAW) sb.dsk  22 0 ./strongbadzone/BACK_OFF   0   0
 	$(DOS33_RAW) sb.dsk  24 0 ../peasant_mini/cliff/CLIMB   0   0
 	$(DOS33_RAW) sb.dsk  28 0 ./dating/DATING_XR  0   0
 
@@ -48,70 +51,30 @@ qload.o:	qload.s qboot.inc
 
 ####
 
-ROOF:	roof.o
+./dating/DATING_XR:	
-	ld65 -o ROOF roof.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
+	cd dating && make
 
-roof.o:	roof.s zx02_optim.s \
+./duck_pond/DUCK_POND:	
-		roof_graphics/strongbad_sample.hgr.zx02 \
+	cd duck_pond && make
-		zp.inc hardware.inc
-	ca65 -o roof.o roof.s -l roof.lst
-
-roof_graphics/strongbad_sample.hgr.zx02:	
-	cd roof_graphics && make
-
-####
-
-ASPLODE:	asplode.o
-	ld65 -o ASPLODE asplode.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
-
-asplode.o:	asplode.s zx02_optim.s \
-		asplode_graphics/sb_title.hgr.zx02 \
-		asplode_graphics/sb_zone.hgr.zx02 \
-		asplode_graphics/sb_sprites.inc \
-		asplode_sound/asplode_sound.btc.zx02 \
-		audio.s play_asplode.s asplode_head.s \
-		hgr_sprite_big.s cycle_colors.s \
-		zp.inc hardware.inc
-	ca65 -o asplode.o asplode.s -l asplode.lst
-
-asplode_graphics/sb_sprites.inc:	
-	cd asplode_graphics && make
-
-asplode_graphics/sb_title.hgr.zx02:	
-	cd asplode_graphics && make
-
-asplode_sound/asplode.btc.zx02:	
-	cd asplode_sound && make
-
-
-####
-
-BACK_OFF:	back_off.o
-	ld65 -o BACK_OFF back_off.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
-
-back_off.o:	back_off.s zx02_optim.s \
-		asplode_graphics/bob_bg.hgr.zx02 \
-		asplode_graphics/bob_sprites.inc \
-		asplode_sound/back_off.btc.zx02 \
-		audio.s play_back_off.s \
-		hgr_sprite_big.s \
-		zp.inc hardware.inc
-	ca65 -o back_off.o back_off.s -l back_off.lst
-
-####
-
-#./cliff/CLIFF:	
-#	cd cliff && make
-
-####
 
 ./fish/FISH:	
 	cd fish && make
 
-####
+./rat/RAT:	
+	cd rat && make
+
+./roof/ROOF:	
+	cd roof && make
+
+./strongbadzone/ASPLODE:	
+	cd strongbadzone && make
+
+./strongbadzone/BACK_OFF:	
+	cd strongbadzone && make
+
+./title/TITLE:	
+	cd title && make
 
-./dating/DATING_XR:	
-	cd dating && make
 
 
 ####
@@ -130,57 +93,28 @@ target_graphics/target.hgr.zx02:
 
 ####
 
-./rat/RAT:	
-	cd rat && make
-
-####
-
-TITLE:	title.o
-	ld65 -o TITLE title.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
-
-title.o:	title.s zx02_optim.s \
-		zp.inc hardware.inc \
-		hgr_logo_scroll.s audio.s hgr_sprite.s \
-		hgr_sprite_big.s hgr_copy_fast.s \
-		play_purple.s lc_detect.s hgr_tables.s \
-		title_sound/purple.btc.zx02 \
-		title_graphics/czmg4ap_title.hgr.zx02 \
-		title_graphics/videlectrix_top.hgr.zx02 \
-		title_graphics/the_cheat_loading.hgr.zx02 \
-		title_graphics/title_sprites.inc
-	ca65 -o title.o title.s -l title.lst
-
-title_sound/purple.btc.zx02:
-	cd title_sound && make
-
-title_graphics/czmg4ap_title.hgr.zx02:	
-	cd title_graphics && make
-
-####
-
-./duck_pond/DUCK_POND:	
-	cd duck_pond && make
-
-####
-
 HELLO:	hello.bas
 	$(TOKENIZE) < hello.bas > HELLO
 
 ####
 
 clean:	
-	rm -f *.lst *.o *~ QBOOT QLOAD TITLE ROOF ASPLODE
+	rm -f *.lst *.o *~ QBOOT QLOAD
-	cd duck_pond && make clean
-	cd rat && make clean
-	cd asplode_sound && make clean
 	cd dating && make clean
-	cd rat_sound && make clean
+	cd duck_pond && make clean
-	cd title_sound && make clean
+	cd fish && make clean
-	cd asplode_graphics && make clean
+	cd rat && make clean
-	cd roof_graphics && make clean
+	cd roof && make clean
-	cd title_graphics && make clean
+	cd strongbadzone && make clean
+	cd title && make clean
+
 
 distclean:
-	rm -f *.lst *.o *~ QBOOT QLOAD TITLE ROOF ASPLODE
+	rm -f *.lst *.o *~ QBOOT QLOAD
+	cd dating && make distclean
 	cd duck_pond && make distclean
+	cd fish && make distclean
 	cd rat && make distclean
+	cd roof && make distclean
+	cd strongbadzone && make distclean
+	cd title && make distclean

games/sb/rat/Makefile

@@ -0,0 +1,46 @@
+include ../../../Makefile.inc
+
+ZX02 = ~/research/6502_compression/zx02.git/build/zx02
+LINKER_SCRIPTS = ../../../linker_scripts
+DOS33 = ../../../utils/dos33fs-utils/dos33
+DOS33_RAW = ../../../utils/dos33fs-utils/dos33_raw
+EMPTY_DISK = ../../../empty_disk/empty.dsk
+TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft
+
+#all:	sb.dsk
+
+all:	RAT
+
+####
+
+RAT:	rat.o
+	ld65 -o RAT rat.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
+
+rat.o:	rat.s \
+	../zx02_optim.s ../duet.s ../hgr_sprite_mask.s \
+	../hgr_sprite.s ../hgr_tables.s \
+	../zp.inc ../hardware.inc \
+	sound/fortnight.ed \
+	graphics/a2_fortnight.hgr.zx02 \
+	graphics/a2_fortnight_99.hgr.zx02 \
+	graphics/a2_fortnight_100.hgr.zx02 \
+	graphics/a2_fortnight_rat1.hgr.zx02 \
+	graphics/a2_fortnight_rat2.hgr.zx02 \
+	graphics/a2_break.hgr.zx02 \
+	graphics/disk_sprites.inc
+	ca65 -o rat.o rat.s -l rat.lst
+
+sound/fortnight.ed:	
+	cd sound && make
+
+graphics/a2_fortnight.hgr.zx02:	
+	cd graphics && make
+
+
+clean:	
+	rm -f *.lst *.o *~ RAT
+
+distclean:	
+	rm -f *.lst *.o *~ RAT
+	cd sound && make clean
+	cd graphics && make clean

games/sb/roof/Makefile

@@ -0,0 +1,28 @@
+include ../../../Makefile.inc
+
+ZX02 = ~/research/6502_compression/zx02.git/build/zx02
+LINKER_SCRIPTS = ../../../linker_scripts
+
+all:	ROOF
+
+####
+
+ROOF:	roof.o
+	ld65 -o ROOF roof.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
+
+roof.o:	roof.s ../zx02_optim.s \
+		graphics/strongbad_sample.hgr.zx02 \
+		../zp.inc ../hardware.inc
+	ca65 -o roof.o roof.s -l roof.lst
+
+graphics/strongbad_sample.hgr.zx02:	
+	cd graphics && make
+
+####
+
+clean:	
+	rm -f *.lst *.o *~ ROOF
+
+distclean:
+	rm -f *.lst *.o *~ ROOF
+	cd graphics && make clean

games/sb/roof/graphics/Makefile

@@ -0,0 +1,23 @@
+include ../../../../Makefile.inc
+
+ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f
+PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
+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 *.hgr *.zx02
+

games/sb/roof/roof.s

@@ -3,8 +3,8 @@
 ; by deater (Vince Weaver) <vince@deater.net>
 
 
-.include "zp.inc"
+.include "../zp.inc"
-.include "hardware.inc"
+.include "../hardware.inc"
 
 
 hires_start:
@@ -65,8 +65,8 @@ which_ok:
 
 
 
-	.include	"zx02_optim.s"
+	.include "../zx02_optim.s"
 
 
 comp_data:
-	.incbin "roof_graphics/strongbad_sample.hgr.zx02"
+	.incbin "graphics/strongbad_sample.hgr.zx02"

games/sb/roof_graphics/Makefile

@@ -1,27 +0,0 @@
-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/strongbadzone/Makefile

@@ -0,0 +1,57 @@
+include ../../../Makefile.inc
+
+LINKER_SCRIPTS = ../../../linker_scripts
+
+all:	ASPLODE BACK_OFF
+
+####
+
+ASPLODE:	asplode.o
+	ld65 -o ASPLODE asplode.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
+
+asplode.o:	asplode.s ../zx02_optim.s \
+		graphics/sb_title.hgr.zx02 \
+		graphics/sb_zone.hgr.zx02 \
+		graphics/sb_sprites.inc \
+		sound/asplode_sound.btc.zx02 \
+		../audio.s play_asplode.s asplode_head.s \
+		../hgr_sprite_big.s cycle_colors.s \
+		../zp.inc ../hardware.inc
+	ca65 -o asplode.o asplode.s -l asplode.lst
+
+graphics/sb_sprites.inc:	
+	cd graphics && make
+
+graphics/sb_title.hgr.zx02:	
+	cd graphics && make
+
+asplode_sound/asplode.btc.zx02:	
+	cd asplode_sound && make
+
+
+####
+
+BACK_OFF:	back_off.o
+	ld65 -o BACK_OFF back_off.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
+
+back_off.o:	back_off.s ../zx02_optim.s \
+		graphics/bob_bg.hgr.zx02 \
+		graphics/bob_sprites.inc \
+		sound/back_off.btc.zx02 \
+		../audio.s play_back_off.s \
+		../hgr_sprite_big.s \
+		../zp.inc ../hardware.inc
+	ca65 -o back_off.o back_off.s -l back_off.lst
+
+####
+
+clean:	
+	rm -f *.lst *.o *~ ASPLODE BACK_OFF
+
+
+
+distclean:
+	rm -f *.lst *.o *~ ASPLODE BACK_OFF
+	cd graphics && make clean
+	cd sound && make clean
+

games/sb/strongbadzone/asplode.s

@@ -35,8 +35,8 @@
 ;   sound
 
 
-.include "zp.inc"
+.include "../zp.inc"
-.include "hardware.inc"
+.include "../hardware.inc"
 
 div7_table     = $400
 mod7_table     = $500
@@ -192,16 +192,16 @@ load_backgrounds:
 
 
 title_data:
-	.incbin "asplode_graphics/sb_title.hgr.zx02"
+	.incbin "graphics/sb_title.hgr.zx02"
 
 bg1_data:
-	.incbin "asplode_graphics/sb_zone.hgr.zx02"
+	.incbin "graphics/sb_zone.hgr.zx02"
 
 sound_data:
-	.incbin "asplode_sound/asplode_sound.btc.zx02"
+	.incbin "sound/asplode_sound.btc.zx02"
 
-	.include	"hgr_tables.s"
+	.include	"../hgr_tables.s"
-	.include	"zx02_optim.s"
+	.include	"../zx02_optim.s"
 
 	; start at least 8k in?
 
@@ -734,13 +734,13 @@ done_flip:
 
 
 
-	.include	"hgr_sprite_big.s"
+	.include	"../hgr_sprite_big.s"
 	.include	"cycle_colors.s"
-	.include	"hgr_copy_fast.s"
+	.include	"../hgr_copy_fast.s"
-	.include	"audio.s"
+	.include	"../audio.s"
 	.include	"play_asplode.s"
 
-	.include	"asplode_graphics/sb_sprites.inc"
+	.include	"graphics/sb_sprites.inc"
 
 
 shield_sprites_l:
@@ -816,4 +816,4 @@ bullet_vals_center:
 ; 9,5 -> 22,14 = 12x9 roughly.  3 times smaller, 4x3?  2x6?
 
 bg2_data:
-	.incbin "asplode_graphics/sb_zone2.hgr.zx02"
+	.incbin "graphics/sb_zone2.hgr.zx02"

games/sb/strongbadzone/back_off.s

@@ -7,8 +7,8 @@
 ;
 ; by deater (Vince Weaver) <vince@deater.net>
 
-.include "zp.inc"
+.include "../zp.inc"
-.include "hardware.inc"
+.include "../hardware.inc"
 
 div7_table     = $400
 mod7_table     = $500
@@ -361,19 +361,19 @@ done_flip:
 
 
 
-	.include	"hgr_sprite_big.s"
+	.include	"../hgr_sprite_big.s"
-	.include	"hgr_copy_fast.s"
+	.include	"../hgr_copy_fast.s"
-	.include	"audio.s"
+	.include	"../audio.s"
 	.include	"play_back_off.s"
 
-	.include	"asplode_graphics/bob_sprites.inc"
+	.include	"graphics/bob_sprites.inc"
 
 bg1_data:
-	.incbin		"asplode_graphics/bob_bg.hgr.zx02"
+	.incbin		"graphics/bob_bg.hgr.zx02"
 
 sound_data:
-	.incbin		"asplode_sound/back_off.btc.zx02"
+	.incbin		"sound/back_off.btc.zx02"
 
-	.include	"zx02_optim.s"
+	.include	"../zx02_optim.s"
 
 

games/sb/strongbadzone/graphics/Makefile

@@ -1,14 +1,11 @@
-include ../../../Makefile.inc
+include ../../../../Makefile.inc
 
 ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f
-PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr
+PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
-LINKER_SCRIPTS = ../../../linker_scripts
+LINKER_SCRIPTS = ../../../../linker_scripts
-DOS33 = ../../../utils/dos33fs-utils/dos33
+PNG2GR = ../../../../utils/gr-utils/png2gr
-EMPTY_DISK = ../../../empty_disk/empty.dsk
+PNG2SPRITES = ../../../../utils/gr-utils/png2sprites
-TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft
+HGR_SPRITE = ../../../../utils/hgr-utils/hgr_make_sprite
-PNG2GR = ../../../utils/gr-utils/png2gr
-PNG2SPRITES = ../../../utils/gr-utils/png2sprites
-HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite
 
 all:	sb_zone.hgr.zx02 sb_zone2.hgr.zx02 \
 	sb_combined.hgr.zx02 \

games/sb/title/Makefile

@@ -0,0 +1,42 @@
+include ../../../Makefile.inc
+
+ZX02 = ~/research/6502_compression/zx02.git/build/zx02
+PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr
+LINKER_SCRIPTS = ../../../linker_scripts
+
+all:	TITLE
+
+####
+
+TITLE:	title.o
+	ld65 -o TITLE title.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
+
+title.o:	title.s ../zx02_optim.s \
+		../zp.inc ../hardware.inc \
+		../hgr_logo_scroll.s ../audio.s ../hgr_sprite.s \
+		../hgr_sprite_big.s ../hgr_copy_fast.s \
+		play_purple.s ../lc_detect.s ../hgr_tables.s \
+		sound/purple.btc.zx02 \
+		graphics/czmg4ap_title.hgr.zx02 \
+		graphics/videlectrix_top.hgr.zx02 \
+		graphics/the_cheat_loading.hgr.zx02 \
+		graphics/title_sprites.inc
+	ca65 -o title.o title.s -l title.lst
+
+sound/purple.btc.zx02:
+	cd sound && make
+
+graphics/czmg4ap_title.hgr.zx02:	
+	cd graphics && make
+
+####
+
+clean:	
+	rm -f *.lst *.o *~ TITLE
+
+distclean:	
+	rm -f *.lst *.o *~ TITLE
+	cd sound && make clean
+	cd graphics && make clean
+
+

games/sb/title/graphics/Makefile

@@ -1,14 +1,10 @@
-include ../../../Makefile.inc
+include ../../../../Makefile.inc
 
 ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f
-PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr
+PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
-LINKER_SCRIPTS = ../../../linker_scripts
+PNG2GR = ../../../../utils/gr-utils/png2gr
-DOS33 = ../../../utils/dos33fs-utils/dos33
+PNG2SPRITES = ../../../../utils/gr-utils/png2sprites
-EMPTY_DISK = ../../../empty_disk/empty.dsk
+HGR_SPRITE = ../../../../utils/hgr-utils/hgr_make_sprite
-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 \
@@ -52,5 +48,5 @@ the_cheat_loading.hgr:	the_cheat_loading.png
 ####
 
 clean:
-	rm -f *~ *.o *.lst
+	rm -f *~ *.o *.lst *.inc *.zx02 *.hgr
 

games/sb/title/sound/Makefile

@@ -6,4 +6,4 @@ purple.btc.zx02:	purple.btc
 	$(ZX02) purple.btc purple.btc.zx02
 
 clean:	
-	rm -f *~
+	rm -f *~ *.zx02

games/sb/title/title.s

@@ -3,8 +3,8 @@
 ; by deater (Vince Weaver) <vince@deater.net>
 
 
-.include "zp.inc"
+.include "../zp.inc"
-.include "hardware.inc"
+.include "../hardware.inc"
 
 div7_table     = $9C00
 mod7_table     = $9D00
@@ -296,25 +296,25 @@ load_new_program:
 	sta	WHICH_LOAD
 	rts
 
-	.include	"zx02_optim.s"
+	.include	"../zx02_optim.s"
-	.include	"hgr_tables.s"
+	.include	"../hgr_tables.s"
-	.include	"hgr_logo_scroll.s"
+	.include	"../hgr_logo_scroll.s"
-	.include	"audio.s"
+	.include	"../audio.s"
 	.include	"play_purple.s"
-	.include	"lc_detect.s"
+	.include	"../lc_detect.s"
-	.include	"title_graphics/title_sprites.inc"
+	.include	"graphics/title_sprites.inc"
-	.include	"hgr_sprite.s"
+	.include	"../hgr_sprite.s"
-	.include	"hgr_sprite_big.s"
+	.include	"../hgr_sprite_big.s"
 
 title_data:
-	.incbin "title_graphics/czmg4ap_title.hgr.zx02"
+	.incbin "graphics/czmg4ap_title.hgr.zx02"
 vid_top:
-	.incbin "title_graphics/videlectrix_top.hgr.zx02"
+	.incbin "graphics/videlectrix_top.hgr.zx02"
 loading_data:
-	.incbin "title_graphics/the_cheat_loading.hgr.zx02"
+	.incbin "graphics/the_cheat_loading.hgr.zx02"
 
 purple_data:
-	.incbin "title_sound/purple.btc.zx02"
+	.incbin "sound/purple.btc.zx02"
 
 	; offsets of arrow
 arrow_y: