From 15d87a099a3395a661d038fd44f9e781ee9b158a Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 22 Aug 2021 22:02:11 -0400 Subject: [PATCH] peasant: add a few more backgrounds --- games/peasant/graphics/Makefile | 32 ++++++++++++++++++++++++++++-- games/peasant/graphics/ned.png | Bin 0 -> 1397 bytes games/peasant/graphics/puddle.png | Bin 0 -> 2058 bytes games/peasant/peasant2.s | 4 ++-- games/peasant/peasant4.s | 8 ++++---- 5 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 games/peasant/graphics/ned.png create mode 100644 games/peasant/graphics/puddle.png diff --git a/games/peasant/graphics/Makefile b/games/peasant/graphics/Makefile index dcd30e78..94975274 100644 --- a/games/peasant/graphics/Makefile +++ b/games/peasant/graphics/Makefile @@ -41,9 +41,11 @@ graphics_peasant1.inc: \ graphics_peasant2.inc: \ todo.lzsa \ + puddle.lzsa \ river.lzsa \ knight.lzsa echo "todo_lzsa: .incbin \"todo.lzsa\"" > graphics_peasant2.inc + echo "puddle_lzsa: .incbin \"puddle.lzsa\"" >> graphics_peasant2.inc echo "river_lzsa: .incbin \"river.lzsa\"" >> graphics_peasant2.inc echo "knight_lzsa: .incbin \"knight.lzsa\"" >> graphics_peasant2.inc @@ -64,11 +66,13 @@ graphics_peasant3.inc: \ ### graphics_peasant4.inc: \ - todo.lzsa \ + empty_hut.lzsa \ + ned.lzsa \ bottom_prints.lzsa \ lady_cottage.lzsa \ crooked_tree.lzsa - echo "todo_lzsa: .incbin \"todo.lzsa\"" > graphics_peasant4.inc + echo "empty_hut_lzsa: .incbin \"empty_hut.lzsa\"" > graphics_peasant4.inc + echo "ned_lzsa: .incbin \"ned.lzsa\"" >> graphics_peasant4.inc echo "bottom_prints_lzsa: .incbin \"bottom_prints.lzsa\"" >> graphics_peasant4.inc echo "lady_cottage_lzsa: .incbin \"lady_cottage.lzsa\"" >> graphics_peasant4.inc echo "crooked_tree_lzsa: .incbin \"crooked_tree.lzsa\"" >> graphics_peasant4.inc @@ -97,6 +101,14 @@ crooked_tree.lzsa: crooked_tree.hgr crooked_tree.hgr: crooked_tree.png $(PNG2HGR) crooked_tree.png > crooked_tree.hgr +### + +empty_hut.lzsa: empty_hut.hgr + $(LZSA) -r -f2 empty_hut.hgr empty_hut.lzsa + +empty_hut.hgr: empty_hut.png + $(PNG2HGR) empty_hut.png > empty_hut.hgr + ### @@ -141,6 +153,22 @@ leaning_tree.hgr: leaning_tree.png ### +ned.lzsa: ned.hgr + $(LZSA) -r -f2 ned.hgr ned.lzsa + +ned.hgr: ned.png + $(PNG2HGR) ned.png > ned.hgr + +### + +puddle.lzsa: puddle.hgr + $(LZSA) -r -f2 puddle.hgr puddle.lzsa + +puddle.hgr: puddle.png + $(PNG2HGR) puddle.png > puddle.hgr + +### + river.lzsa: river.hgr $(LZSA) -r -f2 river.hgr river.lzsa diff --git a/games/peasant/graphics/ned.png b/games/peasant/graphics/ned.png new file mode 100644 index 0000000000000000000000000000000000000000..c2e579a80409ee2b0a5500c4b119abd6df908bc8 GIT binary patch literal 1397 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 oOoM4K4W_{~mtodo_lzsa ; 3 ; .byte >waterfall_lzsa ; 4 -- waterfall .byte >todo_lzsa ; 5 - .byte >todo_lzsa ; 6 + .byte >puddle_lzsa ; 6 -- puddle .byte >todo_lzsa ; 7 .byte >river_lzsa ; 8 -- river .byte >knight_lzsa ; 9 -- knight diff --git a/games/peasant/peasant4.s b/games/peasant/peasant4.s index 2e456024..20fde7c7 100644 --- a/games/peasant/peasant4.s +++ b/games/peasant/peasant4.s @@ -320,8 +320,8 @@ map_backgrounds_low: ; .byte lake_w_lzsa ; 12 -- lake west ; .byte >lake_e_lzsa ; 13 -- lake east ; .byte >inn_lzsa ; 14 -- inn - .byte >todo_lzsa ; 15 - .byte >todo_lzsa ; 16 + .byte >empty_hut_lzsa ; 15 -- empty hut + .byte >ned_lzsa ; 16 -- ned .byte >bottom_prints_lzsa ; 17 -- bottom footprints .byte >lady_cottage_lzsa ; 18 -- cottage lady .byte >crooked_tree_lzsa ; 19 -- crooked tree