mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-02 00:24:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_ari OK (#2160)

Browse Source
This commit is contained in:
Caroline Madsen
2024-05-26 15:52:57 -04:00
committed by GitHub
parent 577f9c6c21
commit 7c7bc7fbd0
47 changed files with 912 additions and 4300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_insect.h
+1
View File
@@ -14,6 +14,7 @@ public:
/* 0 */ LOC_OUTSIDE,
/* 1 */ LOC_AGITHA,
/* 2 */ LOC_UNK_2,
/* 3 */ LOC_UNK_3,
};
/* 8015E010 */ dInsect_c();
include/d/menu/d_menu_insect.h
+2 -1
View File
@@ -1,7 +1,8 @@
#ifndef D_MENU_D_MENU_INSECT_H
#define D_MENU_D_MENU_INSECT_H
#include "d/com/d_com_inf_game.h"
#include "d/d_drawlist.h"
#include "d/save/d_save.h"
class CPaneMgr;
struct CSTControl;
include/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.h
+81
View File
@@ -1,5 +1,86 @@
#ifndef D_A_OBJ_ARI_H
#define D_A_OBJ_ARI_H
#include "SSystem/SComponent/c_phase.h"
#include "Z2AudioLib/Z2Creature.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/cc/d_cc_d.h"
#include "d/a/d_a_player.h"
#include "d/d_insect.h"
class daObjARI_c : public dInsect_c {
public:
/* 80BA26BC */ void InitCcSph();
/* 80BA2728 */ void SetCcSph();
/* 80BA2780 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 80BA28C0 */ int CreateHeap();
/* 80BA2CA4 */ void WallWalk();
/* 80BA3270 */ void MoveAction();
/* 80BA337C */ void Action();
/* 80BA33F8 */ void Insect_Release();
/* 80BA3408 */ void checkGround();
/* 80BA3638 */ void B_MoveAction();
/* 80BA36CC */ void FallAction();
/* 80BA3700 */ void ParticleSet();
/* 80BA3824 */ void BoomChk();
/* 80BA3B38 */ void ObjHit();
/* 80BA3C38 */ int Execute();
/* 80BA44F0 */ void Z_BufferChk();
/* 80BA466C */ int Delete();
/* 80BA46D4 */ void setBaseMtx();
/* inline */ inline int Draw();
/* 80BA483C */ bool CreateChk();
/* 80BA49E8 */ cPhs__Step create();
/* 0x590 */ dBgS_GndChk mGndChk;
/* 0x5E4 */ u8 field_0x5e4[4];
/* 0x5E8 */ u8 mAction;
/* 0x5E9 */ u8 mMode;
/* 0x5EA */ s16 mTimer;
/* 0x5EC */ f32 field_0x5ec;
/* 0x5F0 */ u8 field_0x5f0[4];
/* 0x5F4 */ s16 mTargetAngleY;
/* 0x5F6 */ u8 field_0x5f6[6];
/* 0x5FC */ bool field_0x5fc;
/* 0x5FE */ csXyz mWallAlignAngle;
/* 0x604 */ csXyz mWallAngle;
/* 0x60A */ u8 field_0x60a[2];
/* 0x60C */ s16 mLegAngleY;
/* 0x60E */ s16 mDownAngleY;
/* 0x610 */ u8 field_0x610[4];
/* 0x614 */ cXyz mTargetPos;
/* 0x620 */ mDoExt_brkAnm* mpBrkAnm;
/* 0x624 */ mDoExt_btkAnm* mpBtkAnm;
/* 0x628 */ f32 mScreenZ;
/* 0x62C */ u32 mBufferZ;
/* 0x630 */ u8 mSex; // used instead of the variable from dInsect_c
/* 0x631 */ u8 mLocation;
/* 0x634 */ f32 mParticleScale;
/* 0x638 */ f32 mParticleTargetScale;
/* 0x63C */ dCcD_Stts mCcStts;
/* 0x678 */ dCcD_Sph mCcSph;
/* 0x7B0 */ daPy_boomerangMove_c mBoomerangMove;
/* 0x7BC */ bool mBoomerangHit;
/* 0x7C0 */ Z2Creature mCreatureSound;
/* 0x850 */ dBgS_AcchCir mAcchCir;
/* 0x890 */ dBgS_ObjAcch mAcch;
/* 0xA68 */ mDoExt_McaMorfSO* mpMorf;
/* 0xA6C */ request_of_phase_process_class mPhase;
/* 0xA74 */ bool mHIOInit;
};
STATIC_ASSERT(sizeof(daObjARI_c) == 0xA78);
class daObj_AriHIO_c {
public:
/* 80BA268C */ daObj_AriHIO_c();
/* 80BA5360 */ virtual ~daObj_AriHIO_c() {}
/* 0x4 */ s8 field_0x4;
/* 0x8 */ f32 mScaleFemale;
/* 0xC */ f32 mScaleMale;
};
STATIC_ASSERT(sizeof(daObj_AriHIO_c) == 0x10);
#endif /* D_A_OBJ_ARI_H */
include/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.h
+3 -3
View File
@@ -46,14 +46,14 @@ public:
/* 0x928 */ dBgS_GndChk mGndChk;
/* 0x97C */ f32 mGroundPos;
/* 0x980 */ u8 mAction;
/* 0x981 */ u8 mSubAction;
/* 0x981 */ u8 mMode;
/* 0x982 */ s16 mTimers[3];
/* 0x988 */ f32 mTargetSpeedXZ;
/* 0x98C */ f32 mTargetSpeedY;
/* 0x990 */ s16 mTargetAngleY;
/* 0x994 */ f32 mParticleScale;
/* 0x998 */ f32 field_0x998;
/* 0x99C */ u32 field_0x99c;
/* 0x998 */ f32 mScreenZ;
/* 0x99C */ u32 mBufferZ;
/* 0x9A0 */ u8 field_0x9a0[0xC];
/* 0x9AC */ bool field_0x9ac;
/* 0x9B0 */ f32 mPlaySpeed;
include/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.h
+5 -5
View File
@@ -42,22 +42,22 @@ struct daObjKABUTO_c : public dInsect_c {
/* 0x5CC */ dCcD_Sph mCcSph;
/* 0x704 */ daPy_boomerangMove_c mBoomerangMove;
/* 0x710 */ u8 mAction;
/* 0x711 */ u8 mSubAction;
/* 0x711 */ u8 mMode;
/* 0x712 */ s16 mTimers[3];
/* 0x718 */ f32 mTargetSpeedXZ;
/* 0x71C */ f32 mTargetSpeedY;
/* 0x720 */ s16 mTargetAngleY;
/* 0x722 */ u8 field_0x722[8];
/* 0x72A */ csXyz field_0x72a;
/* 0x72A */ csXyz mWallAngle;
/* 0x730 */ u8 field_0x730[2];
/* 0x732 */ s16 field_0x732;
/* 0x732 */ s16 mDownAngleY;
/* 0x734 */ u8 field_0x734;
/* 0x735 */ bool field_0x735;
/* 0x736 */ u8 mLocation;
/* 0x737 */ bool mBoomerangHit;
/* 0x738 */ dBgS_AcchCir mAcchCir;
/* 0x778 */ f32 field_0x778;
/* 0x77C */ u32 field_0x77c;
/* 0x778 */ f32 mScreenZ;
/* 0x77C */ u32 mBufferZ;
/* 0x780 */ f32 mParticleScale;
/* 0x784 */ f32 mParticleTargetScale;
/* 0x788 */ u8 field_0x788[4];