diff --git a/system/client-functions/RareDropNotifications/RareDropNotifications.4OED.patch.s b/system/client-functions/RareDropNotifications/RareDropNotifications.4OED.patch.s
index 513a2677..ac505d14 100644
--- a/system/client-functions/RareDropNotifications/RareDropNotifications.4OED.patch.s
+++ b/system/client-functions/RareDropNotifications/RareDropNotifications.4OED.patch.s
@@ -51,28 +51,29 @@ sound1_start:
   pop       edi  # From original function
   pop       esi  # From original function
   add       esp, 0xC  # From original function
+  test      eax, eax
+  je        fail  # Item does not exist (was on a different floor)
   cmp       byte [eax + 0xEF], 0x4
-  je        do_sound
+  je        +0x503  # sound2_start
+fail:
   ret
-do_sound:
-  xor       ecx, ecx
-  push      ecx
-  jmp       +0x502  # sound2_start
 sound1_end:
 
   .data     0x00188A52
   .deltaof  sound2_start, sound2_end
 sound2_start:
+  xor       ecx, ecx
+  push      ecx
   push      ecx
   push      ecx
   push      0x0000055E
-  call      +0x162732  # 002EB190 => play_sound(0x55E, nullptr, 0, 0);
-  jmp       +0x31  # sound3_start
+  jmp       +0x33  # sound3_start
 sound2_end:
 
   .data     0x00188A91
   .deltaof  sound3_start, sound3_end
 sound3_start:
+  call      +0x1626FA  # 002EB190 => play_sound(0x55E, nullptr, 0, 0);
   add       esp, 0x10
   ret
 sound3_end:
diff --git a/system/client-functions/RareDropNotifications/RareDropNotifications.4OEU.patch.s b/system/client-functions/RareDropNotifications/RareDropNotifications.4OEU.patch.s
index c3364a9a..ddf51916 100644
--- a/system/client-functions/RareDropNotifications/RareDropNotifications.4OEU.patch.s
+++ b/system/client-functions/RareDropNotifications/RareDropNotifications.4OEU.patch.s
@@ -51,28 +51,29 @@ sound1_start:
   pop       edi  # From original function
   pop       esi  # From original function
   add       esp, 0xC  # From original function
+  test      eax, eax
+  je        fail  # Item does not exist (was on a different floor)
   cmp       byte [eax + 0xEF], 0x4
-  je        do_sound
+  je        +0x503  # sound2_start
+fail:
   ret
-do_sound:
-  xor       ecx, ecx
-  push      ecx
-  jmp       +0x502  # sound2_start
 sound1_end:
 
   .data     0x00188A92
   .deltaof  sound2_start, sound2_end
 sound2_start:
+  xor       ecx, ecx
+  push      ecx
   push      ecx
   push      ecx
   push      0x0000055E
-  call      +0x162912  # 002EB3B0 => play_sound(0x55E, nullptr, 0, 0);
-  jmp       +0x31  # sound3_start
+  jmp       +0x33  # sound3_start
 sound2_end:
 
   .data     0x00188AD1
   .deltaof  sound3_start, sound3_end
 sound3_start:
+  call      +0x1628DA  # 002EB3B0 => play_sound(0x55E, nullptr, 0, 0);
   add       esp, 0x10
   ret
 sound3_end:
diff --git a/system/client-functions/RareDropNotifications/RareDropNotifications.4OJB.patch.s b/system/client-functions/RareDropNotifications/RareDropNotifications.4OJB.patch.s
index 6e8960b1..bb5f4225 100644
--- a/system/client-functions/RareDropNotifications/RareDropNotifications.4OJB.patch.s
+++ b/system/client-functions/RareDropNotifications/RareDropNotifications.4OJB.patch.s
@@ -51,28 +51,29 @@ sound1_start:
   pop       edi  # From original function
   pop       esi  # From original function
   add       esp, 0xC  # From original function
+  test      eax, eax
+  je        fail  # Item does not exist (was on a different floor)
   cmp       byte [eax + 0xEF], 0x4
-  je        do_sound
+  je        +0x503  # sound2_start
+fail:
   ret
-do_sound:
-  xor       ecx, ecx
-  push      ecx
-  jmp       +0x502  # sound2_start
 sound1_end:
 
   .data     0x001888A2
   .deltaof  sound2_start, sound2_end
 sound2_start:
+  xor       ecx, ecx
+  push      ecx
   push      ecx
   push      ecx
   push      0x0000055E
-  call      +0x160982  # 002E9230 => play_sound(0x55E, nullptr, 0, 0);
-  jmp       +0x31  # sound3_start
+  jmp       +0x33  # sound3_start
 sound2_end:
 
   .data     0x001888E1
   .deltaof  sound3_start, sound3_end
 sound3_start:
+  call      +0x16094A  # 002E9230 => play_sound(0x55E, nullptr, 0, 0);
   add       esp, 0x10
   ret
 sound3_end:
diff --git a/system/client-functions/RareDropNotifications/RareDropNotifications.4OJD.patch.s b/system/client-functions/RareDropNotifications/RareDropNotifications.4OJD.patch.s
index 92a03c42..0dfc8fb1 100644
--- a/system/client-functions/RareDropNotifications/RareDropNotifications.4OJD.patch.s
+++ b/system/client-functions/RareDropNotifications/RareDropNotifications.4OJD.patch.s
@@ -51,28 +51,29 @@ sound1_start:
   pop       edi  # From original function
   pop       esi  # From original function
   add       esp, 0xC  # From original function
+  test      eax, eax
+  je        fail  # Item does not exist (was on a different floor)
   cmp       byte [eax + 0xEF], 0x4
-  je        do_sound
+  je        +0x503  # sound2_start
+fail:
   ret
-do_sound:
-  xor       ecx, ecx
-  push      ecx
-  jmp       +0x502  # sound2_start
 sound1_end:
 
   .data     0x00188A62
   .deltaof  sound2_start, sound2_end
 sound2_start:
+  xor       ecx, ecx
+  push      ecx
   push      ecx
   push      ecx
   push      0x0000055E
-  call      +0x161342  # 002E9DB0 => play_sound(0x55E, nullptr, 0, 0);
-  jmp       +0x31  # sound3_start
+  jmp       +0x33  # sound3_start
 sound2_end:
 
   .data     0x00188AA1
   .deltaof  sound3_start, sound3_end
 sound3_start:
+  call      +0x16130A  # 002E9DB0 => play_sound(0x55E, nullptr, 0, 0);
   add       esp, 0x10
   ret
 sound3_end:
diff --git a/system/client-functions/RareDropNotifications/RareDropNotifications.4OJU.patch.s b/system/client-functions/RareDropNotifications/RareDropNotifications.4OJU.patch.s
index 7ab64270..fb45f541 100644
--- a/system/client-functions/RareDropNotifications/RareDropNotifications.4OJU.patch.s
+++ b/system/client-functions/RareDropNotifications/RareDropNotifications.4OJU.patch.s
@@ -51,28 +51,29 @@ sound1_start:
   pop       edi  # From original function
   pop       esi  # From original function
   add       esp, 0xC  # From original function
+  test      eax, eax
+  je        fail  # Item does not exist (was on a different floor)
   cmp       byte [eax + 0xEF], 0x4
-  je        do_sound
+  je        +0x503  # sound2_start
+fail:
   ret
-do_sound:
-  xor       ecx, ecx
-  push      ecx
-  jmp       +0x502  # sound2_start
 sound1_end:
 
   .data     0x00188B62
   .deltaof  sound2_start, sound2_end
 sound2_start:
+  xor       ecx, ecx
+  push      ecx
   push      ecx
   push      ecx
   push      0x0000055E
-  call      +0x162822  # 002EB390 => play_sound(0x55E, nullptr, 0, 0);
-  jmp       +0x31  # sound3_start
+  jmp       +0x33  # sound3_start
 sound2_end:
 
   .data     0x00188BA1
   .deltaof  sound3_start, sound3_end
 sound3_start:
+  call      +0x1627EA  # 002EB390 => play_sound(0x55E, nullptr, 0, 0);
   add       esp, 0x10
   ret
 sound3_end:
diff --git a/system/client-functions/RareDropNotifications/RareDropNotifications.4OPD.patch.s b/system/client-functions/RareDropNotifications/RareDropNotifications.4OPD.patch.s
index 0d46d7b8..42da7946 100644
--- a/system/client-functions/RareDropNotifications/RareDropNotifications.4OPD.patch.s
+++ b/system/client-functions/RareDropNotifications/RareDropNotifications.4OPD.patch.s
@@ -51,28 +51,29 @@ sound1_start:
   pop       edi  # From original function
   pop       esi  # From original function
   add       esp, 0xC  # From original function
+  test      eax, eax
+  je        fail  # Item does not exist (was on a different floor)
   cmp       byte [eax + 0xEF], 0x4
-  je        do_sound
+  je        +0x503  # sound2_start
+fail:
   ret
-do_sound:
-  xor       ecx, ecx
-  push      ecx
-  jmp       +0x502  # sound2_start
 sound1_end:
 
   .data     0x00188A72
   .deltaof  sound2_start, sound2_end
 sound2_start:
+  xor       ecx, ecx
+  push      ecx
   push      ecx
   push      ecx
   push      0x0000055E
-  call      +0x162742  # 002EB1C0 => play_sound(0x55E, nullptr, 0, 0);
-  jmp       +0x31  # sound3_start
+  jmp       +0x33  # sound3_start
 sound2_end:
 
   .data     0x00188AB1
   .deltaof  sound3_start, sound3_end
 sound3_start:
+  call      +0x16270A  # 002EB1C0 => play_sound(0x55E, nullptr, 0, 0);
   add       esp, 0x10
   ret
 sound3_end:
diff --git a/system/client-functions/RareDropNotifications/RareDropNotifications.4OPU.patch.s b/system/client-functions/RareDropNotifications/RareDropNotifications.4OPU.patch.s
index e2609a32..84864591 100644
--- a/system/client-functions/RareDropNotifications/RareDropNotifications.4OPU.patch.s
+++ b/system/client-functions/RareDropNotifications/RareDropNotifications.4OPU.patch.s
@@ -51,28 +51,29 @@ sound1_start:
   pop       edi  # From original function
   pop       esi  # From original function
   add       esp, 0xC  # From original function
+  test      eax, eax
+  je        fail  # Item does not exist (was on a different floor)
   cmp       byte [eax + 0xEF], 0x4
-  je        do_sound
+  je        +0x503  # sound2_start
+fail:
   ret
-do_sound:
-  xor       ecx, ecx
-  push      ecx
-  jmp       +0x502  # sound2_start
 sound1_end:
 
   .data     0x00188A52
   .deltaof  sound2_start, sound2_end
 sound2_start:
+  xor       ecx, ecx
+  push      ecx
   push      ecx
   push      ecx
   push      0x0000055E
-  call      +0x162982  # 002EB3E0 => play_sound(0x55E, nullptr, 0, 0);
-  jmp       +0x31  # sound3_start
+  jmp       +0x33  # sound3_start
 sound2_end:
 
   .data     0x00188A91
   .deltaof  sound3_start, sound3_end
 sound3_start:
+  call      +0x16294A  # 002EB3E0 => play_sound(0x55E, nullptr, 0, 0);
   add       esp, 0x10
   ret
 sound3_end: