diff --git a/src/funcs.h b/src/funcs.h
index 8a17b42..9088264 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -2701,7 +2701,7 @@ uint16 Xray_Func5(void);
 uint16 Xray_Func7(uint16 j);
 uint16 Xray_Func8(uint16 j);
 uint16 Xray_Func9(uint16 j);
-uint8 CanXrayShowBlocks(void);
+bool CanXrayShowBlocks(void);
 uint8 HandleBeamChargePalettes(void);
 uint8 HandleCollDueToChangedPose_Block_CollAbove(void);
 uint8 HandleCollDueToChangedPose_Block_CollBelow(void);
@@ -2769,7 +2769,6 @@ uint8 Xray_Initialize(void);
 uint8 nullsub_164(void);
 void CalculateXrayHdmaTable_OriginOffScreen(uint16 k, uint16 j);
 void CalculateXrayHdmaTable_OriginOnScreen(uint16 k, uint16 j);
-void CanXrayShowBlocks_(void);
 void CopyToSamusSuitPalette(uint16 k);
 void CopyToSamusSuitTargetPalette(uint16 k);
 void DemoObjectInputHandler(void);
diff --git a/src/sm_88.c b/src/sm_88.c
index 924a26d..0c044ea 100644
--- a/src/sm_88.c
+++ b/src/sm_88.c
@@ -780,7 +780,7 @@ void HdmaobjPreInstr_Xray(uint16 k) {
   v1 = 4096;
   if (fx_type != 36) {
     v1 = 0x2000;
-    if ((CanXrayShowBlocks() & 2) == 0) {
+    if (CanXrayShowBlocks()) {
       v1 = 0x4000;
       *(uint16 *)&reg_COLDATA[0] = 0x27;
       *(uint16 *)&reg_COLDATA[1] = 0x47;
@@ -925,7 +925,7 @@ void HdmaobjPreInstr_XrayFunc3_DeactivateBeam(uint16 k) {  // 0x888934
   v1 = 4096;
   if (fx_type != 36) {
     v1 = 0x2000;
-    if ((CanXrayShowBlocks() & 2) == 0)
+    if (CanXrayShowBlocks())
       v1 = 0x4000;
   }
   fx_layer_blending_config_c |= v1;
@@ -953,7 +953,7 @@ void HdmaobjPreInstr_XrayFunc4_DeactivateBeam(uint16 k) {  // 0x8889BA
   v1 = 4096;
   if (fx_type != 36) {
     v1 = 0x2000;
-    if ((CanXrayShowBlocks() & 2) == 0)
+    if (CanXrayShowBlocks())
       v1 = 0x4000;
   }
   fx_layer_blending_config_c |= v1;
@@ -974,7 +974,7 @@ void HdmaobjPreInstr_XrayFunc5_DeactivateBeam(uint16 k) {  // 0x888A08
   v1 = 4096;
   if (fx_type != 36) {
     v1 = 0x2000;
-    if ((CanXrayShowBlocks() & 2) == 0)
+    if (CanXrayShowBlocks())
       v1 = 0x4000;
   }
   fx_layer_blending_config_c |= v1;
diff --git a/src/sm_91.c b/src/sm_91.c
index ac87168..2528bf7 100644
--- a/src/sm_91.c
+++ b/src/sm_91.c
@@ -2339,7 +2339,7 @@ void Xray_Func16(uint16 a) {  // 0x91D0A6
 void Xray_SetupStage5(void) {  // 0x91D0D3
   unsigned int v1;
 
-  if ((CanXrayShowBlocks() & 2) == 0) {
+  if (CanXrayShowBlocks()) {
     if (earthquake_timer) {
       reg_BG1HOFS = layer1_x_pos + bg1_x_offset;
       reg_BG1VOFS = layer1_y_pos + bg1_y_offset;
@@ -2358,24 +2358,20 @@ void Xray_SetupStage5(void) {  // 0x91D0D3
   vram_read_queue_tail = v0 + 9;
 }
 
-void CanXrayShowBlocks_(void) {  // 0x91D141
-  CanXrayShowBlocks();
-}
-
-uint8 CanXrayShowBlocks(void) {  // 0x91D143
-  uint8 result = room_ptr;
-  if (room_ptr != (uint16)addr_kRoom_a66a && room_ptr != (uint16)addr_kRoom_cefb) {
-    result = fx_type;
-    if (fx_type != 36)
-      return boss_id;
-  }
-  return result;
+bool CanXrayShowBlocks(void) {  // 0x91D143
+  if (room_ptr == addr_kRoom_a66a || room_ptr == addr_kRoom_cefb)
+    return false;
+  if (fx_type == 0x24)
+    return false;
+  if (boss_id == 3 || boss_id == 6 || boss_id == 7 || boss_id == 8 || boss_id == 10)
+    return false;
+  return true;
 }
 
 void Xray_SetupStage6(void) {  // 0x91D173
   VramWriteEntry *v1;
 
-  if ((CanXrayShowBlocks() & 2) == 0) {
+  if (CanXrayShowBlocks()) {
     uint16 v0 = vram_write_queue_tail;
     v1 = gVramWriteEntry(vram_write_queue_tail);
     v1->size = 2048;
@@ -2389,7 +2385,7 @@ void Xray_SetupStage6(void) {  // 0x91D173
 void Xray_SetupStage7(void) {  // 0x91D1A0
   VramWriteEntry *v1;
 
-  if ((CanXrayShowBlocks() & 2) == 0) {
+  if (CanXrayShowBlocks()) {
     uint16 v0 = vram_write_queue_tail;
     v1 = gVramWriteEntry(vram_write_queue_tail);
     v1->size = 2048;
@@ -2423,7 +2419,7 @@ void HdmaobjPreInstr_XraySetup(uint16 k) {  // 0x91D27F
     goto LABEL_4;
   }
   v1 = 0x2000;
-  if ((CanXrayShowBlocks() & 2) == 0) {
+  if (CanXrayShowBlocks()) {
     v1 = 0x4000;
 LABEL_4:
     *(uint16 *)&reg_COLDATA[0] = 0x27;