diff --git a/games/peasant/graphics/Makefile b/games/peasant/graphics/Makefile index 073edf6c..7e78a019 100644 --- a/games/peasant/graphics/Makefile +++ b/games/peasant/graphics/Makefile @@ -57,12 +57,14 @@ graphics_peasant3.inc: \ jhonka.lzsa \ cottage.lzsa \ lake_e.lzsa \ + lake_e_boat.lzsa \ lake_w.lzsa \ inn.lzsa 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 + echo "lake_e_boat_lzsa: .incbin \"lake_e_boat.lzsa\"" >> graphics_peasant3.inc echo "inn_lzsa: .incbin \"inn.lzsa\"" >> graphics_peasant3.inc ### @@ -161,6 +163,24 @@ lady_cottage.hgr: lady_cottage.png $(PNG2HGR) lady_cottage.png > lady_cottage.hgr +### + +lake_e.lzsa: lake_e.hgr + $(LZSA) -r -f2 lake_e.hgr lake_e.lzsa + +lake_e.hgr: lake_e.png + $(PNG2HGR) lake_e.png > lake_e.hgr + + +### + +lake_e_boat.lzsa: lake_e_boat.hgr + $(LZSA) -r -f2 lake_e_boat.hgr lake_e_boat.lzsa + +lake_e_boat.hgr: lake_e_boat.png + $(PNG2HGR) lake_e_boat.png > lake_e_boat.hgr + + ### lake_w.lzsa: lake_w.hgr @@ -169,13 +189,6 @@ lake_w.lzsa: lake_w.hgr lake_w.hgr: lake_w.png $(PNG2HGR) lake_w.png > lake_w.hgr -### - -lake_e.lzsa: lake_e.hgr - $(LZSA) -r -f2 lake_e.hgr lake_e.lzsa - -lake_e.hgr: lake_e.png - $(PNG2HGR) lake_e.png > lake_e.hgr ### diff --git a/games/peasant/graphics/cottage.png b/games/peasant/graphics/cottage.png index e410ca1c..e7a12d08 100644 Binary files a/games/peasant/graphics/cottage.png and b/games/peasant/graphics/cottage.png differ diff --git a/games/peasant/graphics/haystack.png b/games/peasant/graphics/haystack.png index 4d67291b..9f063215 100644 Binary files a/games/peasant/graphics/haystack.png and b/games/peasant/graphics/haystack.png differ diff --git a/games/peasant/graphics/lake_e_boat.png b/games/peasant/graphics/lake_e_boat.png new file mode 100644 index 00000000..c9a1fe39 Binary files /dev/null and b/games/peasant/graphics/lake_e_boat.png differ diff --git a/games/peasant/graphics/lake_w.png b/games/peasant/graphics/lake_w.png index b4aa8d63..02dd2fc2 100644 Binary files a/games/peasant/graphics/lake_w.png and b/games/peasant/graphics/lake_w.png differ diff --git a/games/peasant/graphics/map.png b/games/peasant/graphics/map.png new file mode 100644 index 00000000..5b0e8bf2 Binary files /dev/null and b/games/peasant/graphics/map.png differ diff --git a/games/peasant/graphics/wishing_well.png b/games/peasant/graphics/wishing_well.png index cf8a6ade..a1d3ab8f 100644 Binary files a/games/peasant/graphics/wishing_well.png and b/games/peasant/graphics/wishing_well.png differ diff --git a/games/peasant/peasant1.s b/games/peasant/peasant1.s index 7add7dd6..137944d8 100644 --- a/games/peasant/peasant1.s +++ b/games/peasant/peasant1.s @@ -277,18 +277,13 @@ score_text: .include "graphics/graphics_peasant1.inc" +.include "version.inc" help_message: .byte 0,43,24, 0,253,82 .byte 8,41,"I don't understand. Type",13 .byte "HELP for assistances.",0 -version_message: -.byte 0,43,24, 0,253,82 -.byte 8,41,"APPLE ][ PEASANT'S QUEST",13 -.byte "version 0.3",0 - - fake_error1: .byte 0,43,24, 0,253,82 .byte 8,41,"?SYNTAX ERROR IN 1020",13 diff --git a/games/peasant/peasant2.s b/games/peasant/peasant2.s index e7a48f21..ea826c02 100644 --- a/games/peasant/peasant2.s +++ b/games/peasant/peasant2.s @@ -279,18 +279,13 @@ score_text: .include "graphics/graphics_peasant2.inc" +.include "version.inc" help_message: .byte 0,43,24, 0,253,82 .byte 8,41,"I don't understand. Type",13 .byte "HELP for assistances.",0 -version_message: -.byte 0,43,24, 0,253,82 -.byte 8,41,"APPLE ][ PEASANT'S QUEST",13 -.byte "version 0.3",0 - - fake_error1: .byte 0,43,24, 0,253,82 .byte 8,41,"?SYNTAX ERROR IN 1020",13 diff --git a/games/peasant/peasant3.s b/games/peasant/peasant3.s index ab88f3cd..f431025c 100644 --- a/games/peasant/peasant3.s +++ b/games/peasant/peasant3.s @@ -279,18 +279,13 @@ score_text: .include "graphics/graphics_peasant3.inc" +.include "version.inc" help_message: .byte 0,43,24, 0,253,82 .byte 8,41,"I don't understand. Type",13 .byte "HELP for assistances.",0 -version_message: -.byte 0,43,24, 0,253,82 -.byte 8,41,"APPLE ][ PEASANT'S QUEST",13 -.byte "version 0.3",0 - - fake_error1: .byte 0,43,24, 0,253,82 .byte 8,41,"?SYNTAX ERROR IN 1020",13 @@ -317,7 +312,7 @@ map_backgrounds_low: .byte jhonka_lzsa ; 10 -- jhonka .byte >cottage_lzsa ; 11 -- cottage .byte >lake_w_lzsa ; 12 -- lake west - .byte >lake_e_lzsa ; 13 -- lake east + .byte >lake_e_boat_lzsa ; 13 -- lake east .byte >inn_lzsa ; 14 -- inn ; .byte >todo_lzsa ; 15 ; .byte >todo_lzsa ; 16 diff --git a/games/peasant/peasant4.s b/games/peasant/peasant4.s index 20fde7c7..c0de45ab 100644 --- a/games/peasant/peasant4.s +++ b/games/peasant/peasant4.s @@ -281,18 +281,13 @@ score_text: .include "graphics/graphics_peasant4.inc" +.include "version.inc" help_message: .byte 0,43,24, 0,253,82 .byte 8,41,"I don't understand. Type",13 .byte "HELP for assistances.",0 -version_message: -.byte 0,43,24, 0,253,82 -.byte 8,41,"APPLE ][ PEASANT'S QUEST",13 -.byte "version 0.3",0 - - fake_error1: .byte 0,43,24, 0,253,82 .byte 8,41,"?SYNTAX ERROR IN 1020",13 diff --git a/games/peasant/version.inc b/games/peasant/version.inc new file mode 100644 index 00000000..7b802ee7 --- /dev/null +++ b/games/peasant/version.inc @@ -0,0 +1,4 @@ +version_message: +.byte 0,43,24, 0,253,82 +.byte 8,41,"APPLE ][ PEASANT'S QUEST",13 +.byte "version 0.4",0