Alter every file that contains static void setMidnaBindEffect to link f_op_actor_enemy.h; this will improve percentage progress slightly and help out with rodata matching too. Also, some slight cleanup of d_a_e_ym (#2302)

1 files changed, 2 insertions, 115 deletions

diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp
index 65db9980a7..f8dcc69493 100644
--- a/src/d/actor/d_a_e_sm2.cpp
+++ b/src/d/actor/d_a_e_sm2.cpp
@@ -6,6 +6,8 @@
 #include "d/actor/d_a_e_sm2.h"
 #include "d/d_cc_d.h"
 #include "dol2asm.h"
+UNK_REL_DATA;
+#include "f_op/f_op_actor_enemy.h"
 
 //
 // Forward References:
@@ -56,7 +58,6 @@ extern "C" static void func_8079D0F0();
 extern "C" static void func_8079D0F8();
 extern "C" static void func_8079D100();
 extern "C" static void func_8079D108();
-extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
 extern "C" void __dt__5csXyzFv();
 extern "C" void __dt__4cXyzFv();
 extern "C" extern char const* const d_a_e_sm2__stringBase0;
@@ -190,11 +191,9 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25];
 extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
 extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
-extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
 extern "C" extern u8 g_Counter[12 + 4 /* padding */];
 extern "C" u8 sincosTable___5JMath[65536];
-extern "C" extern void* calc_mtx[1 + 1 /* padding */];
 extern "C" f32 mGroundY__11fopAcM_gc_c;
 extern "C" u8 m_midnaActor__9daPy_py_c[4];
 extern "C" void __register_global_object();
@@ -204,56 +203,6 @@ extern "C" void __register_global_object();
 //
 
 /* ############################################################################################## */
-/* 8079D734-8079D740 000000 000C+00 5/5 0/0 0/0 .data            cNullVec__6Z2Calc */
-SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-/* 8079D740-8079D754 00000C 0004+10 0/0 0/0 0/0 .data            @1787 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
-    0x02000201,
-    /* padding */
-    0x40080000,
-    0x00000000,
-    0x3FE00000,
-    0x00000000,
-};
-#pragma pop
-
-/* 8079D754-8079D75C 000020 0008+00 0/1 0/0 0/0 .data            e_prim$3669 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u8 e_prim[8] = {
-    0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
-};
-#pragma pop
-
-/* 8079D75C-8079D764 000028 0008+00 0/1 0/0 0/0 .data            e_env$3670 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u8 e_env[8] = {
-    0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
-};
-#pragma pop
-
-/* 8079D764-8079D76C 000030 0006+02 0/1 0/0 0/0 .data            eff_id$3678 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u8 eff_id[6 + 2 /* padding */] = {
-    0x02,
-    0x9D,
-    0x02,
-    0x9E,
-    0x02,
-    0x9F,
-    /* padding */
-    0x00,
-    0x00,
-};
-#pragma pop
-
 /* 8079D76C-8079D780 000038 0014+00 1/1 0/0 0/0 .data            sc_d$4052 */
 SECTION_DATA static u8 sc_d[20] = {
     0x3E, 0x80, 0x00, 0x00, 0x3E, 0xC0, 0x00, 0x00, 0x3F, 0x00,
@@ -727,61 +676,6 @@ static void nodeCallBack(J3DJoint* param_0, int param_1) {
 }
 
 /* ############################################################################################## */
-/* 8079D5B0-8079D5B4 000000 0004+00 17/17 0/0 0/0 .rodata          @3790 */
-SECTION_RODATA static f32 const lit_3790 = 100.0f;
-COMPILER_STRIP_GATE(0x8079D5B0, &lit_3790);
-
-/* 8079D5B4-8079D5B8 000004 0004+00 1/11 0/0 0/0 .rodata          @3791 */
-SECTION_RODATA static u8 const lit_3791[4] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-COMPILER_STRIP_GATE(0x8079D5B4, &lit_3791);
-
-/* 8079D5B8-8079D5C0 000008 0004+04 3/14 0/0 0/0 .rodata          @3792 */
-SECTION_RODATA static f32 const lit_3792[1 + 1 /* padding */] = {
-    1.0f,
-    /* padding */
-    0.0f,
-};
-COMPILER_STRIP_GATE(0x8079D5B8, &lit_3792);
-
-/* 8079D5C0-8079D5C8 000010 0008+00 0/2 0/0 0/0 .rodata          @3793 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3793[8] = {
-    0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x8079D5C0, &lit_3793);
-#pragma pop
-
-/* 8079D5C8-8079D5D0 000018 0008+00 0/2 0/0 0/0 .rodata          @3794 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3794[8] = {
-    0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x8079D5C8, &lit_3794);
-#pragma pop
-
-/* 8079D5D0-8079D5D8 000020 0008+00 0/3 0/0 0/0 .rodata          @3795 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3795[8] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x8079D5D0, &lit_3795);
-#pragma pop
-
-/* 8079D5D8-8079D5DC 000028 0004+00 0/5 0/0 0/0 .rodata          @3796 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3796 = 1.0f / 100.0f;
-COMPILER_STRIP_GATE(0x8079D5D8, &lit_3796);
-#pragma pop
-
 /* 8079D5DC-8079D5E0 00002C 0004+00 0/1 0/0 0/0 .rodata          @4040 */
 #pragma push
 #pragma force_active on
@@ -1726,13 +1620,6 @@ static void func_8079D108() {
     // NONMATCHING
 }
 
-/* 8079D110-8079D524 0046B0 0414+00 1/1 0/0 0/0 .text
- * setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz */
-static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, cXyz* param_2,
-                                   cXyz* param_3) {
-    // NONMATCHING
-}
-
 /* 8079D524-8079D560 004AC4 003C+00 1/1 0/0 0/0 .text            __dt__5csXyzFv */
 // csXyz::~csXyz() {
 extern "C" void __dt__5csXyzFv() {