diff --git a/Dungeons/house_tag.asm b/Dungeons/house_tag.asm
index d079a25..9ce772c 100644
--- a/Dungeons/house_tag.asm
+++ b/Dungeons/house_tag.asm
@@ -95,7 +95,7 @@ HouseTag_WakeUpPlayer:
   ; Set the game mode
   LDA #$00 : STA $7EF3C5   ; (0 - intro, 1 - pendants, 2 - crystals)
   LDA #$00 : STA $7EF3CC   ; disable telepathic message
-  JSL $00FC41   ; fix monsters
+  JSL Sprite_LoadGfxProperties
   
   RTS
 }
diff --git a/Items/bottle_net.asm b/Items/bottle_net.asm
index c117aa0..bb30dbb 100644
--- a/Items/bottle_net.asm
+++ b/Items/bottle_net.asm
@@ -4,11 +4,8 @@
 
 !BottleFlag = $0AA6
 
-org $1EFE33
-PlayerItem_SpawnFaerie:
-
-org $1EDCCF
-PlayerItem_ReleaseBee:
+PlayerItem_SpawnFaerie = $1EFE33
+PlayerItem_ReleaseBee = $1EDCCF
 
 ; =============================================================================
 ; LinkItem_Bottle
@@ -155,7 +152,7 @@ LinkItem_Bottles:
   LDA.b #$0E : STA.b $10
   LDA.b #$07 : STA.w $0208
   
-  JSL $0DFA58
+  JSL RebuildHUD_long
   
   RTS
 
@@ -175,7 +172,7 @@ LinkItem_Bottles:
   LDA.b #$0E : STA.b $10
   LDA.b #$07 : STA.w $0208
 
-  JSL $0DFA58 ; RebuildHUD_long 
+  JSL RebuildHUD_long
   BRA .bottle_exit
 
 .LinkItem_BluePotion
@@ -194,7 +191,7 @@ LinkItem_Bottles:
   LDA.b #$0E : STA.b $10
   LDA.b #$07 : STA.w $0208
   
-  JSL $0DFA58 ; RebuildHUD_Long 
+  JSL RebuildHUD_long
   BRA .bottle_exit
 
 .LinkItem_FairyBottle
@@ -203,7 +200,7 @@ LinkItem_Bottles:
   BRL LinkGoBeep ; BRL $07A955
 
 .released
-  JSL $0DFA58 ; RebuildHUD_Long 
+  JSL RebuildHUD_long
   BRA .bottle_exit
 
 .LinkItem_BeeBottle
@@ -213,7 +210,7 @@ LinkItem_Bottles:
 
 .bee_spawn_success
   LDA.b #$02 : STA.l $7EF35C, X
-  JSL $0DFA58 ; RebuildHUD_Long 
+  JSL RebuildHUD_long
 
 .bottle_exit
   RTS
diff --git a/Items/goldstar.asm b/Items/goldstar.asm
index 083016f..5b15061 100644
--- a/Items/goldstar.asm
+++ b/Items/goldstar.asm
@@ -959,7 +959,7 @@ BeginGoldstarOrHookshot:
   JSL Hookshot_Init
   JSL BallChain_StartAnimationFlag
   LDY.b #$03 : LDA.b #$1F ; ANCILLA 1F
-  JSL $099B10 ; AncillaAdd_Hookshot
+  JSL AncillaAdd_Hookshot
   JSL TransferGFXinRAM
   RTL
   
@@ -968,7 +968,7 @@ BeginGoldstarOrHookshot:
   LDA.b #$13 : STA $5D ; Set hookshot state
   LDA.b #$01 : STA.w $037B
   LDY.b #$03 : LDA.b #$1F ; ANCILLA 1F
-  JSL $099B10 ; AncillaAdd_Hookshot
+  JSL AncillaAdd_Hookshot
   RTL
 }
 
diff --git a/Masks/gbc_form.asm b/Masks/gbc_form.asm
index 82778de..7af4dc6 100644
--- a/Masks/gbc_form.asm
+++ b/Masks/gbc_form.asm
@@ -98,7 +98,7 @@ OverworldTransition_CheckForGbcLink:
       LDA #$06 : STA $02B2
       JSL Palette_ArmorAndGloves
   .return
-  JSL $07E6A6 ; Link_HandleMovingAnimation_FullLongEntry
+  JSL Link_HandleMovingAnimation_FullLongEntry
   RTL
 }
 
diff --git a/Oracle_main.asm b/Oracle_main.asm
index 2c72520..2a3c9e9 100644
--- a/Oracle_main.asm
+++ b/Oracle_main.asm
@@ -83,6 +83,7 @@ namespace Oracle
   incsrc "Util/ram.asm"
   incsrc "Util/functions.asm"
   incsrc "Core/music_macros.asm"
+  incsrc "Sprites/ZSpriteLib/sprites.asm"
 
   incsrc "Core/message.asm"
 
diff --git a/Sprites/Bosses/kydreeok_head.asm b/Sprites/Bosses/kydreeok_head.asm
index 64f1dec..4529185 100644
--- a/Sprites/Bosses/kydreeok_head.asm
+++ b/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
diff --git a/Sprites/Bosses/kydrog.asm b/Sprites/Bosses/kydrog.asm
index 2ac00a3..30b194c 100644
--- a/Sprites/Bosses/kydrog.asm
+++ b/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
 
diff --git a/Sprites/Bosses/kydrog_boss.asm b/Sprites/Bosses/kydrog_boss.asm
index e2330ef..4e25389 100644
--- a/Sprites/Bosses/kydrog_boss.asm
+++ b/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
 
diff --git a/Sprites/NPCs/farore.asm b/Sprites/NPCs/farore.asm
index 0828a09..6d80629 100644
--- a/Sprites/NPCs/farore.asm
+++ b/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
diff --git a/Sprites/Objects/minecart.asm b/Sprites/Objects/minecart.asm
index 3ec7592..d973426 100644
--- a/Sprites/Objects/minecart.asm
+++ b/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
diff --git a/Sprites/Objects/portal_sprite.asm b/Sprites/Objects/portal_sprite.asm
index d7b75f4..9a3b42c 100644
--- a/Sprites/Objects/portal_sprite.asm
+++ b/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
diff --git a/Sprites/ZSpriteLib/sprites.asm b/Sprites/ZSpriteLib/sprites.asm
index 6d39ed3..2eebe00 100644
--- a/Sprites/ZSpriteLib/sprites.asm
+++ b/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
\ No newline at end of file
+Sparkle_PrepOAMFromRadial = $08DA17
+
+Fireball_SpawnTrailGarnish = $09B020
diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm
index 9782892..2824dc3 100644
--- a/Sprites/all_sprites.asm
+++ b/Sprites/all_sprites.asm
@@ -69,7 +69,6 @@ org $05FF7D
 ; =========================================================
 
 incsrc ZSpriteLib/sprite_macros.asm
-incsrc ZSpriteLib/sprites.asm
 
 ; TODO: Sprite_AttemptKillingOfKin