From 47889a6d1b824ab3eb8c4acabd1858ac0878808b Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 22 Aug 2021 01:47:52 -0400 Subject: [PATCH] peasant: add some more locations --- games/peasant/graphics/Makefile | 41 +++++++++++++++++++++++ games/peasant/graphics/bottom_prints.png | Bin 0 -> 1464 bytes games/peasant/graphics/gary.png | Bin 0 -> 2380 bytes games/peasant/graphics/leaning_tree.png | Bin 0 -> 2460 bytes games/peasant/graphics/top_prints.png | Bin 0 -> 1635 bytes games/peasant/peasant1.s | 12 +++---- games/peasant/peasant4.s | 4 +-- 7 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 games/peasant/graphics/bottom_prints.png create mode 100644 games/peasant/graphics/gary.png create mode 100644 games/peasant/graphics/leaning_tree.png create mode 100644 games/peasant/graphics/top_prints.png diff --git a/games/peasant/graphics/Makefile b/games/peasant/graphics/Makefile index 7046e164..dcd30e78 100644 --- a/games/peasant/graphics/Makefile +++ b/games/peasant/graphics/Makefile @@ -27,8 +27,14 @@ graphics_intro.inc: \ graphics_peasant1.inc: \ todo.lzsa \ + gary.lzsa \ + top_prints.lzsa \ + leaning_tree.lzsa \ waterfall.lzsa echo "todo_lzsa: .incbin \"todo.lzsa\"" > graphics_peasant1.inc + echo "gary_lzsa: .incbin \"gary.lzsa\"" >> graphics_peasant1.inc + echo "top_prints_lzsa: .incbin \"top_prints.lzsa\"" >> graphics_peasant1.inc + echo "leaning_tree_lzsa: .incbin \"leaning_tree.lzsa\"" >> graphics_peasant1.inc echo "waterfall_lzsa: .incbin \"waterfall.lzsa\"" >> graphics_peasant1.inc ### @@ -59,14 +65,23 @@ graphics_peasant3.inc: \ graphics_peasant4.inc: \ todo.lzsa \ + bottom_prints.lzsa \ lady_cottage.lzsa \ crooked_tree.lzsa echo "todo_lzsa: .incbin \"todo.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 ### +bottom_prints.lzsa: bottom_prints.hgr + $(LZSA) -r -f2 bottom_prints.hgr bottom_prints.lzsa + +bottom_prints.hgr: bottom_prints.png + $(PNG2HGR) bottom_prints.png > bottom_prints.hgr + +### cottage.lzsa: cottage.hgr $(LZSA) -r -f2 cottage.hgr cottage.lzsa @@ -82,6 +97,15 @@ crooked_tree.lzsa: crooked_tree.hgr crooked_tree.hgr: crooked_tree.png $(PNG2HGR) crooked_tree.png > crooked_tree.hgr + +### + +gary.lzsa: gary.hgr + $(LZSA) -r -f2 gary.hgr gary.lzsa + +gary.hgr: gary.png + $(PNG2HGR) gary.png > gary.hgr + ### lady_cottage.lzsa: lady_cottage.hgr @@ -109,6 +133,14 @@ lake_e.hgr: lake_e.png ### +leaning_tree.lzsa: leaning_tree.hgr + $(LZSA) -r -f2 leaning_tree.hgr leaning_tree.lzsa + +leaning_tree.hgr: leaning_tree.png + $(PNG2HGR) leaning_tree.png > leaning_tree.hgr + +### + river.lzsa: river.hgr $(LZSA) -r -f2 river.hgr river.lzsa @@ -117,6 +149,15 @@ river.hgr: river.png ### +top_prints.lzsa: top_prints.hgr + $(LZSA) -r -f2 top_prints.hgr top_prints.lzsa + +top_prints.hgr: top_prints.png + $(PNG2HGR) top_prints.png > top_prints.hgr + + +### + knight.lzsa: knight.hgr $(LZSA) -r -f2 knight.hgr knight.lzsa diff --git a/games/peasant/graphics/bottom_prints.png b/games/peasant/graphics/bottom_prints.png new file mode 100644 index 0000000000000000000000000000000000000000..b60c4c6d66a9e0d055c8ecda3e587f43e797d433 GIT binary patch literal 1464 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 literal 0 HcmV?d00001 diff --git a/games/peasant/peasant1.s b/games/peasant/peasant1.s index 8cd9db5c..13aed951 100644 --- a/games/peasant/peasant1.s +++ b/games/peasant/peasant1.s @@ -303,10 +303,10 @@ fake_error2: map_backgrounds_low: - .byte todo_lzsa ; 0 - .byte >todo_lzsa ; 1 + .byte >gary_lzsa ; 0 -- gary the horse + .byte >top_prints_lzsa ; 1 -- top footprints .byte >todo_lzsa ; 2 - .byte >todo_lzsa ; 3 + .byte >leaning_tree_lzsa ; 3 -- leaning tree .byte >waterfall_lzsa ; 4 -- waterfall ; .byte >todo_lzsa ; 5 ; .byte >todo_lzsa ; 6 diff --git a/games/peasant/peasant4.s b/games/peasant/peasant4.s index 231106de..2e456024 100644 --- a/games/peasant/peasant4.s +++ b/games/peasant/peasant4.s @@ -322,7 +322,7 @@ map_backgrounds_low: ; .byte inn_lzsa ; 14 -- inn .byte >todo_lzsa ; 15 .byte >todo_lzsa ; 16 - .byte >todo_lzsa ; 17 + .byte >bottom_prints_lzsa ; 17 -- bottom footprints .byte >lady_cottage_lzsa ; 18 -- cottage lady .byte >crooked_tree_lzsa ; 19 -- crooked tree