wolf mask shovel code, zora mask labels

2023-03-12 00:08:41 -06:00
parent c16b840345
commit ca76276091
3 changed files with 240 additions and 17 deletions
--- a/Masks/wolf_mask.asm
+++ b/Masks/wolf_mask.asm
@@ -1,6 +1,51 @@
 ; =============================================================================
 ; Wolf Mask 

+; =============================================================================
+
+org $098F5B
+  AddShovelDirt:
+
+org $098C73
+  AddRecoveredFlute:
+
+org $098024
+  AddHitStars:
+
+org $1DFD5C
+  DiggingGameGuy_AttemptPrizeSpawn:
+
+
+; =============================================================================
+
+org $07D077
+  Link_ShovelTileDetect:
+
+org $07F8D1
+Link_ShovelTileDetect_Long:
+{
+  PHB : PHK : PLB
+  JSR Link_ShovelTileDetect
+  PLB
+  RTL
+}
+
+org $07802F
+  Player_DoSfx3:
+
+org $07A772
+Player_DoSfx3_Long:
+{
+  PHB : PHK : PLB
+  JSR Player_DoSfx3
+  PLB
+  RTL
+}
+
+print "Next address for jump in bank07: ", pc 
+
+; =============================================================================
+
 org $07A3DB
 LinkItem_Flute:

@@ -21,6 +66,7 @@ LinkItem_ShovelAndFlute:
 org $07A32C
 LinkItem_WolfMask:
 {
+  JSL LinkItem_UsingWolfMask
  JSR Link_CheckNewY_ButtonPress : BCC .return
  LDA $3A : AND.b #$BF : STA $3A        ; clear the Y button state 

@@ -75,4 +121,156 @@ WolfPalette:
  dw #$6565, #$7271, #$14B5, #$459B, #$3D95, #$22D0, #$567C, #$1890
  dw #$7616, #$0000
  
-; =============================================================================
+; =============================================================================
+
+LinkItem_Return:
+{
+  RTL
+}
+
+print pc
+LinkItem_UsingWolfMask:
+{
+  ; Shovel item code
+  
+  BIT $3A : BVS .in_use
+  LDA $6C : BNE LinkItem_Return ; .BRANCH_$3A312 ; (RTS, BASICALLY)
+  
+  LDA $F2     ; load unfiltered joypad 1 register (AXLR|????)
+  CMP #$10    ; R button pressed?
+  BEQ $03     ; if yes, branch behind the jump that leads to the end and load items instead
+  JMP LinkItem_Return
+  ; JSR Link_CheckNewY_ButtonPress : BCC LinkItem_Return ;.BRANCH_$3A312
+  
+  LDA $A320 : STA $3D
+  
+  STZ $030D
+  STZ $0300
+  
+  LDA.b #$01 : STA $037A
+  LDA.b #$01 : TSB $50
+  STZ $2E
+
+.in_use
+
+  JSR HaltLinkWhenUsingItems ; $AE65 ; $3AE65 IN ROM
+  
+  LDA $67 : AND.b #$F0 : STA $67
+  
+  DEC $3D : BMI .continue
+  
+  RTL
+
+.continue
+
+  LDX $030D : INX : STX $030D
+  
+  LDA $A320, X : STA $3D
+  
+  LDA $A326, X : STA $0300 : CMP.b #$01 : BNE .BRANCH_GAMMA
+  
+  LDY.b #$02
+  
+  PHX
+  
+  ; JSR $D077   ; $3D077 IN ROM
+  JSL Link_ShovelTileDetect_Long
+  
+  PLX
+  
+  LDA $04B2 : BEQ .not_flute_spot
+  
+  LDA.b #$1B : JSL Player_DoSfx3_Long
+  
+  PHX
+  
+  ; Add recovered flute (from digging). Interesting...
+  LDY.b #$00
+  LDA.b #$36
+  
+  JSL AddRecoveredFlute
+  
+  PLX
+
+.not_flute_spot
+
+  LDA $0357 : ORA $035B : AND.b #$01 : BNE .dont_clink
+  
+  PHX
+  
+  LDY.b #$00
+  LDA.b #$16
+  
+  JSL AddHitStars
+  
+  PLX
+  
+  LDA.b #$05 : JSL Player_DoSfx2
+  
+  BRA .finish_up
+
+.dont_clink
+
+  PHX
+  
+  ; Add shovel dirt? what? I thought these were aftermath tiles
+  LDY.b #$00
+  LDA.b #$17
+  
+  JSL AddShovelDirt
+  
+  LDA $03FC : BEQ .digging_game_inactive
+  
+  JSL DiggingGameGuy_AttemptPrizeSpawn
+
+.digging_game_inactive
+
+  PLX
+  
+  LDA.b #$12 : JSL Player_DoSfx2
+
+.finish_up
+
+  CPX.b #$03 : BNE .return
+  
+  STZ $030D
+  STZ $0300
+  
+  LDA $3A : AND.b #$80 : STA $3A
+  
+  STZ $037A
+  
+  LDA $50 : AND.b #$FE : STA $50
+
+.return
+
+  RTL
+}
+
+; ==============================================================================
+
+; *$3AE65-$3AE87 LOCAL
+HaltLinkWhenUsingItems:
+{
+  LDA $AD : CMP.b #$02 : BNE .BRANCH_ALPHA
+  
+  LDA $0322 : AND.b #$03 : CMP.b #$03 : BNE .BRANCH_ALPHA
+  
+  STZ $30
+  STZ $31
+  STZ $67
+  STZ $2A
+  STZ $2B
+  STZ $6B
+
+.BRANCH_ALPHA:
+
+  ; Cane of Somaria transit lines?
+  LDA $02F5 : BEQ .BRANCH_BETA
+  
+  STZ $67
+
+.BRANCH_BETA:
+
+  RTS
+}