From ad17c8e88df602a300590d645fdc9d19c88140f1 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Sat, 12 Aug 2023 15:34:33 -0400
Subject: [PATCH] More small fixes

---
 dialog.asm            | 2 +-
 enemy_adjustments.asm | 2 +-
 events.asm            | 2 +-
 inventory.asm         | 7 ++++---
 newitems.asm          | 2 ++
 npcitems.asm          | 7 +++----
 vanillalabels.asm     | 2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dialog.asm b/dialog.asm
index ab0957d..645ff2a 100644
--- a/dialog.asm
+++ b/dialog.asm
@@ -145,7 +145,7 @@ FreeDungeonItemNotice:
                                    CMP.w DungeonID : BNE +
                 BRA .self_notice
                 .hc_sewers
-                LDA.w DungeonID : CMP.b #$0003 : BCS +
+                LDA.w DungeonID : CMP.w #$0003 : BCS +
                         .self_notice
                         SEP #$20
 		        %CopyDialog(Notice_Self)
diff --git a/enemy_adjustments.asm b/enemy_adjustments.asm
index ee33204..f126791 100644
--- a/enemy_adjustments.asm
+++ b/enemy_adjustments.asm
@@ -20,7 +20,7 @@ RTL
 RTL
 ;--------------------------------------------------------------------------------
 NewFireBarDamage:
-        LDA.w $00EE : CMP.w SpriteLayer, X : BNE .NotSameLayer
+        LDA.b LinkLayer : CMP.w SpriteLayer, X : BNE .NotSameLayer
                 JSL Sprite_AttemptDamageToPlayerPlusRecoilLong
                 RTL
 .NotSameLayer
diff --git a/events.asm b/events.asm
index e8088a3..89ce961 100644
--- a/events.asm
+++ b/events.asm
@@ -46,8 +46,8 @@ OnDungeonExit:
         STA.w DungeonID : STZ.w Map16ChangeIndex ; thing we wrote over
 
         PHA : PHP
-        JSL.l HUD_RebuildLong
         INC.w UpdateHUD
+        JSL.l HUD_RebuildLong
         JSL.l FloodGateResetInner
         JSL.l SetSilverBowMode
         PLP : PLA
diff --git a/inventory.asm b/inventory.asm
index 1d414eb..a148c34 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -141,13 +141,13 @@ AddInventory:
 ; Uses $0B-$0D for long absolute addressing
 	PHA : PHX : PHY : PHP : PHB
         PHK : PLB
+        LDA.b #$7E : STA.b Scrap0D 
 	LDA.l StatsLocked : BNE .done
-        LDA.w InventoryTable_properties,Y : BIT #$01 : BEQ .done
         JSR.w ShopCheck : BCS .done
         JSR.w DungeonIncrement : BCS .done
-                LDA.b #$7E : STA.b Scrap0D 
-                JSR.w StampItem
                 JSR.w IncrementByOne
+                LDA.w InventoryTable_properties,Y : BIT #$01 : BEQ .done
+                JSR.w StampItem
                 SEP #$20
                 JSR.w IncrementYAItems
                         REP #$20
@@ -195,6 +195,7 @@ DungeonIncrement:
                 JSL.l CountChestKeyLong
         +
 	LDA.b IndoorsFlag : BEQ .count
+        LDA.w InventoryTable_properties,Y : BIT #$01 : BEQ .count ; Skip prizes but continue checks in AddInventory
 	LDA.w DungeonID : BMI .count
                 CMP.l BallNChainDungeon : BNE +
                         CPY.b #$32 : BEQ .ballchain_bigkey
diff --git a/newitems.asm b/newitems.asm
index 72a9568..4b9b721 100644
--- a/newitems.asm
+++ b/newitems.asm
@@ -527,6 +527,8 @@ ItemBehavior:
         .same_dungeon
         SEP #$20
         LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys
+        LSR : TAX
+        LDA.l DungeonKeys,X : INC : STA.l DungeonKeys,X ; Update menu key count too
         RTS
 
         .hc_smallkey
diff --git a/npcitems.asm b/npcitems.asm
index af5d87d..f633cca 100644
--- a/npcitems.asm
+++ b/npcitems.asm
@@ -176,8 +176,9 @@ RTL
 LoadZoraKingItemGFX:
         LDA.l $9DE1C3 ; location randomizer writes zora item to
         JSL.l ResolveLootIDLong
-        STA.w SpriteID,X
-        JML.l PrepDynamicTile
+        STA.w SpriteID,Y
+        TYX
+        JML.l PrepDynamicTile_loot_resolved
 ;--------------------------------------------------------------------------------
 JumpToSplashItemTarget:
 	LDA.w SpriteMovement, X
@@ -198,10 +199,8 @@ DrawThrownItem:
         LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish
                 .zora
                 LDA.b #$01 : STA.l RedrawFlag
-                LDA.l $9DE1C3 ; location randomizer writes zora item to
                 BRA .draw
                 .catfish
-                LDA.l $9DE185 ; location randomizer writes catfish item to
                 .draw
                 LDA.w SpriteID,X
                 JML DrawDynamicTile
diff --git a/vanillalabels.asm b/vanillalabels.asm
index c2d4538..dee1f68 100644
--- a/vanillalabels.asm
+++ b/vanillalabels.asm
@@ -63,7 +63,7 @@ OAM_AllocateDeferToPlayerLong                              = $86F86A
 Player_HaltDashAttackLong                                  = $8791B3
 Link_ReceiveItem                                           = $87999D
 Sprite_CheckIfPlayerPreoccupied                            = $87F4AA
-Sprite_AttemptDamageToPlayerPlusRecoilLong                 = $886F42
+Sprite_AttemptDamageToPlayerPlusRecoilLong                 = $86F425
 Ancilla_Main                                               = $888242
 Ancilla_ReceiveItem                                        = $88C3AE
 Ancilla_BreakTowerSeal_draw_single_crystal                 = $88CE93