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
-115
@@ -8,7 +8,8 @@
|
||||
#include "dol2asm.h"
|
||||
#include "d/d_camera.h"
|
||||
#include "d/actor/d_a_obj_smallkey.h"
|
||||
|
||||
UNK_REL_DATA;
|
||||
#include "f_op/f_op_actor_enemy.h"
|
||||
|
||||
|
||||
//
|
||||
@@ -59,7 +60,6 @@ extern "C" void __dt__12daE_GB_HIO_cFv();
|
||||
extern "C" void __sinit_d_a_e_gb_cpp();
|
||||
extern "C" static void func_806C701C();
|
||||
extern "C" static void func_806C7024();
|
||||
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
|
||||
extern "C" void __dt__5csXyzFv();
|
||||
extern "C" void __dt__4cXyzFv();
|
||||
extern "C" void setPos__7daKey_cF4cXyz();
|
||||
@@ -204,7 +204,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[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];
|
||||
@@ -217,115 +216,10 @@ extern "C" void actionWaitInit__7daKey_cFv();
|
||||
//
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 806C74E8-806C74EC 000000 0004+00 20/20 0/0 0/0 .rodata @3906 */
|
||||
SECTION_RODATA static f32 const lit_3906 = 100.0f;
|
||||
COMPILER_STRIP_GATE(0x806C74E8, &lit_3906);
|
||||
|
||||
/* 806C74EC-806C74F0 000004 0004+00 4/24 0/0 0/0 .rodata @3907 */
|
||||
SECTION_RODATA static u8 const lit_3907[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806C74EC, &lit_3907);
|
||||
|
||||
/* 806C74F0-806C74F8 000008 0004+04 3/18 0/0 0/0 .rodata @3908 */
|
||||
SECTION_RODATA static f32 const lit_3908[1 + 1 /* padding */] = {
|
||||
1.0f,
|
||||
/* padding */
|
||||
0.0f,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806C74F0, &lit_3908);
|
||||
|
||||
/* 806C74F8-806C7500 000010 0008+00 0/5 0/0 0/0 .rodata @3909 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3909[8] = {
|
||||
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806C74F8, &lit_3909);
|
||||
#pragma pop
|
||||
|
||||
/* 806C7500-806C7508 000018 0008+00 0/5 0/0 0/0 .rodata @3910 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3910[8] = {
|
||||
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806C7500, &lit_3910);
|
||||
#pragma pop
|
||||
|
||||
/* 806C7508-806C7510 000020 0008+00 0/5 0/0 0/0 .rodata @3911 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3911[8] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x806C7508, &lit_3911);
|
||||
#pragma pop
|
||||
|
||||
/* 806C7510-806C7514 000028 0004+00 0/1 0/0 0/0 .rodata @3912 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3912 = 1.0f / 100.0f;
|
||||
COMPILER_STRIP_GATE(0x806C7510, &lit_3912);
|
||||
#pragma pop
|
||||
|
||||
/* 806C7514-806C7518 00002C 0004+00 1/1 0/0 0/0 .rodata @3927 */
|
||||
SECTION_RODATA static f32 const lit_3927 = 65.0f;
|
||||
COMPILER_STRIP_GATE(0x806C7514, &lit_3927);
|
||||
|
||||
/* 806C76C4-806C76D0 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,
|
||||
};
|
||||
|
||||
/* 806C76D0-806C76E4 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
|
||||
|
||||
/* 806C76E4-806C76EC 000020 0008+00 0/1 0/0 0/0 .data e_prim$3785 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_prim[8] = {
|
||||
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 806C76EC-806C76F4 000028 0008+00 0/1 0/0 0/0 .data e_env$3786 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_env[8] = {
|
||||
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 806C76F4-806C76FC 000030 0006+02 0/1 0/0 0/0 .data eff_id$3794 */
|
||||
#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
|
||||
|
||||
/* 806C76FC-806C7700 000038 0004+00 1/1 0/0 0/0 .data eno$4381 */
|
||||
SECTION_DATA static u8 eno_4381[4] = {
|
||||
0x83,
|
||||
@@ -1584,13 +1478,6 @@ static void func_806C7024() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 806C702C-806C7440 00542C 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
|
||||
}
|
||||
|
||||
/* 806C7440-806C747C 005840 003C+00 1/1 0/0 0/0 .text __dt__5csXyzFv */
|
||||
// csXyz::~csXyz() {
|
||||
extern "C" void __dt__5csXyzFv() {
|
||||
|
||||
Reference in New Issue
Block a user