Item and mask cleanup

Items/bottle_net.asm

@@ -1,13 +1,13 @@
-; =============================================================================
+; ===========================================================
 ; Bottle Net Code
-; =============================================================================
+; ===========================================================
 
 !BottleFlag = $0AA6
 
 PlayerItem_SpawnFaerie = $1EFE33
 PlayerItem_ReleaseBee = $1EDCCF
 
-; =============================================================================
+; ===========================================================
 ; LinkItem_Bottle
 
 org $07A15B

Items/fishing_rod.asm

@@ -9,7 +9,7 @@
 ; $7F5BA2 RAM for fishing mode - 1 = rod out, 2 = pull
 ; $7F5BA3 RAM Index for the fishing floater
 ; Modify the code of the sprite "RunningBoy" 0x74
-; =========================================================
+; ====================================================
 
 ; Sprite_2D_NecklessMan_bounce
 org $06C0B2
@@ -285,9 +285,6 @@ RestoreCaneBlockHammerGfx:
   RTL
 }
 
-
-
-
 FloaterBoySpriteCheck:
 {
   PHB : PHK : PLB

Items/goldstar.asm

@@ -9,9 +9,9 @@
 pullpc
 TransferGFXinRAM:
 {
-  PHX ; keep X
+  PHX
-  PHP ; keep processor byte
+  PHP
-  REP #$20 ; 16bit is a bit faster
+  REP #$20
 
   LDX #$80
   --
@@ -28,8 +28,7 @@ TransferGFXinRAM:
 
 pushpc
 ; OAM Draw Pattern for spikeball gfx
-org $0085C4
+org $0085C4 : dw $0040
-  dw $0040
 
 ; =========================================================
 ; Zarby Code

Masks/all_masks.asm

@@ -25,15 +25,11 @@ DekuFloating   = $70
 ; Unset, will shoot deku bubble instead
 DekuHover      = $71
 
-; =========================================================
-
 AddTransformationCloud = $09912C
 Link_CheckNewY_ButtonPress = $07B073
 LinkItem_EvaluateMagicCost = $07B0AB
 Player_DoSfx2 = $078028
 
-; =========================================================
-
 incsrc "Masks/mask_routines.asm"
 
 ; Start of free space in bank 07

Masks/mask_routines.asm

@@ -102,7 +102,7 @@ ForceResetMask_SaveAndQuit:
 
 Palette_ArmorAndGloves:
 {
-  LDA   !CurrentMask : CMP #$01 : BEQ .deku_mask
+  LDA !CurrentMask : CMP.b #$01 : BEQ .deku_mask
                      CMP.b #$02 : BEQ .zora_mask
                      CMP.b #$03 : BEQ .wolf_mask
                      CMP.b #$04 : BEQ .bunny_hood
@@ -112,31 +112,26 @@ Palette_ArmorAndGloves:
                         JMP   .original_sprite
 
   .deku_mask
-    ; Load Deku Mask Location
   LDA.b #$35 : STA $BC
   JSL UpdateDekuPalette
   RTL
 
   .zora_mask
-    ; Load Zora Mask Location
   LDA.b #$36 : STA $BC
   JSL UpdateZoraPalette
   RTL
 
   .wolf_mask
-    ; Load Wolf Mask Location
   LDA.b #$38 : STA $BC
   JSL $38F000
   RTL
 
   .bunny_hood
-    ; Load Bunny Hood Location
   LDA.b #$37 : STA $BC
   JSL $37F000
   RTL
 
   .minish_form
-    ; Load Minish Form Location
   LDA.b #$39 : STA $BC : JMP .original_palette
 
   .gbc_form
@@ -284,7 +279,6 @@ LinkItem_CheckForSwordSwing_Masks:
       CMP.b #$06 : BEQ .return ; gbc link can use sword
         LDA #$01
         RTL
-
   .return
   LDA $3B : AND.b #$10 ; Restore Link_CheckForSwordSwing
   RTL
@@ -399,17 +393,6 @@ PrepareQuakeSpell:
 
 ; =========================================================
 
-InitCamera:
-{
-  LDA.b $22 : STA.b $3F
-  LDA.b $23 : STA.b $41
-  LDA.b LinkY : STA.b $3E
-  LDA.b LinkYH : STA.b $40
-  RTS
-}
-
-; =========================================================
-
 HandleMovement:
 {
   LDA $F0 : AND #$08 : BEQ .not_up
@@ -550,22 +533,18 @@ DekuLink_SkipPitSlip:
 
 pushpc
 
-org $07C729
+org $07C729 : JSL DekuLink_SkipPitSlip
-  JSL DekuLink_SkipPitSlip
 
-org $07BCEE
+org $07BCEE : JSL DekuLink_SkipPitSlip
-  JSL DekuLink_SkipPitSlip
 
-org $088399
+org $088399 : dw Ancilla0E_MagicBubble
-  dw Ancilla0E_MagicBubble
 
 org $08FFDA ; Bank 08 Free space
   Ancilla0E_MagicBubble:
     JSL Ancilla0E_MagicBubbleLong
     RTS
 
-org $07903F
+org $07903F : JSL DekuLink_CheckForDash
-  JSL DekuLink_CheckForDash
 
 pullpc
 
@@ -849,9 +828,7 @@ Ancilla_Move_Z:
 Ancilla_Killa:
   PLA
   PLA
-
   STZ.w AnciType, X
-
   RTS
 
 Ancilla_BoundsCheck:
@@ -1312,8 +1289,7 @@ MagicBubbleSwapDynamicGfx:
 pushpc
 
 ; Magic Bubble Ancilla damage class
-org $06EC8C
+org $06EC8C : db $01
- db $01
 
 ; =========================================================
 
@@ -1328,14 +1304,9 @@ LinkOAM_DrawShield:
 
   NOP #3
   BEQ .no_shield
-
+    LDA.l $7EF35A : AND.w #$00FF : BEQ .no_shield
-  LDA.l $7EF35A
-  AND.w #$00FF
-  BEQ .no_shield
-
       JSR LinkOAM_SetEquipmentVRAMOffsets
       BCC .shield_continue
-
   .no_shield
   BRL LinkOAM_DrawShadow
 
@@ -1366,8 +1337,7 @@ LinkOAM_CheckForDrawShield:
 
 pushpc
 
-org $07A94F
+org $07A94F : JSL CheckForTwoWayMirror
-  JSL CheckForTwoWayMirror
 
 pullpc
 
@@ -1377,8 +1347,8 @@ CheckForTwoWayMirror:
     LDA.b #$01
     RTL
   .vanilla_code
-  #_07A94F: LDA.b $8A
+  LDA.b $8A
-  #_07A951: AND.b #$40
+  AND.b #$40
   RTL
 }
 

Masks/minish_form.asm

@@ -15,10 +15,7 @@ org $07D8A0
   dw LinkState_CheckMinishTile
 
 ; LinkState_Bunny.not_moving
-org $078427
+org $078427 : JSR $9BAA ; Link_HandleAPress
-  JSR $9BAA ; Link_HandleAPress
-
-; =========================================================
 
 pullpc
 LinkState_CheckForMinishForm: