diff --git a/games/peasant/graphics/Makefile b/games/peasant/graphics/Makefile index 94975274..073edf6c 100644 --- a/games/peasant/graphics/Makefile +++ b/games/peasant/graphics/Makefile @@ -26,38 +26,40 @@ graphics_intro.inc: \ ### graphics_peasant1.inc: \ - todo.lzsa \ gary.lzsa \ top_prints.lzsa \ + wishing_well.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 "gary_lzsa: .incbin \"gary.lzsa\"" > graphics_peasant1.inc echo "top_prints_lzsa: .incbin \"top_prints.lzsa\"" >> graphics_peasant1.inc + echo "wishing_well_lzsa: .incbin \"wishing_well.lzsa\"" >> graphics_peasant1.inc echo "leaning_tree_lzsa: .incbin \"leaning_tree.lzsa\"" >> graphics_peasant1.inc echo "waterfall_lzsa: .incbin \"waterfall.lzsa\"" >> graphics_peasant1.inc ### graphics_peasant2.inc: \ - todo.lzsa \ + haystack.lzsa \ puddle.lzsa \ + archery.lzsa \ river.lzsa \ knight.lzsa - echo "todo_lzsa: .incbin \"todo.lzsa\"" > graphics_peasant2.inc + echo "haystack_lzsa: .incbin \"haystack.lzsa\"" > graphics_peasant2.inc echo "puddle_lzsa: .incbin \"puddle.lzsa\"" >> graphics_peasant2.inc + echo "archery_lzsa: .incbin \"archery.lzsa\"" >> graphics_peasant2.inc echo "river_lzsa: .incbin \"river.lzsa\"" >> graphics_peasant2.inc echo "knight_lzsa: .incbin \"knight.lzsa\"" >> graphics_peasant2.inc ### graphics_peasant3.inc: \ - todo.lzsa \ + jhonka.lzsa \ cottage.lzsa \ lake_e.lzsa \ lake_w.lzsa \ inn.lzsa - echo "todo_lzsa: .incbin \"todo.lzsa\"" > graphics_peasant3.inc + echo "jhonka_lzsa: .incbin \"jhonka.lzsa\"" > graphics_peasant3.inc echo "cottage_lzsa: .incbin \"cottage.lzsa\"" >> graphics_peasant3.inc echo "lake_w_lzsa: .incbin \"lake_w.lzsa\"" >> graphics_peasant3.inc echo "lake_e_lzsa: .incbin \"lake_e.lzsa\"" >> graphics_peasant3.inc @@ -79,6 +81,14 @@ graphics_peasant4.inc: \ ### +archery.lzsa: archery.hgr + $(LZSA) -r -f2 archery.hgr archery.lzsa + +archery.hgr: archery.png + $(PNG2HGR) archery.png > archery.hgr + +### + bottom_prints.lzsa: bottom_prints.hgr $(LZSA) -r -f2 bottom_prints.hgr bottom_prints.lzsa @@ -120,6 +130,30 @@ gary.hgr: gary.png ### +haystack.lzsa: haystack.hgr + $(LZSA) -r -f2 haystack.hgr haystack.lzsa + +haystack.hgr: haystack.png + $(PNG2HGR) haystack.png > haystack.hgr + +### + +jhonka.lzsa: jhonka.hgr + $(LZSA) -r -f2 jhonka.hgr jhonka.lzsa + +jhonka.hgr: jhonka.png + $(PNG2HGR) jhonka.png > jhonka.hgr + +### + +knight.lzsa: knight.hgr + $(LZSA) -r -f2 knight.hgr knight.lzsa + +knight.hgr: knight.png + $(PNG2HGR) knight.png > knight.hgr + +### + lady_cottage.lzsa: lady_cottage.hgr $(LZSA) -r -f2 lady_cottage.hgr lady_cottage.lzsa @@ -186,14 +220,6 @@ top_prints.hgr: top_prints.png ### -knight.lzsa: knight.hgr - $(LZSA) -r -f2 knight.hgr knight.lzsa - -knight.hgr: knight.png - $(PNG2HGR) knight.png > knight.hgr - -### - waterfall.lzsa: waterfall.hgr $(LZSA) -r -f2 waterfall.hgr waterfall.lzsa @@ -202,6 +228,14 @@ waterfall.hgr: waterfall.png ### +wishing_well.lzsa: wishing_well.hgr + $(LZSA) -r -f2 wishing_well.hgr wishing_well.lzsa + +wishing_well.hgr: wishing_well.png + $(PNG2HGR) wishing_well.png > wishing_well.hgr + +### + inn.lzsa: inn.hgr $(LZSA) -r -f2 inn.hgr inn.lzsa diff --git a/games/peasant/graphics/archery.png b/games/peasant/graphics/archery.png new file mode 100644 index 00000000..9cfb6562 Binary files /dev/null and b/games/peasant/graphics/archery.png differ diff --git a/games/peasant/graphics/haystack.png b/games/peasant/graphics/haystack.png new file mode 100644 index 00000000..4d67291b Binary files /dev/null and b/games/peasant/graphics/haystack.png differ diff --git a/games/peasant/graphics/jhonka.png b/games/peasant/graphics/jhonka.png new file mode 100644 index 00000000..646ef539 Binary files /dev/null and b/games/peasant/graphics/jhonka.png differ diff --git a/games/peasant/graphics/wishing_well.png b/games/peasant/graphics/wishing_well.png new file mode 100644 index 00000000..cf8a6ade Binary files /dev/null and b/games/peasant/graphics/wishing_well.png differ diff --git a/games/peasant/peasant1.s b/games/peasant/peasant1.s index 13aed951..7add7dd6 100644 --- a/games/peasant/peasant1.s +++ b/games/peasant/peasant1.s @@ -305,7 +305,7 @@ fake_error2: map_backgrounds_low: .byte gary_lzsa ; 0 -- gary the horse .byte >top_prints_lzsa ; 1 -- top footprints - .byte >todo_lzsa ; 2 + .byte >wishing_well_lzsa ; 2 -- wishing well .byte >leaning_tree_lzsa ; 3 -- leaning tree .byte >waterfall_lzsa ; 4 -- waterfall ; .byte >todo_lzsa ; 5 diff --git a/games/peasant/peasant2.s b/games/peasant/peasant2.s index f5837ccc..e7a48f21 100644 --- a/games/peasant/peasant2.s +++ b/games/peasant/peasant2.s @@ -309,9 +309,9 @@ map_backgrounds_low: ; .byte todo_lzsa ; 2 ; .byte >todo_lzsa ; 3 ; .byte >waterfall_lzsa ; 4 -- waterfall - .byte >todo_lzsa ; 5 + .byte >haystack_lzsa ; 5 -- haystack .byte >puddle_lzsa ; 6 -- puddle - .byte >todo_lzsa ; 7 + .byte >archery_lzsa ; 7 -- archery .byte >river_lzsa ; 8 -- river .byte >knight_lzsa ; 9 -- knight ; .byte >todo_lzsa ; 10 diff --git a/games/peasant/peasant3.s b/games/peasant/peasant3.s index c6d46289..ab88f3cd 100644 --- a/games/peasant/peasant3.s +++ b/games/peasant/peasant3.s @@ -314,7 +314,7 @@ map_backgrounds_low: ; .byte todo_lzsa ; 7 ; .byte >river_lzsa ; 8 -- river ; .byte >knight_lzsa ; 9 -- knight - .byte >todo_lzsa ; 10 + .byte >jhonka_lzsa ; 10 -- jhonka .byte >cottage_lzsa ; 11 -- cottage .byte >lake_w_lzsa ; 12 -- lake west .byte >lake_e_lzsa ; 13 -- lake east