From f9e2a8871c5c7c9a6ce7ee9be23139e98392411c Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 15 Mar 2020 13:58:20 -0400 Subject: [PATCH] mist: selenetic age set puzzle to proper solution --- mist/organ_puzzle.s | 15 +++++++++------ mist/selena.s | 7 +++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mist/organ_puzzle.s b/mist/organ_puzzle.s index d0129d34..3cfad435 100644 --- a/mist/organ_puzzle.s +++ b/mist/organ_puzzle.s @@ -272,16 +272,19 @@ ss_buttons_smc: rts -ROCKET_SOLUTION_0 = $00 -ROCKET_SOLUTION_1 = $01 -ROCKET_SOLUTION_2 = $05 -ROCKET_SOLUTION_3 = $0a +ROCKET_SOLUTION_0 = 0 ; NOTE_C4 +ROCKET_SOLUTION_1 = 12 ; NOTE_C5 +ROCKET_SOLUTION_2 = 15 ; NOTE_DSHARP5 +ROCKET_SOLUTION_3 = 5 ; NOTE_F4 ; twice as many as necessary as X increments by two rocket_notes: - .byte ROCKET_SOLUTION_0,$00,ROCKET_SOLUTION_1,$00 - .byte ROCKET_SOLUTION_2,$00,ROCKET_SOLUTION_3,$00 +; .byte ROCKET_SOLUTION_0,$00,ROCKET_SOLUTION_1,$00 +; .byte ROCKET_SOLUTION_2,$00,ROCKET_SOLUTION_3,$00 + + .byte $00,$00,$00,$00 + .byte $00,$00,$00,$00 controls_pressed: diff --git a/mist/selena.s b/mist/selena.s index b6882707..c7ee847d 100644 --- a/mist/selena.s +++ b/mist/selena.s @@ -80,9 +80,16 @@ game_loop: cmp #1 bne nothing_special + ldy #LOCATION_SPECIAL_EXIT + lda location1,Y + cmp #$ff + beq no_draw_buttons + ; draw the buttons jsr spaceship_draw_buttons +no_draw_buttons: + ; handle animated linking book lda ANIMATE_FRAME