Revert "Fix mixing progressive/non-progressive swords and shields"

This reverts commit 9bcb72f7bc.

inventory.asm

@@ -326,16 +326,33 @@ AddInventory:
 	.itemCounts
 
 	CPY.b #$00 : BNE + ; Fighter's Sword & Fighter's Shield
-		JSR .stampSword
+		LDX #$01
+		JSR .incrementSword
+		JSR .incrementShield
 		JMP .done
 	+ CPY.b #$01 : BNE + ; Master Sword
-		JSR .stampSword
+		LDX #$02
+		JSR .incrementSword
 		JMP .done
 	+ CPY.b #$02 : BNE + ; Tempered Sword
-		JSR .stampSword
+		LDX #$03
+		JSR .incrementSword
 		JMP .done
 	+ CPY.b #$03 : BNE + ; Golden Sword
-		JSR .stampSword
+		LDX #$04
+		JSR .incrementSword
+		JMP .done
+	+ CPY.b #$04 : BNE + ; Fighter's Shield
+		LDX #$01
+		JSR .incrementShield
+		JMP .done
+	+ CPY.b #$05 : BNE + ; Red Shield
+		LDX #$02
+		JSR .incrementShield
+		JMP .done
+	+ CPY.b #$06 : BNE + ; Mirror Shield
+		LDX #$03
+		JSR .incrementShield
 		JMP .done
 	+ CPY.b #$07 : !BLT + ; Items $07 - $0D
 	  CPY.b #$0E : !BGE +
@@ -435,7 +452,8 @@ AddInventory:
 		JSR .incrementY
 		JMP .done
 	+ CPY.b #$49 : BNE + ; Fighter's Sword
-		JSR .stampSword
+		LDX #$01
+		JSR .incrementSword
 		JMP .done
 	+ CPY.b #$4A : BNE + ; Flute (Active)
 		JSR .stampFlute
@@ -454,7 +472,8 @@ AddInventory:
 		JSR .incrementCapacity
 		JMP .done
 	+ CPY.b #$50 : BNE + ; Master Sword (Safe)
-		JSR .stampSword
+		LDX #$02
+		JSR .incrementSword
 		JMP .done
 	+ CPY.b #$51 : BNE + ; 5 Bomb Capacity Upgrade
 		LDX #$02
@@ -472,11 +491,12 @@ AddInventory:
 		JSR .incrementBow
 		JMP .done
 	+ CPY.b #$5E : BNE + ; Progressive Sword
-		JSR .stampSword
-		LDA.l ProgressiveSwords : INC : STA.l ProgressiveSwords
+		LDA SwordEquipment : INC : TAX
+		JSR .incrementSword
 		JMP .done
 	+ CPY.b #$5F : BNE + ; Progressive Shield
-		LDA.l ProgressiveShields : INC : STA.l ProgressiveShields
+		LDA ShieldEquipment : INC : TAX
+		JSR .incrementShield
 		JMP .done
 	+ CPY.b #$60 : BNE + ; Progressive Armor
 		LDA ArmorEquipment : INC : TAX
@@ -565,6 +585,21 @@ RTS
 	SEP #$20 ; set 8-bit accumulator
 RTS
 
+.incrementSword
+	JSR .stampSword
+	LDA HighestSword
+	INC : STA $04 : CPX $04 : !BLT + ; don't increment unless we're getting a better sword
+		TXA : STA HighestSword
+	+
+RTS
+
+.incrementShield
+	LDA HighestShield
+	INC : STA $04 : CPX $04 : !BLT + ; don't increment unless we're getting a better shield
+		TXA : STA HighestShield
+	+
+RTS
+
 .incrementBow
 	LDA BowEquipment : BNE .dontCount ; Don't increment Y item count for extra bows
 .incrementY