Skip to content

Commit 3de1f91

Browse files
carter-ktb21carter-ktb21
authored
d_a_obj_ito work (#2583)
* All functions worked on * padding cleanup
1 parent 4ade12f commit 3de1f91

File tree

3 files changed

+768
-599
lines changed

3 files changed

+768
-599
lines changed

‎include/d/actor/d_a_obj_gm.h‎

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#ifndef D_A_OBJ_GM_H
22
#define D_A_OBJ_GM_H
33

4+
#include "d/d_bg_s_acch.h"
5+
#include "d/d_cc_d.h"
6+
#include "d/d_cc_uty.h"
47
#include "f_op/f_op_actor_mng.h"
58

69
/**
@@ -12,8 +15,59 @@
1215
*
1316
*/
1417
class obj_gm_class : public fopAc_ac_c {
15-
private:
16-
/* 0x568 */ u8 field_0x568[0xaf4 - 0x568];
18+
public:
19+
/* 0x568 */ request_of_phase_process_class mPhase;
20+
/* 0x570 */ u8 field_0x570;
21+
/* 0x571 */ u8 field_0x571;
22+
/* 0x572 */ u8 field_0x572;
23+
/* 0x573 */ u8 field_0x573;
24+
/* 0x574 */ J3DModel* field_0x574;
25+
/* 0x578 */ Z2Creature mSound;
26+
/* 0x608 */ s16 field_0x608;
27+
/* 0x60A */ s16 field_0x60a;
28+
/* 0x60C */ s16 field_0x60c;
29+
/* 0x60E */ s16 field_0x60e;
30+
/* 0x610 */ u8 field_0x610[0x614 - 0x610];
31+
/* 0x614 */ cXyz field_0x614[2];
32+
/* 0x62C */ f32 field_0x62c;
33+
/* 0x630 */ f32 field_0x630;
34+
/* 0x634 */ f32 field_0x634;
35+
/* 0x638 */ f32 field_0x638;
36+
/* 0x63C */ s16 field_0x63c;
37+
/* 0x63E */ s16 field_0x63e;
38+
/* 0x640 */ s16 field_0x640;
39+
/* 0x642 */ s16 field_0x642;
40+
/* 0x644 */ s16 field_0x644;
41+
/* 0x646 */ u8 field_0x646[0x648 - 0x646];
42+
/* 0x648 */ f32 field_0x648;
43+
/* 0x64C */ s16 field_0x64c[4];
44+
/* 0x654 */ cXyz field_0x654[2];
45+
/* 0x66C */ cXyz field_0x66c[2];
46+
/* 0x684 */ cXyz field_0x684[6];
47+
/* 0x6CC */ cXyz field_0x6cc[6];
48+
/* 0x714 */ u8 field_0x714[0x720 - 0x714];
49+
/* 0x720 */ s16 field_0x720;
50+
/* 0x722 */ s16 field_0x722;
51+
/* 0x724 */ u8 field_0x724[0x726 - 0x724];
52+
/* 0x726 */ u8 field_0x726;
53+
/* 0x727 */ u8 field_0x727;
54+
/* 0x728 */ f32 field_0x728;
55+
/* 0x72C */ u8 field_0x72c;
56+
/* 0x72D */ u8 field_0x72d[0x730 - 0x72d];
57+
/* 0x730 */ dBgS_AcchCir mAcchCir;
58+
/* 0x770 */ dBgS_ObjAcch mObjAcch;
59+
/* 0x948 */ s16 field_0x948;
60+
/* 0x94A */ u8 field_0x94a[0x94c - 0x94a];
61+
/* 0x94C */ dCcD_Stts mStts;
62+
/* 0x988 */ dCcD_Sph field_0x988;
63+
/* 0xAC0 */ dCcU_AtInfo mAtInfo;
64+
/* 0xAE4 */ u8 field_0xae4;
65+
/* 0xAE5 */ u8 field_0xae5[0xae8 - 0xae5];
66+
/* 0xAE8 */ u32 field_0xae8;
67+
/* 0xAEC */ u32 field_0xaec;
68+
/* 0xAF0 */ u8 field_0xaf0;
69+
/* 0xAF1 */ u8 field_0xaf1[0xaf4 - 0xaf1];
70+
1771
};
1872

1973
STATIC_ASSERT(sizeof(obj_gm_class) == 0xaf4);

‎include/d/actor/d_a_obj_ito.h‎

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#ifndef D_A_OBJ_ITO_H
22
#define D_A_OBJ_ITO_H
33

4+
#include "d/d_cc_d.h"
45
#include "f_op/f_op_actor_mng.h"
56

67
/**
@@ -10,20 +11,63 @@
1011
*
1112
* @details
1213
*
13-
*/
14-
class obj_ito_class : public fopAc_ac_c {
15-
private:
16-
/* 0x568 */ u8 field_0x568[0x150c - 0x568];
14+
*/
15+
16+
struct ito_s {
17+
/* 0x000 */ mDoExt_3DlineMat0_c mLineMat;
18+
/* 0x01C */ f32 field_0x1c[120];
19+
/* 0x1FC */ cXyz field_0x1fc[6];
20+
/* 0x244 */ s16 field_0x244[6];
21+
/* 0x250 */ f32 field_0x250;
22+
/* 0x254 */ f32 field_0x254;
23+
/* 0x258 */ f32 field_0x258;
1724
};
1825

19-
STATIC_ASSERT(sizeof(obj_ito_class) == 0x150c);
26+
class obj_ito_class {
27+
public:
28+
/* 0x0000 */ fopAc_ac_c actor;
29+
/* 0x0568 */ request_of_phase_process_class mPhase;
30+
/* 0x0570 */ u8 field_0x570;
31+
/* 0x0571 */ u8 field_0x571;
32+
/* 0x0574 */ J3DModel* field_0x574[2];
33+
/* 0x057C */ Z2Creature mSound;
34+
/* 0x060C */ s16 field_0x60c;
35+
/* 0x060E */ u8 field_0x60e[0x610 - 0x60e];
36+
/* 0x0610 */ s16 field_0x610;
37+
/* 0x0612 */ s16 field_0x612[2];
38+
/* 0x0618 */ cXyz field_0x618;
39+
/* 0x0624 */ cXyz field_0x624;
40+
/* 0x0630 */ f32 field_0x630;
41+
/* 0x0634 */ f32 field_0x634;
42+
/* 0x0638 */ s8 field_0x638;
43+
/* 0x0639 */ s8 field_0x639;
44+
/* 0x063A */ s16 field_0x63a;
45+
/* 0x063C */ dCcD_Stts mStts;
46+
/* 0x0678 */ dCcD_Sph field_0x678[8];
47+
/* 0x1038 */ s8 field_0x1038;
48+
/* 0x103C */ ito_s field_0x103c;
49+
/* 0x1298 */ ito_s field_0x1298;
50+
/* 0x14F4 */ u32 field_0x14f4;
51+
/* 0x14F8 */ cXyz field_0x14f8;
52+
/* 0x1504 */ f32 field_0x1504;
53+
/* 0x1508 */ s8 field_0x1508;
54+
/* 0x1509 */ s8 field_0x1509;
55+
/* 0x150A */ s8 field_0x150a;
56+
/* 0x150B */ u8 field_0x150b;
57+
};
2058

21-
struct ito_s {};
59+
STATIC_ASSERT(sizeof(obj_ito_class) == 0x150c);
2260

2361
class daObj_Ito_HIO_c {
2462
public:
2563
/* 8047B2EC */ daObj_Ito_HIO_c();
26-
/* 8047D778 */ ~daObj_Ito_HIO_c();
64+
/* 8047D778 */ virtual ~daObj_Ito_HIO_c() {}
65+
66+
/* ぶら下りＯＢＪ糸 */
67+
/* 0x04 */ s8 field_0x4;
68+
/* 0x08 */ f32 field_0x8; // 糸長さ基準値 - Thread Length Reference Value
69+
/* 0x0C */ f32 field_0xc; // 糸位置補正値 - Thread Position Correction Value
70+
/* 0x10 */ s16 field_0x10;
2771
};
2872

2973

0 commit comments

Comments
 (0)