cleanup goldstar

Items/goldstar.asm

@@ -28,8 +28,8 @@ TransferGFXinRAM:
   .morningstargfx
     incbin morningstar.bin
 }
-pushpc
 
+pushpc
 ; OAM Draw Pattern for spikeball gfx
 org $0085C4
   dw $0040
@@ -302,7 +302,7 @@ Goldstar_SetChainProperties:
     LDA HookshotSpriteData.prop, X
     ORA.b #$02 : ORA.b $65
     RTL
-.ball_chain ; 22D860
+  .ball_chain ; 22D860
   LDA HookshotSpriteData.prop, X
   ORA.b #$02 
   ORA.b $65
@@ -520,8 +520,7 @@ Routine_22DA70:
 
 Routine_22DA80:
 {
-    LDA $7EF34A : CMP #$02
-    BNE + ; $22DA89
+  LDA $7EF34A : CMP #$02 : BNE + ; $22DA89
     RTL
   +
   CMP #$01 : BEQ ++ ; $22DA93
@@ -539,27 +538,27 @@ Routine_22DAA0:
 {
   CPY #$04 : BNE .alpha
     JMP Routine_22DB50 ; $DB50
-.alpha ; 22DAA7
+  .alpha ; 22DAA7
   CPY #$08 : BNE + 
     LDA #$00
     RTS
-+ ; 22DAAE
+  + ; 22DAAE
   CPY #$0C : BNE ++
     LDA #$04
     RTS
-++ ; 22DAB5
+  ++ ; 22DAB5
   CPY #$10 : BNE +++ 
     LDA #$08
     RTS
-+++ ; 22DABC
+  +++ ; 22DABC
   CPY #$14 : BNE ++++ 
     LDA #$0C
     RTS
-++++ ; 22DAC3
+  ++++ ; 22DAC3
   CPY #$18 : BNE +++++ ; $22DACA
     LDA #$10
     RTS
-+++++ ; 22DACA
+  +++++ ; 22DACA
   LDA #$02
   RTS
 }
@@ -598,7 +597,7 @@ pullpc
 ; Hookshot box size 
 BallChain_TryAncillaDraw:
 {
-  ; Ball Chain timer should be $FF here on first run
+; Ball Chain timer should be $FF here on first run
   LDA $7A : AND #$00FF : CMP #$0000 : BEQ + 
     CMP #$0001 : BEQ +
       SEP #$20
@@ -734,7 +733,7 @@ HookshotOrBallChain_Extending_ignore_collision:
   LDA $7A  : CMP #$00 : BNE + 
     JSL Hookshot_CheckTileCollision ; $07D576
     JML $08BE01 ; Hookshot_Extending_ignore_collision continue
-+ ; 22DC5E
+  + ; 22DC5E
   JML $08BEDC ; AncillaDraw_Hookshot
 }
 
@@ -1020,9 +1019,9 @@ MaybeUploadBirdGraphicsToOam:
 {
   LDY $037A : CPY #$0104 : BEQ .here
     LDY #$40E0 : STY $2116
-      JML $008B30
+    JML $008B30 ; NMI_DoUpdates
   .here
-    JML $008B50
+  JML $008B50 ; NMI_DoUpdates.no_update_swagduck
 }
 
 ApplyGoldstarDamageClass:
@@ -1035,10 +1034,10 @@ ApplyGoldstarDamageClass:
       PLA
       LDA #$02
       JMP .apply
-.return
+  .return
   PLA
   .apply
-  JSL $06ED25 ; .apply
+  JSL $06ED25 ; Ancilla_CheckDamageToSprite_preset.apply
   RTL
 }