From 40d301b3e0a48c45182c71d111d8d8b1721dc46b Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 20 Apr 2023 20:32:18 -0500
Subject: [PATCH] Animate standing rupees instead of drawing new OAM slot

---
 utilities.asm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/utilities.asm b/utilities.asm
index 3158132..a4aa35f 100644
--- a/utilities.asm
+++ b/utilities.asm
@@ -412,7 +412,7 @@ PrepDynamicTile:
 	TXA
 	JSR.w LoadDynamicTileOAMTable
 	CMP.b #$34 : BCC +
-	CMP.b #$37 : BCS + : BRA ++ ; if rupees, don't draw to OAM
+	CMP.b #$36+1 : BCS + : BRA ++ ; if rupees, don't draw to OAM
 		+ JSL.l GetSpriteID ; convert loot id to sprite id
 		JSL.l GetAnimatedSpriteTile_variable
 	++ LDA.b #$00 : STA !MULTIWORLD_SPRITEITEM_PLAYER_ID
@@ -436,7 +436,7 @@ LoadDynamicTileOAMTable:
 		LDA.w #$0200 : STA.l !SPRITE_OAM+6
 		SEP #$20 ; set 8-bit accumulator
 		LDA $01,s : CMP.b #$34 : BCC +
-		CMP.b #$37 : BCS + ; if rupees, use animated gfx already in OAM
+		CMP.b #$36+1 : BCS + ; if rupees, use animated gfx already in OAM
 			LDA.b #$0B : BRA ++
 		+ LDA.b #$24
 		++ STA.l !SPRITE_OAM+4
@@ -452,9 +452,11 @@ LoadDynamicTileOAMTable:
 
 	.narrow
 	LDA $02,s : CMP.b #$34 : BCC +
-	CMP.b #$37 : REP #$20 : BCS + ; if rupees, use animated gfx already in OAM
+	CMP.b #$36+1 : BCS + ; if rupees, use animated gfx already in OAM
+		REP #$20
 		LDA.w #$1B00 : BRA ++
-	+ LDA.w #$3400
+	+ REP #$20
+	LDA.w #$3400
 	++ STA.l !SPRITE_OAM+11
 	LDA.w #$0000 : STA.l !SPRITE_OAM+7
 	               STA.l !SPRITE_OAM+14
@@ -566,7 +568,7 @@ LoadModifiedTileBufferAddress:
 	PHA
 	LDA !TILE_UPLOAD_OFFSET_OVERRIDE : BEQ +
 		TAX
-    	LDY.w #$0002
+		LDY.w #$0002
 		LDA.w #$0000 : STA !TILE_UPLOAD_OFFSET_OVERRIDE
 		BRA .done
 	+