From 30fa5688fd384420af059002d2fbcfaff140797b Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Thu, 28 Oct 2021 00:50:19 -0400
Subject: [PATCH] peasant: cliff: hook up cliff heights

---
 games/peasant/cliff.s                             |   8 ++++----
 games/peasant/graphics_cliff/Makefile             |  13 +++++++++++--
 .../graphics_cliff/cliff_heights_priority.png     | Bin 0 -> 960 bytes
 games/peasant/new_map_location.s                  |   2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 games/peasant/graphics_cliff/cliff_heights_priority.png

diff --git a/games/peasant/cliff.s b/games/peasant/cliff.s
index ec504aef..d347cb39 100644
--- a/games/peasant/cliff.s
+++ b/games/peasant/cliff.s
@@ -226,22 +226,22 @@ game_over:
 
 map_backgrounds_low:
 	.byte   <cliff_base_lzsa
-	.byte   <cliff_base_lzsa
+	.byte   <cliff_heights_lzsa
 	.byte   <cliff_base_lzsa
 
 map_backgrounds_hi:
 	.byte   >cliff_base_lzsa
-	.byte   >cliff_base_lzsa
+	.byte   >cliff_heights_lzsa
 	.byte   >cliff_base_lzsa
 
 map_priority_low:
 	.byte	<cliff_base_priority_lzsa
-	.byte	<cliff_base_priority_lzsa
+	.byte	<cliff_heights_priority_lzsa
 	.byte	<cliff_base_priority_lzsa
 
 map_priority_hi:
 	.byte	>cliff_base_priority_lzsa
-	.byte	>cliff_base_priority_lzsa
+	.byte	>cliff_heights_priority_lzsa
 	.byte	>cliff_base_priority_lzsa
 
 verb_tables_low:
diff --git a/games/peasant/graphics_cliff/Makefile b/games/peasant/graphics_cliff/Makefile
index 50bfc047..873f6ed3 100644
--- a/games/peasant/graphics_cliff/Makefile
+++ b/games/peasant/graphics_cliff/Makefile
@@ -36,9 +36,10 @@ cliff_heights.hgr:	cliff_heights.png
 
 priority_cliff.inc:  \
 	todo_priority.lzsa \
-	cliff_base_priority.lzsa
+	cliff_base_priority.lzsa \
+	cliff_heights_priority.lzsa
 	echo "cliff_base_priority_lzsa: .incbin \"cliff_base_priority.lzsa\"" > priority_cliff.inc
-	echo "cliff_heights_priority_lzsa: .incbin \"todo_priority.lzsa\"" >> priority_cliff.inc
+	echo "cliff_heights_priority_lzsa: .incbin \"cliff_heights_priority.lzsa\"" >> priority_cliff.inc
 
 
 ####
@@ -57,6 +58,14 @@ cliff_base_priority.lzsa:	cliff_base_priority.gr
 cliff_base_priority.gr:	cliff_base_priority.png
 	$(PNG2GR) cliff_base_priority.png cliff_base_priority.gr
 
+####
+
+cliff_heights_priority.lzsa:	cliff_heights_priority.gr
+	$(LZSA) -r -f2 cliff_heights_priority.gr cliff_heights_priority.lzsa
+
+cliff_heights_priority.gr:	cliff_heights_priority.png
+	$(PNG2GR) cliff_heights_priority.png cliff_heights_priority.gr
+
 
 ####
 
diff --git a/games/peasant/graphics_cliff/cliff_heights_priority.png b/games/peasant/graphics_cliff/cliff_heights_priority.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f362c10451ffd689d69fdf1e6a19387c1881e1d
GIT binary patch
literal 960
zcmeAS@N?(olHy`uVBq!ia0y~yV3Yu|4{$I8$roNd9zcPXOlRi+PiJR^f};Gi%$!sP
z291fe6Ky>XJIEZ34_+Fi)l?=>cp_k~PDhtTmS|Ui;uWs7Rx@ILvHD6)5)pSlxb?w<
z<4IQ!9*qoV4|f#!!%$dU98@w<=>K$)s3R2xclyh}%ay-pSQwZ%>#8YV#;)9DlQ|7%
zM~gbI=Wuqge<YBSCRsdbO4IuvyWAVrmlw`^TL13+#nsPr*;rg2MW)R#`^fh3%d*^p
zd+L3gCan>gFWf(~#PN~)I&HcAg?hVmKAc%G)APKrd*{(4c5T@+Ud!BUTxEhy=YDEk
zb6o4W?zyO?$D+PJ(eHWkb!zIm%Q9|4-4RVJf?Qb|i<xHs(sEWm>NM+{u-!k!>-rPD
z6~iTaWVly2HNW|F@c)DI?O};UhrGK~8s3Q?|0%)fwA*3xJB$0r`!3rsHl05(_1?E|
z=>uofUw+*tX3g|#TVwa@ZOh&;PPabrV6x)uP1>xPT&+wW>fG*6VP?x~{4nc!bhi9*
zeuuVQUUwPT+Ye+++;qM6-rdVLZ|_f!`umqb*S4rTDCU_pFj|ZQd_r7-^kcb%1i!ui
zUH&pGPM9-ij>!4H7Y_eVC}RGfWixl~-2V$Mh<vrVaJRSU|Aqhm{{z*}?Qd%UQk(@I
zk;M!Q5<Wm&!Z?40g91>Hy~NYkmHjD~42wR0d`GM~P)M@GHKN2hKQ}iuuY|$5C^fMp
zHASI3vm`^o-P1Q9ypc~Fm^QLKT^vIyZoR#Eke6AJhsEKN!!LdF{3S0+#E&+-y~);4
zx#mDm`073R=?#p`Y&;SM2?yxNxOA|m0chPaW1l~Yk7|K77b~3El*Pi#*7Hdg<dDg{
z%Z?}u0bS*vIIVXgP~b9m+D*63u^)g;uxlfq8Lr-c=O9=jSowZL#u0X)>Z6J4zWsb1
z=QTwi=$~&HjX<?$p255|>!66x&-V+sKz@B@tPv0K@iIvtR(T*(hTm9!V(ZI|93Y*C
zRI*cmVozEE_W@ngx#xjuwe2~OVT}f&X^-N!f*j0pCUo{vKA`GH33eqRp4;bLig*Ex
O8wO8TKbLh*2~7ZHzkI#`

literal 0
HcmV?d00001

diff --git a/games/peasant/new_map_location.s b/games/peasant/new_map_location.s
index 3670ed84..7dad34d1 100644
--- a/games/peasant/new_map_location.s
+++ b/games/peasant/new_map_location.s
@@ -132,7 +132,7 @@ exits_south:
 .byte LOCATION_YELLOW_TREE	; LOCATION_OUTSIDE_LADY	=	18
 .byte LOCATION_WATERFALL	; LOCATION_BURN_TREES	= 	19
 
-.byte LOCATION_EMPTY		; LOCATION_CLIFF_BASE	=	20
+.byte LOCATION_CLIFF_HEIGHTS	; LOCATION_CLIFF_BASE	=	20
 .byte LOCATION_EMPTY		; LOCATION_CLIFF_HEIGHTS=	21
 .byte LOCATION_EMPTY		; LOCATION_TROGDOR_OUTER=	22
 .byte LOCATION_EMPTY		; LOCATION_TROGDOR_LAIR	=	23