diff --git a/Dungeons/Objects/Collision/main.asm b/Dungeons/Objects/Collision/main.asm
index 9d89ecf..b33f4ea 100644
--- a/Dungeons/Objects/Collision/main.asm
+++ b/Dungeons/Objects/Collision/main.asm
@@ -1,5 +1,5 @@
 incsrc CollisionTablesExpanded_Hook.asm
 
-org $348000
+org $338000
 
 incsrc CollisionTablesExpanded.asm
diff --git a/Dungeons/house_tag.asm b/Dungeons/house_tag.asm
index 663b99e..7103f18 100644
--- a/Dungeons/house_tag.asm
+++ b/Dungeons/house_tag.asm
@@ -10,7 +10,8 @@ org $01CC18 ; override routine 0x39 "Holes(7)"
 org $01CC5A 
   HouseTag_Return:
 
-org $2F8000
+; org $2F8000
+pullpc
 HouseTag:
 {
   PHX 
@@ -110,6 +111,8 @@ HouseTag_End:
   RTS
 }
 
+pushpc
+
 ; ==============================================================================
 ; Dying Uncle Code Hook
 ; Uncle won't remove tagalong when interacting 
diff --git a/Dungeons/spike_subtype.asm b/Dungeons/spike_subtype.asm
index 4c518dc..6cfa1aa 100644
--- a/Dungeons/spike_subtype.asm
+++ b/Dungeons/spike_subtype.asm
@@ -44,4 +44,5 @@ LDA $0D40, X : EOR.b #$FF : INC A : STA $0D40, X
 
 LDA.b #$05 : JSL $0DBB7C ; Sound_SetSfx2PanLong
 
-RTL
\ No newline at end of file
+RTL
+pushpc
\ No newline at end of file
diff --git a/Dungeons/together_warp_tag.asm b/Dungeons/together_warp_tag.asm
index 9793dde..f70a665 100644
--- a/Dungeons/together_warp_tag.asm
+++ b/Dungeons/together_warp_tag.asm
@@ -14,7 +14,7 @@
 
 ;relpaces the original tag.
 
-dw $CC1C ; = $CC1C* ; routine 0x3A "Holes(8)"
+; dw $CC1C ; = $CC1C* ; routine 0x3A "Holes(8)"
 
 org $01CC1C
     JML WarpTag
@@ -24,7 +24,9 @@ org $01CC5A
 
 ; ==============================================================================
 
-org $338000
+; org $338000
+pullpc ; Bank 0x2C
+print "Warp Tag", pc
 WarpTag:
 {
     PHX
diff --git a/Masks/deku_mask.asm b/Masks/deku_mask.asm
index cabc5b8..3b6617b 100644
--- a/Masks/deku_mask.asm
+++ b/Masks/deku_mask.asm
@@ -69,7 +69,7 @@ LinkState_UsingQuake:
 warnpc $07A779
 
 
-org $318000
+org $348000
 ; org $07A013
 ;   JSL LinkItem_SlingshotPrepare
 
diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm
index 06da339..6299c47 100644
--- a/Sprites/all_sprites.asm
+++ b/Sprites/all_sprites.asm
@@ -28,12 +28,12 @@ incsrc ZSpriteLib/sprite_functions_hooks.asm
 
 ;==============================================================================
 
-org    $298000
+org    $308000
 incsrc ZSpriteLib/sprite_new_table.asm
 
 ;==============================================================================
 
-org    $2A8000
+org    $318000
 incsrc ZSpriteLib/sprite_new_functions.asm
 
 incsrc "Sprites/farore.asm"
@@ -86,4 +86,4 @@ print  "End of poltergeist.asm            ",  pc
 
 incsrc "Sprites/NPCs/bug_net_kid.asm"
 
-warnpc $2B8000
\ No newline at end of file
+warnpc $328000
\ No newline at end of file