equip mask fix, wolf mask hook, include boat gfx

Masks/bunny_hood.asm

@@ -24,21 +24,21 @@ org $07A494
 LinkItem_Ether:
 {
   JSR Link_CheckNewY_ButtonPress : BCC .return
+  LDA $3A : AND.b #$BF : STA $3A        ; clear the Y button state 
 
-  LDA $6C : BNE .return ; doorway
-  LDA $0FFC : BNE .return ; cant open menu
-  
-  LDY.b #$04
-  LDA.b #$23
-  
+  LDA $6C : BNE .return                 ; in a doorway
+  LDA $0FFC : BNE .return               ; can't open menu
+
+  LDY.b #$04 : LDA.b #$23
   JSL AddTransformationCloud
-  LDA $02B2 : CMP #$01 : BNE .continue ; is the hood already on?
-  LDA #$10 : STA $BC                   ; take the hood off 
-  STZ $02B2 
-  BRA .return ; do not.
-.continue 
-  LDA #$37 : STA $BC
-  LDA #$01 : STA $02B2 ; set the bunny hood on 
+  LDA.b #$14 : JSR Player_DoSfx2
+  
+  LDA $02B2 : CMP #$04 : BEQ .unequip ; is the hood already on?
+  LDA #$37 : STA $BC                   ; change link's sprite 
+  LDA #$04 : STA $02B2
+  BRA .return
+.unequip
+  LDA #$10 : STA $BC : STZ $02B2        ; take the hood off
 
 .return
   CLC
@@ -48,37 +48,30 @@ LinkItem_Ether:
 org $378000
 incbin bunny_link.4bpp
 
-namespace BunnyHood 
-{
-  Main: 
-  {
-    lorom
-    org $87E330
-    JSR $FD66
-    CLC
 
-    org $87FD66
-    JSL $20AF20
-    RTS
+org $87E330
+JSR $FD66
+CLC
 
-    org $20AF20
-    CPX.b #$11 : BCS end  ; speed value upper bound check
-    LDA.w $0202           ; check the current item
-    CMP.b #$16 : BNE end  ; is it the bunny hood?
-    LDA.w $02B2           ; did you put it on?
-    BEQ end
-    LDA $20AF70,X         ; load new speed values
-    CLC
-    RTL
+org $87FD66
+JSL $20AF20
+RTS
 
-    end: {
-      LDA $87E227,X       ; load native speed values
-      CLC
-      RTL
-    }
+org $20AF20
+CPX.b #$11 : BCS end  ; speed value upper bound check
+LDA.w $0202           ; check the current item
+CMP.b #$16 : BNE end  ; is it the bunny hood?
+LDA.w $02B2           ; did you put it on?
+BEQ end
+LDA $20AF70,X         ; load new speed values
+CLC
+RTL
 
-    org $20AF70           ; this selects the new speed values
-    db $20, $12, $0a, $18, $10, $08, $08, $04, $0c, $10, $09, $19, $14, $0d, $10, $08, $40
-  }  ; label Main
+end: {
+  LDA $87E227,X       ; load native speed values
+  CLC
+  RTL
+}
 
-}  ; namespace BunnyHood
+org $20AF70           ; this selects the new speed values
+db $20, $12, $0a, $18, $10, $08, $08, $04, $0c, $10, $09, $19, $14, $0d, $10, $08, $40