Skip to content

Commit 036b67c

Browse files
YunataSaviorYunataSavior
authored
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)
1 parent 6e94efa commit 036b67c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+117
-6178
lines changed

‎src/d/actor/d_a_b_gg.cpp‎

Lines changed: 2 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
#include "d/d_cc_d.h"
88
#include "dol2asm.h"
99
#include "d/d_camera.h"
10-
10+
UNK_REL_DATA;
11+
#include "f_op/f_op_actor_enemy.h"
1112

1213

1314
//
@@ -115,7 +116,6 @@ extern "C" void __dt__12daB_GG_HIO_cFv();
115116
extern "C" void __sinit_d_a_b_gg_cpp();
116117
extern "C" static void func_805ECBEC();
117118
extern "C" static void func_805ECBF4();
118-
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
119119
extern "C" void __dt__4cXyzFv();
120120
extern "C" extern char const* const d_a_b_gg__stringBase0;
121121

@@ -270,13 +270,11 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25];
270270
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
271271
extern "C" extern void* __vt__9cCcD_Stts[8];
272272
extern "C" u8 now__14mDoMtx_stack_c[48];
273-
extern "C" extern u8 g_dComIfG_gameInfo[122384];
274273
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
275274
extern "C" u8 mCurrentMtx__6J3DSys[48];
276275
extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4];
277276
extern "C" extern u8 struct_80450C98[4];
278277
extern "C" u8 m_midnaActor__9daPy_py_c[4];
279-
extern "C" extern u8 pauseTimer__9dScnPly_c[4];
280278
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
281279
extern "C" void __register_global_object();
282280

@@ -285,61 +283,6 @@ extern "C" void __register_global_object();
285283
//
286284

287285
/* ############################################################################################## */
288-
/* 805ED060-805ED064 000000 0004+00 45/45 0/0 0/0 .rodata @3911 */
289-
SECTION_RODATA static f32 const lit_3911 = 100.0f;
290-
COMPILER_STRIP_GATE(0x805ED060, &lit_3911);
291-
292-
/* 805ED064-805ED068 000004 0004+00 8/44 0/0 0/0 .rodata @3912 */
293-
SECTION_RODATA static u8 const lit_3912[4] = {
294-
0x00,
295-
0x00,
296-
0x00,
297-
0x00,
298-
};
299-
COMPILER_STRIP_GATE(0x805ED064, &lit_3912);
300-
301-
/* 805ED068-805ED070 000008 0004+04 1/21 0/0 0/0 .rodata @3913 */
302-
SECTION_RODATA static f32 const lit_3913[1 + 1 /* padding */] = {
303-
1.0f,
304-
/* padding */
305-
0.0f,
306-
};
307-
COMPILER_STRIP_GATE(0x805ED068, &lit_3913);
308-
309-
/* 805ED070-805ED078 000010 0008+00 0/13 0/0 0/0 .rodata @3914 */
310-
#pragma push
311-
#pragma force_active on
312-
SECTION_RODATA static u8 const lit_3914[8] = {
313-
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
314-
};
315-
COMPILER_STRIP_GATE(0x805ED070, &lit_3914);
316-
#pragma pop
317-
318-
/* 805ED078-805ED080 000018 0008+00 0/13 0/0 0/0 .rodata @3915 */
319-
#pragma push
320-
#pragma force_active on
321-
SECTION_RODATA static u8 const lit_3915[8] = {
322-
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
323-
};
324-
COMPILER_STRIP_GATE(0x805ED078, &lit_3915);
325-
#pragma pop
326-
327-
/* 805ED080-805ED088 000020 0008+00 0/13 0/0 0/0 .rodata @3916 */
328-
#pragma push
329-
#pragma force_active on
330-
SECTION_RODATA static u8 const lit_3916[8] = {
331-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
332-
};
333-
COMPILER_STRIP_GATE(0x805ED080, &lit_3916);
334-
#pragma pop
335-
336-
/* 805ED088-805ED08C 000028 0004+00 0/2 0/0 0/0 .rodata @3917 */
337-
#pragma push
338-
#pragma force_active on
339-
SECTION_RODATA static f32 const lit_3917 = 1.0f / 100.0f;
340-
COMPILER_STRIP_GATE(0x805ED088, &lit_3917);
341-
#pragma pop
342-
343286
/* 805ED08C-805ED090 00002C 0004+00 0/4 0/0 0/0 .rodata @3932 */
344287
#pragma push
345288
#pragma force_active on
@@ -358,56 +301,6 @@ COMPILER_STRIP_GATE(0x805ED090, &lit_3933);
358301
SECTION_RODATA static f32 const lit_3934 = 0.5f;
359302
COMPILER_STRIP_GATE(0x805ED094, &lit_3934);
360303

361-
/* 805ED3F0-805ED3FC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
362-
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
363-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
364-
};
365-
366-
/* 805ED3FC-805ED410 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
367-
#pragma push
368-
#pragma force_active on
369-
SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
370-
0x02000201,
371-
/* padding */
372-
0x40080000,
373-
0x00000000,
374-
0x3FE00000,
375-
0x00000000,
376-
};
377-
#pragma pop
378-
379-
/* 805ED410-805ED418 000020 0008+00 0/1 0/0 0/0 .data e_prim$3790 */
380-
#pragma push
381-
#pragma force_active on
382-
SECTION_DATA static u8 e_prim[8] = {
383-
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
384-
};
385-
#pragma pop
386-
387-
/* 805ED418-805ED420 000028 0008+00 0/1 0/0 0/0 .data e_env$3791 */
388-
#pragma push
389-
#pragma force_active on
390-
SECTION_DATA static u8 e_env[8] = {
391-
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
392-
};
393-
#pragma pop
394-
395-
/* 805ED420-805ED428 000030 0006+02 0/1 0/0 0/0 .data eff_id$3799 */
396-
#pragma push
397-
#pragma force_active on
398-
SECTION_DATA static u8 eff_id[6 + 2 /* padding */] = {
399-
0x02,
400-
0x9D,
401-
0x02,
402-
0x9E,
403-
0x02,
404-
0x9F,
405-
/* padding */
406-
0x00,
407-
0x00,
408-
};
409-
#pragma pop
410-
411304
/* 805ED428-805ED47C -00001 0054+00 1/1 0/0 0/0 .data @5037 */
412305
SECTION_DATA static void* lit_5037[21] = {
413306
(void*)(((char*)St_CamAction__8daB_GG_cFv) + 0x88),
@@ -2386,13 +2279,6 @@ static void func_805ECBF4() {
23862279
// NONMATCHING
23872280
}
23882281

2389-
/* 805ECBFC-805ED010 00E8DC 0414+00 1/1 0/0 0/0 .text
2390-
* setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz */
2391-
static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, cXyz* param_2,
2392-
cXyz* param_3) {
2393-
// NONMATCHING
2394-
}
2395-
23962282
/* 805ED010-805ED04C 00ECF0 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */
23972283
// cXyz::~cXyz() {
23982284
extern "C" void __dt__4cXyzFv() {

‎src/d/actor/d_a_b_mgn.cpp‎

Lines changed: 2 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include "d/actor/d_a_b_mgn.h"
77
#include "dol2asm.h"
88
#include "d/d_camera.h"
9-
10-
9+
UNK_REL_DATA;
10+
#include "f_op/f_op_actor_enemy.h"
1111

1212

1313

@@ -94,7 +94,6 @@ extern "C" void __dt__13daB_MGN_HIO_cFv();
9494
extern "C" void __sinit_d_a_b_mgn_cpp();
9595
extern "C" static void func_8060F954();
9696
extern "C" static void func_8060F95C();
97-
extern "C" static void setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz();
9897
extern "C" void __dt__4cXyzFv();
9998
extern "C" void checkNowWolf__9daPy_py_cFv();
10099
extern "C" extern char const* const d_a_b_mgn__stringBase0;
@@ -266,7 +265,6 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25];
266265
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
267266
extern "C" extern void* __vt__9cCcD_Stts[8];
268267
extern "C" u8 now__14mDoMtx_stack_c[48];
269-
extern "C" extern u8 g_dComIfG_gameInfo[122384];
270268
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
271269
extern "C" u8 mCurrentMtx__6J3DSys[48];
272270
extern "C" u8 sincosTable___5JMath[65536];
@@ -281,61 +279,6 @@ extern "C" void __register_global_object();
281279
//
282280

283281
/* ############################################################################################## */
284-
/* 8060FDE0-8060FDE4 000000 0004+00 30/30 0/0 0/0 .rodata @3928 */
285-
SECTION_RODATA static f32 const lit_3928 = 100.0f;
286-
COMPILER_STRIP_GATE(0x8060FDE0, &lit_3928);
287-
288-
/* 8060FDE4-8060FDE8 000004 0004+00 3/26 0/0 0/0 .rodata @3929 */
289-
SECTION_RODATA static u8 const lit_3929[4] = {
290-
0x00,
291-
0x00,
292-
0x00,
293-
0x00,
294-
};
295-
COMPILER_STRIP_GATE(0x8060FDE4, &lit_3929);
296-
297-
/* 8060FDE8-8060FDF0 000008 0004+04 5/24 0/0 0/0 .rodata @3930 */
298-
SECTION_RODATA static f32 const lit_3930[1 + 1 /* padding */] = {
299-
1.0f,
300-
/* padding */
301-
0.0f,
302-
};
303-
COMPILER_STRIP_GATE(0x8060FDE8, &lit_3930);
304-
305-
/* 8060FDF0-8060FDF8 000010 0008+00 0/7 0/0 0/0 .rodata @3931 */
306-
#pragma push
307-
#pragma force_active on
308-
SECTION_RODATA static u8 const lit_3931[8] = {
309-
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
310-
};
311-
COMPILER_STRIP_GATE(0x8060FDF0, &lit_3931);
312-
#pragma pop
313-
314-
/* 8060FDF8-8060FE00 000018 0008+00 0/7 0/0 0/0 .rodata @3932 */
315-
#pragma push
316-
#pragma force_active on
317-
SECTION_RODATA static u8 const lit_3932[8] = {
318-
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
319-
};
320-
COMPILER_STRIP_GATE(0x8060FDF8, &lit_3932);
321-
#pragma pop
322-
323-
/* 8060FE00-8060FE08 000020 0008+00 0/7 0/0 0/0 .rodata @3933 */
324-
#pragma push
325-
#pragma force_active on
326-
SECTION_RODATA static u8 const lit_3933[8] = {
327-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
328-
};
329-
COMPILER_STRIP_GATE(0x8060FE00, &lit_3933);
330-
#pragma pop
331-
332-
/* 8060FE08-8060FE0C 000028 0004+00 0/1 0/0 0/0 .rodata @3934 */
333-
#pragma push
334-
#pragma force_active on
335-
SECTION_RODATA static f32 const lit_3934 = 1.0f / 100.0f;
336-
COMPILER_STRIP_GATE(0x8060FE08, &lit_3934);
337-
#pragma pop
338-
339282
/* 8060FE0C-8060FE10 00002C 0004+00 0/1 0/0 0/0 .rodata @3949 */
340283
#pragma push
341284
#pragma force_active on
@@ -357,56 +300,6 @@ SECTION_RODATA static f32 const lit_3951 = 70.0f;
357300
COMPILER_STRIP_GATE(0x8060FE14, &lit_3951);
358301
#pragma pop
359302

360-
/* 80610094-806100A0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */
361-
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
362-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
363-
};
364-
365-
/* 806100A0-806100B4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
366-
#pragma push
367-
#pragma force_active on
368-
SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
369-
0x02000201,
370-
/* padding */
371-
0x40080000,
372-
0x00000000,
373-
0x3FE00000,
374-
0x00000000,
375-
};
376-
#pragma pop
377-
378-
/* 806100B4-806100BC 000020 0008+00 0/1 0/0 0/0 .data e_prim$3807 */
379-
#pragma push
380-
#pragma force_active on
381-
SECTION_DATA static u8 e_prim[8] = {
382-
0xFF, 0x78, 0x00, 0x00, 0xFF, 0x64, 0x78, 0x00,
383-
};
384-
#pragma pop
385-
386-
/* 806100BC-806100C4 000028 0008+00 0/1 0/0 0/0 .data e_env$3808 */
387-
#pragma push
388-
#pragma force_active on
389-
SECTION_DATA static u8 e_env[8] = {
390-
0x5A, 0x2D, 0x2D, 0x00, 0x3C, 0x1E, 0x1E, 0x00,
391-
};
392-
#pragma pop
393-
394-
/* 806100C4-806100CC 000030 0006+02 0/1 0/0 0/0 .data eff_id$3816 */
395-
#pragma push
396-
#pragma force_active on
397-
SECTION_DATA static u8 eff_id[6 + 2 /* padding */] = {
398-
0x02,
399-
0x9D,
400-
0x02,
401-
0x9E,
402-
0x02,
403-
0x9F,
404-
/* padding */
405-
0x00,
406-
0x00,
407-
};
408-
#pragma pop
409-
410303
/* 806100CC-8061010C 000038 0040+00 0/1 0/0 0/0 .data cc_sph_src__23@unnamed@d_a_b_mgn_cpp@ */
411304
#pragma push
412305
#pragma force_active on
@@ -2005,13 +1898,6 @@ static void func_8060F95C() {
20051898
// NONMATCHING
20061899
}
20071900

2008-
/* 8060F964-8060FD78 00A324 0414+00 1/1 0/0 0/0 .text
2009-
* setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz */
2010-
static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, cXyz* param_2,
2011-
cXyz* param_3) {
2012-
// NONMATCHING
2013-
}
2014-
20151901
/* 8060FD78-8060FDB4 00A738 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */
20161902
// cXyz::~cXyz() {
20171903
extern "C" void __dt__4cXyzFv() {

0 commit comments

Comments
 (0)