diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078F04.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078F04.s
deleted file mode 100644
index 1d391e802b5..00000000000
--- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078F04.s
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 80078F04 00075E44  88 03 00 04 */ lbz r0, 4(r3)
-/* 80078F08 00075E48  28 00 00 00 */ cmplwi r0, 0
-/* 80078F0C 00075E4C  40 82 00 58 */ bne lbl_80078F64
-/* 80078F10 00075E50  88 03 00 05 */ lbz r0, 5(r3)
-/* 80078F14 00075E54  28 00 00 00 */ cmplwi r0, 0
-/* 80078F18 00075E58  40 82 00 4C */ bne lbl_80078F64
-/* 80078F1C 00075E5C  88 03 00 06 */ lbz r0, 6(r3)
-/* 80078F20 00075E60  28 00 00 00 */ cmplwi r0, 0
-/* 80078F24 00075E64  40 82 00 40 */ bne lbl_80078F64
-/* 80078F28 00075E68  88 03 00 07 */ lbz r0, 7(r3)
-/* 80078F2C 00075E6C  28 00 00 00 */ cmplwi r0, 0
-/* 80078F30 00075E70  40 82 00 34 */ bne lbl_80078F64
-/* 80078F34 00075E74  88 03 00 08 */ lbz r0, 8(r3)
-/* 80078F38 00075E78  28 00 00 00 */ cmplwi r0, 0
-/* 80078F3C 00075E7C  40 82 00 28 */ bne lbl_80078F64
-/* 80078F40 00075E80  88 03 00 09 */ lbz r0, 9(r3)
-/* 80078F44 00075E84  28 00 00 00 */ cmplwi r0, 0
-/* 80078F48 00075E88  40 82 00 1C */ bne lbl_80078F64
-/* 80078F4C 00075E8C  88 03 00 0A */ lbz r0, 0xa(r3)
-/* 80078F50 00075E90  28 00 00 00 */ cmplwi r0, 0
-/* 80078F54 00075E94  40 82 00 10 */ bne lbl_80078F64
-/* 80078F58 00075E98  88 03 00 0B */ lbz r0, 0xb(r3)
-/* 80078F5C 00075E9C  28 00 00 00 */ cmplwi r0, 0
-/* 80078F60 00075EA0  41 82 00 0C */ beq lbl_80078F6C
-lbl_80078F64:
-/* 80078F64 00075EA4  38 60 00 01 */ li r3, 1
-/* 80078F68 00075EA8  4E 80 00 20 */ blr
-lbl_80078F6C:
-/* 80078F6C 00075EAC  88 03 00 0C */ lbz r0, 0xc(r3)
-/* 80078F70 00075EB0  7C 00 00 34 */ cntlzw r0, r0
-/* 80078F74 00075EB4  54 03 D9 7E */ srwi r3, r0, 5
-/* 80078F78 00075EB8  4E 80 00 20 */ blr
diff --git a/src/d/d_bg/d_bg_s_poly_pass_chk.cpp b/src/d/d_bg/d_bg_s_poly_pass_chk.cpp
index d84ce81d185..89fc47cadd0 100644
--- a/src/d/d_bg/d_bg_s_poly_pass_chk.cpp
+++ b/src/d/d_bg/d_bg_s_poly_pass_chk.cpp
@@ -83,11 +83,11 @@ void dBgS_PolyPassChk::SetHorse() {
     mHorse = true;
 }
 
-// ChkNoHorse__16dBgS_PolyPassChkFv
-// dBgS_PolyPassChk::ChkNoHorse(void)
-asm bool dBgS_PolyPassChk::ChkNoHorse() {
-    nofralloc
-    #include "d/d_bg/d_bg_s/polypass/asm/func_80078F04.s"
+bool dBgS_PolyPassChk::ChkNoHorse() {
+    if (mObject || mCamera || mLink || mArrow || mBomb || mBoomerang || mRope || mUnderwaterRoof) {
+        return true;
+    }
+    return !mHorse;
 }
 
 void dBgS_PolyPassChk::SetStatue() {