ootw: ending: get the music working properly

This commit is contained in:
Vince Weaver 2019-08-21 11:20:37 -04:00
parent da080ca97c
commit cf853e4ce4
8 changed files with 11 additions and 10 deletions

View File

@ -216,5 +216,5 @@ PT3_LOC = song
; must be page aligned
.align 256
song:
.incbin "ootw_audio/ootw_intro.pt3"
.incbin "ootw_audio/ootw_outro.pt3"

View File

@ -18,6 +18,7 @@
; to be sure status flag and accumulator set properly
interrupt_handler:
php ; save status flags
pha ; save A ; 3
; A is saved in $45 by firmware

Binary file not shown.

View File

@ -68,7 +68,7 @@ rooftop_rle: .byte $28 ; ysize=48
.byte $A0,$11,$AA, $00, $A0,$12,$AA, $00,$00, $0A, $AF,$AA, $0A
.byte $A3,$00, $70, $50,$50, $F0, $C0,$C0, $CB, $0B
.byte $00, $B9, $99, $A0,$12,$00, $0A, $A4,$AA, $0A
.byte $AE,$00, $A0,$16,$70, $7A, $A0,$02,$AA, $A0,$01,$A0, $A0,$24,$00, $A0,$01,$A0
.byte $AE,$00, $A0,$16,$50, $5A, $A0,$02,$AA, $A0,$01,$A0, $A0,$24,$00, $A0,$01,$A0
.byte $A3,$AA, $A0,$01,$A0, $A0,$22,$00, $A6,$AA, $A0,$22,$00, $A6,$AA, $A0,$22,$00
.byte $A3,$AA
.byte $A1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@ -295,7 +295,7 @@ load_ornament0:
load_ornament:
sty TEMP ; save Y value ; 3
sty PT3_TEMP ; save Y value ; 3
;pt3->ornament_patterns[i]=
; (pt3->data[0xaa+(i*2)]<<8)|pt3->data[0xa9+(i*2)];
@ -340,7 +340,7 @@ load_ornament:
adc #$0 ; 2
sta note_a+NOTE_ORNAMENT_POINTER_H,X ; 5
ldy TEMP ; restore Y value ; 3
ldy PT3_TEMP ; restore Y value ; 3
rts ; 6
@ -369,7 +369,7 @@ load_sample1:
load_sample:
sty TEMP ; 3
sty PT3_TEMP ; 3
;pt3->ornament_patterns[i]=
; (pt3->data[0x6a+(i*2)]<<8)|pt3->data[0x69+(i*2)];
@ -412,7 +412,7 @@ load_sample:
adc #$0 ; 2
sta note_a+NOTE_SAMPLE_POINTER_H,X ; 5
ldy TEMP ; 3
ldy PT3_TEMP ; 3
rts ; 6
;============
@ -2205,7 +2205,7 @@ done_do_frame:
; FIXME: self modify code
GetNoteFreq:
sty TEMP ; 3
sty PT3_TEMP ; 3
tay ; 2
lda PT3_LOC+PT3_HEADER_FREQUENCY ; 4
@ -2217,7 +2217,7 @@ GetNoteFreq:
lda PT3NoteTable_ST_low,Y ; 4+
sta freq_l ; 4
ldy TEMP ; 3
ldy PT3_TEMP ; 3
rts ; 6
;===========
; 40
@ -2229,7 +2229,7 @@ freq_table_2:
lda PT3NoteTable_ASM_34_35_low,Y ; 4+
sta freq_l ; 4
ldy TEMP ; 3
ldy PT3_TEMP ; 3
rts ; 6
;===========
; 41

View File

@ -88,7 +88,7 @@ MB_ADDRL = $86
MB_ADDRH = $87
DONE_PLAYING = $88
DONE_SONG = $89
PT3_TEMP = $8A
; More zero-page addresses