diff --git a/games/peasant/Makefile b/games/peasant/Makefile index 33849419..48b0eafe 100644 --- a/games/peasant/Makefile +++ b/games/peasant/Makefile @@ -22,9 +22,7 @@ peasant.dsk: QBOOT QLOAD VID_LOGO TITLE INTRO COPY_CHECK \ $(DOS33_RAW) peasant.dsk 12 0 COPY_CHECK 0 0 $(DOS33_RAW) peasant.dsk 14 0 PEASANT1 0 0 $(DOS33_RAW) peasant.dsk 19 0 PEASANT2 0 0 - $(DOS33_RAW) peasant.dsk 19 0 TROGDOR 0 0 $(DOS33_RAW) peasant.dsk 24 0 PEASANT3 0 0 - $(DOS33_RAW) peasant.dsk 24 0 ENDING 0 0 $(DOS33_RAW) peasant.dsk 29 0 PEASANT4 0 0 peasant_side2.dsk: WBOOT2 TROGDOR ENDING @@ -133,8 +131,7 @@ peasant2.o: peasant2.s zp.inc \ hgr_7x28_sprite_mask.s hgr_1x5_sprite.s hgr_save_restore.s \ wait_a_bit.s draw_peasant.s hgr_text_box.s \ keyboard.s parse_input.s new_map_location.s \ - peasant_move.s score.s inventory.s - + peasant_move.s score.s inventory.s loadsave_menu.s ca65 -o peasant2.o peasant2.s -l peasant2.lst ### diff --git a/games/peasant/parse_input.s b/games/peasant/parse_input.s index 40aad60f..a465f11a 100644 --- a/games/peasant/parse_input.s +++ b/games/peasant/parse_input.s @@ -22,16 +22,27 @@ parse_copy: parse_inventory: cmp #'I' - bne parse_look + bne parse_l jsr show_inventory jmp restore_parse_message -parse_look: +parse_l: cmp #'L' bne parse_talk + lda input_buffer+2 + and #$DF ; make uppercase 0110 0001 -> 0100 0001 + cmp #'O' + beq parse_look +parse_load: + jsr load_menu + + jmp finish_parse_message + +parse_look: + lda #fake_error1 diff --git a/games/peasant/peasant1.s b/games/peasant/peasant1.s index a72cc34f..dae68dd8 100644 --- a/games/peasant/peasant1.s +++ b/games/peasant/peasant1.s @@ -185,6 +185,7 @@ peasant_text: .include "graphics/priority_peasant1.inc" .include "version.inc" +.include "loadsave_menu.s" help_message: .byte 0,43,24, 0,253,82 diff --git a/games/peasant/peasant2.s b/games/peasant/peasant2.s index bd57cd10..af923519 100644 --- a/games/peasant/peasant2.s +++ b/games/peasant/peasant2.s @@ -190,6 +190,8 @@ peasant_text: .include "inventory.s" +.include "loadsave_menu.s" + help_message: .byte 0,43,24, 0,253,82 .byte 8,41,"I don't understand. Type",13 diff --git a/games/peasant/peasant3.s b/games/peasant/peasant3.s index 308e36a9..58568aa8 100644 --- a/games/peasant/peasant3.s +++ b/games/peasant/peasant3.s @@ -187,6 +187,7 @@ peasant_text: .include "graphics/priority_peasant3.inc" .include "version.inc" +.include "loadsave_menu.s" help_message: .byte 0,43,24, 0,253,82 diff --git a/games/peasant/peasant4.s b/games/peasant/peasant4.s index a3041e90..0026323e 100644 --- a/games/peasant/peasant4.s +++ b/games/peasant/peasant4.s @@ -190,6 +190,7 @@ peasant_text: .include "graphics/priority_peasant4.inc" .include "version.inc" +.include "loadsave_menu.s" help_message: .byte 0,43,24, 0,253,82