mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 20:43:07 -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_sw.cpp
+2 -115
View File
@@ -5,7 +5,8 @@
#include "d/actor/d_a_e_sw.h"
#include "dol2asm.h"
UNK_REL_DATA;
#include "f_op/f_op_actor_enemy.h"
//
@@ -88,7 +89,6 @@ extern "C" void __dt__12daE_SW_HIO_cFv();
extern "C" void __sinit_d_a_e_sw_cpp();
extern "C" static void func_807AF8F4();
extern "C" static void func_807AF8FC();
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
extern "C" extern char const* const d_a_e_sw__stringBase0;
//
@@ -210,7 +210,6 @@ 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" 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 sincosTable___5JMath[65536];
extern "C" f32 mGroundY__11fopAcM_gc_c;
@@ -222,61 +221,6 @@ extern "C" void __register_global_object();
//
/* ############################################################################################## */
/* 807AFD2C-807AFD30 000000 0004+00 38/38 0/0 0/0 .rodata @3909 */
SECTION_RODATA static f32 const lit_3909 = 100.0f;
COMPILER_STRIP_GATE(0x807AFD2C, &lit_3909);
/* 807AFD30-807AFD34 000004 0004+00 1/33 0/0 0/0 .rodata @3910 */
SECTION_RODATA static u8 const lit_3910[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x807AFD30, &lit_3910);
/* 807AFD34-807AFD3C 000008 0004+04 7/38 0/0 0/0 .rodata @3911 */
SECTION_RODATA static f32 const lit_3911[1 + 1 /* padding */] = {
1.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x807AFD34, &lit_3911);
/* 807AFD3C-807AFD44 000010 0008+00 0/15 0/0 0/0 .rodata @3912 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3912[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x807AFD3C, &lit_3912);
#pragma pop
/* 807AFD44-807AFD4C 000018 0008+00 0/15 0/0 0/0 .rodata @3913 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3913[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x807AFD44, &lit_3913);
#pragma pop
/* 807AFD4C-807AFD54 000020 0008+00 0/15 0/0 0/0 .rodata @3914 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3914[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x807AFD4C, &lit_3914);
#pragma pop
/* 807AFD54-807AFD58 000028 0004+00 0/1 0/0 0/0 .rodata @3915 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3915 = 1.0f / 100.0f;
COMPILER_STRIP_GATE(0x807AFD54, &lit_3915);
#pragma pop
/* 807AFD58-807AFD5C 00002C 0004+00 0/4 0/0 0/0 .rodata @3930 */
#pragma push
#pragma force_active on
@@ -305,56 +249,6 @@ SECTION_RODATA static f32 const lit_3933 = 1000.0f;
COMPILER_STRIP_GATE(0x807AFD64, &lit_3933);
#pragma pop
/* 807AFE7C-807AFE88 000000 000C+00 5/5 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,
};
/* 807AFE88-807AFE9C 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
/* 807AFE9C-807AFEA4 000020 0008+00 0/1 0/0 0/0 .data e_prim$3788 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 e_prim[8] = {
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
};
#pragma pop
/* 807AFEA4-807AFEAC 000028 0008+00 0/1 0/0 0/0 .data e_env$3789 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 e_env[8] = {
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
};
#pragma pop
/* 807AFEAC-807AFEB4 000030 0006+02 0/1 0/0 0/0 .data eff_id$3797 */
#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
/* 807AFEB4-807AFEF4 000038 0040+00 1/1 0/0 0/0 .data cc_sph_src__22@unnamed@d_a_e_sw_cpp@ */
SECTION_DATA static u8 data_807AFEB4[64] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D,
@@ -1756,13 +1650,6 @@ static void func_807AF8FC() {
// NONMATCHING
}
/* 807AF904-807AFD18 0085E4 0414+00 2/2 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
}
/* ############################################################################################## */
/* 807B0234-807B0238 000084 0004+00 0/0 0/0 0/0 .bss
* sInstance__40JASGlobalInstance<19JASDefaultBankTable> */