Merge remote-tracking branch 'baserom/master' into MergeDecompression

# Conflicts: # goalitem.asm # inventory.asm # invertedmaps.asm # newhud.asm # pendantcrystalhud.asm Also some bugfixes here and there
2023-08-24 16:16:31 -06:00
parent f1dda4a8c0 188c965fbc
commit 09702e659d
22 changed files with 955 additions and 809 deletions
--- a/heartpieces.asm
+++ b/heartpieces.asm
@@ -44,10 +44,15 @@ DrawHeartPieceGFX:
                LDA.l SpriteProperties_standing_width,X : BNE +
                        PLX
                        LDA.w SpriteControl, X : ORA.b #$20 : STA.w SpriteControl, X
-                        BRA .draw
+                        PLA
+                        JSL.l DrawDynamicTile
+                        LDA.b Scrap00
+                        CLC : ADC.b #$04
+                        STA.b Scrap00
+                        JSL.l Sprite_DrawShadowLong
+                        BRA .done
                +
                PLX
-                .draw
                PLA
                JSL.l DrawDynamicTile
                JSL.l Sprite_DrawShadowLong