diff --git a/include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h b/include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h index c342d5b3f36..1eb52fca09a 100644 --- a/include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h +++ b/include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h @@ -68,6 +68,8 @@ extern u8 lbl_803ABA44; // Additional symbols needed for d_bg_s_poly_pass_chk.cpp // autogenerated by split.py v0.3 at 2021-01-22 10:32:31.090542 extern "C" { +void __dt__16cBgS_PolyPassChkFv(void); + void __ct__16dBgS_PolyPassChkFv(void); void __dt__16dBgS_PolyPassChkFv(void); @@ -75,6 +77,7 @@ void ChkNoHorse__16dBgS_PolyPassChkFv(void); void ClrBomb__16dBgS_PolyPassChkFv(void); void ClrCam__16dBgS_PolyPassChkFv(void); +void ClrIronBall__16dBgS_PolyPassChkFv(void); void ClrLink__16dBgS_PolyPassChkFv(void); void ClrObj__16dBgS_PolyPassChkFv(void); void ClrStatue__16dBgS_PolyPassChkFv(void); @@ -91,9 +94,6 @@ void SetPassChkInfo__16dBgS_PolyPassChkFR16dBgS_PolyPassChk(void); void SetRope__16dBgS_PolyPassChkFv(void); void SetStatue__16dBgS_PolyPassChkFv(void); void SetUnderwaterRoof__16dBgS_PolyPassChkFv(void); - -void ClrIronBall__16dBgS_PolyPassChkFv(void); -void func_80078FAC(void); } #endif // D_BG_S_POLY_PASS_CHK_H_ diff --git a/ldscript.lcf b/ldscript.lcf index 3dfae138eb0..796c04cc5f8 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -3138,7 +3138,7 @@ func_8002CB30 func_8002CAF0 __ct__14JAISoundHandleFv dispose__14Z2SoundObjBaseFv -func_80078FAC +__dt__16cBgS_PolyPassChkFv ClrIronBall__16dBgS_PolyPassChkFv } /* 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 750ce2cb16a..dd21ec85cc0 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 @@ -90,9 +90,7 @@ void dBgS_PolyPassChk::ClrIronBall() { } extern "C" { -// __dt__16cBgS_PolyPassChkFv -// cBgS_PolyPassChk::~cBgS_PolyPassChk(void) -asm void func_80078FAC(void) { +asm void __dt__16cBgS_PolyPassChkFv(void) { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078FAC.s" }