mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-15 04:02:50 -04:00
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)
This commit is contained in:
YunataSavior
+2
-115
@@ -5,7 +5,8 @@
|
||||
|
||||
#include "d/actor/d_a_e_ww.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
UNK_REL_DATA;
|
||||
#include "f_op/f_op_actor_enemy.h"
|
||||
|
||||
|
||||
|
||||
@@ -77,7 +78,6 @@ extern "C" static void func_807EF2D4();
|
||||
extern "C" static void func_807EF2DC();
|
||||
extern "C" static void func_807EF2E4();
|
||||
extern "C" static void func_807EF2EC();
|
||||
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
|
||||
extern "C" void __dt__4cXyzFv();
|
||||
extern "C" void checkNowWolf__9daPy_py_cFv();
|
||||
extern "C" extern char const* const d_a_e_ww__stringBase0;
|
||||
@@ -203,7 +203,6 @@ 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];
|
||||
@@ -215,61 +214,6 @@ extern "C" void __register_global_object();
|
||||
//
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 807EF770-807EF774 000000 0004+00 30/30 0/0 0/0 .rodata @3905 */
|
||||
SECTION_RODATA static f32 const lit_3905 = 100.0f;
|
||||
COMPILER_STRIP_GATE(0x807EF770, &lit_3905);
|
||||
|
||||
/* 807EF774-807EF778 000004 0004+00 1/23 0/0 0/0 .rodata @3906 */
|
||||
SECTION_RODATA static u8 const lit_3906[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x807EF774, &lit_3906);
|
||||
|
||||
/* 807EF778-807EF780 000008 0004+04 2/12 0/0 0/0 .rodata @3907 */
|
||||
SECTION_RODATA static f32 const lit_3907[1 + 1 /* padding */] = {
|
||||
1.0f,
|
||||
/* padding */
|
||||
0.0f,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x807EF778, &lit_3907);
|
||||
|
||||
/* 807EF780-807EF788 000010 0008+00 0/12 0/0 0/0 .rodata @3908 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3908[8] = {
|
||||
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x807EF780, &lit_3908);
|
||||
#pragma pop
|
||||
|
||||
/* 807EF788-807EF790 000018 0008+00 0/12 0/0 0/0 .rodata @3909 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3909[8] = {
|
||||
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x807EF788, &lit_3909);
|
||||
#pragma pop
|
||||
|
||||
/* 807EF790-807EF798 000020 0008+00 0/12 0/0 0/0 .rodata @3910 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3910[8] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x807EF790, &lit_3910);
|
||||
#pragma pop
|
||||
|
||||
/* 807EF798-807EF79C 000028 0004+00 0/1 0/0 0/0 .rodata @3911 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3911 = 1.0f / 100.0f;
|
||||
COMPILER_STRIP_GATE(0x807EF798, &lit_3911);
|
||||
#pragma pop
|
||||
|
||||
/* 807EF79C-807EF7A0 00002C 0004+00 0/3 0/0 0/0 .rodata @3926 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
@@ -305,56 +249,6 @@ SECTION_RODATA static f32 const lit_3930 = 25.0f;
|
||||
COMPILER_STRIP_GATE(0x807EF7AC, &lit_3930);
|
||||
#pragma pop
|
||||
|
||||
/* 807EF8CC-807EF8D8 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,
|
||||
};
|
||||
|
||||
/* 807EF8D8-807EF8EC 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
|
||||
|
||||
/* 807EF8EC-807EF8F4 000020 0008+00 0/1 0/0 0/0 .data e_prim$3784 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_prim[8] = {
|
||||
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 807EF8F4-807EF8FC 000028 0008+00 0/1 0/0 0/0 .data e_env$3785 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_env[8] = {
|
||||
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 807EF8FC-807EF904 000030 0006+02 0/1 0/0 0/0 .data eff_id$3793 */
|
||||
#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
|
||||
|
||||
/* 807EF904-807EF944 000038 0040+00 1/1 0/0 0/0 .data cc_ww_src__22@unnamed@d_a_e_ww_cpp@
|
||||
*/
|
||||
SECTION_DATA static u8 data_807EF904[64] = {
|
||||
@@ -1562,13 +1456,6 @@ static void func_807EF2EC() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 807EF2F4-807EF708 007CF4 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
|
||||
}
|
||||
|
||||
/* 807EF708-807EF744 008108 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */
|
||||
// cXyz::~cXyz() {
|
||||
extern "C" void __dt__4cXyzFv() {
|
||||
|
||||
Reference in New Issue
Block a user