From 8a63b7ca9187ca8ad16e192629bce6a5d8d5aa77 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Sat, 19 Aug 2023 14:33:24 -0400
Subject: [PATCH] v31.2.0 fixes

---
 heartpieces.asm    | 11 ++++++++---
 itemdatatables.asm |  4 ++--
 newhud.asm         | 22 +++++++++++++++-------
 utilities.asm      | 12 +++++++-----
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/heartpieces.asm b/heartpieces.asm
index 73a070b..a236318 100644
--- a/heartpieces.asm
+++ b/heartpieces.asm
@@ -42,13 +42,18 @@ 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 
+                JSL.l Sprite_DrawShadowLong
                 .done
                 PLY : PLA
         .offscreen
diff --git a/itemdatatables.asm b/itemdatatables.asm
index 2f7918e..e59f008 100644
--- a/itemdatatables.asm
+++ b/itemdatatables.asm
@@ -945,7 +945,7 @@ ItemReceiptGraphicsOffsets:
 	dw $0                                  ; 69 -
 	dw $0060                               ; 6A - Triforce
 	dw $11E0                               ; 6B - Power star
-	dw $0                                  ; 6C -
+	dw $0060                               ; 6C - Triforce Piece
 	dw $0                                  ; 6D - Server request item
 	dw $0                                  ; 6E - Server request item (dungeon drop)
 	dw $0                                  ; 6F -
@@ -1215,7 +1215,7 @@ StandingItemGraphicsOffsets:
 	dw $0                                  ; 69 -
 	dw $0060                               ; 6A - Triforce
 	dw $11E0                               ; 6B - Power star
-	dw $0                                  ; 6C -
+	dw $0060                               ; 6C - Triforce Piece
 	dw $0                                  ; 6D - Server request item
 	dw $0                                  ; 6E - Server request item (dungeon drop)
 	dw $0                                  ; 6F -
diff --git a/newhud.asm b/newhud.asm
index 480e9ac..52de6f7 100644
--- a/newhud.asm
+++ b/newhud.asm
@@ -395,7 +395,7 @@ UpdateHearts:
 	PHX
 	PLB
 
-	LDA.w $7EF36C
+	LDA.w MaximumHealth
 	LSR
 	LSR
 	LSR
@@ -414,7 +414,11 @@ UpdateHearts:
 	CPX.b #$01
 	BMI .done_hearts
 
-        JSR.w CheckHeartPalette
+        PHX
+        LDA.l HUDHeartColors_index : ASL : TAX
+        LDA.l HUDHeartColors_masks_game_hud,X
+        PLX
+        ORA.w #$20A0
 
 	CPY.b #$01
 	BPL .add_heart
@@ -450,18 +454,22 @@ UpdateHearts:
 	BRA .next_filled_heart
 
 .done_hearts
-	LDA.w $7EF36D
+	LDA.w CurrentHealth
 	AND.w #$0007
 	BEQ .skip_partial
-
 	CMP.w #$0005
-
-        JSR.w CheckHeartPalette
 	BCS .more_than_half
 
-	INC
+        LDA.l HUDHeartColors_index : ASL : TAX
+        LDA.l HUDHeartColors_masks_game_hud,X
+        ORA.w #$20A1
+	STA.b ($09)
+        BRA .skip_partial
 
 .more_than_half
+        LDA.l HUDHeartColors_index : ASL : TAX
+        LDA.l HUDHeartColors_masks_game_hud,X
+        ORA.w #$20A0
 	STA.b ($09)
 
 .skip_partial
diff --git a/utilities.asm b/utilities.asm
index b795183..97b37f8 100644
--- a/utilities.asm
+++ b/utilities.asm
@@ -69,10 +69,6 @@ RTL
 ;-------------------------------------------------------------------------------- 20/847B
 LoadDynamicTileOAMTable:
         PHP
-        REP #$20
-        LDA.w #$0000 : STA.l SpriteOAM : STA.l SpriteOAM+2
-        LDA.w #$0200 : STA.l SpriteOAM+6
-        SEP #$20
         LDA.b #$24 : STA.l SpriteOAM+4
 
         LDA.w SpriteID,X
@@ -80,11 +76,17 @@ LoadDynamicTileOAMTable:
         STA.l SpriteOAM+5 : STA.l SpriteOAM+13
         PHX
         LDA.l SpriteProperties_standing_width,X : BEQ .narrow
+        REP #$20
+        LDA.w #$0000 : STA.l SpriteOAM : STA.l SpriteOAM+2
+        LDA.w #$0200 : STA.l SpriteOAM+6
         BRA .done
 
         .narrow
         REP #$20
-        LDA.w #$0000 : STA.l SpriteOAM+7 : STA.l SpriteOAM+14
+        LDA.w #$0004 : STA.l SpriteOAM
+        LDA.w #$0200 : STA.l SpriteOAM+6
+
+        LDA.w #$0400 : STA.l SpriteOAM+7 : STA.l SpriteOAM+14
         LDA.w #$0800 : STA.l SpriteOAM+9
         LDA.w #$3400 : STA.l SpriteOAM+11