Skip to content

savestate fixes: low health warning sound and no music on load #377

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

Merged
blkerby merged 1 commit into from
Sep 16, 2026
+18 −3
Merged

savestate fixes: low health warning sound and no music on load #377

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
Binary file modified patches/ips/savestate.ips
View file
Open in desktop
Binary file not shown.
21 changes: 18 additions & 3 deletions patches/src/savestate.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ org $80ffd8
!MUSIC_QUEUE_START = $063B
!MUSIC_ENTRY = $063D
!MUSIC_TIMER = $063F
!MSU_MUSIC_TRACK = $064C
!MUSIC_DATA = $07F3
!MUSIC_TRACK = $07F5
!SOUND_TIMER = $0686
Expand Down Expand Up @@ -149,6 +150,8 @@ post_load_state:
BEQ .skip_bg3
JSL $85A290
.skip_bg3
; Clear low health sound flag
STZ !SAMUS_HEALTH_WARNING
RTS
}

Expand Down Expand Up @@ -231,12 +234,24 @@ post_load_music:
.queued_music_set_timer
STA !MUSIC_QUEUE_TIMERS,X : STA !SOUND_TIMER : STA !MUSIC_TIMER
BRA .done

.load_track
BRA .load_track2

.check_track
LDA !SRAM_MUSIC_TRACK : CMP !MUSIC_TRACK : BEQ .done
LDA !SRAM_MUSIC_TRACK : BNE .check_track2 ; music stopped at time of load?
STA !MUSIC_TRACK
%ai8() : STA !MSU_MUSIC_TRACK : %ai16() ; msu1.asm checks this
LDA !MUSIC_ENTRY ; queued music track
BRA .call_music

.check_track2
CMP !MUSIC_TRACK : BEQ .done

.load_track
LDA !MUSIC_TRACK : JSL !MUSIC_ROUTINE
.load_track2
LDA !MUSIC_TRACK
.call_music
JSL !MUSIC_ROUTINE

.done
RTS
Expand Down
Loading