Merged in DR v1.4.1.6

boots.asm

@@ -1,77 +1,76 @@
 ;================================================================================
 ; Boots State Modifier
 ;--------------------------------------------------------------------------------
-!BOOTS_MODIFIER = "$7F50CE"
 ModifyBoots:
     PHA
-        LDA !BOOTS_MODIFIER : CMP.b #$01 : BNE +
-            PLA : AND AbilityFlags : ORA.b #$04 : RTL ; yes boots
+        LDA.l BootsModifier : CMP.b #$01 : BNE +
+            PLA : AND.l AbilityFlags : ORA.b #$04 : RTL ; yes boots
         + : CMP.b #$02 : BNE +
-            PLA : AND AbilityFlags : AND.b #$FB : RTL ; no boots
-        + : LDA FakeBoots : CMP.b #$01 : BNE +
-            LDA $5B : BEQ ++ : LDA $59 : BNE + ; hover check
-                ++ : PLA : AND AbilityFlags : ORA.b #$04 : RTL ; yes boots, not hovering
+            PLA : AND.l AbilityFlags : AND.b #$FB : RTL ; no boots
+        + : LDA.l FakeBoots : CMP.b #$01 : BNE +
+            LDA.b LinkSlipping : BEQ ++ : LDA.b PitTileActField : BNE + ; hover check
+                ++ : PLA : AND.l AbilityFlags : ORA.b #$04 : RTL ; yes boots, not hovering
         +
     PLA
-    AND AbilityFlags ; regular boots
+    AND.l AbilityFlags ; regular boots
 RTL
 ;--------------------------------------------------------------------------------
 AddBonkTremors:
     PHA
-        LDA $46 : BNE + ; Check for incapacitated Link
-            JSL.l IncrementBonkCounter
+        LDA.b LinkIncapacitatedTimer : BNE + ; Check for incapacitated Link
+            JSL IncrementBonkCounter
         +
-        LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
-        LDA BootsEquipment : BNE + ; Check for Boots
+        LDA.l BootsModifier : CMP.b #$01 : BEQ +
+        LDA.l BootsEquipment : BNE + ; Check for Boots
             PLA : RTL
         +
     PLA
-    JSL.l AddDashTremor : JSL.l Player_ApplyRumbleToSprites ; things we wrote over
+    JSL AddDashTremor : JSL Player_ApplyRumbleToSprites ; things we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 BonkBreakableWall:
     PHX : PHP
         SEP #$30 ; set 8-bit accumulator and index registers
-        LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
-        LDA BootsEquipment : BNE + ; Check for Boots
+        LDA.l BootsModifier : CMP.b #$01 : BEQ +
+        LDA.l BootsEquipment : BNE + ; Check for Boots
             PLP : PLX : LDA.w #$0000 : RTL
         +
     PLP : PLX
-    LDA $0372 : AND.w #$00FF ; things we wrote over
+    LDA.w LinkDashing : AND.w #$00FF ; things we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 BonkRockPile:
-    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
-    LDA BootsEquipment : BNE + ; Check for Boots
+    LDA.l BootsModifier : CMP.b #$01 : BEQ +
+    LDA.l BootsEquipment : BNE + ; Check for Boots
         LDA.b #$00 : RTL
     +
-    LDA $02EF : AND.b #$70 ; things we wrote over
+    LDA.w TileActBE : AND.b #$70 ; things we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 GravestoneHook:
-    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
-    LDA BootsEquipment : BEQ .done ; Check for Boots
+    LDA.l BootsModifier : CMP.b #$01 : BEQ +
+    LDA.l BootsEquipment : BEQ .done ; Check for Boots
     +
-    LDA $0372 : BEQ .done ; things we wrote over
-        JML.l moveGravestone
+    LDA.w LinkDashing : BEQ .done ; things we wrote over
+        JML moveGravestone
     .done
-    JML.l GravestoneHook_continue
+    JML GravestoneHook_continue
 ;--------------------------------------------------------------------------------
 JumpDownLedge:
-    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
-    LDA BootsEquipment : BNE + ; Check for Boots
+    LDA.l BootsModifier : CMP.b #$01 : BEQ +
+    LDA.l BootsEquipment : BNE + ; Check for Boots
         ; Disarm Waterwalk
-        LDA $5B : CMP.b #$01 : BNE +
-            STZ $5B
+        LDA.b LinkSlipping : CMP.b #$01 : BNE +
+            STZ.b LinkSlipping
     +
-    LDA $1B : BNE .done : LDA.b #$02 : STA $EE ; things we wrote over
+    LDA.b IndoorsFlag : BNE .done : LDA.b #$02 : STA.b LinkLayer ; things we wrote over
     .done
 RTL
 ;--------------------------------------------------------------------------------
 BonkRecoil:
-    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
-    LDA BootsEquipment : BNE + ; Check for Boots
-        LDA.b #$16 : STA $29 : RTL
+    LDA.l BootsModifier : CMP.b #$01 : BEQ +
+    LDA.l BootsEquipment : BNE + ; Check for Boots
+        LDA.b #$16 : STA.b LinkRecoilZ : RTL
     +
-    LDA.b #$24 : STA $29 ; things we wrote over
+    LDA.b #$24 : STA.b LinkRecoilZ ; things we wrote over
 RTL