fixed a bug that caused the currently selected item to not be saved after death and caused the bomb and arrow counts to dissapear on the HUD after opening a chest. Also added certain rom and emulator file types to the .gitIgnore

.gitignore

@@ -1,12 +1,9 @@
-asar.exe
+*.exe
-oos111.sfc
+*.bst
-oos111x-1.bst
+*.bp
-oos111x-2.bst
+*.cht
-oos111x-3.bst
+*.cpu.sym
-oos111x.bp
+*.sfc
-oos111x.cht
+*.smp.sym
-oos111x.cpu.sym
+*.srm
-oos111x.sfc
+*.sym
-oos111x.smp.sym
-oos111x.srm
-oos111x.sym

Menu/menu_select_item.asm

@@ -250,38 +250,67 @@ GotoNextItem_Local:
   RTS
 }
 
+DoWeHaveThisItem_OverrideLong:
+{
+  PHB : PHK : PLB
+  JSR DoWeHaveThisItem_Override
+  PLB 
+  RTL
+}
+
 DoWeHaveThisItem_Override:
 {
-  LDY $0202 : LDX.w Menu_AddressLong, Y
+  LDY $0202 : LDX.w Menu_AddressLong-1, Y
-  LDA.l $7EF33F, X : BNE .have_this_item
+  LDA.l $7EF300, X : BNE .have_this_item
     CLC
-    RTL
+    RTS
+
   .have_this_item
   SEC 
-  RTL
+  RTS
 }
 
 TryEquipNextItem_Override:
 {
   .keep_looking
+
     JSR GotoNextItem_Local
-  JSL DoWeHaveThisItem_Override : BCC .keep_looking
+  JSR DoWeHaveThisItem_Override : BCC .keep_looking
+
   RTS
 }
 
+SearchForEquippedItem_OverrideLong:
+{
+  PHB : PHK : PLB
+  JSR SearchForEquippedItem_Override
+  PLB 
+  RTL
+}
+
 SearchForEquippedItem_Override:
 {
   SEP #$30
 
-  LDY $0202 : LDX.w Menu_AddressLong-1, Y
+  LDA.b #$00
-  LDA.l $7EF33F, X : CMP.b #$00 : BNE .item_available
+  LDY.b #$18
+    
+  .itemCheck 
+
+    LDX Menu_AddressLong-1, Y
+    ORA $7EF300, X
+  DEY : CPY.b #$00 : BNE .itemCheck 
+
+  CMP.b #$00 : BNE .equippableItemAvailable
     ; In this case we have no equippable items
     STZ $0202 : STZ $0203 : STZ $0204
         
-    .we_have_that_item
+    .weHaveThatItem
-    RTL
+        
+    RTS
+    
+  .equippableItemAvailable
 
-  .item_available
   ; Is there an item currently equipped (in the HUD slot)?
   LDA $0202 : BNE .alreadyEquipped
     ; If not, set the equipped item to the Bow and Arrow 
@@ -292,10 +321,7 @@ SearchForEquippedItem_Override:
 
   ; Checks to see if we actually have that item
   ; We're done if we have that item
-  .keep_looking
+  JSR DoWeHaveThisItem_Override : BCS .weHaveThatItem
-    JSR GotoNextItem_Local
-  JSL DoWeHaveThisItem_Override : BCC .keep_looking
-  BCS .we_have_that_item
     
   JMP TryEquipNextItem_Override
 }
@@ -305,16 +331,14 @@ pushpc
 org $0DDEB0
 DoWeHaveThisItem:
 {
-  JSL DoWeHaveThisItem_Override
+  JSL DoWeHaveThisItem_OverrideLong
   RTS
 }
 
 org $0DE399
 SearchForEquippedItem:
 {
-  PHB : PHK : PLB
+  JSL SearchForEquippedItem_OverrideLong
-  JSL SearchForEquippedItem_Override
-  PLB 
   RTS
 }
 warnpc $0DE3C7