mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 12:39:27 -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_dn.cpp
+2 -117
View File
@@ -6,7 +6,8 @@
#include "d/actor/d_a_e_dn.h"
#include "d/d_cc_d.h"
#include "dol2asm.h"
UNK_REL_DATA;
#include "f_op/f_op_actor_enemy.h"
//
@@ -81,7 +82,6 @@ extern "C" static void func_804EE428();
extern "C" static void func_804EE430();
extern "C" static void func_804EE438();
extern "C" static void func_804EE440();
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
extern "C" void __dt__5csXyzFv();
extern "C" extern char const* const d_a_e_dn__stringBase0;
@@ -226,13 +226,10 @@ 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" extern u8 pauseTimer__9dScnPly_c[4];
extern "C" void __register_global_object();
//
@@ -240,61 +237,6 @@ extern "C" void __register_global_object();
//
/* ############################################################################################## */
/* 804EE8AC-804EE8B0 000000 0004+00 35/35 0/0 0/0 .rodata @3789 */
SECTION_RODATA static f32 const lit_3789 = 100.0f;
COMPILER_STRIP_GATE(0x804EE8AC, &lit_3789);
/* 804EE8B0-804EE8B4 000004 0004+00 2/29 0/0 0/0 .rodata @3790 */
SECTION_RODATA static u8 const lit_3790[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x804EE8B0, &lit_3790);
/* 804EE8B4-804EE8BC 000008 0004+04 2/22 0/0 0/0 .rodata @3791 */
SECTION_RODATA static f32 const lit_3791[1 + 1 /* padding */] = {
1.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x804EE8B4, &lit_3791);
/* 804EE8BC-804EE8C4 000010 0008+00 0/5 0/0 0/0 .rodata @3792 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3792[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x804EE8BC, &lit_3792);
#pragma pop
/* 804EE8C4-804EE8CC 000018 0008+00 0/5 0/0 0/0 .rodata @3793 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3793[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x804EE8C4, &lit_3793);
#pragma pop
/* 804EE8CC-804EE8D4 000020 0008+00 0/5 0/0 0/0 .rodata @3794 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3794[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x804EE8CC, &lit_3794);
#pragma pop
/* 804EE8D4-804EE8D8 000028 0004+00 0/1 0/0 0/0 .rodata @3795 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3795 = 1.0f / 100.0f;
COMPILER_STRIP_GATE(0x804EE8D4, &lit_3795);
#pragma pop
/* 804EE8D8-804EE8DC 00002C 0004+00 0/2 0/0 0/0 .rodata @3810 */
#pragma push
#pragma force_active on
@@ -327,56 +269,6 @@ SECTION_RODATA static f32 const lit_3814 = 350.0f;
COMPILER_STRIP_GATE(0x804EE8E8, &lit_3814);
#pragma pop
/* 804EEA40-804EEA4C 000000 000C+00 2/2 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,
};
/* 804EEA4C-804EEA60 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
/* 804EEA60-804EEA68 000020 0008+00 0/1 0/0 0/0 .data e_prim$3668 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 e_prim[8] = {
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
};
#pragma pop
/* 804EEA68-804EEA70 000028 0008+00 0/1 0/0 0/0 .data e_env$3669 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 e_env[8] = {
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
};
#pragma pop
/* 804EEA70-804EEA78 000030 0006+02 0/1 0/0 0/0 .data eff_id$3677 */
#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
/* 804EEA78-804EEAA4 -00001 002C+00 1/1 0/0 0/0 .data @4546 */
SECTION_DATA static void* lit_4546[11] = {
(void*)(((char*)e_dn_stay__FP10e_dn_class) + 0x4C),
@@ -1790,13 +1682,6 @@ static void func_804EE440() {
// NONMATCHING
}
/* 804EE448-804EE85C 009388 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
}
/* 804EE85C-804EE898 00979C 003C+00 1/1 0/0 0/0 .text __dt__5csXyzFv */
// csXyz::~csXyz() {
extern "C" void __dt__5csXyzFv() {