mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-17 12:39:27 -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_cr.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
UNK_REL_DATA;
|
||||
#include "f_op/f_op_actor_enemy.h"
|
||||
|
||||
|
||||
//
|
||||
@@ -40,7 +41,6 @@ extern "C" void __dt__12daE_CR_HIO_cFv();
|
||||
extern "C" void __sinit_d_a_e_cr_cpp();
|
||||
extern "C" static void func_80699878();
|
||||
extern "C" static void func_80699880();
|
||||
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
|
||||
extern "C" extern char const* const d_a_e_cr__stringBase0;
|
||||
|
||||
//
|
||||
@@ -129,10 +129,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();
|
||||
|
||||
@@ -141,61 +139,6 @@ extern "C" void __register_global_object();
|
||||
//
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80699CB0-80699CB4 000000 0004+00 8/8 0/0 0/0 .rodata @3788 */
|
||||
SECTION_RODATA static f32 const lit_3788 = 100.0f;
|
||||
COMPILER_STRIP_GATE(0x80699CB0, &lit_3788);
|
||||
|
||||
/* 80699CB4-80699CB8 000004 0004+00 2/7 0/0 0/0 .rodata @3789 */
|
||||
SECTION_RODATA static u8 const lit_3789[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80699CB4, &lit_3789);
|
||||
|
||||
/* 80699CB8-80699CC0 000008 0004+04 2/7 0/0 0/0 .rodata @3790 */
|
||||
SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = {
|
||||
1.0f,
|
||||
/* padding */
|
||||
0.0f,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80699CB8, &lit_3790);
|
||||
|
||||
/* 80699CC0-80699CC8 000010 0008+00 0/1 0/0 0/0 .rodata @3791 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3791[8] = {
|
||||
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80699CC0, &lit_3791);
|
||||
#pragma pop
|
||||
|
||||
/* 80699CC8-80699CD0 000018 0008+00 0/1 0/0 0/0 .rodata @3792 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3792[8] = {
|
||||
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80699CC8, &lit_3792);
|
||||
#pragma pop
|
||||
|
||||
/* 80699CD0-80699CD8 000020 0008+00 0/1 0/0 0/0 .rodata @3793 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3793[8] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80699CD0, &lit_3793);
|
||||
#pragma pop
|
||||
|
||||
/* 80699CD8-80699CDC 000028 0004+00 0/1 0/0 0/0 .rodata @3794 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3794 = 1.0f / 100.0f;
|
||||
COMPILER_STRIP_GATE(0x80699CD8, &lit_3794);
|
||||
#pragma pop
|
||||
|
||||
/* 80699CDC-80699CE0 00002C 0004+00 0/2 0/0 0/0 .rodata @3809 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
@@ -214,56 +157,6 @@ SECTION_RODATA static f32 const lit_3811 = 400.0f;
|
||||
COMPILER_STRIP_GATE(0x80699CE4, &lit_3811);
|
||||
#pragma pop
|
||||
|
||||
/* 80699D4C-80699D58 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,
|
||||
};
|
||||
|
||||
/* 80699D58-80699D6C 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
|
||||
|
||||
/* 80699D6C-80699D74 000020 0008+00 0/1 0/0 0/0 .data e_prim$3667 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_prim[8] = {
|
||||
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 80699D74-80699D7C 000028 0008+00 0/1 0/0 0/0 .data e_env$3668 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_env[8] = {
|
||||
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 80699D7C-80699D84 000030 0006+02 0/1 0/0 0/0 .data eff_id$3676 */
|
||||
#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
|
||||
|
||||
/* 80699D84-80699DC4 000038 0040+00 1/1 0/0 0/0 .data cc_sph_src$4251 */
|
||||
static dCcD_SrcSph cc_sph_src = {
|
||||
{
|
||||
@@ -682,11 +575,4 @@ static void func_80699880() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80699888-80699C9C 001968 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
|
||||
}
|
||||
|
||||
/* 80699D40-80699D40 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
Reference in New Issue
Block a user