peasant: more moving files around

games/peasant/Makefile

@@ -52,7 +52,7 @@ peasant_disk2.dsk:	QBOOT QLOAD \
 	$(DOS33_RAW) peasant_disk2.dsk  25 0 PEASANT3	  0   0
 	$(DOS33_RAW) peasant_disk2.dsk  30 0 PEASANT4	  0   0
 
-peasant_disk3.dsk:	WBOOT2 ./trogdor/TROGDOR ENDING \
+peasant_disk3.dsk:	WBOOT2 ./trogdor/TROGDOR ./ending/ENDING \
 	CLIFF GAME_OVER INSIDE INN ARCHERY MAP
 	cp $(EMPTY_DISK)/empty.dsk peasant_disk3.dsk
 	$(DOS33_RAW) peasant_disk3.dsk   0 0  WBOOT2      0   1
@@ -62,7 +62,7 @@ peasant_disk3.dsk:	WBOOT2 ./trogdor/TROGDOR ENDING \
 	$(DOS33_RAW) peasant_disk3.dsk   9 0 INSIDE       0   0
 	$(DOS33_RAW) peasant_disk3.dsk  14 0 INN          0   0
 	$(DOS33_RAW) peasant_disk3.dsk  19 0 ./trogdor/TROGDOR	  0   0
-	$(DOS33_RAW) peasant_disk3.dsk  24 0 ENDING	  0   0
+	$(DOS33_RAW) peasant_disk3.dsk  24 0 ./ending/ENDING	  0   0
 	$(DOS33_RAW) peasant_disk3.dsk  29 0 CLIFF	  0   0
 
 
@@ -379,25 +379,8 @@ peasant4.o:	peasant4.s zp.inc inventory.inc \
 ./trogdor/TROGDOR:	DIALOG_TROGDOR.ZX02
 	cd trogdor && make
 
-###
-
-ENDING:	ending.o
-	ld65 -o ENDING ending.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
-
-ending.o:	ending.s zp.inc qload.inc ./music/music.inc \
-		graphics_end/ending_graphics.inc sprites/peasant_sprites.inc \
-		sprites/ending_sprites.inc \
-		draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \
-		hgr_2x14_sprite_mask.s \
-		hgr_sprite.s hgr_save_restore.s \
-		wait_a_bit.s draw_peasant.s hgr_text_box.s \
-		keyboard.s new_map_location.s \
-		move_peasant.s score.s inventory.s
-
-	ca65 -o ending.o ending.s -l ending.lst
-
-
-###
+./ending/ENDING:	
+	cd ending && make
 
 ./copy/COPY_CHECK:	
 	cd copy && make
@@ -644,9 +627,6 @@ graphics_archery/archery_graphics.inc:
 graphics_cliff/cliff_graphics.inc:
 	cd graphics_cliff && make
 
-graphics_end/ending_graphics.inc:
-	cd graphics_end && make
-
 graphics_inn/graphics_inn.inc:
 	cd graphics_inn && make
 
@@ -686,7 +666,6 @@ distclean:
 	cd sprites && make clean
 	cd graphics_archery && make clean
 	cd graphics_cliff && make clean
-	cd graphics_end && make clean
 	cd graphics_inn && make clean
 	cd graphics_inside && make clean
 	cd graphics_map && make clean
@@ -694,6 +673,7 @@ distclean:
 	cd graphics_peasantry && make clean
 	cd text && make clean
 	cd copy && make distclean
+	cd ending && make distclean
 	cd intro && make distclean
 	cd trogdor && make distclean
 	cd vid_logo && make distclean
@@ -703,10 +683,11 @@ distclean:
 clean:	
 	rm -f *~ *.o *.lst \
 			PEASANT1 PEASANT2 PEASANT3 PEASANT4 \
-			ENDING GAME_OVER \
+			GAME_OVER \
 			*.ZX02 dialog_peasant2 \
 			generate_common generate_all_symbols
 	cd copy && make clean
+	cd ending && make clean
 	cd intro && make clean
 	cd music && make clean
 	cd title && make clean

games/peasant/ending/Makefile

@@ -0,0 +1,42 @@
+include ../../../Makefile.inc
+
+LINKER_SCRIPTS = ../../../linker_scripts
+
+all:	ENDING
+
+###
+
+ENDING:	ending.o
+	ld65 -o ENDING ending.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
+
+ending.o:	ending.s \
+		../zp.inc ../qload.inc ../music/music.inc \
+		graphics_end/ending_graphics.inc \
+		../sprites/peasant_sprites.inc \
+		sprites/ending_sprites.inc \
+		../draw_box.s ../hgr_rectangle.s ../hgr_font.s ../hgr_input.s \
+		../hgr_2x14_sprite_mask.s \
+		../hgr_sprite.s ../hgr_save_restore.s \
+		../wait_a_bit.s ../draw_peasant.s ../hgr_text_box.s \
+		../keyboard.s ../new_map_location.s \
+		../move_peasant.s ../score.s ../inventory.s
+
+	ca65 -o ending.o ending.s -l ending.lst
+
+
+###
+
+graphics_end/ending_graphics.inc:
+	cd graphics_end && make
+
+###
+
+distclean:
+	make clean
+	cd graphics_end && make clean
+
+###
+
+clean:	
+	rm -f *~ *.o *.lst ENDING
+

games/peasant/ending/ending.s

@@ -5,11 +5,11 @@
 
 ; by Vince `deater` Weaver	vince@deater.net
 
-.include "hardware.inc"
-.include "zp.inc"
+.include "../hardware.inc"
+.include "../zp.inc"
 
-.include "qload.inc"
-.include "./music/music.inc"
+.include "../qload.inc"
+.include "../music/music.inc"
 
 ending:
 
@@ -565,14 +565,14 @@ stuck_forever:
 
 
 
-.include "hgr_2x14_sprite_mask.s"
-.include "hgr_sprite.s"
+.include "../hgr_2x14_sprite_mask.s"
+.include "../hgr_sprite.s"
 
 
-.include "wait.s"
-.include "wait_a_bit.s"
+.include "../wait.s"
+.include "../wait_a_bit.s"
 
-.include "speaker_beeps.inc"
+.include "../speaker_beeps.inc"
 
 .include "graphics_end/ending_graphics.inc"
 

games/peasant/ending/graphics_end/Makefile

@@ -1,9 +1,6 @@
 
-PNG2RLE = ../../../utils/gr-utils/png2rle
-PNG2GR = ../../../utils/gr-utils/png2gr
-PNG2HGR = ../../../utils/hgr-utils/png2hgr
-#LZSA = ~/research/lzsa/lzsa/lzsa
-B2D = ../../../utils/bmp2dhr/b2d
+PNG2GR = ../../../../utils/gr-utils/png2gr
+PNG2HGR = ../../../../utils/hgr-utils/png2hgr
 ZX02 = ~/research/6502_compression/zx02.git/build/zx02
 
 all:	ending_graphics.inc

games/peasant/ending/sprites/Makefile

@@ -0,0 +1,42 @@
+HGR_SPRITE = ../../../../utils/hgr-utils/hgr_make_sprite
+
+all:	ending_sprites.inc
+
+ending_sprites.inc:	end_sprites.png end_boat_sprites.png
+	$(HGR_SPRITE) -l baby0_sprite end_sprites.png 14 3 27 17 > ending_sprites.inc
+	$(HGR_SPRITE) -l baby0_mask end_sprites.png 42 3 55 17 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby1_sprite end_sprites.png 14 20 27 34 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby1_mask end_sprites.png 42 20 55 34 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby2_sprite end_sprites.png 14 37 27 51 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby2_mask end_sprites.png 42 37 55 51 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby3_sprite end_sprites.png 14 54 27 68 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby3_mask end_sprites.png 42 54 55 68 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby4_sprite end_sprites.png 14 71 27 85 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby4_mask end_sprites.png 42 71 55 85 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby5_sprite end_sprites.png 14 88 27 102 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby5_mask end_sprites.png 42 88 55 102 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby6_sprite end_sprites.png 14 105 27 119 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby6_mask end_sprites.png 42 105 55 119 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby7_sprite end_sprites.png 14 122 27 136 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby7_mask end_sprites.png 42 122 55 136 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby8_sprite end_sprites.png 14 139 27 153 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby8_mask end_sprites.png 42 139 55 153 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby9_sprite end_sprites.png 14 156 27 170 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby9_mask end_sprites.png 42 156 55 170 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby10_sprite end_sprites.png 14 173 27 187 >> ending_sprites.inc
+	$(HGR_SPRITE) -l baby10_mask end_sprites.png 42 173 55 187 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l jhonka1 end_sprites.png 105 84 145 115 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l jhonka2 end_sprites.png 105 121 145 152 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat0 end_boat_sprites.png  7   1 81   45 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat1 end_boat_sprites.png  7  47 81   91 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat2 end_boat_sprites.png  7  93 81  137 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat3 end_boat_sprites.png  7 139 81  183 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat4 end_boat_sprites.png 91   1 165  45 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat5 end_boat_sprites.png 91  47 165  91 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat6 end_boat_sprites.png 91  93 165 137 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l boat7 end_boat_sprites.png 91 139 165 183 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l foam0 end_sprites.png 155  38 165 85 >> ending_sprites.inc
+	$(HGR_SPRITE) -s -l foam1 end_sprites.png 183  38 195 85 >> ending_sprites.inc
+
+clean:
+	rm -f *~ ending_sprites.inc