Skip to content

Fix expansion controller reading in NSF player #2

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

Open
consolethinks wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix expansion controller reading in NSF player #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df4faec
fix expansion controller reading for Famicom users with thirdparty co…
Dec 5, 2021
373fdc0
FIX - reset RAM before playing songs to prevent channels from continu…
Dec 5, 2021
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
30 changes: 25 additions & 5 deletions n8nsf/nsf.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,16 +435,16 @@ joy_read:
pha
lda #$01
sta JOY_PORT1
nop
lda #$00
sta JOY_PORT1
nop
ldx #8
@0:
asl VAR_JOY_BUF
lda JOY_PORT1
and #1
ora VAR_JOY_BUF
and #3
beq @1
lda #1
@1: ora VAR_JOY_BUF
sta VAR_JOY_BUF
dex
bne @0
Expand Down Expand Up @@ -483,7 +483,27 @@ nsf_init:
sta VAR_ADDR
lda NSF_INIT+1
sta VAR_ADDR+1
lda VAR_CUR_SND
lda #0 ; clearing ram in $0-7FF, $6000-7FFF
tay
ldx #$7F
sta $00
@3:
stx $01
@0:
sta ($00),Y
iny
bne @0
cpx #$60
bne @1
ldx #$08
@1:
CPX #$02
BNE @2
LDX #$01
@2:
dex
bpl @3
lda VAR_CUR_SND ; return from init
ldx #0
jmp MEM_EXEC

Expand Down