cleanup labels, move sprites.asm to main

Sprites/Bosses/kydreeok_head.asm

@@ -346,7 +346,7 @@ RandomlyAttack:
       LDA   #$CF
       JSL   Sprite_SpawnDynamically
       JSL   Sprite_SetSpawnedCoords
-      JSL $09B020 ; Fireball_SpawnTrailGarnish
+      JSL   Fireball_SpawnTrailGarnish
       LDA.b #$05 : STA.w SprAction, Y
       LDA   #$20 : STA.w SprTimerA, Y
   .no_attack

Sprites/Bosses/kydrog.asm

@@ -116,7 +116,7 @@ Sprite_Kydrog_Main:
     ; Put us in the Dark World.
     LDA $7EF3CA : EOR.b #$40 : STA $7EF3CA
 
-    JSL $00FC41 ; Sprite_LoadGfxProperties
+    JSL Sprite_LoadGfxProperties
 
     STZ $037B : STZ $3C : STZ $3A : STZ $03EF
 

Sprites/Bosses/kydrog_boss.asm

@@ -326,7 +326,7 @@ Sprite_KydrogBoss_Main:
       LDA.b #$28 ; SFX3.28
       JSL $0DBB8A  ; SpriteSFX_QueueSFX3WithPan
       %GotoAction($0A) ; Goto KydrogBoss_Ascend
-      JSL $09EF56 ; Kill friends
+      JSL Sprite_KillFriends
       RTS
     .continue
 
@@ -404,7 +404,7 @@ Sprite_KydrogBoss_Main:
     %StartOnFrame(0)
     %PlayAnimation(0, 0, 10)
 
-    JSL $09EF56 ; Kill friends
+    JSL Sprite_KillFriends
     LDA $0DA0, X : INC : CMP.b #$08 : BNE .dontReset
       LDA.b #$00
 

Sprites/NPCs/farore.asm

@@ -195,7 +195,7 @@ Sprite_Farore_Main:
     LDA #$02 : STA $7EF3C5   ; (0 - intro, 1 - pendants, 2 - crystals)
     LDA #$05 : STA $012D ; turn off rain sound
     LDA #$01 : STA $B6 ; Set Story State 
-    JSL $00FC41   ; fix monsters
+    JSL Sprite_LoadGfxProperties
 
     %GotoAction(6)
     RTS

Sprites/Objects/minecart.asm

@@ -138,7 +138,7 @@ macro HandlePlayerCamera()
   LDA $20 : SEC : SBC $3E : STA $30
   PHX 
   
-  JSL $07E6A6 ; Link_HandleMovingAnimation_FullLongEntry
+  JSL Link_HandleMovingAnimation_FullLongEntry
   JSL HandleIndoorCameraAndDoors
   
   JSL Link_CancelDash

Sprites/Objects/portal_sprite.asm

@@ -252,7 +252,7 @@ Sprite_Portal_Main:
     LDA $7EC194 : STA $0614
     LDA $7EC196 : STA $0616
 
-    JSL $07E9D3 ; ApplyLinksMovementToCamera
+    JSL ApplyLinksMovementToCamera
 
     PHX ; Infinite loop prevention protocol
     LDA OrangeSpriteIndex : TAX
@@ -276,7 +276,7 @@ Sprite_Portal_Main:
     LDA $7EC194 : STA $0614
     LDA $7EC196 : STA $0616
 
-    JSL $07E9D3 ; ApplyLinksMovementToCamera
+    JSL ApplyLinksMovementToCamera
 
     PHX
     LDA BlueSpriteIndex : TAX

Sprites/ZSpriteLib/sprites.asm

@@ -462,6 +462,8 @@ Sprite_RepelDash = $079291
 
 Sprite_SpawnPoofGarnish = $05AB9C
 
+Sprite_LoadGfxProperties = $00FC41
+
 ThrownSprite_TileAndSpriteInteraction_long = $06DFF2
 
 ; =========================================================
@@ -490,6 +492,10 @@ Mosaic       = $95
 ;    0x00 indicates no sprite in this slot
 UWDEATH         = $7FDF80
 
+; =========================================================
+
+RebuildHUD_long = $0DFA58
+
 ; =========================================================
 ; Controllers
 
@@ -855,7 +861,10 @@ AncillaAdd_SwordSwingSparkle = $0993C2
 AncillaAdd_QuakeSpell = $099589
 AncillaAdd_IceRodShot = $099863
 AncillaAdd_Splash = $0998FC
+AncillaAdd_Hookshot = $099B10
 
 DeleteBoomAndByrnaSparks = $0FFD86
 
-Sparkle_PrepOAMFromRadial = $08DA17
+Sparkle_PrepOAMFromRadial = $08DA17
+
+Fireball_SpawnTrailGarnish = $09B020

Sprites/all_sprites.asm

@@ -69,7 +69,6 @@ org $05FF7D
 ; =========================================================
 
 incsrc ZSpriteLib/sprite_macros.asm
-incsrc ZSpriteLib/sprites.asm
 
 ; TODO: Sprite_AttemptKillingOfKin