Skip to content

Commit c6bc89e

Browse files
committed
Fix fanfare so when you skip save or select no then save is skipped
1 parent 3891be8 commit c6bc89e

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

src/fanfare.asm

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,14 +356,19 @@ hook_unpause_play_sound:
356356

357357
hook_end_fanfare:
358358
{
359+
; save answer
360+
PHA
359361
LDA !sram_healthalarm : CMP #$0004 : BNE .done_health_alarm
360362
LDA #$0002 : JSL $80914D
361363
.done_health_alarm
364+
; initialize water physics in case we just collected gravity or space jump
365+
JSL init_physics_ram
366+
; restore answer
367+
PLA
362368
; original logic
363369
PLY : PLX
364370
PLB : PLP
365-
; initialize water physics in case we just collected gravity or space jump
366-
JML init_physics_ram
371+
RTL
367372
}
368373

369374
%endfree(85)

src/main.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ lorom
1616
!VERSION_MAJOR = 2
1717
!VERSION_MINOR = 7
1818
!VERSION_BUILD = 1
19-
!VERSION_REV = 1
19+
!VERSION_REV = 2
2020

2121
table ../resources/normal.tbl
2222
print ""

web/data/changelog.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
- Add bootless up in two room strat, and kraid arm and mouth hitboxes (2.7.1)
1212
- Workaround audio popping issue with music off by muting track 4 and playing it instead of nothing (2.7.1)
1313
- Corrections for KPDR 25% presets (2.7.1.1)
14+
- Fix save stations so when you skip save or select no then save is skipped (2.7.1.2)
1415

1516
# Version 2.6.x
1617
- Optimize kraid rock projectiles to reduce lag when Kraid rises (2.6.0)

web/data/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Super Metroid Practice Hack",
3-
"version": "2.7.1.1",
3+
"version": "2.7.1.2",
44
"variants": ["NTSC", "PAL"],
55
"base": {
66
"NTSC": {

0 commit comments

Comments
 (0)