From de86481d847198d4c7c5f1dd5daff658f05a9add Mon Sep 17 00:00:00 2001 From: idle Date: Mon, 28 Jul 2025 15:06:38 -0500 Subject: [PATCH] Fix fanfare so when you skip save or select no then save is skipped --- src/fanfare.asm | 9 +++++++-- src/main.asm | 2 +- web/data/changelog.mdx | 1 + web/data/config.json | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/fanfare.asm b/src/fanfare.asm index a0861688..3d01a575 100644 --- a/src/fanfare.asm +++ b/src/fanfare.asm @@ -356,14 +356,19 @@ hook_unpause_play_sound: hook_end_fanfare: { + ; save answer + PHA LDA !sram_healthalarm : CMP #$0004 : BNE .done_health_alarm LDA #$0002 : JSL $80914D .done_health_alarm + ; initialize water physics in case we just collected gravity or space jump + JSL init_physics_ram + ; restore answer + PLA ; original logic PLY : PLX PLB : PLP - ; initialize water physics in case we just collected gravity or space jump - JML init_physics_ram + RTL } %endfree(85) diff --git a/src/main.asm b/src/main.asm index 17e19e40..64b19b87 100644 --- a/src/main.asm +++ b/src/main.asm @@ -16,7 +16,7 @@ lorom !VERSION_MAJOR = 2 !VERSION_MINOR = 7 !VERSION_BUILD = 1 -!VERSION_REV = 1 +!VERSION_REV = 2 table ../resources/normal.tbl print "" diff --git a/web/data/changelog.mdx b/web/data/changelog.mdx index 4e51bd4c..1dde5645 100644 --- a/web/data/changelog.mdx +++ b/web/data/changelog.mdx @@ -11,6 +11,7 @@ - Add bootless up in two room strat, and kraid arm and mouth hitboxes (2.7.1) - Workaround audio popping issue with music off by muting track 4 and playing it instead of nothing (2.7.1) - Corrections for KPDR 25% presets (2.7.1.1) +- Fix save stations so when you skip save or select no then save is skipped (2.7.1.2) # Version 2.6.x - Optimize kraid rock projectiles to reduce lag when Kraid rises (2.6.0) diff --git a/web/data/config.json b/web/data/config.json index e57ef1d1..18b585a4 100644 --- a/web/data/config.json +++ b/web/data/config.json @@ -1,6 +1,6 @@ { "name": "Super Metroid Practice Hack", - "version": "2.7.1.1", + "version": "2.7.1.2", "variants": ["NTSC", "PAL"], "base": { "NTSC": {