diff --git a/games/peasant/Makefile b/games/peasant/Makefile index aac6fd2a..787b629a 100644 --- a/games/peasant/Makefile +++ b/games/peasant/Makefile @@ -25,7 +25,7 @@ PEASANT: peasant.o ld65 -o PEASANT peasant.o -C $(LINKER_SCRIPTS)/apple2_6000.inc peasant.o: peasant.s graphics/graphics.inc \ - directions.s cottage.s + directions.s cottage.s lake_w.s lake_e.s river.s ca65 -o peasant.o peasant.s -l peasant.lst ### diff --git a/games/peasant/graphics/Makefile b/games/peasant/graphics/Makefile index 5b26c434..31f616c1 100644 --- a/games/peasant/graphics/Makefile +++ b/games/peasant/graphics/Makefile @@ -22,7 +22,7 @@ graphics.inc: \ echo "tips_lzsa: .incbin \"tips.lzsa\"" >> graphics.inc echo "cottage_lzsa: .incbin \"cottage.lzsa\"" >> graphics.inc echo "lake_w_lzsa: .incbin \"lake_w.lzsa\"" >> graphics.inc -# echo "lake_e_lzsa: .incbin \"lake_e.lzsa\"" >> graphics.inc + echo "lake_e_lzsa: .incbin \"lake_e.lzsa\"" >> graphics.inc # echo "river_lzsa: .incbin \"river.lzsa\"" >> graphics.inc # echo "knight_lzsa: .incbin \"knight.lzsa\"" >> graphics.inc diff --git a/games/peasant/graphics/lake_w.png b/games/peasant/graphics/lake_w.png index 3313a233..fb3a07fd 100644 Binary files a/games/peasant/graphics/lake_w.png and b/games/peasant/graphics/lake_w.png differ diff --git a/games/peasant/lake_e.s b/games/peasant/lake_e.s new file mode 100644 index 00000000..8e369770 --- /dev/null +++ b/games/peasant/lake_e.s @@ -0,0 +1,26 @@ +; Lake East + + ;************************ + ; Lake East + ;************************ +lake_east: + lda #<(lake_e_lzsa) + sta getsrc_smc+1 + lda #>(lake_e_lzsa) + sta getsrc_smc+2 + + lda #$40 + + jsr decompress_lzsa2_fast + + lda #peasant_text + sta OUTH + + jsr hgr_put_string + + + jsr wait_until_keypress + + rts diff --git a/games/peasant/lake_w.s b/games/peasant/lake_w.s new file mode 100644 index 00000000..a0397fd6 --- /dev/null +++ b/games/peasant/lake_w.s @@ -0,0 +1,26 @@ +; Lake West + + ;************************ + ; Lake West + ;************************ +lake_west: + lda #<(lake_w_lzsa) + sta getsrc_smc+1 + lda #>(lake_w_lzsa) + sta getsrc_smc+2 + + lda #$40 + + jsr decompress_lzsa2_fast + + lda #peasant_text + sta OUTH + + jsr hgr_put_string + + + jsr wait_until_keypress + + rts diff --git a/games/peasant/peasant.s b/games/peasant/peasant.s index 8d27af70..8be0f8db 100644 --- a/games/peasant/peasant.s +++ b/games/peasant/peasant.s @@ -78,49 +78,22 @@ hgr_display: ; Lake West ;************************ - lda #<(lake_w_lzsa) - sta getsrc_smc+1 - lda #>(lake_w_lzsa) - sta getsrc_smc+2 - - lda #$40 - - jsr decompress_lzsa2_fast - - jsr wait_until_keypress - - -.if 0 + jsr lake_west ;************************ ; Lake East ;************************ - lda #<(lake_e_lzsa) - sta getsrc_smc+1 - lda #>(lake_e_lzsa) - sta getsrc_smc+2 + jsr lake_east - lda #$40 +.if 0 - jsr decompress_lzsa2_fast - - jsr wait_until_keypress ;************************ ; River ;************************ - lda #<(river_lzsa) - sta getsrc_smc+1 - lda #>(river_lzsa) - sta getsrc_smc+2 - - lda #$40 - - jsr decompress_lzsa2_fast - - jsr wait_until_keypress + jsr river ;************************ @@ -149,6 +122,10 @@ forever: .include "directions.s" .include "cottage.s" +.include "lake_w.s" +.include "lake_e.s" +;.include "river.s" + .include "hgr_font.s" diff --git a/games/peasant/river.s b/games/peasant/river.s new file mode 100644 index 00000000..c357b782 --- /dev/null +++ b/games/peasant/river.s @@ -0,0 +1,26 @@ +; o/~ At the beautiful, the beautiful, River o/~ + + ;************************ + ; River + ;************************ +river: + lda #<(river_lzsa) + sta getsrc_smc+1 + lda #>(river_lzsa) + sta getsrc_smc+2 + + lda #$40 + + jsr decompress_lzsa2_fast + + lda #peasant_text + sta OUTH + + jsr hgr_put_string + + + jsr wait_until_keypress + + rts