Removeall remaining sym off fakematches, correctly fix more weak func order

4 files changed, 41 insertions, 4 deletions

diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp
index 10e20fc1..1b47a0f3 100644
--- a/src/d/actor/d_a_bst.cpp
+++ b/src/d/actor/d_a_bst.cpp
@@ -23,6 +23,19 @@
 #include "d/d_cc_d.h"
 #include "JSystem/JUtility/JUTReport.h"
 
+class daBst_HIO_c : public JORReflexible {
+public:
+    daBst_HIO_c();
+    virtual ~daBst_HIO_c() {}
+
+    void genMessage(JORMContext* ctx);
+
+public:
+    /* 0x4 */ s8 field_0x4;
+    /* 0x5 */ u8 field_0x5;
+    /* 0x6 */ u8 field_0x6;
+};
+
 static u8 hio_set;
 static daBst_HIO_c l_HIO;
 
diff --git a/src/d/actor/d_a_npc_bmsw.cpp b/src/d/actor/d_a_npc_bmsw.cpp
index 98de3941..7c3d58f0 100644
--- a/src/d/actor/d_a_npc_bmsw.cpp
+++ b/src/d/actor/d_a_npc_bmsw.cpp
@@ -17,6 +17,34 @@
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_hostIO.h"
 
+class daNpc_Bmsw_HIO_c : public JORReflexible {
+public:
+    daNpc_Bmsw_HIO_c();
+    virtual ~daNpc_Bmsw_HIO_c() {}
+
+    void genMessage(JORMContext* ctx);
+
+public:
+    /* 0x04 */ s8 mNo;
+    /* 0x05 */ u8 field_0x05[0x08 - 0x05];
+    /* 0x08 */ dNpc_HIO_c mNpc;
+    /* 0x30 */ s16 field_0x30;
+    /* 0x32 */ s16 field_0x32;
+    /* 0x34 */ s16 field_0x34;
+    /* 0x36 */ s16 r_1;
+    /* 0x38 */ s16 g_1;
+    /* 0x3A */ s16 b_1;
+    /* 0x3C */ s16 r_2;
+    /* 0x3E */ s16 g_2;
+    /* 0x40 */ s16 b_2;
+    /* 0x42 */ u8 field_0x42[0x44 - 0x42];
+    /* 0x44 */ f32 field_0x44;
+    /* 0x48 */ f32 field_0x48;
+    /* 0x4C */ f32 field_0x4C;
+    /* 0x50 */ f32 field_0x50;
+    /* 0x54 */ f32 field_0x54;
+};  // Size: 0x58
+
 daNpc_Bmsw_HIO_c l_HIO;
 
 
diff --git a/src/d/actor/d_a_obj_homen.cpp b/src/d/actor/d_a_obj_homen.cpp
index 1082b3bd..0ccf5242 100644
--- a/src/d/actor/d_a_obj_homen.cpp
+++ b/src/d/actor/d_a_obj_homen.cpp
@@ -4,9 +4,7 @@
  */
 
 #include "d/dolzel.h" // IWYU pragma: keep
-#pragma sym off
 #include "d/actor/d_a_obj_homen.h"
-#pragma sym on
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
diff --git a/src/d/d_magma.cpp b/src/d/d_magma.cpp
index b5615f04..79580870 100644
--- a/src/d/d_magma.cpp
+++ b/src/d/d_magma.cpp
@@ -11,8 +11,6 @@
 #include "m_Do/m_Do_mtx.h"
 #include "m_Do/m_Do_lib.h"
 
-// #pragma sym on
-
 Mtx l_kuroOrthoMtx;
 Mtx l_colOrthoMtx;
 GXTexObj dMagma_packet_c::mKuroTexObj;