diff --git a/games/mist_hgr/mist_title.s b/games/mist_hgr/mist_title.s index 946ece73..c6685bca 100644 --- a/games/mist_hgr/mist_title.s +++ b/games/mist_hgr/mist_title.s @@ -159,7 +159,7 @@ mockingboard_found: and #$87 ora #$30 - sta $7d0+39 ; 23,39 + sta $7d0+31 ; 23,31 jsr mockingboard_patch ; patch to work in slots other than 4? @@ -288,13 +288,13 @@ cyan_title_mb: ; First ldx #cyan1_lzsa - lda #20 + lda #$FF jsr draw_and_wait ; Second ldx #cyan2_lzsa - lda #40 + lda #$FE jsr draw_and_wait sei ; disable music @@ -820,6 +820,7 @@ draw_and_wait: jsr play_vgi pla + jsr wait_a_bit ; check if escape was pressed, skip into in that case @@ -933,8 +934,8 @@ narration6: config_string: ; 0123456789012345678901234567890123456789 -.byte 0,23,"APPLE II?, 48K RAM, MOCKINGBOARD: SLOT ?",0 -; MOCKINGBOARD: NONE +.byte 0,23,"APPLE II?, 48K, MOCKINGBOARD: S?, SSI: N",0 +; MOCKINGBOARD: NONE ;============================== diff --git a/games/mist_hgr/wait_a_bit.s b/games/mist_hgr/wait_a_bit.s index d2fab18a..ab093eed 100644 --- a/games/mist_hgr/wait_a_bit.s +++ b/games/mist_hgr/wait_a_bit.s @@ -1,8 +1,19 @@ ;==================================== ; wait for keypress or a few seconds ;==================================== + ; SPECIAL CASE + ; $FF = wait until sound pattern 1 + ; $FE = wait until DONE_PLAYING + ; $FD = wait until text done wait_a_bit: + cmp #$FF + beq wait_a_bit_pattern1 + cmp #$FE + beq wait_a_bit_end_song + + +wait_a_bit_time: bit KEYRESET tax @@ -14,8 +25,6 @@ keyloop: lda KEYPRESS bmi done_keyloop -; bmi keypress_exit - dex bne keyloop @@ -27,3 +36,37 @@ done_keyloop: rts + + ;===================== + ; wait for pattern 1 +wait_a_bit_pattern1: + bit KEYRESET +keyloop2: + lda current_pattern_smc+1 + bne done_keyloop2 + lda KEYPRESS + bmi done_keyloop2 + bpl keyloop2 +done_keyloop2: + sta LAST_KEY + bit KEYRESET + + rts + + ;===================== + ; wait for song done +wait_a_bit_end_song: + bit KEYRESET +keyloop3: + lda DONE_PLAYING + bne done_keyloop3 + lda KEYPRESS + bmi done_keyloop3 + bpl keyloop3 +done_keyloop3: + sta LAST_KEY + bit KEYRESET + + rts + +