Skip to content

d_a_obj_sw work #2465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TakaRikka merged 18 commits into from
May 31, 2025
Merged

d_a_obj_sw work #2465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0da7aab
Initial work
carter-ktb21 May 22, 2025
568fde9
Work on ori2 and others
carter-ktb21 May 24, 2025
b9a3d48
Work on npc_ks_home
carter-ktb21 May 24, 2025
d85acb1
Work on npc_ks_demo_022
carter-ktb21 May 26, 2025
8a10cc5
Chugging through
carter-ktb21 May 26, 2025
5de654a
Started on demo_camera
carter-ktb21 May 27, 2025
cc944d3
More demo_camera work
carter-ktb21 May 27, 2025
58e4d8d
51% equivalent
carter-ktb21 May 28, 2025
f9458a4
General cleanup
carter-ktb21 May 28, 2025
677361d
Merge branch 'main' of https://github.com/zeldaret/tp into d_a_npc_ks
carter-ktb21 May 28, 2025
d840251
Fixed compile error in d_a_e_mk
carter-ktb21 May 28, 2025
8bf1472
Small d_a_e_mk fix
carter-ktb21 May 28, 2025
477d658
d_a_e_fs fix
carter-ktb21 May 28, 2025
7944624
PR cleanup
carter-ktb21 May 29, 2025
bfdb4d8
Started work on d_a_obj_sw
carter-ktb21 May 29, 2025
620d82d
Merge branch 'main' of https://github.com/zeldaret/tp into d_a_npc_ks
carter-ktb21 May 30, 2025
45aaa63
d_a_obj_sw work
carter-ktb21 May 30, 2025
fcf113f
Small fixes
carter-ktb21 May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 32 additions & 21 deletions include/d/actor/d_a_obj_sw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,15 @@

struct obj_sc_s {
public:
/* 80CF2F3C */ ~obj_sc_s();
/* 80CF2FA8 */ obj_sc_s();
/* 80CF2F3C */ ~obj_sc_s() {};
/* 80CF2FA8 */ obj_sc_s() {};

/* 0x00 */ s8 field_0x0;
/* 0x01 */ u8 field_0x1[0x4 - 0x1];
/* 0x04 */ cXyz field_0x4;
/* 0x10 */ cXyz field_0x10;
/* 0x1C */ cXyz field_0x1c;
/* 0x28 */ s16 field_0x28;
/* 0x2A */ s16 field_0x2a;
/* 0x2C */ s16 field_0x2c;
/* 0x28 */ csXyz field_0x28;
/* 0x2E */ u8 field_0x2e[0x30 - 0x2e];
/* 0x30 */ f32 field_0x30;
/* 0x34 */ s8 field_0x34;
Expand All @@ -34,36 +32,49 @@ struct obj_sc_s {
/* 0x3C */ int field_0x3c;
/* 0x40 */ mDoExt_McaMorf* mpModelMorf;
/* 0x44 */ Z2SoundObjSimple mSound;
/* 0x64 */ J3DModel* mpModel;
/* 0x68 */ s16 field_0x68;
// + 2 bytes of padding
};

STATIC_ASSERT(sizeof(obj_sc_s) == 0x64);

class obj_sw_class {
public:
/* 0x000 */ fopAc_ac_c actor;
/* 0x568 */ u8 field_0x568[0x570 - 0x568];
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ u8 field_0x570;
/* 0x571 */ u8 field_0x571[0x576 - 0x571];
/* 0x571 */ u8 field_0x571;
/* 0x572 */ u8 field_0x572[0x574 - 0x572];
/* 0x574 */ s16 field_0x574;
/* 0x576 */ s16 field_0x576;
/* 0x578 */ u8 field_0x578[0x57a - 0x578];
/* 0x57A */ s16 field_0x57a;
/* 0x57C */ s16 field_0x57c;
/* 0x57E */ s16 field_0x57e;
/* 0x57A */ s16 field_0x57a[3];
/* 0x580 */ s16 field_0x580;
/* 0x582 */ s16 field_0x582;
/* 0x584 */ u8 field_0x584[0x5a8 - 0x584];
/* 0x5A8 */ obj_sc_s field_0x5a8;
/* 0x614 */ cXyz field_0x614;
/* 0x620 */ u8 field_0x620[0x864 - 0x620];
/* 0x864 */ obj_sc_s field_0x864;
/* 0x8D0 */ u8 field_0x8d0[0x8fc - 0x8d0];
/* 0x584 */ f32 field_0x584;
/* 0x588 */ f32 field_0x588;
/* 0x58C */ f32 field_0x58c;
/* 0x590 */ f32 field_0x590;
/* 0x594 */ s16 field_0x594;
/* 0x596 */ s16 field_0x596;
/* 0x598 */ cXyz field_0x598;
/* 0x5A4 */ f32 field_0x5a4;
/* 0x5A8 */ obj_sc_s field_0x5a8[8];
/* 0x8C8 */ J3DModel* field_0x8c8;
/* 0x8CC */ s16 mDemoMode;
/* 0x8CE */ s16 field_0x8ce;
/* 0x8D0 */ cXyz mDemoCamEye;
/* 0x8DC */ cXyz mDemoCamCenter;
/* 0x8E8 */ cXyz field_0x8e8;
/* 0x8F4 */ f32 mDemoCamFovy;
/* 0x8F8 */ u8 field_0x8f8[0x8fc - 0x8f8];
/* 0x8FC */ f32 field_0x8fc;
/* 0x900 */ f32 field_0x900;
/* 0x904 */ cXyz field_0x904[2];
/* 0x91C */ int field_0x91c;
/* 0x920 */ cXyz field_0x920[12];
/* 0x9B0 */ u8 field_0x9b0[0xd50 - 0x9b0];
/* 0x920 */ cXyz field_0x920[63];
/* 0xC14 */ f32 field_0xc14[4];
/* 0xC24 */ u8 field_0xc24[0xd10 - 0xc24];
/* 0xD10 */ s8 field_0xd10[4];
/* 0xD14 */ u8 field_0xd14[0xd50 - 0xd14];
/* 0xD50 */ mDoExt_3DlineMat1_c field_0xd50;
/* 0xD8C */ int field_0xd8c;
};
Expand Down
Loading