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

Add updated screenshots for Menu and HUD

.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_hud.asm

@@ -516,7 +516,7 @@ org $0DF811
 ; =========================================================
 ; $6FE77-$6FFC0
 
-org    $0DFE77
+org $0DFE77
 HUD_Tilemap:
 incbin tilemaps/hud.tilemap
 
@@ -528,7 +528,7 @@ incbin tilemaps/hud.tilemap
 ; ==========================================================
 
 ; $57CE0 DATA
-org    $0AFCE0
+org $0AFCE0
 FloorIndicatorNumberHigh:
 {
   dw $2508, $2509, $2509, $250A, $250B, $250C, $250D, $251D

Menu/menu_select_item.asm

@@ -242,46 +242,75 @@ GotoNextItem_Local:
   ; Load our currently equipped item, and move to the next one
   ; If we reach our limit (21), set it back to the bow and arrow slot.
   LDA $0202 : INC A : CMP.b #$18 : BCC .dont_reset
-  LDA.b #$01
+    LDA.b #$01
 
-.dont_reset
+  .dont_reset
   ; Otherwise try to equip the item in the next slot
   STA $0202
   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
+  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 
@@ -290,12 +319,9 @@ SearchForEquippedItem_Override:
 
   .alreadyEquipped
 
-    ; Checks to see if we actually have that item
+  ; Checks to see if we actually have that item
-    ; We're done if we 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

README.md

@@ -10,10 +10,12 @@ Build using [Asar](https://github.com/RPGHacker/asar) with `build.bat`
 ![oos55001](https://user-images.githubusercontent.com/47263509/175397658-56358685-74fa-42cd-bca7-b03b2909ab9c.png)
 ![oos55002](https://user-images.githubusercontent.com/47263509/175397677-9199c207-1d8a-4de9-9040-63bf420de49f.png)
 
-## Custom Menu
+## Custom Menu and HUD
+
+![image](https://github.com/scawful/Oracle-of-Secrets/assets/47263509/77e12478-127f-4dbd-b9c8-19da12b75ca2)
+![image](https://github.com/scawful/Oracle-of-Secrets/assets/47263509/a02d8d78-b7ed-4085-809e-59d78319e576)
+![image](https://github.com/scawful/Oracle-of-Secrets/assets/47263509/a6c7e247-f645-4a1c-954a-6c2d9c864d3e)
 
-![oos69x_004](https://user-images.githubusercontent.com/47263509/175392740-69b44931-298c-4000-b22d-5a2ebf76e1ad.png)
-![oos69x_005](https://user-images.githubusercontent.com/47263509/175392746-263801e4-5353-4fb8-b5cf-2d2e7f1c0282.png)
 
 ## Custom Sprites