obj_Iceleaf almost done / d_a_alink work (#2217)

* obj_iceleaf almost done

* fix up d_a_alink procvars

* more d_a_alink work

* some d_a_alink error cleanup

* some more cleanup
This commit is contained in:
TakaRikka
2024-10-19 01:54:22 -07:00
committed by GitHub
parent abc4c6659a
commit 0652b2c7b3
49 changed files with 1759 additions and 5204 deletions
+35 -15
View File
@@ -15,13 +15,27 @@
*/
class daObjIceLeaf_c : public fopAc_ac_c {
public:
enum daObjIceLeaf_MODE {
MODE_DROP_WAIT_e,
MODE_DROP_e,
MODE_PLAYER_WAIT_e,
MODE_RIDE_e,
};
enum daObjIceLeaf_ACTION {
ACT_WAIT_e,
ACT_ORDER_EVENT_e,
ACT_EVENT_e,
ACT_DEAD_e,
};
/* 80C24738 */ void initBaseMtx();
/* 80C24774 */ void setBaseMtx();
/* 80C249E4 */ void Create();
/* 80C249E4 */ int Create();
/* 80C24BC4 */ void setAnmPos();
/* 80C24C9C */ void CreateHeap();
/* 80C24E14 */ void create();
/* 80C25158 */ void execute();
/* 80C24C9C */ int CreateHeap();
/* 80C24E14 */ int create();
/* 80C25158 */ int execute();
/* 80C25360 */ void action();
/* 80C2541C */ void modeDropWait();
/* 80C25614 */ void modeDrop();
@@ -33,13 +47,19 @@ public:
/* 80C25A68 */ void actionEvent();
/* 80C25AC4 */ void actionDead();
/* 80C25AC8 */ void setFallSE();
/* 80C25BB8 */ void draw();
/* 80C25C50 */ void _delete();
/* 80C25BB8 */ int draw();
/* 80C25C50 */ int _delete();
void offRide() { mRide = false; }
void onRide() { mRide = true; }
void setBreakEffect() { mBreakEffect = true; }
void deleteActor() { field_0x961 = 1; }
void deleteActor() { mDeleteActor = true; }
void setAction(u8 i_action) { mAction = i_action; }
void setMode(u8 i_mode) { mMode = i_mode; }
u8 getEvId() { return fopAcM_GetParamBit(this, 0, 8); }
u8 checkRideStatus() { return fopAcM_GetParamBit(this, 0x10, 8); }
u8 getSwbit() { return fopAcM_GetParamBit(this, 8, 8); }
private:
/* 0x568 */ request_of_phase_process_class mPhase;
@@ -49,18 +69,18 @@ private:
/* 0x78C */ dCcD_Stts mStts;
/* 0x7C8 */ dCcD_Cyl mCyl;
/* 0x904 */ mDoExt_bckAnm* mpBck;
/* 0x908 */ J3DTransformInfo field_0x908;
/* 0x928 */ u8 mAction;
/* 0x929 */ u8 field_0x929;
/* 0x92A */ u8 field_0x92a;
/* 0x908 */ J3DTransformInfo mTransformInfo;
/* 0x928 */ u8 mMode;
/* 0x929 */ u8 mAction;
/* 0x92A */ u8 mEvId;
/* 0x92B */ u8 field_0x92b;
/* 0x92C */ s16 mEventID;
/* 0x930 */ Mtx field_0x930;
/* 0x930 */ Mtx mMtx;
/* 0x960 */ u8 mRide;
/* 0x961 */ u8 field_0x961;
/* 0x961 */ u8 mDeleteActor;
/* 0x962 */ u8 mBreakEffect;
/* 0x964 */ cXyz field_0x964;
/* 0x970 */ cXyz field_0x970;
/* 0x964 */ cXyz mFallSEPos;
/* 0x970 */ cXyz mFallStartSEPos;
};
STATIC_ASSERT(sizeof(daObjIceLeaf_c) == 0x97c);