mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 04:31:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

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)

Browse Source
This commit is contained in:
YunataSavior
2025-02-13 17:20:55 -08:00
committed by GitHub
parent dc32cbd7e6
commit d4b5613456
52 changed files with 117 additions and 6178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_yr.cpp
+2 -116
View File
@@ -6,7 +6,8 @@
#include "d/actor/d_a_e_yr.h"
#include "d/d_cc_d.h"
#include "dol2asm.h"
UNK_REL_DATA;
#include "f_op/f_op_actor_enemy.h"
//
@@ -53,7 +54,6 @@ extern "C" void __dt__18fOpAcm_HIO_entry_cFv();
extern "C" void __dt__14mDoHIO_entry_cFv();
extern "C" static void func_808283DC();
extern "C" static void func_808283E4();
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
extern "C" void __dt__4cXyzFv();
extern "C" extern char const* const d_a_e_yr__stringBase0;
@@ -168,11 +168,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 void* calc_mtx[1 + 1 /* padding */];
extern "C" u8 m_midnaActor__9daPy_py_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void __register_global_object();
@@ -187,61 +185,6 @@ static void nodeCallBack(J3DJoint* param_0, int param_1) {
}
/* ############################################################################################## */
/* 80828850-80828854 000000 0004+00 20/20 0/0 0/0 .rodata @3902 */
SECTION_RODATA static f32 const lit_3902 = 100.0f;
COMPILER_STRIP_GATE(0x80828850, &lit_3902);
/* 80828854-80828858 000004 0004+00 1/16 0/0 0/0 .rodata @3903 */
SECTION_RODATA static u8 const lit_3903[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80828854, &lit_3903);
/* 80828858-80828860 000008 0004+04 1/16 0/0 0/0 .rodata @3904 */
SECTION_RODATA static f32 const lit_3904[1 + 1 /* padding */] = {
1.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x80828858, &lit_3904);
/* 80828860-80828868 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(0x80828860, &lit_3905);
#pragma pop
/* 80828868-80828870 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(0x80828868, &lit_3906);
#pragma pop
/* 80828870-80828878 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(0x80828870, &lit_3907);
#pragma pop
/* 80828878-8082887C 000028 0004+00 0/2 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(0x80828878, &lit_3908);
#pragma pop
/* 8082887C-80828880 00002C 0004+00 0/1 0/0 0/0 .rodata @4099 */
#pragma push
#pragma force_active on
@@ -458,56 +401,6 @@ SECTION_RODATA static f32 const lit_4545 = 30.0f;
COMPILER_STRIP_GATE(0x808288D0, &lit_4545);
#pragma pop
/* 808289B4-808289C0 000000 000C+00 3/3 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,
};
/* 808289C0-808289D4 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
/* 808289D4-808289DC 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
/* 808289DC-808289E4 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
/* 808289E4-808289EC 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
/* 808289EC-80828A58 -00001 006C+00 1/1 0/0 0/0 .data @4552 */
SECTION_DATA static void* lit_4552[27] = {
(void*)(((char*)e_yr_path_move__FP10e_yr_class) + 0x1A0),
@@ -1381,13 +1274,6 @@ static void func_808283E4() {
// NONMATCHING
}
/* 808283EC-80828800 0062CC 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
}
/* 80828800-8082883C 0066E0 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */
// cXyz::~cXyz() {
extern "C" void __dt__4cXyzFv() {