Start Farore custom sprite, rearrange banks

Masks/deku_mask.asm

@@ -4,7 +4,7 @@
 ; =============================================================================
 ; Hooks 
 
-incsrc "../Sprites/sprite_functions_hooks.asm"
+; incsrc "../Sprites/sprite_functions_hooks.asm"
 
 org $008A01
   LDA $BC
@@ -160,7 +160,7 @@ LinkItem_UsingQuake:
 
 ; =============================================================================
 
-org $288000
+org $318000
 ;incsrc "link_handler.asm"
 LinkItem_UsingDekuMask:
 {

Masks/wolf_mask.asm

@@ -1,6 +1,9 @@
 ; =============================================================================
 ; Wolf Mask 
-
+; 
+; Talk to animals 
+; Dig for treasure ability (shovel)
+; 
 ; =============================================================================
 
 org $07A3DB
@@ -31,16 +34,9 @@ LinkItem_WolfMask:
   JSR LinkItem_Shovel
 
 .equip 
-  ; JSR Link_CheckNewY_ButtonPress : BCC .return
-
-  ; joypad 1 register (AXLR|????)
-  ; check for R button press
+  ; check for R button held
   LDA $F2 : CMP #$10 : BNE .return 
-  LDA $46 : BNE .return
-  TSB $3A 
-  SEC 
-  ; LDA $F4 : AND.b #$10 : BEQ .return
-
+  JSR Link_CheckNewY_ButtonPress : BCC .return
   LDA $3A : AND.b #$BF : STA $3A        ; clear the Y button state 
 
   LDA $6C : BNE .return                 ; in a doorway

Masks/zora_mask.asm

@@ -85,38 +85,25 @@ LinkState_UsingZoraMask:
   LDA #$00 : STA $5E ; Reset speed to normal 
   STA $037B
   JMP .return
-
+  
 .swimming
 ; -----------------------------------------------------------------------------
 
   ; Check if we are indoors or outdoors 
   LDA $1B : BEQ .overworld ; z flag is 1 
 
-  CLC
-  REP #$30
-  JSR Link_CheckNewY_ButtonPress : BCC .return_dungeon
-  LDA $3A : AND.b #$BF : STA $3A
-  SEP #$30
-
   ; Check if already underwater
   LDA $0AAB : BEQ .dive_dungeon
-
-  JMP .return_dungeon
   
   ; Handle dungeon swimming (hard)
 .dive_dungeon
-  ; Set underwater walking mode 
-  LDA #$01 : STA $5D
-  STA $0AAB
 
-  ; Splash visual effect 
+  LDA #$01 : STA $5D
+  ; Else, restore to normal swimming state 
   LDA.b #$15 : LDY.b #$00
   JSL AddTransitionSplash
-
-  ; Change the layer Link is on to BG2 
   LDA.b #$00 : STA $EE
 
-.return_dungeon
   JSR $E8F0 ; HandleIndoorCameraAndDoors
   RTS
 
@@ -130,9 +117,9 @@ LinkState_UsingZoraMask:
   ; Check if already underwater 
   LDA $0AAB : BEQ .dive
 
-  STZ $55              ; Reset cape flag 
-  STZ $0AAB            ; Reset underwater flag 
-  STZ $0351            ; Reset ripple flag 
+  STZ $55     ; Reset cape flag 
+  STZ $0AAB   ; Reset underwater flag 
+  STZ $0351   ; Reset ripple flag 
   LDA #$00 : STA $037B ; Reset invincibility flag
   LDA #$04 : STA $5D