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

This reverts commit 9bcb72f7bc.

itemdowngrade.asm

@@ -60,7 +60,7 @@ RTS
 RTS
 	.isSword
 	PHA
-		LDA SwordEquipment : STA $04
+		LDA HighestSword : STA $04
 		TYA ; load sword item
 		CMP.b #$49 : BNE + : LDA.b #$00 : + ; convert extra fighter's sword to normal one
 		CMP.b #$50 : BNE + : LDA.b #$01 : + ; convert extra master sword to normal one
@@ -73,11 +73,9 @@ RTS
 JMP .done
 	.isUncleSwordShield
 	PHA
-		; set sword to 1 if current sword is 0
-		LDA [$00] : BNE + : LDA.b #$01 : STA [$00] : +
+		LDA HighestSword : STA [$00] ; already set to 1 if we had no sword, always keep highest
 		INC $00
-		; set shield to 1 if current shield is 0
-		LDA [$00] : BNE + : LDA.b #$01 : STA [$00] : +
+		LDA HighestShield : STA [$00]
 	PLA
 RTS
 ;================================================================================