diff --git a/bugfixes.asm b/bugfixes.asm index a20c769..2808edd 100644 --- a/bugfixes.asm +++ b/bugfixes.asm @@ -184,3 +184,13 @@ RTL dey bpl - RTL + +;-------------------------------------------------------------------------------- +; Fix pedestal pull overlay +PedestalPullOverlayFix: +LDA.b #$09 : STA $039F, X ; the thing we wrote over +LDA $1B : BNE + + LDA $8A : CMP.b #$80 : BNE + + LDA $8C : CMP.b #$97 ++ +RTL diff --git a/hooks.asm b/hooks.asm index f56c8cb..58d609b 100755 --- a/hooks.asm +++ b/hooks.asm @@ -542,10 +542,16 @@ NOP #2 ;-------------------------------------------------------------------------------- ;================================================================================ -; Master Sword Chest Fix +; Master Sword Overlay Fix ;-------------------------------------------------------------------------------- -;org $0987d7 ; <- ancilla_init.asm : 1071 -;NOP #4 +org $0987b2 ; <- ancilla_init.asm : 1051 (LDA.b #$09) +JSL.l PedestalPullOverlayFix + +org $0987b8 ; <- ancilla_init.asm : 1055 (STA $039F, X) +NOP #3 + +org $0987df ; <- ancilla_init.asm : 1077 (STA $039F, X) +NOP #3 ;-------------------------------------------------------------------------------- ;================================================================================