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_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp
index 529ebc112a..9f3844d0cf 100644
--- a/src/d/actor/d_a_e_rdy.cpp
+++ b/src/d/actor/d_a_e_rdy.cpp
@@ -7,6 +7,8 @@
 #include "d/d_cc_d.h"
 #include "dol2asm.h"
 #include "d/d_camera.h"
+UNK_REL_DATA;
+#include "f_op/f_op_actor_enemy.h"
 
 
 //
@@ -93,7 +95,6 @@ extern "C" static void func_80779928();
 extern "C" static void func_80779930();
 extern "C" static void func_80779938();
 extern "C" static void func_80779940();
-extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
 extern "C" void __dt__5csXyzFv();
 extern "C" void __dt__4cXyzFv();
 extern "C" void changeDemoMode__9daPy_py_cFUliis();
@@ -279,11 +280,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" u8 mCurrentMtx__6J3DSys[48];
 extern "C" u8 sincosTable___5JMath[65536];
-extern "C" extern u32 g_blackColor;
 extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */];
 extern "C" u8 m_midnaActor__9daPy_py_c[4];
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
@@ -294,61 +293,6 @@ extern "C" void __register_global_object();
 //
 
 /* ############################################################################################## */
-/* 80779DFC-80779E00 000000 0004+00 43/43 0/0 0/0 .rodata          @4018 */
-SECTION_RODATA static f32 const lit_4018 = 100.0f;
-COMPILER_STRIP_GATE(0x80779DFC, &lit_4018);
-
-/* 80779E00-80779E04 000004 0004+00 2/34 0/0 0/0 .rodata          @4019 */
-SECTION_RODATA static u8 const lit_4019[4] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-COMPILER_STRIP_GATE(0x80779E00, &lit_4019);
-
-/* 80779E04-80779E0C 000008 0004+04 1/28 0/0 0/0 .rodata          @4020 */
-SECTION_RODATA static f32 const lit_4020[1 + 1 /* padding */] = {
-    1.0f,
-    /* padding */
-    0.0f,
-};
-COMPILER_STRIP_GATE(0x80779E04, &lit_4020);
-
-/* 80779E0C-80779E14 000010 0008+00 0/6 0/0 0/0 .rodata          @4021 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_4021[8] = {
-    0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80779E0C, &lit_4021);
-#pragma pop
-
-/* 80779E14-80779E1C 000018 0008+00 0/6 0/0 0/0 .rodata          @4022 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_4022[8] = {
-    0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80779E14, &lit_4022);
-#pragma pop
-
-/* 80779E1C-80779E24 000020 0008+00 0/6 0/0 0/0 .rodata          @4023 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_4023[8] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80779E1C, &lit_4023);
-#pragma pop
-
-/* 80779E24-80779E28 000028 0004+00 0/1 0/0 0/0 .rodata          @4024 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_4024 = 1.0f / 100.0f;
-COMPILER_STRIP_GATE(0x80779E24, &lit_4024);
-#pragma pop
-
 /* 80779E28-80779E2C 00002C 0004+00 0/1 0/0 0/0 .rodata          @4039 */
 #pragma push
 #pragma force_active on
@@ -437,56 +381,6 @@ SECTION_RODATA static f32 const lit_4051 = 33.0f;
 COMPILER_STRIP_GATE(0x80779E58, &lit_4051);
 #pragma pop
 
-/* 8077A0DC-8077A0E8 000000 000C+00 1/1 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,
-};
-
-/* 8077A0E8-8077A0FC 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
-
-/* 8077A0FC-8077A104 000020 0008+00 0/1 0/0 0/0 .data            e_prim$3897 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u8 e_prim[8] = {
-    0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
-};
-#pragma pop
-
-/* 8077A104-8077A10C 000028 0008+00 0/1 0/0 0/0 .data            e_env$3898 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u8 e_env[8] = {
-    0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
-};
-#pragma pop
-
-/* 8077A10C-8077A114 000030 0006+02 0/1 0/0 0/0 .data            eff_id$3906 */
-#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
-
 /* 8077A114-8077A17C -00001 0068+00 1/1 0/0 0/0 .data            @5017 */
 SECTION_DATA static void* lit_5017[26] = {
     (void*)(((char*)e_rdy_fight_run__FP11e_rdy_class) + 0x114),
@@ -2660,13 +2554,6 @@ static void func_80779940() {
     // NONMATCHING
 }
 
-/* 80779948-80779D5C 00DC68 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
-}
-
 /* 80779D5C-80779D98 00E07C 003C+00 1/1 0/0 0/0 .text            __dt__5csXyzFv */
 // csXyz::~csXyz() {
 extern "C" void __dt__5csXyzFv() {