diff --git a/configure.py b/configure.py index 2ab0170c8..7c5f48855 100644 --- a/configure.py +++ b/configure.py @@ -1260,7 +1260,7 @@ config.libs = [ ActorRel(Matching, "d_a_obj_akabe"), ActorRel(NonMatching, "d_a_obj_barrel"), ActorRel(NonMatching, "d_a_obj_barrel2"), - ActorRel(NonMatching, "d_a_obj_bscurtain"), + ActorRel(Matching, "d_a_obj_bscurtain", extra_cflags=['-pragma "nosyminline on"']), ActorRel(Matching, "d_a_obj_cafelmp"), ActorRel(NonMatching, "d_a_obj_coming"), ActorRel(NonMatching, "d_a_obj_demo_barrel"), diff --git a/include/d/actor/d_a_obj_bscurtain.h b/include/d/actor/d_a_obj_bscurtain.h index e2ffdec14..09d14fd61 100644 --- a/include/d/actor/d_a_obj_bscurtain.h +++ b/include/d/actor/d_a_obj_bscurtain.h @@ -22,7 +22,7 @@ public: /* 0x29C */ J3DModel * mpModel; }; -class daObj_Bscurtain_HIO_c : public mDoHIO_entry_c { +class daObj_Bscurtain_HIO_c { public: daObj_Bscurtain_HIO_c(); virtual ~daObj_Bscurtain_HIO_c() {} diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp index 8b028c13f..602d66ba9 100644 --- a/src/d/actor/d_a_obj_bscurtain.cpp +++ b/src/d/actor/d_a_obj_bscurtain.cpp @@ -14,9 +14,9 @@ #include "m_Do/m_Do_hostIO.h" #include "m_Do/m_Do_mtx.h" -daObj_Bscurtain_HIO_c l_HIO; +static u8 dummy[0x4C]; // TODO -const char daObj_Bscurtain_c::M_arcname[4] = "Ptc"; +daObj_Bscurtain_HIO_c l_HIO; /* 000000EC-00000118 .text __ct__21daObj_Bscurtain_HIO_cFv */ daObj_Bscurtain_HIO_c::daObj_Bscurtain_HIO_c() { @@ -25,6 +25,8 @@ daObj_Bscurtain_HIO_c::daObj_Bscurtain_HIO_c() { field_0x0c = 0; } +const char daObj_Bscurtain_c::M_arcname[4] = "Ptc"; + /* 00000118-000001C8 .text set_mtx__17daObj_Bscurtain_cFv */ void daObj_Bscurtain_c::set_mtx() { static cXyz trans = cXyz::Zero;