From 047c1496ed15882740fbc9314bdca0e08de51c62 Mon Sep 17 00:00:00 2001 From: idle Date: Tue, 21 Apr 2026 00:23:47 -0500 Subject: [PATCH] Force Big Boy room music to be correct prior to baby skip attempt --- src/layout.asm | 19 +++++++++++++++++++ src/main.asm | 2 +- web/data/changelog.mdx | 1 + web/data/config.json | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/layout.asm b/src/layout.asm index a1b020e3..d35ff68a 100644 --- a/src/layout.asm +++ b/src/layout.asm @@ -453,6 +453,11 @@ hook_layout_asm_pants_to_pants: dw #$8000 dw #layout_asm_pants_to_pants_scrolls +; Big Boy Room right door +org $83AA36 +hook_layout_asm_dusttorizo_door1: + dw #layout_asm_big_boy_music + ; Tourian Escape 1 right door org $83AA96 hook_layout_asm_motherbrain_door1: @@ -2475,6 +2480,20 @@ layout_asm_tourianescape1: RTS } +layout_asm_big_boy_music: +{ + LDA !MUSIC_DATA : CMP #$0045 : BEQ .check_track + TDC : JSL !MUSIC_ROUTINE + LDA #$FF45 : JSL !MUSIC_ROUTINE + + .check_track + LDA #$0006 : CMP !MUSIC_TRACK : BEQ .done + JSL !MUSIC_ROUTINE + + .done + RTS +} + layout_asm_ceres_ridley_state_check: { LDA !TIMER_STATUS : BEQ .noTimer diff --git a/src/main.asm b/src/main.asm index 21922273..b85338de 100644 --- a/src/main.asm +++ b/src/main.asm @@ -17,7 +17,7 @@ lorom !VERSION_MAJOR = 2 !VERSION_MINOR = 7 !VERSION_BUILD = 3 -!VERSION_REV = 0 +!VERSION_REV = 1 table ../resources/normal.tbl print "" diff --git a/web/data/changelog.mdx b/web/data/changelog.mdx index 52a12b3b..a5c1651e 100644 --- a/web/data/changelog.mdx +++ b/web/data/changelog.mdx @@ -25,6 +25,7 @@ - Fix page navigation in SuperHUD menu (2.7.2.3) - Add category adjustment options, and also a few small category preset fixes (2.7.3) - Add toggle IGT/RTA and Boss HP controller shortcuts, and a couple bonk indicators (2.7.3) +- Force Big Boy room music to be correct prior to baby skip attempt (2.7.3.1) # 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 7e92c834..4638bda0 100644 --- a/web/data/config.json +++ b/web/data/config.json @@ -1,6 +1,6 @@ { "name": "Super Metroid Practice Hack", - "version": "2.7.3", + "version": "2.7.3.1", "variants": ["NTSC", "PAL"], "base": { "NTSC": {