mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-17 12:39:27 -04:00
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)
This commit is contained in:
YunataSavior
+2
-114
@@ -6,6 +6,8 @@
|
||||
#include "d/actor/d_a_e_ge.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "dol2asm.h"
|
||||
UNK_REL_DATA;
|
||||
#include "f_op/f_op_actor_enemy.h"
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
@@ -65,7 +67,6 @@ extern "C" void __dt__12daE_GE_HIO_cFv();
|
||||
extern "C" void __sinit_d_a_e_ge_cpp();
|
||||
extern "C" static void func_806CCBC8();
|
||||
extern "C" static void func_806CCBD0();
|
||||
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
|
||||
extern "C" extern char const* const d_a_e_ge__stringBase0;
|
||||
extern "C" u8 l_actionmenu__8daE_GE_c[108];
|
||||
|
||||
@@ -183,7 +184,6 @@ 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" u8 m_midnaActor__9daPy_py_c[4];
|
||||
@@ -194,61 +194,6 @@ extern "C" void __register_global_object();
|
||||
//
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 806CD000-806CD004 000000 0004+00 18/18 0/0 0/0 .rodata @3904 */
|
||||
SECTION_RODATA static f32 const lit_3904 = 100.0f;
|
||||
COMPILER_STRIP_GATE(0x806CD000, &lit_3904);
|
||||
|
||||
/* 806CD004-806CD008 000004 0004+00 4/18 0/0 0/0 .rodata @3905 */
|
||||
SECTION_RODATA static u8 const lit_3905[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806CD004, &lit_3905);
|
||||
|
||||
/* 806CD008-806CD010 000008 0004+04 2/15 0/0 0/0 .rodata @3906 */
|
||||
SECTION_RODATA static f32 const lit_3906[1 + 1 /* padding */] = {
|
||||
1.0f,
|
||||
/* padding */
|
||||
0.0f,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806CD008, &lit_3906);
|
||||
|
||||
/* 806CD010-806CD018 000010 0008+00 0/8 0/0 0/0 .rodata @3907 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3907[8] = {
|
||||
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806CD010, &lit_3907);
|
||||
#pragma pop
|
||||
|
||||
/* 806CD018-806CD020 000018 0008+00 0/8 0/0 0/0 .rodata @3908 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3908[8] = {
|
||||
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806CD018, &lit_3908);
|
||||
#pragma pop
|
||||
|
||||
/* 806CD020-806CD028 000020 0008+00 0/8 0/0 0/0 .rodata @3909 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3909[8] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806CD020, &lit_3909);
|
||||
#pragma pop
|
||||
|
||||
/* 806CD028-806CD02C 000028 0004+00 0/1 0/0 0/0 .rodata @3910 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3910 = 1.0f / 100.0f;
|
||||
COMPILER_STRIP_GATE(0x806CD028, &lit_3910);
|
||||
#pragma pop
|
||||
|
||||
/* 806CD02C-806CD030 00002C 0004+00 0/4 0/0 0/0 .rodata @3925 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
@@ -302,56 +247,6 @@ SECTION_RODATA static f32 const lit_3932 = 110.0f;
|
||||
COMPILER_STRIP_GATE(0x806CD048, &lit_3932);
|
||||
#pragma pop
|
||||
|
||||
/* 806CD118-806CD124 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,
|
||||
};
|
||||
|
||||
/* 806CD124-806CD138 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
|
||||
|
||||
/* 806CD138-806CD140 000020 0008+00 0/1 0/0 0/0 .data e_prim$3783 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_prim[8] = {
|
||||
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 806CD140-806CD148 000028 0008+00 0/1 0/0 0/0 .data e_env$3784 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_env[8] = {
|
||||
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 806CD148-806CD150 000030 0006+02 0/1 0/0 0/0 .data eff_id$3792 */
|
||||
#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
|
||||
|
||||
/* 806CD150-806CD17C -00001 002C+00 1/1 0/0 0/0 .data @5071 */
|
||||
SECTION_DATA static void* lit_5071[11] = {
|
||||
(void*)(((char*)executeBack__8daE_GE_cFv) + 0x48),
|
||||
@@ -1192,11 +1087,4 @@ static void func_806CCBD0() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 806CCBD8-806CCFEC 005278 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
|
||||
}
|
||||
|
||||
/* 806CD10C-806CD10C 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
Reference in New Issue
Block a user