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

d_camera / m_Do_ext / d_particle + minor various wip (#210)

Browse Source
This commit is contained in:
TakaRikka
2022-10-03 15:26:26 -07:00
committed by GitHub
parent 0309490521
commit 4913395dbd
267 changed files with 5153 additions and 8112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rel/d/a/d_a_crod/d_a_crod.h
+1 -1
View File
@@ -23,7 +23,7 @@ public:
/* 804A3FD4 */ void draw();
static fopAc_ac_c* makeIronBallDummy(fopAc_ac_c* p_actor) {
return (fopAc_ac_c*)fopAcM_fastCreate(0x2F4, 6, &p_actor->mCurrent.mPosition,
return (fopAc_ac_c*)fopAcM_fastCreate(0x2F4, 6, &p_actor->current.pos,
fopAcM_GetRoomNo(p_actor), NULL, NULL, -1, NULL,
NULL);
}
include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h
+2 -2
View File
@@ -13,8 +13,8 @@ public:
u8 getArg1() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
u8 getArg0() { return fopAcM_GetParam(this); }
u32 getSwNo() { return fopAcM_GetParam(this) >> 0x18; }
u16 getOffEventBit() { return mOrig.mAngle.z & 0xFFF; }
u16 getOnEventBit() { return mOrig.mAngle.x & 0xFFF; }
u16 getOffEventBit() { return orig.angle.z & 0xFFF; }
u16 getOnEventBit() { return orig.angle.x & 0xFFF; }
void setSceneChangeOK() { mSceneChangeOK = true; }
/* 0x568 */ Mtx mMatrix;
include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h
+58 -1
View File
@@ -1,6 +1,63 @@
#ifndef D_A_OBJ_YOBIKUSA_H
#define D_A_OBJ_YOBIKUSA_H
#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
class daObjYobikusa_c;
typedef void (daObjYobikusa_c::*actionFunc)();
class daObjYobikusa_c : public fopAc_ac_c {
public:
enum Mode_e {};
/* 8059C9F8 */ void setAction(daObjYobikusa_c::Mode_e);
/* 8059CA2C */ void callInit();
/* 8059CA54 */ void callExecute();
/* 8059CA80 */ void initSwingWind();
/* 8059CA8C */ void executeSwingWind();
/* 8059CC54 */ void initPushDown();
/* 8059CC60 */ void executePushDown();
/* 8059CD44 */ void initPickLeaf();
/* 8059CD80 */ void executePickLeaf();
/* 8059CE7C */ void create_init();
/* 8059D120 */ void initBaseMtx();
/* 8059D198 */ void getJointAngle(csXyz*, int);
/* 8059D1BC */ void getJointScale(int);
/* 8059D320 */ void initCcCylinder();
/* 8059D380 */ void setCcCylinder();
/* 8059D3B4 */ void toPickLeaf();
/* 8059D454 */ void setNewLeaf();
/* 8059D738 */ void execute();
static u8 const M_attr[64];
static u8 ActionTable[72];
u8 getType() { return mSubtype & 0x7F; }
u8 getPathID() { return fopAcM_GetParam(this); }
bool isPlayerCorrect() { return (s8)(u8)(fopAcM_GetParam(this) >> 8) > 0; }
private:
/* 0x568 */ J3DModel* field_0x568;
/* 0x56C */ J3DModel* field_0x56c;
/* 0x570 */ J3DModel* field_0x570;
/* 0x574 */ Mtx field_0x574;
/* 0x5A4 */ request_of_phase_process_class mPhase;
/* 0x5AC */ void* field_0x5ac;
/* 0x5B0 */ int field_0x5b0;
/* 0x5B4 */ dCcD_Stts mStts;
/* 0x5F0 */ dCcD_Cyl mCcCyl;
/* 0x72C */ cBgS_PolyInfo field_0x72c;
/* 0x73C */ f32 field_0x73c;
/* 0x740 */ f32 mJointScale;
/* 0x744 */ f32 field_0x744;
/* 0x748 */ f32 field_0x748;
/* 0x74C */ csXyz field_0x74c[3];
/* 0x760 */ char* mResName;
/* 0x764 */ s16 field_0x764;
/* 0x766 */ s16 field_0x766;
/* 0x768 */ s16 field_0x768;
/* 0x76A */ s16 field_0x76a;
/* 0x76C */ s16 field_0x76c;
};
#endif /* D_A_OBJ_YOBIKUSA_H */
include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h
+1 -1
View File
@@ -12,7 +12,7 @@ public:
int create();
void execute();
u16 getMessageNo() { return mOrig.mAngle.z; }
u16 getMessageNo() { return orig.angle.z; }
private:
/* 0x568 */ u16 mMessageNo;