diff --git a/Items/jump_feather.asm b/Items/jump_feather.asm index eb49bb8..4b757b7 100644 --- a/Items/jump_feather.asm +++ b/Items/jump_feather.asm @@ -1,49 +1,57 @@ +; ============================================================================= ; Zarby Feather org $07AFF8 -BIT $3A : BVS .return ;if Y or B are already pressed +{ + BIT $3A : BVS .return ;if Y or B are already pressed -LDA $6C : BNE .return ; if we are standing in a dooray or not + LDA $6C : BNE .return ; if we are standing in a dooray or not -JSR $B073 : BCC .return; Check if we just pressed Y Button ; Link_CheckNewY_ButtonPress - JSL NewBookCode + ; Link_CheckNewY_ButtonPress + JSR $B073 : BCC .return ; Check if we just pressed Y Button + JSL NewBookCode .return -RTS + RTS +} + +; ============================================================================= org $348000 NewBookCode: -JSL $07983A ; Reset swim state -LDA $46 : BNE .cantuseit -LDA #$02 : STA $5D ; state recoil -LDA #$01 : STA $4D ; state recoil 2 +{ + JSL $07983A ; Reset swim state + LDA $46 : BNE .cantuseit + LDA #$02 : STA $5D ; state recoil + LDA #$01 : STA $4D ; state recoil 2 -LDA #$20 ; Change this to change the length of the jump + LDA #$20 ; Change this to change the length of the jump -STA $46 + STA $46 -LDA #$24 ; Change this to change the height of the jump + LDA #$24 ; Change this to change the height of the jump -STA $29 : STA $02C7 -LDA #$08 : STA $0340 : STA $67 -STZ $31 -STZ $30 + STA $29 : STA $02C7 + LDA #$08 : STA $0340 : STA $67 + STZ $31 + STZ $30 -LDA $F4 : AND #$08 : BEQ .noUp - LDA #-8 ; Change that -8 if you want higher speed moving up - STA $27 -.noUp -LDA $F4 : AND #$04 : BEQ .noDown - LDA #8 ; Change that -8 if you want higher speed moving down - STA $27 -.noDown -LDA $F4 : AND #$02 : BEQ .noLeft - LDA #-8 ; Change that -8 if you want higher speed moving left - STA $28 -.noLeft -LDA $F4 : AND #$01 : BEQ .noRight - LDA #8 ; Change that 8 if you want higher speed moving right - STA $28 -.noRight -.cantuseit -RTL \ No newline at end of file + LDA $F4 : AND #$08 : BEQ .noUp + LDA #-8 ; Change that -8 if you want higher speed moving up + STA $27 + .noUp + LDA $F4 : AND #$04 : BEQ .noDown + LDA #8 ; Change that -8 if you want higher speed moving down + STA $27 + .noDown + LDA $F4 : AND #$02 : BEQ .noLeft + LDA #-8 ; Change that -8 if you want higher speed moving left + STA $28 + .noLeft + LDA $F4 : AND #$01 : BEQ .noRight + LDA #8 ; Change that 8 if you want higher speed moving right + STA $28 + .noRight + .cantuseit + RTL +} diff --git a/Masks/wolf_mask.asm b/Masks/wolf_mask.asm index 8b3c02a..71c3ea9 100644 --- a/Masks/wolf_mask.asm +++ b/Masks/wolf_mask.asm @@ -1,6 +1,10 @@ +; ============================================================================= + org $07A3DB LinkItem_Flute: +; ============================================================================= + org $07A313 LinkItem_ShovelAndFlute: { @@ -9,6 +13,8 @@ LinkItem_ShovelAndFlute: BRL LinkItem_Flute } +; ============================================================================= + ; TODO: Make sure there's no inaccessible code issues past here ; LinkItem_Shovel org $07A32C