Fix HUD artifact: Revert FloorIndicator overflow from Song of Storms commit
The changes in commit 841ef2d added ~15 bytes to FloorIndicator, exceeding
its 156-byte size limit ($0AFD0C-$0AFDA7) and causing ROM corruption that
manifested as a brown/black tile artifact below the HUD item box.
Reverted changes:
- BNE+JMP pattern back to BEQ (saves 3 bytes)
- Removed Song of Storms rain check from FloorIndicator (saves 12 bytes)
Song of Storms functionality in ZSCustomOverworld.asm remains intact.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -551,9 +551,7 @@ org $0AFD0C
|
|||||||
FloorIndicator:
|
FloorIndicator:
|
||||||
{
|
{
|
||||||
REP #$30
|
REP #$30
|
||||||
LDA $04A0 : AND.w #$00FF : BNE +
|
LDA $04A0 : AND.w #$00FF : BEQ .hide_indicator
|
||||||
JMP .hide_indicator
|
|
||||||
+
|
|
||||||
INC A : CMP.w #$00C0 : BNE .dont_disable
|
INC A : CMP.w #$00C0 : BNE .dont_disable
|
||||||
; if the count up timer reaches 0x00BF frames
|
; if the count up timer reaches 0x00BF frames
|
||||||
; disable the floor indicator during the next frame.
|
; disable the floor indicator during the next frame.
|
||||||
@@ -577,12 +575,7 @@ FloorIndicator:
|
|||||||
LDA $A0 : CMP.w #$0002 : BEQ .sanctuary_rat_room
|
LDA $A0 : CMP.w #$0002 : BEQ .sanctuary_rat_room
|
||||||
SEP #$20
|
SEP #$20
|
||||||
|
|
||||||
; Check if Song of Storms rain is active
|
; Check the world state
|
||||||
LDA.l $7EE00E : BEQ .checkIntroRain
|
|
||||||
LDA.b #$05 : STA $012D ; Indoor rain SFX
|
|
||||||
BRA .no_rain_state
|
|
||||||
.checkIntroRain
|
|
||||||
; Check the world state (intro rain)
|
|
||||||
LDA $7EF3C5 : CMP.b #$02 : BCS .no_rain_state
|
LDA $7EF3C5 : CMP.b #$02 : BCS .no_rain_state
|
||||||
; cause the ambient rain sound to occur (indoor version)
|
; cause the ambient rain sound to occur (indoor version)
|
||||||
LDA.b #$05 : STA $012D
|
LDA.b #$05 : STA $012D
|
||||||
|
|||||||
Reference in New Issue
Block a user