diff --git a/configure.py b/configure.py index bc1761e97..4012fbbdf 100755 --- a/configure.py +++ b/configure.py @@ -1391,7 +1391,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_lod_bg"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_lwood"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_magma"), - ActorRel(NonMatching, "d_a_majuu_flag", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Equivalent, "d_a_majuu_flag", extra_cflags=['-pragma "nosyminline on"']), # weak func order ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_mdoor", extra_cflags=['-pragma "nosyminline on"']), ActorRel(MatchingFor("D44J01"), "d_a_msw", extra_cflags=['-pragma "nosyminline on"']), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_mtoge"), diff --git a/src/d/actor/d_a_majuu_flag.cpp b/src/d/actor/d_a_majuu_flag.cpp index 42e9ac3d9..4416cf403 100644 --- a/src/d/actor/d_a_majuu_flag.cpp +++ b/src/d/actor/d_a_majuu_flag.cpp @@ -16,7 +16,8 @@ #include "dolphin/gx/GXTexture.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_graphic.h" -#include "m_Do/m_Do_hostIO.h" + +#include "weak_data_1811.h" // IWYU pragma: keep class daMajuu_Flag_HIO_c : public mDoHIO_entry_c { public: @@ -36,7 +37,6 @@ public: m07 = 0; m08 = 0; } - virtual ~daMajuu_Flag_HIO_c() {} void genMessage(JORMContext* ctx); @@ -60,8 +60,6 @@ public: static daMajuu_Flag_HIO_c l_HIO; -#include "weak_data_1811.h" // IWYU pragma: keep - static u8 unused1[16] = {0}; // IWYU pragma: keep #include "assets/l_flag02TEX.h"