summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/d/a/d_a_alink.h21
-rw-r--r--include/d/a/d_a_player.h1
-rw-r--r--include/rel/d/a/b/d_a_b_dr/d_a_b_dr.h2
-rw-r--r--include/rel/d/a/b/d_a_b_dre/d_a_b_dre.h44
-rw-r--r--include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h37
-rw-r--r--include/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h3
6 files changed, 88 insertions, 20 deletions
diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h
index 773643d9b9..cb76aa13c5 100644
--- a/include/d/a/d_a_alink.h
+++ b/include/d/a/d_a_alink.h
@@ -2256,9 +2256,9 @@ public:
/* 800FC240 */ int procHangReady();
/* 800FC2F4 */ int procHangLeverDownInit();
/* 800FC390 */ int procHangLeverDown();
- /* 800FC5A4 */ void setDragonHangPos();
+ /* 800FC5A4 */ int setDragonHangPos();
/* 800FC6B4 */ int setOctaIealHangPos();
- /* 800FC748 */ void setBossBodyHangPos();
+ /* 800FC748 */ int setBossBodyHangPos();
/* 800FC77C */ int procBossBodyHangInit(fopAc_ac_c*);
/* 800FC870 */ int procBossBodyHang();
/* 800FCF58 */ int getLadderUnitCount() const;
@@ -2266,7 +2266,7 @@ public:
/* 800FD048 */ void setLadderPosInit();
/* 800FD1F0 */ void setLadderPos(int);
/* 800FD288 */ f32 getLadderMoveAnmSpeed();
- /* 800FD2AC */ void changeLadderMoveProc(int);
+ /* 800FD2AC */ int changeLadderMoveProc(int);
/* 800FD4A8 */ int setMoveBGLadderCorrect();
/* 800FD5E4 */ int checkLadderFall();
/* 800FD648 */ int procLadderUpStartInit();
@@ -2286,14 +2286,14 @@ public:
/* 800FE174 */ void setClimbShapeOffset();
/* 800FE3C4 */ int getClimbDirectionFromAngle();
/* 800FE438 */ void changeClimbMoveProc(int);
- /* 800FE5A0 */ void checkClimbMoveUpDownProc(int);
- /* 800FE6E8 */ void checkClimbMoveSideProc(int);
- /* 800FE868 */ void setMoveBGClimbCorrect();
+ /* 800FE5A0 */ BOOL checkClimbMoveUpDownProc(int);
+ /* 800FE6E8 */ BOOL checkClimbMoveSideProc(int);
+ /* 800FE868 */ int setMoveBGClimbCorrect();
/* 800FEB90 */ int checkBgCorrectClimbMove(cXyz*, cXyz*);
- /* 800FEC70 */ void checkClimbRoof(f32);
+ /* 800FEC70 */ BOOL checkClimbRoof(f32);
/* 800FED50 */ int checkClimbGround(cXyz*, f32);
- /* 800FEEC0 */ void checkBgClimbMove(int);
- /* 800FF28C */ void setClimbStartNotGround();
+ /* 800FEEC0 */ BOOL checkBgClimbMove(int);
+ /* 800FF28C */ int setClimbStartNotGround();
/* 800FF450 */ int procClimbUpStartInit(int);
/* 800FF704 */ int procClimbUpStart();
/* 800FF818 */ int procClimbDownStartInit(s16);
@@ -2311,7 +2311,7 @@ public:
/* 80100614 */ void setRoofHangHandOnSE(cBgS_PolyInfo*);
/* 80100668 */ int checkRoofHangMovePos();
/* 80100770 */ int commonRoofHangProc();
- /* 801008EC */ void checkNextActionRoofHang();
+ /* 801008EC */ int checkNextActionRoofHang();
/* 80100A10 */ int procRoofHangStartInit(cBgS_PolyInfo const&, cXyz const&, int);
/* 80100AE4 */ int procRoofHangStart();
/* 80100BB4 */ int procRoofHangWaitInit(int);
@@ -3230,6 +3230,7 @@ public:
static bool checkMidnaChargeAttack() { return dComIfGs_isEventBit(0x501); }
u16 getMidnaMsgNum() const { return mMidnaMsgNum; }
u32 getStartEvent() { return fopAcM_GetParam(this) >> 0x18; }
+ BOOL checkClimbFall() { return checkLadderFall(); }
const daAlink_AnmData* getAnmData(daAlink_ANM anmID) const { return &m_anmDataTable[anmID]; }
const daAlink_FaceTexData* getFaceTexData(daAlink_FTANM i_anmID) const { return &m_faceTexDataTable[i_anmID]; }
diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index fefa599d53..98b1ef8eb9 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -403,6 +403,7 @@ public:
RFLG0_UNK_8000000 = 0x8000000,
RFLG0_UNK_4000000 = 0x4000000,
RFLG0_GRAB_PUT_START = 0x400000,
+ RFLG0_UNK_40000 = 0x40000,
RFLG0_UNK_20000 = 0x20000,
RFLG0_UNK_10000 = 0x10000,
RFLG0_UNK_8000 = 0x8000,
diff --git a/include/rel/d/a/b/d_a_b_dr/d_a_b_dr.h b/include/rel/d/a/b/d_a_b_dr/d_a_b_dr.h
index 980b602e4a..e10b7aa565 100644
--- a/include/rel/d/a/b/d_a_b_dr/d_a_b_dr.h
+++ b/include/rel/d/a/b/d_a_b_dr/d_a_b_dr.h
@@ -76,6 +76,8 @@ public:
/* 805C5974 */ void create();
/* 805C62B0 */ daB_DR_c();
+ MtxP getMtx() { return mpModelMorf->getModel()->getAnmMtx(15); }
+
void onTarget() { mTarget = true; }
bool isBack() { return mPrm0; }
diff --git a/include/rel/d/a/b/d_a_b_dre/d_a_b_dre.h b/include/rel/d/a/b/d_a_b_dre/d_a_b_dre.h
index 5bd1a16710..d98de51ffc 100644
--- a/include/rel/d/a/b/d_a_b_dre/d_a_b_dre.h
+++ b/include/rel/d/a/b/d_a_b_dre/d_a_b_dre.h
@@ -1,8 +1,9 @@
#ifndef D_A_B_DRE_H
#define D_A_B_DRE_H
-#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "Z2AudioLib/Z2Creature.h"
/**
* @ingroup actors-enemies
@@ -37,8 +38,47 @@ public:
/* 805CA6C0 */ void setBaseMtx();
/* 805CA944 */ void create();
+ MtxP getMtx() { return field_0x6ec->getModel()->getAnmMtx(15); }
+
private:
- /* 0x5ac */ u8 field_0x5ac[0x930 - 0x5ac];
+ /* 0x5AC */ u8 field_0x5AC[0x5B0 - 0x5AC];
+ /* 0x5B0 */ int mAnm;
+ /* 0x5B4 */ u8 field_0x5b4;
+ /* 0x5B5 */ u8 field_0x5b5;
+ /* 0x5B6 */ u8 field_0x5B6[0x5B7 - 0x5B6];
+ /* 0x5B7 */ u8 field_0x5b7;
+ /* 0x5B8 */ u8 field_0x5b8;
+ /* 0x5B9 */ u8 field_0x5b9;
+ /* 0x5BA */ u8 field_0x5BA[0x5C8 - 0x5BA];
+ /* 0x5C8 */ cXyz field_0x5c8;
+ /* 0x5D4 */ cXyz field_0x5d4;
+ /* 0x5E0 */ cXyz field_0x5e0;
+ /* 0x5EC */ cXyz field_0x5ec;
+ /* 0x5F8 */ f32 field_0x5f8;
+ /* 0x5FC */ s16 field_0x5fc;
+ /* 0x5FE */ u8 field_0x5FE[0x600 - 0x5FE];
+ /* 0x600 */ f32 field_0x600;
+ /* 0x604 */ mDoExt_brkAnm* field_0x604;
+ /* 0x608 */ f32 field_0x608;
+ /* 0x60C */ u8 field_0x60C[0x610 - 0x60C];
+ /* 0x610 */ f32 field_0x610;
+ /* 0x614 */ f32 field_0x614;
+ /* 0x618 */ f32 field_0x618;
+ /* 0x61C */ u32 field_0x61c[4];
+ /* 0x62C */ s16 field_0x62c[5];
+ /* 0x636 */ u8 field_0x636;
+ /* 0x637 */ u8 field_0x637;
+ /* 0x638 */ u8 field_0x638;
+ /* 0x639 */ u8 field_0x639[0x63C - 0x639];
+ /* 0x63C */ request_of_phase_process_class mPhase;
+ /* 0x644 */ Z2CreatureEnemy mSound;
+ /* 0x6E8 */ u8 field_0x6E8[0x6EC - 0x6E8];
+ /* 0x6EC */ mDoExt_McaMorfSO* field_0x6ec;
+ /* 0x6F0 */ dBgS_AcchCir mAcchCir;
+ /* 0x730 */ dBgS_ObjAcch mAcch;
+ /* 0x908 */ u8 field_0x908[0x910 - 0x908];
+ /* 0x910 */ Z2CreatureEnemy* field_0x910;
+ /* 0x914 */ u8 field_0x914[0x930 - 0x914];
};
STATIC_ASSERT(sizeof(daB_DRE_c) == 0x930);
diff --git a/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h b/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h
index 90c12aa833..42f62da70a 100644
--- a/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h
+++ b/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h
@@ -2,6 +2,8 @@
#define D_A_OBJ_LV5YIBLLTRAY_H
#include "f_op/f_op_actor_mng.h"
+#include "d/bg/d_bg_s_movebg_actor.h"
+#include "d/cc/d_cc_d.h"
/**
* @ingroup actors-objects
@@ -11,24 +13,45 @@
* @details
*
*/
-class daObjYIblltray_c : public fopAc_ac_c {
+class daObjYIblltray_c : public dBgS_MoveBgActor, public request_of_phase_process_class {
public:
/* 80C6EBF8 */ void create1st();
/* 80C6EC88 */ void setMtx();
- /* 80C6EDA8 */ void CreateHeap();
- /* 80C6EEFC */ void Create();
/* 80C6F1E8 */ void rideActor(fopAc_ac_c*);
/* 80C6F23C */ void sendBall(unsigned int);
/* 80C6F440 */ void onAttention();
/* 80C6F450 */ void offAttention();
- /* 80C6F460 */ void Execute(f32 (**)[3][4]);
/* 80C702E0 */ void initRotTo();
- /* 80C70330 */ void Draw();
- /* 80C70408 */ void Delete();
/* 80C7088C */ ~daObjYIblltray_c();
+ /* 80C6EDA8 */ virtual int CreateHeap();
+ /* 80C6EEFC */ virtual int Create();
+ /* 80C6F460 */ virtual int Execute(Mtx**);
+ /* 80C70330 */ virtual int Draw();
+ /* 80C70408 */ virtual int Delete();
+
+ cXyz& getHandlePos() { return mHandlePos; }
+ void onHang() { mIsHang = true; }
+
private:
- /* 0x568 */ u8 field_0x568[0xa94 - 0x568];
+ /* 0x5A8 */ cXyz field_0x5a8;
+ /* 0x5B4 */ cXyz field_0x5b4;
+ /* 0x5C0 */ Mtx field_0x5c0;
+ /* 0x5F0 */ Mtx field_0x5f0;
+ /* 0x620 */ J3DModel* field_0x620;
+ /* 0x624 */ s16 field_0x624;
+ /* 0x628 */ cXyz field_0x628;
+ /* 0x634 */ u32 field_0x634;
+ /* 0x638 */ int field_0x638;
+ /* 0x63C */ f32 field_0x63c;
+ /* 0x640 */ int field_0x640;
+ /* 0x644 */ dCcD_Cyl mCcCyl[3];
+ /* 0x9F8 */ dCcD_Stts mCcStts;
+ /* 0xA34 */ J3DModel* field_0xa34;
+ /* 0xA38 */ mDoExt_bckAnm mBck;
+ /* 0xA54 */ Mtx field_0xa54;
+ /* 0xA84 */ u8 mIsHang;
+ /* 0xA88 */ cXyz mHandlePos;
};
STATIC_ASSERT(sizeof(daObjYIblltray_c) == 0xa94);
diff --git a/include/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h b/include/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h
index d8a611d75d..82cd74299f 100644
--- a/include/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h
+++ b/include/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h
@@ -16,7 +16,6 @@
*/
class daObjSwHang_c : public dBgS_MoveBgActor {
public:
- /* 80101874 */ cXyz getHangPos();
/* 80CFB9D8 */ void initBaseMtx();
/* 80CFBA60 */ void setBaseMtx();
/* 80CFBDD0 */ void create1st();
@@ -39,6 +38,8 @@ public:
/* 80CFCD04 */ virtual int Draw();
/* 80CFCD98 */ virtual int Delete();
+ cXyz getHangPos() { return mHangPos; }
+
void setHangPlayer() { mHangPlayer = 1; }
u8 getType() { return field_0x730; }
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 03:41:28 +0000