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 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_sf.cpp
+2 -116
View File
@@ -7,7 +7,8 @@
#include "d/d_cc_d.h"
#include "dol2asm.h"
#include "d/d_camera.h"
UNK_REL_DATA;
#include "f_op/f_op_actor_enemy.h"
//
@@ -56,7 +57,6 @@ extern "C" void __dt__12daE_SF_HIO_cFv();
extern "C" void __sinit_d_a_e_sf_cpp();
extern "C" static void func_80789800();
extern "C" static void func_80789808();
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
extern "C" extern char const* const d_a_e_sf__stringBase0;
//
@@ -194,12 +194,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" u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 pauseTimer__9dScnPly_c[4];
extern "C" void __register_global_object();
//
@@ -207,61 +205,6 @@ extern "C" void __register_global_object();
//
/* ############################################################################################## */
/* 80789C38-80789C3C 000000 0004+00 19/19 0/0 0/0 .rodata @3908 */
SECTION_RODATA static f32 const lit_3908 = 100.0f;
COMPILER_STRIP_GATE(0x80789C38, &lit_3908);
/* 80789C3C-80789C40 000004 0004+00 4/18 0/0 0/0 .rodata @3909 */
SECTION_RODATA static u8 const lit_3909[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80789C3C, &lit_3909);
/* 80789C40-80789C48 000008 0004+04 3/16 0/0 0/0 .rodata @3910 */
SECTION_RODATA static f32 const lit_3910[1 + 1 /* padding */] = {
1.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x80789C40, &lit_3910);
/* 80789C48-80789C50 000010 0008+00 0/1 0/0 0/0 .rodata @3911 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3911[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80789C48, &lit_3911);
#pragma pop
/* 80789C50-80789C58 000018 0008+00 0/1 0/0 0/0 .rodata @3912 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3912[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80789C50, &lit_3912);
#pragma pop
/* 80789C58-80789C60 000020 0008+00 0/1 0/0 0/0 .rodata @3913 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3913[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80789C58, &lit_3913);
#pragma pop
/* 80789C60-80789C64 000028 0004+00 0/1 0/0 0/0 .rodata @3914 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3914 = 1.0f / 100.0f;
COMPILER_STRIP_GATE(0x80789C60, &lit_3914);
#pragma pop
/* 80789C64-80789C68 00002C 0004+00 0/1 0/0 0/0 .rodata @3929 */
#pragma push
#pragma force_active on
@@ -304,56 +247,6 @@ SECTION_RODATA static f32 const lit_3934 = 300.0f;
COMPILER_STRIP_GATE(0x80789C78, &lit_3934);
#pragma pop
/* 80789D90-80789D9C 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,
};
/* 80789D9C-80789DB0 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
/* 80789DB0-80789DB8 000020 0008+00 0/1 0/0 0/0 .data e_prim$3787 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 e_prim[8] = {
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
};
#pragma pop
/* 80789DB8-80789DC0 000028 0008+00 0/1 0/0 0/0 .data e_env$3788 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 e_env[8] = {
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
};
#pragma pop
/* 80789DC0-80789DC8 000030 0006+02 0/1 0/0 0/0 .data eff_id$3796 */
#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
/* 80789DC8-80789E00 -00001 0038+00 1/1 0/0 0/0 .data @4353 */
SECTION_DATA static void* lit_4353[14] = {
(void*)(((char*)e_sf_fight_run__FP10e_sf_class) + 0x54),
@@ -1381,13 +1274,6 @@ static void func_80789808() {
// NONMATCHING
}
/* 80789810-80789C24 0047D0 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
}
/* ############################################################################################## */
/* 8078A0D4-8078A0D8 0000AC 0004+00 0/0 0/0 0/0 .bss
* sInstance__40JASGlobalInstance<19JASDefaultBankTable> */