diff --git a/boots.asm b/boots.asm index 4e8c771..b92a873 100644 --- a/boots.asm +++ b/boots.asm @@ -74,3 +74,22 @@ BonkRecoil: + LDA.b #$24 : STA.b LinkRecoilZ ; things we wrote over RTL +;-------------------------------------------------------------------------------- +BonkRecoilStop: + LDA.l BootsModifier : CMP.b #$01 : BEQ .return + LDA.l BootsEquipment : BNE .return + LDA.b LinkState : CMP.b #$02 : BNE .return + LDA.b LinkPosZ : BMI .return : CMP.b #$09 : BCC .return + LDA.b FrameCounter : AND.b #$01 : BNE .return + REP #$20 + LDA.w $0114 : CMP.w #$0020 : SEP #$20 : BNE .return + LDA.b LinkRecoilY : BEQ ++ : BMI + + DEC : BRA ++ + + INC + ++ STA.b LinkRecoilY + LDA.b LinkRecoilX : BEQ ++ : BMI + + DEC : BRA ++ + + INC + ++ STA.b LinkRecoilX + .return + JML LinkHop_FindArbitraryLandingSpot diff --git a/hooks.asm b/hooks.asm index 4efb639..d65def9 100755 --- a/hooks.asm +++ b/hooks.asm @@ -150,8 +150,15 @@ JSL JumpDownLedge : NOP #4 ;================================================================================ ; Bonk Recoil ;-------------------------------------------------------------------------------- -org $87922C ; 3922C <- Bank07.asm : 2869 (LDA.b #$24 : STA $29) -JSL BonkRecoil +;org $87922C ; 3922C <- Bank07.asm : 2869 (LDA.b #$24 : STA $29) +;JSL BonkRecoil +;-------------------------------------------------------------------------------- + +;================================================================================ +; Bonk Recoil Over Pit +;-------------------------------------------------------------------------------- +org $87883B +JSL BonkRecoilStop ;-------------------------------------------------------------------------------- ;================================================================================ diff --git a/vanillalabels.asm b/vanillalabels.asm index 39a9ef3..f151050 100644 --- a/vanillalabels.asm +++ b/vanillalabels.asm @@ -91,6 +91,7 @@ Player_HaltDashAttackLong = $8791B3 Link_ReceiveItem = $87999D Link_ReceiveItem_cool_pose = $8799EE Link_ReceiveItem_not_cool_pose = $8799F2 +LinkHop_FindArbitraryLandingSpot = $87E359 Link_HandleMovingAnimation_FullLongEntry = $87E68F Link_CheckForEdgeScreenTransition = $87F413 Sprite_CheckIfPlayerPreoccupied = $87F4AA