diff --git a/bugfixes.asm b/bugfixes.asm
index 175c329..0b28bd6 100644
--- a/bugfixes.asm
+++ b/bugfixes.asm
@@ -137,4 +137,14 @@ TryToSpawnCrystalUntilSuccess:
 	.spawned
 	STZ $AE ; the "trying to spawn crystal" flag
 	STZ $AF ; the "trying to spawn pendant" flag
-RTL
\ No newline at end of file
+RTL
+
+;--------------------------------------------------------------------------------
+; Fix crystal not spawning when using somaria vs boss
+WallmasterCameraFix:
+	STZ $A7    ; disable vertical camera scrolling for current room
+	REP #$20
+	STZ $0618  ; something about scrolling, setting these to 0 tricks the game 
+	STZ $061A  ; into thinking we're at the edge of the room so it doesn't scroll.
+	SEP #$20
+	JML Sound_SetSfx3PanLong ; what we wrote over, also this will RTL
\ No newline at end of file
diff --git a/hooks.asm b/hooks.asm
index 8011b52..f0b6838 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -530,6 +530,12 @@ JSL.l AssignKiki
 NOP #2
 ;--------------------------------------------------------------------------------
 
+;================================================================================
+; Wallmaster camera fix
+;--------------------------------------------------------------------------------
+org $1EAF77 ; <- F2F77 sprite_wallmaster.asm : 141 (LDA.b #$2A : JSL Sound_SetSfx3PanLong)
+JSL.l WallmasterCameraFix
+
 ;================================================================================
 ; Hard & Masochist Mode Fixes
 ;--------------------------------------------------------------------------------
@@ -1773,14 +1779,6 @@ dw $05AC, $04FC, $0001, $0027, $00F0 ; Zelda in the water room
 ; org $01CA66 ; <- CA66 Bank01.asm : 10864 - (LDA.w #$2200 : ADD $041C : STA $041C)
 ; LDA.w #$4400 ; #$2200 is the normal speed, $#FF00 is max.
 ;----------------------------------------------------------
-;-- Hobo gives item faster
-; org $06BE3A ; <- 33E3A sprite_hobo.asm : 90 - (db 6, 2, 6, 6, 2, 100, 30)
-; db 6, 2, 6, 6, 2, 6, 30
-;----------------------------------------------------------
-;-- Sick kid gives item faster
-; org $06B9A1 ; <- 339A1 sprite_bug_net_kid : 62 - (db 8, 12, 8, 12, 8, 96, 16)
-; db 8, 12, 8, 12, 8, 32, 16
-;----------------------------------------------------------
 
 ;================================================================================
 ; Ganon Fixes