mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-15 12:08: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 6e94efaefb
commit 036b67cb7e
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_gm.cpp
+2 -116
View File
@@ -5,7 +5,8 @@
#include "d/actor/d_a_e_gm.h"
#include "dol2asm.h"
UNK_REL_DATA;
#include "f_op/f_op_actor_enemy.h"
//
@@ -63,7 +64,6 @@ extern "C" void __dt__12daE_GM_HIO_cFv();
extern "C" void __sinit_d_a_e_gm_cpp();
extern "C" static void func_806D74F0();
extern "C" static void func_806D74F8();
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
extern "C" void __dt__5csXyzFv();
extern "C" void __dt__4cXyzFv();
extern "C" extern char const* const d_a_e_gm__stringBase0;
@@ -174,11 +174,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 sincosTable___5JMath[65536];
extern "C" u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 pauseTimer__9dScnPly_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void __register_global_object();
@@ -187,61 +185,6 @@ extern "C" void __register_global_object();
//
/* ############################################################################################## */
/* 806D79A0-806D79A4 000000 0004+00 26/26 0/0 0/0 .rodata @3906 */
SECTION_RODATA static f32 const lit_3906 = 100.0f;
COMPILER_STRIP_GATE(0x806D79A0, &lit_3906);
/* 806D79A4-806D79A8 000004 0004+00 1/23 0/0 0/0 .rodata @3907 */
SECTION_RODATA static u8 const lit_3907[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x806D79A4, &lit_3907);
/* 806D79A8-806D79B0 000008 0004+04 4/24 0/0 0/0 .rodata @3908 */
SECTION_RODATA static f32 const lit_3908[1 + 1 /* padding */] = {
1.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x806D79A8, &lit_3908);
/* 806D79B0-806D79B8 000010 0008+00 0/6 0/0 0/0 .rodata @3909 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3909[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x806D79B0, &lit_3909);
#pragma pop
/* 806D79B8-806D79C0 000018 0008+00 0/6 0/0 0/0 .rodata @3910 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3910[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x806D79B8, &lit_3910);
#pragma pop
/* 806D79C0-806D79C8 000020 0008+00 0/6 0/0 0/0 .rodata @3911 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3911[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x806D79C0, &lit_3911);
#pragma pop
/* 806D79C8-806D79CC 000028 0004+00 0/1 0/0 0/0 .rodata @3912 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3912 = 1.0f / 100.0f;
COMPILER_STRIP_GATE(0x806D79C8, &lit_3912);
#pragma pop
/* 806D79CC-806D79D0 00002C 0004+00 0/2 0/0 0/0 .rodata @4055 */
#pragma push
#pragma force_active on
@@ -281,56 +224,6 @@ SECTION_RODATA static f32 const lit_4060 = 300.0f;
COMPILER_STRIP_GATE(0x806D79E0, &lit_4060);
#pragma pop
/* 806D7AFC-806D7B08 000000 000C+00 8/8 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,
};
/* 806D7B08-806D7B1C 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
/* 806D7B1C-806D7B24 000020 0008+00 0/1 0/0 0/0 .data e_prim$3785 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 e_prim[8] = {
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
};
#pragma pop
/* 806D7B24-806D7B2C 000028 0008+00 0/1 0/0 0/0 .data e_env$3786 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 e_env[8] = {
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
};
#pragma pop
/* 806D7B2C-806D7B34 000030 0006+02 0/1 0/0 0/0 .data eff_id$3794 */
#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
/* 806D7B34-806D7B38 000038 0004+00 2/3 0/0 0/0 .data l_hitActorID__22@unnamed@d_a_e_gm_cpp@ */
SECTION_DATA static u32 data_806D7B34 = 0xFFFFFFFF;
@@ -1701,13 +1594,6 @@ static void func_806D74F8() {
// NONMATCHING
}
/* 806D7500-806D7914 006380 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
}
/* 806D7914-806D7950 006794 003C+00 1/1 0/0 0/0 .text __dt__5csXyzFv */
// csXyz::~csXyz() {
extern "C" void __dt__5csXyzFv() {