mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 20:27:36 -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_yg.cpp
+2 -117
View File
@@ -6,7 +6,8 @@
#include "d/actor/d_a_e_yg.h"
#include "d/d_cc_d.h"
#include "dol2asm.h"
UNK_REL_DATA;
#include "f_op/f_op_actor_enemy.h"
@@ -55,7 +56,6 @@ extern "C" void __dt__12daE_YG_HIO_cFv();
extern "C" void __sinit_d_a_e_yg_cpp();
extern "C" static void func_807FC804();
extern "C" static void func_807FC80C();
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_yg__stringBase0;
@@ -191,12 +191,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" 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" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void __register_global_object();
@@ -205,61 +202,6 @@ extern "C" void __register_global_object();
//
/* ############################################################################################## */
/* 807FCCB4-807FCCB8 000000 0004+00 20/20 0/0 0/0 .rodata @3801 */
SECTION_RODATA static f32 const lit_3801 = 100.0f;
COMPILER_STRIP_GATE(0x807FCCB4, &lit_3801);
/* 807FCCB8-807FCCBC 000004 0004+00 2/17 0/0 0/0 .rodata @3802 */
SECTION_RODATA static u8 const lit_3802[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x807FCCB8, &lit_3802);
/* 807FCCBC-807FCCC4 000008 0004+04 3/15 0/0 0/0 .rodata @3803 */
SECTION_RODATA static f32 const lit_3803[1 + 1 /* padding */] = {
1.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x807FCCBC, &lit_3803);
/* 807FCCC4-807FCCCC 000010 0008+00 0/3 0/0 0/0 .rodata @3804 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3804[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x807FCCC4, &lit_3804);
#pragma pop
/* 807FCCCC-807FCCD4 000018 0008+00 0/3 0/0 0/0 .rodata @3805 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3805[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x807FCCCC, &lit_3805);
#pragma pop
/* 807FCCD4-807FCCDC 000020 0008+00 0/3 0/0 0/0 .rodata @3806 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3806[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x807FCCD4, &lit_3806);
#pragma pop
/* 807FCCDC-807FCCE0 000028 0004+00 0/1 0/0 0/0 .rodata @3807 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3807 = 1.0f / 100.0f;
COMPILER_STRIP_GATE(0x807FCCDC, &lit_3807);
#pragma pop
/* 807FCCE0-807FCCE4 00002C 0004+00 0/3 0/0 0/0 .rodata @3822 */
#pragma push
#pragma force_active on
@@ -288,56 +230,6 @@ SECTION_RODATA static f32 const lit_3825 = 450.0f;
COMPILER_STRIP_GATE(0x807FCCEC, &lit_3825);
#pragma pop
/* 807FCDFC-807FCE08 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,
};
/* 807FCE08-807FCE1C 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
/* 807FCE1C-807FCE24 000020 0008+00 0/1 0/0 0/0 .data e_prim$3680 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 e_prim[8] = {
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
};
#pragma pop
/* 807FCE24-807FCE2C 000028 0008+00 0/1 0/0 0/0 .data e_env$3681 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 e_env[8] = {
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
};
#pragma pop
/* 807FCE2C-807FCE34 000030 0006+02 0/1 0/0 0/0 .data eff_id$3689 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 eff_id_3689[6 + 2 /* padding */] = {
0x02,
0x9D,
0x02,
0x9E,
0x02,
0x9F,
/* padding */
0x00,
0x00,
};
#pragma pop
/* 807FCE34-807FCE94 -00001 0060+00 1/1 0/0 0/0 .data @4282 */
SECTION_DATA static void* lit_4282[24] = {
(void*)(((char*)e_yg_attack__FP10e_yg_class) + 0x58),
@@ -1488,13 +1380,6 @@ static void func_807FC80C() {
// NONMATCHING
}
/* 807FC814-807FCC28 0045B4 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
}
/* 807FCC28-807FCC64 0049C8 003C+00 1/1 0/0 0/0 .text __dt__5csXyzFv */
// csXyz::~csXyz() {
extern "C" void __dt__5csXyzFv() {