Cleanup ocarina.asm

Items/ocarina.asm

@@ -125,12 +125,8 @@ assert pc() <= $1A922B
 
 org $07A3DB
 LinkItem_FluteHook:
-{
   JSR LinkItem_NewFlute
   RTS
-}
-
-; =========================================================
 
 ; Free Space Bank07
 pullpc
@@ -145,7 +141,6 @@ LinkItem_NewFlute:
   BIT.b $3A : BVC .y_button_not_held
     DEC.w $03F0 : LDA.w $03F0 : BNE ReturnFromFluteHook
     LDA.b $3A : AND.b #$BF : STA.b $3A
-
   .y_button_not_held
 
   ; Check for Switch Swong
@@ -252,10 +247,8 @@ LinkItem_NewFlute:
 ; =========================================================
 
 UpdateFluteSong:
-{
   JSL UpdateFluteSong_Long
   RTS
-}
 
 Link_HandleCardinalCollision_Long:
 {
@@ -328,7 +321,6 @@ PlayThunderAndRain:
   RTL
 }
 
-
 CheckRealTable:
 {
   LDA $7EE00E : CMP #$00 : BEQ .continue
@@ -351,12 +343,11 @@ ResetOcarinaFlag:
     REP #$30
     LDA #$0000 : STA.l $7EE00E
     SEP #$30
-.continue
+  .continue
   LDA.w $0416 : ASL A
   RTL
 }
 
-
 ; $030F - Current Song RAM
 ; 00 - No Song
 ; 01 - Song of Storms
@@ -372,31 +363,25 @@ ResetOcarinaFlag:
 
 UpdateFluteSong_Long:
 {
-  LDA $7EF34C : CMP.b #$01 : BEQ .notPressed
+  LDA $7EF34C : CMP.b #$01 : BEQ .not_pressed
-
+    LDA $030F : BNE .song_exists
-  LDA $030F : BNE .songExists
       ; if this code is running, we have the flute song 1
       LDA #$01 : STA $030F
-  .songExists
+    .song_exists
     LDA.b $F6
     BIT.b #$20 : BNE .left  ; pressed left
     BIT.b #$10 : BNE .right ; pressed right
       RTL
 
-  .left
+    .left ; L Button Pressed - Decrement song
-  ; L Button Pressed - Decrement song
     ; LDA.b #$13 : JSR Player_DoSfx2
     DEC $030F
-  LDA $030F
+    LDA $030F : CMP #$00 : BEQ .wrap_to_max
-  CMP #$00 : BEQ .wrap_to_max
       BRA .update_song
 
-  .right
+    .right ; R Button Pressed - Increment song
-  ; R Button Pressed - Increment song
+    INC $030F
-  INC $030F        ; increment $030F Song RAM
+    LDA $030F : CMP.b #$05 : BCS .wrap_to_min
-  LDA $030F        ; load incremented Song RAM
-  CMP.b #$05
-  BCS .wrap_to_min
     .update_song
       RTL
 
@@ -414,7 +399,7 @@ UpdateFluteSong_Long:
     .wrap_to_min
     LDA #$01 : STA $030F
 
-  .notPressed
+  .not_pressed
   RTL
 }
 print  "End of Items/ocarina.asm          ", pc
@@ -437,7 +422,7 @@ RainAnimation_Overridden:
   .rainOverlaySet
 
   ; If misery mire has been opened already, we're done.
-    ;LDA.l $7EF2F0 : AND.b #$20 : BNE .skipMovement
+  ; LDA.l $7EF2F0 : AND.b #$20 : BNE .skipMovement
   ; Check the frame counter.
   ; On the third frame do a flash of lightning.
   LDA.b $1A
@@ -459,7 +444,7 @@ RainAnimation_Overridden:
   .thunder
 
   ; Play the thunder sound when outdoors.
-    ;LDX.b #$36 : STX.w $012E
+  ; LDX.b #$36 : STX.w $012E
   JSL PlayThunderAndRain
 
   .lightning
@@ -475,10 +460,8 @@ RainAnimation_Overridden:
   ; Overlay is only moved every 4th frame.
   LDA.b $1A : AND.b #$03 : BNE .skipMovement
     LDA.w $0494 : INC A : AND.b #$03 : STA.w $0494 : TAX
-
     LDA.b $E1 : CLC : ADC.l $02A46D, X : STA.b $E1
     LDA.b $E7 : CLC : ADC.l $02A471, X : STA.b $E7
-
   .skipMovement
 
   RTL