From 825082d0873f42b23b266d0567e363175d37d9b7 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 15 Aug 2021 23:49:56 -0400 Subject: [PATCH] peasant: add some silly placeholders --- games/peasant/copy_check.s | 47 +++++++++++++++++++------------- games/peasant/graphics/Makefile | 10 +++++++ games/peasant/graphics/inn.png | Bin 0 -> 4574 bytes games/peasant/peasant.s | 43 +++++++++++++++++++++++------ 4 files changed, 73 insertions(+), 27 deletions(-) create mode 100644 games/peasant/graphics/inn.png diff --git a/games/peasant/copy_check.s b/games/peasant/copy_check.s index 7e0ac136..7e3f9fe5 100644 --- a/games/peasant/copy_check.s +++ b/games/peasant/copy_check.s @@ -46,33 +46,36 @@ trogdor_question: jsr hgr_input + ; check for right results ("Doug the dino") + + lda input_buffer + cmp #'D' + bne wrong + + lda #correct_text + sta OUTH + + jsr hgr_text_box + + jsr wait_until_keypress + + lda #LOAD_PEASANT + sta WHICH_LOAD + rts + + ;============================= ; draw WRONG! box ;============================= - lda #0 - sta BOX_X1H - lda #97 - sta BOX_X1L - lda #69 - sta BOX_Y1 - - lda #0 - sta BOX_X2H - lda #184 - sta BOX_X2L - lda #109 - sta BOX_Y2 - - jsr draw_box - - ; print WRONG! at 16, 84 - +wrong: lda #wrong_text sta OUTH - jsr hgr_put_string + jsr hgr_text_box jsr wait_until_keypress @@ -116,6 +119,7 @@ forever: .include "hgr_rectangle.s" .include "hgr_input.s" .include "hgr_tables.s" +.include "hgr_text_box.s" .include "graphics_copy/copy_graphics.inc" @@ -126,8 +130,13 @@ score_text: .byte 0,2,"Score: 0 of 150",0 wrong_text: + .byte 0,97,69, 0,184,109 .byte 16,84,"WRONG!!!",0 +correct_text: + .byte 0,97,69, 0,184,109 + .byte 16,84,"CORRECT!",0 + ; 0123456789012345678901234567890123456789 copy_protection_text: .byte 0,160,"Before proceeding, don thy red glasses",0 diff --git a/games/peasant/graphics/Makefile b/games/peasant/graphics/Makefile index 6a1ad0d4..7efa3dab 100644 --- a/games/peasant/graphics/Makefile +++ b/games/peasant/graphics/Makefile @@ -30,6 +30,7 @@ graphics.inc: \ river.lzsa \ knight.lzsa \ waterfall.lzsa \ + inn.lzsa \ todo.lzsa echo "cottage_lzsa: .incbin \"cottage.lzsa\"" > graphics.inc echo "lake_w_lzsa: .incbin \"lake_w.lzsa\"" >> graphics.inc @@ -37,6 +38,7 @@ graphics.inc: \ echo "river_lzsa: .incbin \"river.lzsa\"" >> graphics.inc echo "knight_lzsa: .incbin \"knight.lzsa\"" >> graphics.inc echo "waterfall_lzsa: .incbin \"waterfall.lzsa\"" >> graphics.inc + echo "inn_lzsa: .incbin \"inn.lzsa\"" >> graphics.inc echo "todo_lzsa: .incbin \"todo.lzsa\"" >> graphics.inc @@ -114,6 +116,14 @@ waterfall.hgr: waterfall.png ### +inn.lzsa: inn.hgr + $(LZSA) -r -f2 inn.hgr inn.lzsa + +inn.hgr: inn.png + $(PNG2HGR) inn.png > inn.hgr + +### + todo.lzsa: todo.hgr $(LZSA) -r -f2 todo.hgr todo.lzsa diff --git a/games/peasant/graphics/inn.png b/games/peasant/graphics/inn.png new file mode 100644 index 0000000000000000000000000000000000000000..da73c72b32990bc4bb9061c7d0a968595c783ee6 GIT binary patch literal 4574 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 + jmp finish_parse_message + + +parse_talk: + cmp #'T' + bne parse_version + + lda #fake_error2 + jmp finish_parse_message + + parse_version: cmp #'V' bne parse_help @@ -352,6 +372,16 @@ version_message: .byte "version 0.2",0 +fake_error1: +.byte 0,43,24, 0,253,82 +.byte 8,41,"?SYNTAX ERROR IN 1020",13 +.byte "]",127,0 + +fake_error2: +.byte 0,43,24, 0,253,82 +.byte 8,41,"?UNDEF'D STATEMENT ERROR",13 +.byte "]",127,0 + clear_bottom: ; draw rectangle @@ -438,7 +468,7 @@ map_backgrounds_low: .byte cottage_lzsa ; 11 -- cottage .byte >lake_w_lzsa ; 12 -- lake west .byte >lake_e_lzsa ; 13 -- lake east - .byte >todo_lzsa ; 14 + .byte >inn_lzsa ; 14 -- inn .byte >todo_lzsa ; 15 .byte >todo_lzsa ; 16 .byte >todo_lzsa ; 17 .byte >todo_lzsa ; 18 .byte >todo_lzsa ; 19 - - -