Merge branch 'main' into kara

inventory.asm

@@ -181,13 +181,17 @@ AddInventory:
 	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
+                REP #$30
+                TYA : AND.w #$00FF : ASL : TAX
+                SEP #$20
+
+                LDA.w InventoryTable_properties,X : BIT.b #$01 : BEQ .done
 	JSR.w ShopCheck : BCS .done
 	JSR.w DungeonIncrement : BCS .done
 		JSR.w IncrementByOne
 		JSR.w StampItem
-		SEP #$20
 		JSR.w IncrementYAItems
 			REP #$20
 			LDA.l TotalItemCounter : INC : TAY
@@ -203,14 +207,17 @@ AddInventory:
 			TYA
 			STA.l TotalItemCounter
 	.done
+        SEP #$30
 	PLB : PLP : PLY : PLX : PLA
 RTL
 
 ShopCheck:
+; In: X - Receipt ID << 1
 ; TODO: If we write all shops, we can use the ShopPurchase flag instead of this
+        PHX
 	LDA.b IndoorsFlag : BEQ .count
 	LDA.w ItemReceiptMethod : CMP.b #$01 : BEQ .count
-	LDA.w InventoryTable_properties,Y : BIT.b #$02 : BNE .count
+        LDA.w InventoryTable_properties,X : BIT.b #$02 : BNE .count
 		REP #$20
 		LDA.b RoomIndex
 		CMP.w #274 : BEQ .nocount ; dark world death mountain shop, ornamental shield shop
@@ -225,15 +232,20 @@ ShopCheck:
 		SEP #$20
 	.count
 	CLC
+        PLX
 RTS
 	.nocount
 	SEP #$21
+        PLX
 RTS
 
 DungeonIncrement:
-	LDA.w InventoryTable_properties,Y : BIT.b #$40 : BEQ +
+; In: X - Receipt ID << 1
+        PHX
+        LDA.w InventoryTable_properties,X : BIT.b #$40 : BEQ +
 		JSL.l CountChestKeyLong
 	+
+        SEP #$10
 	LDA.b IndoorsFlag : BEQ .done
 	LDA.w DungeonID : BMI .done
 	CMP.l BallNChainDungeon : BNE +
@@ -243,36 +255,41 @@ DungeonIncrement:
 		LDA.l SewersLocations : INC : STA.l SewersLocations : STA.l HCLocations
 		BRA .done
 	+
-	LSR : TAX : LDA.l DungeonLocationsChecked, X : INC : STA.l DungeonLocationsChecked, X
+                LSR : TAX
+                LDA.l DungeonLocationsChecked, X : INC : STA.l DungeonLocationsChecked, X
 		CPX.b #$0D : BNE +
 			LDA.l BigKeyField : BIT.b #$04 : BNE ++
 				LDA.l PreGTBKLocations : INC : STA.l PreGTBKLocations
 			++
 		+
 	.done
-	CLC
+        REP #$11
+        PLX
 RTS
 	.ballchain_bigkey
-	LDA.l BigKeysBigChests
-	CLC : ADC.b #$10
-	STA.l BigKeysBigChests
+        REP #$10
+        PLX
 	SEC
 RTS
 
 StampItem:
 	REP #$30
-	TYA : ASL : TAX
 	LDA.w InventoryTable_stamp,X : BEQ .skip
 		STA.b Scrap0B
 		LDA.b [Scrap0B] : BNE .skip
+                INC.b Scrap0B : INC.b Scrap0B
+                LDA.b [Scrap0B] : BNE .skip
+                        DEC.b Scrap0B : DEC.b Scrap0B
 			LDA.l NMIFrames : STA.b [Scrap0B]
 			INC.b Scrap0B : INC.b Scrap0B
 			LDA.l NMIFrames+2 : STA.b [Scrap0B]
 	.skip
+        SEP #$20
 RTS
 
 IncrementYAItems:
-	 LDA.w InventoryTable_properties,Y
+        PHX
+        LDA.w InventoryTable_properties,X
 	 BIT.b #$10 : BNE .bomb_check
 	 BIT.b #$20 : BNE .bow_check
 	 BIT.b #$04 : BEQ .not_y
@@ -286,28 +303,29 @@ IncrementYAItems:
 		 LDA.l YAItemCounter : AND.b #$F8 : STA.l YAItemCounter
 		 TXA : ORA.l YAItemCounter : STA.l YAItemCounter
 	.done
+        PLX
 RTS
 	.bow_check
 	LDA.l BowEquipment : BNE +
 		BRA .y_item
-	+
-RTS
 	.bomb_check
 	LDA.l InventoryTracking+1 : BIT.b #$02 : BNE +
 		ORA.b #$02 : STA.l InventoryTracking+1
 		BRA .y_item
 	+
+        PLX
 RTS
 
 IncrementByOne:
+        PHX
 	REP #$20
-	TYA : ASL : TAX
 	LDA.w InventoryTable_stat,X : BEQ .skip
 		STA.b Scrap0B
 		SEP #$21
 		LDA.b #$00 : ADC.b [Scrap0B] : STA.b [Scrap0B]
 	.skip
 	SEP #$20
+        PLX
 RTS
 
 IncrementBossSword: