Handle 16-bit GoalCounter and TotalItemCounter

Fix vanilla sword + shield item Fix how progressive items handled Clean up compasses.asm
2022-02-08 19:25:59 -05:00
parent 02932a2a9d
commit 905e897b52
9 changed files with 70 additions and 156 deletions
--- a/itemdowngrade.asm
+++ b/itemdowngrade.asm
@@ -73,13 +73,9 @@ RTS
 JMP .done
        .isUncleSwordShield
 	PHA
-                LDA HighestSword
-                STA [$00] ; already set to 1 if we had no sword, always keep highest
+                LDA HighestSword : STA [$00] ; already set to 1 if we had no sword, always keep highest
                INC $00
-                LDA HighestShield : BNE + ; keep our shield unless we have no shield
-                        INC A
-                +
-                        STA [$00]
+                LDA HighestShield : STA [$00]
 	PLA
 RTS
 ;================================================================================