diff --git a/games/peasant/Makefile b/games/peasant/Makefile index b44dbf29..ca012e27 100644 --- a/games/peasant/Makefile +++ b/games/peasant/Makefile @@ -117,6 +117,7 @@ qload.inc: generate_common QLOAD ./generate_common -a 0xb00 -s disp_put_string_cursor qload.lst >> qload.inc ./generate_common -a 0xb00 -s hgr_put_char_cursor qload.lst >> qload.inc ./generate_common -a 0xb00 -s vgi_simple_rectangle qload.lst >> qload.inc + ./generate_common -a 0xb00 -s peasant_text qload.lst >> qload.inc echo "hposn_high = \$$BA00" >> qload.inc echo "hposn_low = \$$BB00" >> qload.inc echo "driveoff = \$$A22" >> qload.inc diff --git a/games/peasant/copy_check.s b/games/peasant/copy_check.s index bc16c385..203d3045 100644 --- a/games/peasant/copy_check.s +++ b/games/peasant/copy_check.s @@ -125,9 +125,6 @@ forever: .include "graphics_copy/copy_graphics.inc" -peasant_text: - .byte 25,2,"Peasant's Quest",0 - score_text: .byte 0,2,"Score: 0 of 150",0 diff --git a/games/peasant/ending.s b/games/peasant/ending.s index b94f2c3d..d07baede 100644 --- a/games/peasant/ending.s +++ b/games/peasant/ending.s @@ -535,10 +535,6 @@ game_over: jmp boat -peasant_text: - .byte 25,2,"Peasant's Quest",0 - - ;.include "decompress_fast_v2.s" .include "wait_keypress.s" diff --git a/games/peasant/intro_cottage.s b/games/peasant/intro_cottage.s index fa4a3ed8..745cb0dd 100644 --- a/games/peasant/intro_cottage.s +++ b/games/peasant/intro_cottage.s @@ -180,10 +180,6 @@ done_cottage: ; 01234567 01234567 -peasant_text: - .byte 25,2,"Peasant's Quest",0 - - cottage_text1: .byte 0,52,24, 0,253,82 .byte 9,35,"YOU are Rather Dashing, a",13 diff --git a/games/peasant/parse_input.s b/games/peasant/parse_input.s index 1ae34266..312227df 100644 --- a/games/peasant/parse_input.s +++ b/games/peasant/parse_input.s @@ -19,12 +19,25 @@ upcase_loop: jmp upcase_loop done_upcase_loop: + ;===================== + ; get the verb + jsr get_verb + ;===================== + ; get the noun + ; jsr get_noun + + ;============================= + ; handle room-specific actions + ; jsr local_parser + ;================================ + ; fall through to default actions + lda CURRENT_VERB check_copy: diff --git a/games/peasant/peasant1.s b/games/peasant/peasant1.s index 221091e5..83cab8e2 100644 --- a/games/peasant/peasant1.s +++ b/games/peasant/peasant1.s @@ -144,10 +144,6 @@ game_over: rts -peasant_text: - .byte 25,2,"Peasant's Quest",0 - - ;.include "decompress_fast_v2.s" .include "wait_keypress.s" diff --git a/games/peasant/peasant2.s b/games/peasant/peasant2.s index b80e07e6..185f02d4 100644 --- a/games/peasant/peasant2.s +++ b/games/peasant/peasant2.s @@ -142,10 +142,6 @@ game_over: rts -peasant_text: - .byte 25,2,"Peasant's Quest",0 - - .include "wait_keypress.s" diff --git a/games/peasant/peasant3.s b/games/peasant/peasant3.s index 7af57cbe..be2803d0 100644 --- a/games/peasant/peasant3.s +++ b/games/peasant/peasant3.s @@ -140,11 +140,6 @@ game_over: rts -peasant_text: - .byte 25,2,"Peasant's Quest",0 - - - ;.include "decompress_fast_v2.s" .include "wait_keypress.s" diff --git a/games/peasant/peasant4.s b/games/peasant/peasant4.s index b8bec802..a0d9692d 100644 --- a/games/peasant/peasant4.s +++ b/games/peasant/peasant4.s @@ -146,12 +146,6 @@ game_over: rts -peasant_text: - .byte 25,2,"Peasant's Quest",0 - - - - ;.include "decompress_fast_v2.s" .include "wait_keypress.s" diff --git a/games/peasant/qload.inc b/games/peasant/qload.inc index 41350d32..c80b09f5 100644 --- a/games/peasant/qload.inc +++ b/games/peasant/qload.inc @@ -23,6 +23,7 @@ invert_smc1 =$0f64 disp_put_string_cursor =$167c hgr_put_char_cursor =$0f15 vgi_simple_rectangle =$12ef +peasant_text =$178b hposn_high = $BA00 hposn_low = $BB00 driveoff = $A22 diff --git a/games/peasant/qload.s b/games/peasant/qload.s index 60f08498..a4219c4c 100644 --- a/games/peasant/qload.s +++ b/games/peasant/qload.s @@ -255,6 +255,9 @@ length_array: .include "hgr_hgr2.s" ; this one is maybe only needed once? .include "gr_offsets.s" +peasant_text: + .byte 25,2,"Peasant's Quest",0 + qload_end: ;.assert (>qload_end - >qload_start) < $e , error, "loader too big" diff --git a/games/peasant/trogdor.s b/games/peasant/trogdor.s index 43d14085..4233ff78 100644 --- a/games/peasant/trogdor.s +++ b/games/peasant/trogdor.s @@ -311,9 +311,6 @@ game_over: rts -peasant_text: - .byte 25,2,"Peasant's Quest",0 - ;.include "decompress_fast_v2.s" .include "wait_keypress.s"