Skip to content

d_a_obj_sekidoor matching #2344

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 10 commits into from
Mar 24, 2025
Merged

d_a_obj_sekidoor matching #2344

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e3f9431
Started work on d_a_obj_sekidoor, 38% match
Stbn-antier Mar 19, 2025
0dc7abe
Merge branch 'main' of https://github.com/zeldaret/tp into d_a_obj_se…
Stbn-antier Mar 19, 2025
3f171c1
Filled functions, rough 70% match
Stbn-antier Mar 20, 2025
55281fc
76% method matching
Stbn-antier Mar 20, 2025
e119b67
84% match, only setPrtcls remaining
Stbn-antier Mar 21, 2025
541b128
Object 100% matching
Stbn-antier Mar 23, 2025
36da4b0
Merge branch 'main' of https://github.com/zeldaret/tp into d_a_obj_se…
Stbn-antier Mar 23, 2025
b161a3e
Cleanup, remove padding
Stbn-antier Mar 23, 2025
2da1d85
Adressed review comments
Stbn-antier Mar 23, 2025
14bb75f
Adressed review comment
Stbn-antier Mar 24, 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
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2053,7 +2053,7 @@ def MatchingFor(*versions):
ActorRel(NonMatching, "d_a_obj_scannon"),
ActorRel(NonMatching, "d_a_obj_scannon_crs"),
ActorRel(NonMatching, "d_a_obj_scannon_ten"),
ActorRel(NonMatching, "d_a_obj_sekidoor"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sekidoor"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sekizo"),
ActorRel(NonMatching, "d_a_obj_sekizoa"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_shield"),
Expand Down
43 changes: 30 additions & 13 deletions include/d/actor/d_a_obj_sekidoor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#ifndef D_A_OBJ_SEKIDOOR_H
#define D_A_OBJ_SEKIDOOR_H

#include "d/d_bg_s_movebg_actor.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"

/**
Expand All @@ -11,30 +14,44 @@
* @details
*
*/
class daObj_SekiDoor_c : public fopAc_ac_c {
class daObj_SekiDoor_c : public dBgS_MoveBgActor {
public:
/* 80CCD02C */ void create();
/* 80CCD154 */ void CreateHeap();
/* 80CCD1F0 */ void Create();
/* 80CCD23C */ void Delete();
/* 80CCD290 */ void Execute(f32 (**)[3][4]);
/* 80CCD538 */ void Draw();
/* 80CCD5DC */ void evtSkip();
/* 80CCD02C */ int create();
/* 80CCD154 */ virtual int CreateHeap();
/* 80CCD1F0 */ virtual int Create(); //Done
/* 80CCD23C */ virtual int Delete();
/* 80CCD290 */ virtual int Execute(Mtx**);
/* 80CCD538 */ virtual int Draw(); //Done
/* 80CCD5DC */ void evtSkip(); // Done
/* 80CCD64C */ void setPrtcls();
/* 80CCD810 */ void initBaseMtx();
/* 80CCD84C */ void setBaseMtx();
/* 80CCD810 */ void initBaseMtx(); // Done
/* 80CCD84C */ void setBaseMtx(); // Done

u16 getBitSW() { return (fopAcM_GetParam(this) & 0xff); }
void open() { mOpening = true; }
bool chkDestroy() { return (mDestroyed == true); }

private:
/* 0x568 */ u8 field_0x568[0x5d8 - 0x568];
/* 0x5A0 */ s32 field_0x5A0;
/* 0x5A4 */ request_of_phase_process_class mPhaseReq;
/* 0x5AC */ J3DModel* mpModel;
/* 0x5B0 */ csXyz mRotation;
/* 0x5B8 */ int mFrameCounter;
/* 0x5BC */ float mDoorPosY;
/* 0x5C0 */ s16 mOpenSpeed;
/* 0x5C4 */ u32 mpEmitters[4];
/* 0x5D4 */ u8 mDestroyed;
/* 0x5D5 */ u8 mOpening;
/* 0x5D6 */ u8 mBitSW;
};

STATIC_ASSERT(sizeof(daObj_SekiDoor_c) == 0x5d8);

class daObj_SekiDoor_Param_c {
public:
/* 80CCD9AC */ ~daObj_SekiDoor_Param_c();
/* 80CCD9AC */ virtual ~daObj_SekiDoor_Param_c() {return;};

static u8 const m[1 + 3 /* padding */];
static u8 const m; //ファイル書き出し, File beginning
};


Expand Down
Loading