diff --git a/demosplash/NOTES b/demosplash/NOTES index 7b1c29fe..8b8ee67b 100644 --- a/demosplash/NOTES +++ b/demosplash/NOTES @@ -1,33 +1,24 @@ TODO: - + red underline on missing - + glitch prevention finish - + clear screen at begin on missing Music glitching: -+ Demosplash - gen 4 pages -+ Apple II intro - plays for 2 pages - (MILD GLITCH) -+ Missing notice - - - - - ++ Demosplash -- generates 4 pages of music ++ Apple II intro -- plays 2 pages ++ Missing notice -- plays 2 pages ++ opening_book -- irq driven ++ Starbase -- irq driven (up to page $19) ++ Escape -- plays 4 pages (depends on playback) ++ reading/end_book-- text (irq driven?) + book plays 1 page ++ credits -- plays 5 pages (could use more) TODO: CYCLE: Apple II intro - + Remove keyboard pause CYCLE: MISSING notice - + Add missing text - + Autogen the active background code PLAIN: Hollowed out book + Meanwhile on a distant starbase, a prisoner receives a mysterious package... - + Draw this sequence PLAIN: STARBASE OOTW sequence + Update graphics + Update backgrounds diff --git a/demosplash/starbase.s b/demosplash/starbase.s index 892009a8..3e1836fa 100644 --- a/demosplash/starbase.s +++ b/demosplash/starbase.s @@ -14,7 +14,6 @@ starbase: ;======================= ; Run the "intro" ;======================= - ; just us falling? jsr starbase_init diff --git a/demosplash/starbase_action.s b/demosplash/starbase_action.s index ab8c9063..3cc74795 100644 --- a/demosplash/starbase_action.s +++ b/demosplash/starbase_action.s @@ -12,7 +12,6 @@ starbase_init: sta CART_OUT sta LASER_OUT sta BLAST_OUT - sta GUN_STATE sta GUN_FIRE sta NUM_DOORS sta ON_ELEVATOR @@ -20,6 +19,9 @@ starbase_init: lda #1 sta DIRECTION ; right + lda #20 ; start already charging + sta GUN_STATE + lda #100 sta GUN_CHARGE diff --git a/demosplash/starbase_keyboard.s b/demosplash/starbase_keyboard.s index 87a18be4..fc1ad6e7 100644 --- a/demosplash/starbase_keyboard.s +++ b/demosplash/starbase_keyboard.s @@ -451,7 +451,8 @@ change_state_clear_gait: starbase_keypresses: ; in room 0 - .byte 'L',180 ; start charging laser, wait 180 + ; already charging, so do nothing + .byte '.',80 ; start charging laser, wait 180 .byte 'L',10 ; release, blasting door, wait 2 .byte 'D',20 ; walk right .byte 'D',180 ; run right