mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-14 03:52:13 -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
@@ -6,7 +6,8 @@
|
||||
#include "d/actor/d_a_e_gi.h"
|
||||
#include "dol2asm.h"
|
||||
#include "d/d_camera.h"
|
||||
|
||||
UNK_REL_DATA;
|
||||
#include "f_op/f_op_actor_enemy.h"
|
||||
|
||||
|
||||
//
|
||||
@@ -60,7 +61,6 @@ extern "C" void __dt__12daE_GI_HIO_cFv();
|
||||
extern "C" void __sinit_d_a_e_gi_cpp();
|
||||
extern "C" static void func_806D0A10();
|
||||
extern "C" static void func_806D0A18();
|
||||
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
|
||||
extern "C" void checkNowWolf__9daPy_py_cFv();
|
||||
extern "C" extern char const* const d_a_e_gi__stringBase0;
|
||||
|
||||
@@ -184,7 +184,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
|
||||
extern "C" extern void* __vt__9cCcD_Stts[8];
|
||||
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
|
||||
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 m_midnaActor__9daPy_py_c[4];
|
||||
@@ -195,61 +194,6 @@ extern "C" void __register_global_object();
|
||||
//
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 806D0E60-806D0E64 000000 0004+00 15/15 0/0 0/0 .rodata @3907 */
|
||||
SECTION_RODATA static f32 const lit_3907 = 100.0f;
|
||||
COMPILER_STRIP_GATE(0x806D0E60, &lit_3907);
|
||||
|
||||
/* 806D0E64-806D0E68 000004 0004+00 2/15 0/0 0/0 .rodata @3908 */
|
||||
SECTION_RODATA static u8 const lit_3908[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806D0E64, &lit_3908);
|
||||
|
||||
/* 806D0E68-806D0E70 000008 0004+04 3/14 0/0 0/0 .rodata @3909 */
|
||||
SECTION_RODATA static f32 const lit_3909[1 + 1 /* padding */] = {
|
||||
1.0f,
|
||||
/* padding */
|
||||
0.0f,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806D0E68, &lit_3909);
|
||||
|
||||
/* 806D0E70-806D0E78 000010 0008+00 0/2 0/0 0/0 .rodata @3910 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3910[8] = {
|
||||
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806D0E70, &lit_3910);
|
||||
#pragma pop
|
||||
|
||||
/* 806D0E78-806D0E80 000018 0008+00 0/1 0/0 0/0 .rodata @3911 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3911[8] = {
|
||||
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806D0E78, &lit_3911);
|
||||
#pragma pop
|
||||
|
||||
/* 806D0E80-806D0E88 000020 0008+00 0/1 0/0 0/0 .rodata @3912 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3912[8] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806D0E80, &lit_3912);
|
||||
#pragma pop
|
||||
|
||||
/* 806D0E88-806D0E8C 000028 0004+00 0/1 0/0 0/0 .rodata @3913 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3913 = 1.0f / 100.0f;
|
||||
COMPILER_STRIP_GATE(0x806D0E88, &lit_3913);
|
||||
#pragma pop
|
||||
|
||||
/* 806D0E8C-806D0E90 00002C 0004+00 0/1 0/0 0/0 .rodata @3928 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
@@ -310,56 +254,6 @@ SECTION_RODATA static f32 const lit_3936 = 35.0f;
|
||||
COMPILER_STRIP_GATE(0x806D0EAC, &lit_3936);
|
||||
#pragma pop
|
||||
|
||||
/* 806D0F84-806D0F90 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,
|
||||
};
|
||||
|
||||
/* 806D0F90-806D0FA4 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
|
||||
|
||||
/* 806D0FA4-806D0FAC 000020 0008+00 0/1 0/0 0/0 .data e_prim$3786 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_prim[8] = {
|
||||
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 806D0FAC-806D0FB4 000028 0008+00 0/1 0/0 0/0 .data e_env$3787 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_env[8] = {
|
||||
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 806D0FB4-806D0FBC 000030 0006+02 0/1 0/0 0/0 .data eff_id$3795 */
|
||||
#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
|
||||
|
||||
/* 806D0FBC-806D0FFC 000038 0040+00 1/1 0/0 0/0 .data cc_gi_src__22@unnamed@d_a_e_gi_cpp@
|
||||
*/
|
||||
SECTION_DATA static u8 data_806D0FBC[64] = {
|
||||
@@ -1094,13 +988,6 @@ static void func_806D0A18() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 806D0A20-806D0E34 003680 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
|
||||
}
|
||||
|
||||
/* 806D0E34-806D0E4C 003A94 0018+00 2/2 0/0 0/0 .text checkNowWolf__9daPy_py_cFv */
|
||||
// void daPy_py_c::checkNowWolf() {
|
||||
extern "C" void checkNowWolf__9daPy_py_cFv() {
|
||||
|
||||
Reference in New Issue
Block a user