From 279a0ad030458e791b01e38c1c09d89c88603f34 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Wed, 10 Apr 2024 03:17:03 -0500
Subject: [PATCH] Various GFX fixes

---
 itemdatatables.asm          | 2 +-
 keydrop/dynamic_si_vram.asm | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/itemdatatables.asm b/itemdatatables.asm
index f1dd73c..00d7a89 100644
--- a/itemdatatables.asm
+++ b/itemdatatables.asm
@@ -430,7 +430,7 @@ endmacro
 %SpriteProps($0B, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 0B - Bow
 %SpriteProps($0C, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 0C - Blue Boomerang
 %SpriteProps($0D, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 0D - Powder
-%SpriteProps($0E, 2, 0, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 0E - Bottle refill (bee)
+%SpriteProps($0E, 2, 0, $02, $03, PalettesVanilla_blue_ice+$0E)         ; 0E - Bottle refill (bee)
 %SpriteProps($0F, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 0F - Bombos
 %SpriteProps($10, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 10 - Ether
 %SpriteProps($11, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 11 - Quake
diff --git a/keydrop/dynamic_si_vram.asm b/keydrop/dynamic_si_vram.asm
index b191211..692b817 100644
--- a/keydrop/dynamic_si_vram.asm
+++ b/keydrop/dynamic_si_vram.asm
@@ -34,7 +34,8 @@ RequestStandingItemVRAMSlot:
 		++ LDA.b #!DynamicDropGFXSlotCount_OW
 		+++ INC : STA.w SprItemGFXSlot,X
 		JMP .success
-	+ CMP.b #$A0 : BCC + : CMP.b #$AF+1 : BCS + ; if key, use key OAM slot
+	+ CMP.b #$24 : BEQ .key : CMP.b #$A0 : BCC + : CMP.b #$AF+1 : BCS + ; if key, use key OAM slot
+		.key
 		LDY.b LinkState : CPY.b #$19 : BCC ++ : CPY.b #$1A+1 : BCS ++ ; if getting tablet item, don't use key slot
 			BRA +
 		++