peasant: update cliff graphics

games/peasant/cliff_base/graphics_cliff/Makefile

@@ -2,6 +2,7 @@
 PNG2GR = ../../../../utils/gr-utils/png2gr
 PNG2HGR = ../../../../utils/hgr-utils/png2hgr
 ZX02 = ~/research/6502_compression/zx02.git/build/zx02
+PNG2COLLISION = ../../../../utils/gr-utils/png2collision
 
 all:	cliff_graphics.inc \
 	priority_cliff.inc
@@ -9,13 +10,13 @@ all:	cliff_graphics.inc \
 ###
 
 cliff_graphics.inc:	\
-	cliff_base.zx02
-	echo "cliff_base_zx02: .incbin \"cliff_base.zx02\"" > cliff_graphics.inc
+	cliff_base.hgr.zx02
+	echo "cliff_base_zx02: .incbin \"cliff_base.hgr.zx02\"" > cliff_graphics.inc
 
 ###
 
-cliff_base.zx02:	cliff_base.hgr
-	$(ZX02) -f cliff_base.hgr cliff_base.zx02
+cliff_base.hgr.zx02:	cliff_base.hgr
+	$(ZX02) -f cliff_base.hgr cliff_base.hgr.zx02
 
 cliff_base.hgr:	cliff_base.png
 	$(PNG2HGR) cliff_base.png > cliff_base.hgr
@@ -28,14 +29,22 @@ priority_cliff.inc:  \
 
 ####
 
-cliff_base_priority.zx02:	cliff_base_priority.gr
-	$(ZX02) -f cliff_base_priority.gr cliff_base_priority.zx02
+cliff_base_priority.zx02:	cliff_base_priority.combined
+	$(ZX02) -f cliff_base_priority.combined cliff_base_priority.zx02
+
+cliff_base_priority.combined:	cliff_base_priority.gr cliff_base_collision.bin
+	cat cliff_base_priority.gr > cliff_base_priority.combined
+	cat cliff_base_collision.bin >> cliff_base_priority.combined
 
 cliff_base_priority.gr:	cliff_base_priority.png
 	$(PNG2GR) cliff_base_priority.png cliff_base_priority.gr
 
+cliff_base_collision.bin:	cliff_base_collision.png
+	$(PNG2COLLISION) cliff_base_collision.png cliff_base_collision.bin
+
 ####
 
 clean:	
-	rm -f *~ cliff_graphics.inc priority_cliff.inc *.zx02 *.gr *.hgr
+	rm -f *~ cliff_graphics.inc priority_cliff.inc \
+		*.combined *.bin *.zx02 *.gr *.hgr
 

games/peasant/inside/inside_actions.s

@@ -1069,4 +1069,4 @@ inside_nn_close_drawer_full:
 
 
 
-.include "../dialog_inside.inc"
+.include "dialog_inside.inc"

games/peasant/trogdor/Makefile

@@ -12,7 +12,7 @@ TROGDOR:	trogdor.o
 
 trogdor.o:	trogdor.s ../zp.inc \
 		graphics_trogdor/trogdor_graphics.inc sprites/trogdor_sprites.inc \
-		DIALOG_TROGDOR.ZX02 ../dialog_trogdor.inc \
+		DIALOG_TROGDOR.ZX02 dialog_trogdor.inc \
 		../ssi263/ssi263_simple_speech.s \
 		../draw_box.s ../hgr_rectangle.s ../hgr_font.s ../hgr_input.s \
 		../hgr_save_restore.s \

games/peasant/trogdor/trogdor_actions.s

@@ -505,5 +505,5 @@ dashing_progress_h:
 	.byte >dashing6_sprite,>dashing7_sprite,>dashing8_sprite
 
 
-.include "../dialog_trogdor.inc"
+.include "dialog_trogdor.inc"