Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scraping the barrel #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

scraping the barrel #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pt3_player/mockingboard_a.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ reset_ay_both:
clear_ay_both:
ldx #14
lda #0
sta MB_VALUE
sta MB_VALUE_smc+1
clear_ay_left_loop:
; Write sequence
; Inactive -> Latch Address -> Inactive -> Write Data -> Inactive
Expand All @@ -104,7 +104,8 @@ write_ay_both:
sty MOCK_6522_ORB2 ; 3

; value
lda MB_VALUE ; 3
MB_VALUE_smc:
lda #$d1 ; 2
sta MOCK_6522_ORA1 ; put value on PA1 ; 3
sta MOCK_6522_ORA2 ; put value on PA2 ; 3
lda #MOCK_AY_WRITE ; ; 2
Expand All @@ -114,7 +115,7 @@ write_ay_both:
sty MOCK_6522_ORB2 ; 3

;===========
; 45
; 44
dex
bpl clear_ay_left_loop
rts
Expand Down
12 changes: 6 additions & 6 deletions pt3_player/pt3_lib.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ zero_song_structs_loop:
sta note_c+NOTE_VOLUME ; 4

; default ornament/sample in A
ldx #(NOTE_STRUCT_SIZE*0) ; 2
;;ldx #(NOTE_STRUCT_SIZE*0) ; 2
jsr load_ornament0_sample1 ; 6+93

; default ornament/sample in B
Expand Down Expand Up @@ -1026,12 +1026,12 @@ done_note:
lsr pt3_mixer_value_smc+1

handle_onoff:
lda note_a+NOTE_ONOFF,X ;if (a->onoff>0) {
ldy note_a+NOTE_ONOFF,X ;if (a->onoff>0) {
beq done_onoff

dec note_a+NOTE_ONOFF,X ; a->onoff--;
dey ; a->onoff--;

bne done_onoff ; if (a->onoff==0) {
bne put_offon ; if (a->onoff==0) {
lda note_a+NOTE_ENABLED,X
eor #$1 ; toggle
sta note_a+NOTE_ENABLED,X
Expand All @@ -1041,9 +1041,9 @@ do_onoff:
dex ; select ONOFF
;lda note_a+NOTE_ONOFF_DELAY,X ; if (a->enabled) a->onoff=a->onoff_delay;
do_offon:
lda note_a+NOTE_OFFON_DELAY,X ; else a->onoff=a->offon_delay;
ldy note_a+NOTE_OFFON_DELAY,X ; else a->onoff=a->offon_delay;
put_offon:
sta note_a+NOTE_ONOFF,X
sty note_a+NOTE_ONOFF,X

done_onoff:

Expand Down
1 change: 0 additions & 1 deletion pt3_player/pt3_player.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,6 @@ done_MHz:
sta $AD1

; Print Rright Arrow (INVERSE)
lda #'-'
sta $6F6
sta $AF6

Expand Down
5 changes: 3 additions & 2 deletions pt3_player/text_print.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ point_to_end_string:
;================================
print_both_pages:
lda DRAW_PAGE
pha
sta draw_page_smc+1

lda #0
sta DRAW_PAGE
Expand All @@ -72,7 +72,8 @@ print_both_pages:
sta DRAW_PAGE
jsr move_and_print

pla
draw_page_smc:
lda #$d1
sta DRAW_PAGE

rts ; oops forgot this initially
Expand Down
5 changes: 2 additions & 3 deletions pt3_player/zp.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@ ORNAMENT_H = $03
SAMPLE_L = $04
SAMPLE_H = $05

WHICH_FILE = $62
LOOP = $63
MB_VALUE = $64
WHICH_FILE = $63
LOOP = $64
MB_ADDRL = $65
MB_ADDRH = $66
DONE_PLAYING = $67
Expand Down