mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-17 20:43:07 -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
-116
@@ -6,7 +6,8 @@
|
||||
#include "d/actor/d_a_e_sh.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
UNK_REL_DATA;
|
||||
#include "f_op/f_op_actor_enemy.h"
|
||||
|
||||
|
||||
//
|
||||
@@ -45,7 +46,6 @@ extern "C" void __dt__12daE_SH_HIO_cFv();
|
||||
extern "C" void __sinit_d_a_e_sh_cpp();
|
||||
extern "C" static void func_80791938();
|
||||
extern "C" static void func_80791940();
|
||||
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
|
||||
extern "C" extern char const* const d_a_e_sh__stringBase0;
|
||||
|
||||
//
|
||||
@@ -157,10 +157,8 @@ 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" extern void* calc_mtx[1 + 1 /* padding */];
|
||||
extern "C" u8 m_midnaActor__9daPy_py_c[4];
|
||||
extern "C" void __register_global_object();
|
||||
|
||||
@@ -169,61 +167,6 @@ extern "C" void __register_global_object();
|
||||
//
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80791D70-80791D74 000000 0004+00 13/13 0/0 0/0 .rodata @3902 */
|
||||
SECTION_RODATA static f32 const lit_3902 = 100.0f;
|
||||
COMPILER_STRIP_GATE(0x80791D70, &lit_3902);
|
||||
|
||||
/* 80791D74-80791D78 000004 0004+00 2/11 0/0 0/0 .rodata @3903 */
|
||||
SECTION_RODATA static u8 const lit_3903[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80791D74, &lit_3903);
|
||||
|
||||
/* 80791D78-80791D80 000008 0004+04 2/13 0/0 0/0 .rodata @3904 */
|
||||
SECTION_RODATA static f32 const lit_3904[1 + 1 /* padding */] = {
|
||||
1.0f,
|
||||
/* padding */
|
||||
0.0f,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80791D78, &lit_3904);
|
||||
|
||||
/* 80791D80-80791D88 000010 0008+00 0/3 0/0 0/0 .rodata @3905 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3905[8] = {
|
||||
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80791D80, &lit_3905);
|
||||
#pragma pop
|
||||
|
||||
/* 80791D88-80791D90 000018 0008+00 0/3 0/0 0/0 .rodata @3906 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3906[8] = {
|
||||
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80791D88, &lit_3906);
|
||||
#pragma pop
|
||||
|
||||
/* 80791D90-80791D98 000020 0008+00 0/3 0/0 0/0 .rodata @3907 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3907[8] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80791D90, &lit_3907);
|
||||
#pragma pop
|
||||
|
||||
/* 80791D98-80791D9C 000028 0004+00 0/1 0/0 0/0 .rodata @3908 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3908 = 1.0f / 100.0f;
|
||||
COMPILER_STRIP_GATE(0x80791D98, &lit_3908);
|
||||
#pragma pop
|
||||
|
||||
/* 80791D9C-80791DA0 00002C 0004+00 0/1 0/0 0/0 .rodata @3923 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
@@ -280,56 +223,6 @@ SECTION_RODATA static f32 const lit_3930 = 500.0f;
|
||||
COMPILER_STRIP_GATE(0x80791DB8, &lit_3930);
|
||||
#pragma pop
|
||||
|
||||
/* 80791EC8-80791ED4 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,
|
||||
};
|
||||
|
||||
/* 80791ED4-80791EE8 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
|
||||
|
||||
/* 80791EE8-80791EF0 000020 0008+00 0/1 0/0 0/0 .data e_prim$3781 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_prim[8] = {
|
||||
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 80791EF0-80791EF8 000028 0008+00 0/1 0/0 0/0 .data e_env$3782 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_env[8] = {
|
||||
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 80791EF8-80791F00 000030 0006+02 0/1 0/0 0/0 .data eff_id$3790 */
|
||||
#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
|
||||
|
||||
/* 80791F00-80791F08 000038 0006+02 1/1 0/0 0/0 .data ap_name$4188 */
|
||||
SECTION_DATA static u8 ap_name[6 + 2 /* padding */] = {
|
||||
0x81,
|
||||
@@ -1138,11 +1031,4 @@ static void func_80791940() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80791948-80791D5C 0036E8 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
|
||||
}
|
||||
|
||||
/* 80791EC0-80791EC0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
Reference in New Issue
Block a user