From 438dc1b64cd87efcb73b61766d9f32dc69a65c36 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 28 Oct 2021 10:07:18 -0400 Subject: [PATCH] peasant: can get to end of game again --- games/peasant/cliff.s | 8 ++++---- games/peasant/graphics_cliff/Makefile | 13 ++++++++++++- games/peasant/graphics_cliff/cliff2.png | Bin 0 -> 3117 bytes games/peasant/graphics_cliff/outer.png | Bin 0 -> 4443 bytes 4 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 games/peasant/graphics_cliff/cliff2.png create mode 100644 games/peasant/graphics_cliff/outer.png diff --git a/games/peasant/cliff.s b/games/peasant/cliff.s index d347cb39..7cbf419f 100644 --- a/games/peasant/cliff.s +++ b/games/peasant/cliff.s @@ -227,22 +227,22 @@ game_over: map_backgrounds_low: .byte cliff_base_lzsa .byte >cliff_heights_lzsa - .byte >cliff_base_lzsa + .byte >outer_lzsa map_priority_low: .byte cliff_base_priority_lzsa .byte >cliff_heights_priority_lzsa - .byte >cliff_base_priority_lzsa + .byte >outer_priority_lzsa verb_tables_low: diff --git a/games/peasant/graphics_cliff/Makefile b/games/peasant/graphics_cliff/Makefile index 873f6ed3..67727374 100644 --- a/games/peasant/graphics_cliff/Makefile +++ b/games/peasant/graphics_cliff/Makefile @@ -11,9 +11,10 @@ all: cliff_graphics.inc \ ### cliff_graphics.inc: \ - cliff_base.lzsa cliff_heights.lzsa + cliff_base.lzsa cliff_heights.lzsa outer.lzsa echo "cliff_base_lzsa: .incbin \"cliff_base.lzsa\"" > cliff_graphics.inc echo "cliff_heights_lzsa: .incbin \"cliff_heights.lzsa\"" >> cliff_graphics.inc + echo "outer_lzsa: .incbin \"outer.lzsa\"" >> cliff_graphics.inc ### @@ -31,6 +32,15 @@ cliff_heights.lzsa: cliff_heights.hgr cliff_heights.hgr: cliff_heights.png $(PNG2HGR) cliff_heights.png > cliff_heights.hgr +### + +outer.lzsa: outer.hgr + $(LZSA) -r -f2 outer.hgr outer.lzsa + +outer.hgr: outer.png + $(PNG2HGR) outer.png > outer.hgr + + ### @@ -40,6 +50,7 @@ priority_cliff.inc: \ cliff_heights_priority.lzsa echo "cliff_base_priority_lzsa: .incbin \"cliff_base_priority.lzsa\"" > priority_cliff.inc echo "cliff_heights_priority_lzsa: .incbin \"cliff_heights_priority.lzsa\"" >> priority_cliff.inc + echo "outer_priority_lzsa: .incbin \"todo_priority.lzsa\"" >> priority_cliff.inc #### diff --git a/games/peasant/graphics_cliff/cliff2.png b/games/peasant/graphics_cliff/cliff2.png new file mode 100644 index 0000000000000000000000000000000000000000..9f196b5db321f67d1748ee6d37942a9a0b14bfd6 GIT binary patch literal 3117 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 Hu0mjfHr%v3 literal 0 HcmV?d00001 diff --git a/games/peasant/graphics_cliff/outer.png b/games/peasant/graphics_cliff/outer.png new file mode 100644 index 0000000000000000000000000000000000000000..69c15a02f24b82dcebbfa70aa451ffc3bc0eabd0 GIT binary patch literal 4443 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