diff --git a/games/peasant/TODO b/games/peasant/TODO index ff562f84..f7ae8017 100644 --- a/games/peasant/TODO +++ b/games/peasant/TODO @@ -1,9 +1,10 @@ TODO: next: -+ fix keyboard input so it handles lowecase - wasd - Y/N on load/save ++ Loading screen is slow when getting names + Print "Loading" message while doing it? ++ After loading, no need to clear text before moving to next level + + complete waterfall, including animation + update intro to walk closer to edges + fix issue where walking stops when you cross to screen w priority diff --git a/games/peasant/inventory.s b/games/peasant/inventory.s index 909fff93..c1037605 100644 --- a/games/peasant/inventory.s +++ b/games/peasant/inventory.s @@ -218,7 +218,7 @@ handle_inv_keypress: pla - and #$7f ; clear top bit + and #$5F ; clear top bit, make uppercase cmp #27 beq urgh_done ; ESCAPE diff --git a/games/peasant/loadsave_menu.s b/games/peasant/loadsave_menu.s index a0e25024..deaf97b1 100644 --- a/games/peasant/loadsave_menu.s +++ b/games/peasant/loadsave_menu.s @@ -274,6 +274,8 @@ urgh_done_ls: jmp done_ls_keypress ls_check_down: + and #$5F ; make uppercase + cmp #$0A beq ls_handle_down cmp #'S' @@ -599,7 +601,7 @@ wait_confirmation: bit KEYRESET ; clear keypress - and #$7f + and #$5F ; clear high-bit, make uppercase cmp #'Y' bne dont_do_it diff --git a/games/peasant/parse_input.s b/games/peasant/parse_input.s index e98c1d67..1bc10788 100644 --- a/games/peasant/parse_input.s +++ b/games/peasant/parse_input.s @@ -213,6 +213,16 @@ restore_parse_message: jsr hgr_partial_restore +; lda last_bg_l + ; sta getsrc_smc+1 + ; lda last_bg_h + ; sta getsrc_smc+2 + + ; lda #$40 + +; jsr decompress_lzsa2_fast + + done_parse_message: @@ -389,3 +399,7 @@ count_message_done: message_len: .byte $0 + +last_bg_l: .byte $00 +last_bg_h: .byte $00 + diff --git a/games/peasant/peasant2.s b/games/peasant/peasant2.s index da3a988b..13d151a9 100644 --- a/games/peasant/peasant2.s +++ b/games/peasant/peasant2.s @@ -55,8 +55,10 @@ new_location: lda map_backgrounds_low,X sta getsrc_smc+1 +; sta last_bg_l lda map_backgrounds_hi,X sta getsrc_smc+2 +; sta last_bg_h lda #$40 @@ -236,3 +238,7 @@ map_priority_hi: .byte >archery_priority_lzsa ; 7 -- archery .byte >river_priority_lzsa ; 8 -- river .byte >knight_priority_lzsa ; 9 -- knight + + + +