mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-14 19:59:45 -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
@@ -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"
|
||||
|
||||
|
||||
|
||||
@@ -58,7 +59,6 @@ extern "C" void __dt__12daE_TH_HIO_cFv();
|
||||
extern "C" void __sinit_d_a_e_th_cpp();
|
||||
extern "C" static void func_807B4028();
|
||||
extern "C" static void func_807B4030();
|
||||
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
|
||||
extern "C" void __dt__4cXyzFv();
|
||||
extern "C" extern char const* const d_a_e_th__stringBase0;
|
||||
|
||||
@@ -191,7 +191,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 mCurrentMtx__6J3DSys[48];
|
||||
extern "C" extern u8 struct_80450C98[4];
|
||||
@@ -204,61 +203,6 @@ extern "C" void __register_global_object();
|
||||
//
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 807B449C-807B44A0 000000 0004+00 16/16 0/0 0/0 .rodata @3906 */
|
||||
SECTION_RODATA static f32 const lit_3906 = 100.0f;
|
||||
COMPILER_STRIP_GATE(0x807B449C, &lit_3906);
|
||||
|
||||
/* 807B44A0-807B44A4 000004 0004+00 1/13 0/0 0/0 .rodata @3907 */
|
||||
SECTION_RODATA static u8 const lit_3907[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x807B44A0, &lit_3907);
|
||||
|
||||
/* 807B44A4-807B44AC 000008 0004+04 1/11 0/0 0/0 .rodata @3908 */
|
||||
SECTION_RODATA static f32 const lit_3908[1 + 1 /* padding */] = {
|
||||
1.0f,
|
||||
/* padding */
|
||||
0.0f,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x807B44A4, &lit_3908);
|
||||
|
||||
/* 807B44AC-807B44B4 000010 0008+00 0/1 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(0x807B44AC, &lit_3909);
|
||||
#pragma pop
|
||||
|
||||
/* 807B44B4-807B44BC 000018 0008+00 0/1 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(0x807B44B4, &lit_3910);
|
||||
#pragma pop
|
||||
|
||||
/* 807B44BC-807B44C4 000020 0008+00 0/1 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(0x807B44BC, &lit_3911);
|
||||
#pragma pop
|
||||
|
||||
/* 807B44C4-807B44C8 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(0x807B44C4, &lit_3912);
|
||||
#pragma pop
|
||||
|
||||
/* 807B44C8-807B44CC 00002C 0004+00 0/1 0/0 0/0 .rodata @3927 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
@@ -273,56 +217,6 @@ SECTION_RODATA static f32 const lit_3928 = 700.0f;
|
||||
COMPILER_STRIP_GATE(0x807B44CC, &lit_3928);
|
||||
#pragma pop
|
||||
|
||||
/* 807B464C-807B4658 000000 000C+00 1/1 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,
|
||||
};
|
||||
|
||||
/* 807B4658-807B466C 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
|
||||
|
||||
/* 807B466C-807B4674 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
|
||||
|
||||
/* 807B4674-807B467C 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
|
||||
|
||||
/* 807B467C-807B4684 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
|
||||
|
||||
/* 807B4684-807B4688 000038 0004+00 1/1 0/0 0/0 .data l_color$4083 */
|
||||
SECTION_DATA static u8 l_color[4] = {
|
||||
0x50,
|
||||
@@ -1386,13 +1280,6 @@ static void func_807B4030() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 807B4038-807B444C 003D98 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
|
||||
}
|
||||
|
||||
/* 807B444C-807B4488 0041AC 003C+00 2/2 0/0 0/0 .text __dt__4cXyzFv */
|
||||
// cXyz::~cXyz() {
|
||||
extern "C" void __dt__4cXyzFv() {
|
||||
|
||||
Reference in New Issue
Block a user