diff --git a/heartpieces.asm b/heartpieces.asm index 682e153..0b88a08 100644 --- a/heartpieces.asm +++ b/heartpieces.asm @@ -5,8 +5,10 @@ HeartPieceGet: PHX : PHY LDA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID LDY.w SprSourceItemId, X - JSL MaybeMarkDigSpotCollected JSL HeartGet + BCC + + JSL MaybeMarkDigSpotCollected + + PLY : PLX RTL ;-------------------------------------------------------------------------------- diff --git a/hooks.asm b/hooks.asm index 357e816..60040a5 100755 --- a/hooks.asm +++ b/hooks.asm @@ -2067,7 +2067,9 @@ JSL HeartPieceSpawnDelayFix ;-------------------------------------------------------------------------------- org $85F08A ; <- 2F08A - sprite_heart_upgrades.asm : 324 - (LDA $7EF36B : INC A : AND.b #$03 : STA $7EF36B : BNE .got_4_piecese) item determination JSL HeartPieceGet +PHP JSL DynamicDrawCleanup +PLP : BCC + JSL IsMedallion BCS + : BRA Sprite_EB_HeartPiece_handle_flags : + ; Don't change OW flags if we're STZ.w SpriteAITable, X : RTS ; getting a tablet item diff --git a/tablets.asm b/tablets.asm index a96bc52..c4def06 100644 --- a/tablets.asm +++ b/tablets.asm @@ -67,7 +67,6 @@ MaybeUnlockTabletAnimation: SEP #$20 ; set 8-bit accumulator LDA.b #$02 : STA.b LinkDirection ; face link forward LDA.b #$3C : STA.b LinkIncapacitatedTimer ; lock link for 60f - STZ.w CutsceneFlag ++ SEP #$20 ; set 8-bit accumulator +