mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-06 01:18:13 -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
-116
@@ -6,7 +6,8 @@
|
||||
#include "d/actor/d_a_e_nz.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
UNK_REL_DATA;
|
||||
#include "f_op/f_op_actor_enemy.h"
|
||||
|
||||
|
||||
//
|
||||
@@ -39,7 +40,6 @@ extern "C" void __dt__12daE_NZ_HIO_cFv();
|
||||
extern "C" void __sinit_d_a_e_nz_cpp();
|
||||
extern "C" static void func_8072BD0C();
|
||||
extern "C" static void func_8072BD14();
|
||||
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
|
||||
extern "C" void __dt__4cXyzFv();
|
||||
extern "C" extern char const* const d_a_e_nz__stringBase0;
|
||||
|
||||
@@ -150,8 +150,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" extern void* calc_mtx[1 + 1 /* padding */];
|
||||
extern "C" u8 m_midnaActor__9daPy_py_c[4];
|
||||
extern "C" void __register_global_object();
|
||||
|
||||
@@ -160,61 +158,6 @@ extern "C" void __register_global_object();
|
||||
//
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 8072C180-8072C184 000000 0004+00 8/8 0/0 0/0 .rodata @3789 */
|
||||
SECTION_RODATA static f32 const lit_3789 = 100.0f;
|
||||
COMPILER_STRIP_GATE(0x8072C180, &lit_3789);
|
||||
|
||||
/* 8072C184-8072C188 000004 0004+00 2/9 0/0 0/0 .rodata @3790 */
|
||||
SECTION_RODATA static u8 const lit_3790[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x8072C184, &lit_3790);
|
||||
|
||||
/* 8072C188-8072C190 000008 0004+04 2/9 0/0 0/0 .rodata @3791 */
|
||||
SECTION_RODATA static f32 const lit_3791[1 + 1 /* padding */] = {
|
||||
1.0f,
|
||||
/* padding */
|
||||
0.0f,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x8072C188, &lit_3791);
|
||||
|
||||
/* 8072C190-8072C198 000010 0008+00 0/2 0/0 0/0 .rodata @3792 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3792[8] = {
|
||||
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x8072C190, &lit_3792);
|
||||
#pragma pop
|
||||
|
||||
/* 8072C198-8072C1A0 000018 0008+00 0/2 0/0 0/0 .rodata @3793 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3793[8] = {
|
||||
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x8072C198, &lit_3793);
|
||||
#pragma pop
|
||||
|
||||
/* 8072C1A0-8072C1A8 000020 0008+00 0/2 0/0 0/0 .rodata @3794 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3794[8] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x8072C1A0, &lit_3794);
|
||||
#pragma pop
|
||||
|
||||
/* 8072C1A8-8072C1AC 000028 0004+00 0/1 0/0 0/0 .rodata @3795 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3795 = 1.0f / 100.0f;
|
||||
COMPILER_STRIP_GATE(0x8072C1A8, &lit_3795);
|
||||
#pragma pop
|
||||
|
||||
/* 8072C1AC-8072C1B0 00002C 0004+00 0/1 0/0 0/0 .rodata @3810 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
@@ -247,56 +190,6 @@ COMPILER_STRIP_GATE(0x8072C1B8, &lit_3813);
|
||||
SECTION_RODATA static f32 const lit_3814 = 30.0f;
|
||||
COMPILER_STRIP_GATE(0x8072C1BC, &lit_3814);
|
||||
|
||||
/* 8072C24C-8072C258 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,
|
||||
};
|
||||
|
||||
/* 8072C258-8072C26C 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
|
||||
|
||||
/* 8072C26C-8072C274 000020 0008+00 0/1 0/0 0/0 .data e_prim$3668 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_prim[8] = {
|
||||
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 8072C274-8072C27C 000028 0008+00 0/1 0/0 0/0 .data e_env$3669 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 e_env[8] = {
|
||||
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 8072C27C-8072C284 000030 0006+02 0/1 0/0 0/0 .data eff_id$3677 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 eff_id_3677[6 + 2 /* padding */] = {
|
||||
0x02,
|
||||
0x9D,
|
||||
0x02,
|
||||
0x9E,
|
||||
0x02,
|
||||
0x9F,
|
||||
/* padding */
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 8072C284-8072C28C 000038 0008+00 5/5 0/0 0/0 .data stick_bit */
|
||||
SECTION_DATA static u8 stick_bit[8] = {
|
||||
0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
|
||||
@@ -896,13 +789,6 @@ static void func_8072BD14() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 8072BD1C-8072C130 00241C 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
|
||||
}
|
||||
|
||||
/* 8072C130-8072C16C 002830 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */
|
||||
// cXyz::~cXyz() {
|
||||
extern "C" void __dt__4cXyzFv() {
|
||||
|
||||
Reference in New Issue
Block a user