mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 20:57:46 -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_st.cpp
+2 -117
View File
@@ -6,7 +6,8 @@
#include "d/actor/d_a_e_st.h"
#include "d/d_cc_d.h"
#include "dol2asm.h"
UNK_REL_DATA;
#include "f_op/f_op_actor_enemy.h"
@@ -84,7 +85,6 @@ extern "C" static void func_807A6384();
extern "C" static void func_807A638C();
extern "C" static void func_807A6394();
extern "C" static void func_807A639C();
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
extern "C" void __dt__4cXyzFv();
extern "C" void getHeadTopPos__9daPy_py_cCFv();
extern "C" extern char const* const d_a_e_st__stringBase0;
@@ -227,14 +227,11 @@ extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mGndCheck__11fopAcM_gc_c[84];
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" f32 mGroundY__11fopAcM_gc_c;
extern "C" u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 pauseTimer__9dScnPly_c[4];
extern "C" void __register_global_object();
//
@@ -242,61 +239,6 @@ extern "C" void __register_global_object();
//
/* ############################################################################################## */
/* 807A6824-807A6828 000000 0004+00 40/40 0/0 0/0 .rodata @3903 */
SECTION_RODATA static f32 const lit_3903 = 100.0f;
COMPILER_STRIP_GATE(0x807A6824, &lit_3903);
/* 807A6828-807A682C 000004 0004+00 3/36 0/0 0/0 .rodata @3904 */
SECTION_RODATA static u8 const lit_3904[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x807A6828, &lit_3904);
/* 807A682C-807A6834 000008 0004+04 1/30 0/0 0/0 .rodata @3905 */
SECTION_RODATA static f32 const lit_3905[1 + 1 /* padding */] = {
1.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x807A682C, &lit_3905);
/* 807A6834-807A683C 000010 0008+00 0/1 0/0 0/0 .rodata @3906 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3906[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x807A6834, &lit_3906);
#pragma pop
/* 807A683C-807A6844 000018 0008+00 0/1 0/0 0/0 .rodata @3907 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3907[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x807A683C, &lit_3907);
#pragma pop
/* 807A6844-807A684C 000020 0008+00 0/1 0/0 0/0 .rodata @3908 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3908[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x807A6844, &lit_3908);
#pragma pop
/* 807A684C-807A6850 000028 0004+00 0/1 0/0 0/0 .rodata @3909 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3909 = 1.0f / 100.0f;
COMPILER_STRIP_GATE(0x807A684C, &lit_3909);
#pragma pop
/* 807A6850-807A6854 00002C 0004+00 0/2 0/0 0/0 .rodata @3924 */
#pragma push
#pragma force_active on
@@ -326,56 +268,6 @@ COMPILER_STRIP_GATE(0x807A685C, &lit_3927);
SECTION_RODATA static f32 const lit_3928 = -1.0f;
COMPILER_STRIP_GATE(0x807A6860, &lit_3928);
/* 807A69EC-807A69F8 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,
};
/* 807A69F8-807A6A0C 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
/* 807A6A0C-807A6A14 000020 0008+00 0/1 0/0 0/0 .data e_prim$3782 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 e_prim[8] = {
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
};
#pragma pop
/* 807A6A14-807A6A1C 000028 0008+00 0/1 0/0 0/0 .data e_env$3783 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 e_env[8] = {
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
};
#pragma pop
/* 807A6A1C-807A6A24 000030 0006+02 0/1 0/0 0/0 .data eff_id$3791 */
#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
/* 807A6A24-807A6A40 -00001 001C+00 1/1 0/0 0/0 .data @5044 */
SECTION_DATA static void* lit_5044[7] = {
(void*)(((char*)e_st_jump_attack__FP10e_st_class) + 0x70),
@@ -1843,13 +1735,6 @@ static void func_807A639C() {
// NONMATCHING
}
/* 807A63A4-807A67B8 0086A4 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
}
/* 807A67B8-807A67F4 008AB8 003C+00 2/2 0/0 0/0 .text __dt__4cXyzFv */
// cXyz::~cXyz() {
extern "C" void __dt__4cXyzFv() {