mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-29 16:45:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

e_ym / obj_volcball wip. obj_mgate done (#318)

Browse Source 
* e_ym / obj_volcball wip. obj_mgate done

* remove asm

---------

Co-authored-by: root <root@DESKTOP-BTVP2BC>
This commit is contained in:
TakaRikka
2023-04-21 07:18:49 -07:00
committed by GitHub
parent f5fc527d39
commit e1a0f636e5
80 changed files with 2121 additions and 3466 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphBase/J3DMaterial.h
+1
View File
@@ -61,6 +61,7 @@ public:
}
J3DNBTScale* getNBTScale() const { return mTexGenBlock->getNBTScale(); }
u32 getTexNo(u32 idx) const { return mTevBlock->getTexNo(idx); }
GXColor* getTevKColor(u32 param_0) { return mTevBlock->getTevKColor(param_0); }
void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); }
void setTevKColor(u32 i, const J3DGXColor* i_color) { mTevBlock->setTevKColor(i, i_color); }
include/SSystem/SComponent/c_cc_d.h
+2 -1
View File
@@ -335,7 +335,7 @@ public:
cCcD_ObjCommonBase() { ct(); }
/* 8008409C */ virtual ~cCcD_ObjCommonBase() {}
/* 802639B0 */ void ct();
void setSPrm(s32 sprm) { mSPrm = sprm; }
void SetSPrm(u32 sprm) { mSPrm = sprm; }
s32 getSPrm() const { return mSPrm; }
void setRPrm(s32 rprm) { mRPrm = rprm; }
s32 getRPrm() const { return mRPrm; }
@@ -458,6 +458,7 @@ public:
void OffAtVsPlayerBit() { mObjAt.OffSPrmBit(0xC); }
void OnAtVsPlayerBit() { mObjAt.OnSPrmBit(0xC); }
void OnCoSPrmBit(u32 flag) { mObjCo.OnSPrmBit(flag); }
void SetCoSPrm(u32 prm) { mObjCo.SetSPrm(prm); }
}; // Size = 0x40
include/d/a/d_a_player.h
+4 -1
View File
@@ -377,6 +377,7 @@ public:
enum daPy_RFLG1 {
RFLG1_UNK_30 = 0x30,
RFLG1_UNK_2 = 0x2,
RFLG1_WOLF_ATTACK_REVERSE = 0x1,
};
enum {
@@ -450,7 +451,7 @@ public:
static BOOL checkMasterSwordEquip();
static BOOL checkWoodShieldEquip();
static f32 getAttentionOffsetY();
s16 checkNowWolfEyeUp();
static int checkNowWolfEyeUp();
static void forceRestartRoom(int, u32, int);
static void setFmChainPos(fopAc_ac_c*, cXyz*, int);
static void cancelFmChainGrab();
@@ -709,6 +710,7 @@ public:
bool checkWaterInMove() const { return i_checkNoResetFlg0(FLG0_UNDERWATER); }
bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(FLG2_SCN_CHG_START); }
bool checkFrontRollCrash() const { return i_checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); }
bool checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); }
void onForceAutoJump() { i_onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); }
void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); }
@@ -749,6 +751,7 @@ public:
void i_offEndResetFlg2(daPy_ERFLG2 flag) { mEndResetFlg2 &= ~flag; }
int i_checkResetFlg0(daPy_py_c::daPy_RFLG0 flag) const { return mResetFlg0 & flag; }
int checkResetFlg1(daPy_py_c::daPy_RFLG1 flag) const { return mResetFlg1 & flag; }
int i_checkEndResetFlg0(daPy_py_c::daPy_ERFLG0 flag) const { return mEndResetFlg0 & flag; }
int i_checkEndResetFlg1(daPy_py_c::daPy_ERFLG1 flag) const { return mEndResetFlg1 & flag; }
include/d/bg/d_bg_s.h
+1 -1
View File
@@ -112,7 +112,7 @@ bool dBgS_CheckBWallPoly(cBgS_PolyInfo const&);
void dBgS_MoveBGProc_Typical(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2,
bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6);
void dBgS_MoveBGProc_TypicalRotY(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2,
bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6);
bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6);
f32 dBgS_GetNY(cBgS_PolyInfo const& poly);
#endif /* D_BG_D_BG_S_H */
include/d/bg/d_bg_s_movebg_actor.h
+2
View File
@@ -20,6 +20,8 @@ public:
/* 800788DC */ int MoveBGDelete();
/* 80078950 */ int MoveBGExecute();
int MoveBGDraw() { return Draw(); }
/* 80078688 */ virtual int CreateHeap();
/* 80078690 */ virtual int Create();
/* 80078698 */ virtual int Execute(f32 (**)[3][4]);
include/d/d_lib.h
+4 -2
View File
@@ -1,12 +1,14 @@
#ifndef D_D_LIB_H
#define D_D_LIB_H
#include "dolphin/types.h"
#include "dolphin/os/OS.h"
#include "dolphin/mtx/quat.h"
#include "dolphin/os/OS.h"
#include "f_op/f_op_actor.h"
struct JKRAramArchive;
u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* arc, char const* resName);
BOOL dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2,
cXyz const* param_3);
struct STControl {
STControl() {
include/d/d_vibration.h
+1 -1
View File
@@ -13,7 +13,7 @@ public:
/* 8006FB10 */ bool StartQuake(int, int, cXyz);
/* 8006FD94 */ int StopQuake(int);
/* 8006FE00 */ void Kill();
/* 8006FE5C */ int CheckQuake();
/* 8006FE5C */ bool CheckQuake();
/* 8006FE84 */ void setDefault();
/* 8006FF04 */ void Init();
/* 8006FF38 */ void Pause();
include/d/event/d_event_lib.h
+5
View File
@@ -21,6 +21,11 @@ struct action_class {
};
struct dEvLib_callback_c {
dEvLib_callback_c(fopAc_ac_c* param_0) {
mActor = param_0;
mAction = NULL;
}
/* 8004886C */ BOOL eventUpdate();
/* 800488A4 */ BOOL setEvent(int, int, int);
/* 80048940 */ void orderEvent(int, int, int);
include/d/particle/d_particle.h
+1
View File
@@ -58,6 +58,7 @@ public:
class dPa_followEcallBack : public dPa_levelEcallBack {
public:
/* 80049580 */ dPa_followEcallBack(u8, u8);
/* 80D22230 */ void __defctor(); // compiler generated
/* 80050200 */ virtual ~dPa_followEcallBack();
/* 800495BC */ virtual void execute(JPABaseEmitter*);
include/m_Do/m_Do_ext.h
+1
View File
@@ -262,6 +262,7 @@ public:
bool isLoop() { return mFrameCtrl.checkState(2); }
f32 getEndFrame() { return mFrameCtrl.getEnd(); }
BOOL checkFrame(f32 frame) { return mFrameCtrl.checkPass(frame); }
J3DAnmTransform* getAnm() { return mpAnm; }
bool isStop() {
bool stopped = true;
include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h
+136 -19
View File
@@ -1,32 +1,64 @@
#ifndef D_A_E_YM_H
#define D_A_E_YM_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/cc/d_cc_uty.h"
#include "d/com/d_com_inf_game.h"
class daE_YM_HIO_c {
public:
/* 8080812C */ daE_YM_HIO_c();
/* 80815458 */ virtual ~daE_YM_HIO_c();
/* 0x04 */ s8 field_0x4;
/* 0x08 */ f32 mModelSize;
/* 0x0C */ f32 mElectricInvincibilityTimeExtension;
/* 0x10 */ f32 mMoveSpeed;
/* 0x14 */ f32 mFlyMoveSpeed;
/* 0x18 */ f32 mFlyAttackSpeed;
/* 0x1C */ f32 mSurpriseDistance;
/* 0x20 */ f32 mMoveRange;
};
class daE_YM_c : public fopEn_enemy_c {
public:
u8 getTagNo() {
return mTagNo;
}
enum daE_YM_Action {
/* 0 */ ACT_WAIT,
/* 1 */ ACT_MOVE,
/* 2 */ ACT_ESCAPE,
/* 3 */ ACT_DOWN,
/* 4 */ ACT_WIND,
/* 5 */ ACT_SURPRISE,
/* 6 */ ACT_BACK,
/* 7 */ ACT_FALL,
/* 8 */ ACT_ATTACK,
/* 9 */ ACT_ATTACK_WALL,
/* 10 */ ACT_DEFENSE,
/* 11 */ ACT_FLY,
/* 12 */ ACT_FLY_ATTACK,
/* 13 */ ACT_RAIL,
/* 14 */ ACT_BACK_RAIL,
/* 15 */ ACT_ELECTRIC,
/* 16 */ ACT_SWITCH,
/* 17 */ ACT_FIRE,
/* 18 */ ACT_RIVER,
};
void setTagPos(cXyz& i_position) {
mTagPos = i_position;
}
u8 getTagNo() { return mTagNo; }
void setTagPosP() {
mTagPosP = &mTagPos;
}
void setTagPos(cXyz& i_position) { mTagPos = i_position; }
/* 80808184 */ void checkBck(char const*, int);
void setTagPosP() { mTagPosP = &mTagPos; }
/* 80808184 */ BOOL checkBck(char const*, int);
/* 808081E0 */ void bckSet(int, u8, f32, f32);
/* 80808328 */ void bckSetFly(int, u8, f32, f32);
/* 808083CC */ void draw();
/* 808083CC */ int draw();
/* 80808768 */ void setDigEffect();
/* 80808884 */ void setElecEffect1();
/* 808089DC */ void setElecEffect2();
/* 80808B3C */ void setFireEffect();
/* 80808E34 */ void checkWallCrash();
/* 80808E34 */ bool checkWallCrash();
/* 80809000 */ void checkWolfBark();
/* 80809228 */ void checkSurpriseLock();
/* 8080963C */ void checkRailSurprise();
@@ -74,20 +106,105 @@ public:
/* 8081300C */ void action();
/* 80813528 */ void mtx_set();
/* 808135B0 */ void cc_set();
/* 808138AC */ void execute();
/* 80813A38 */ void _delete();
/* 80813AF0 */ void CreateHeap();
/* 808138AC */ int execute();
/* 80813A38 */ int _delete();
/* 80813AF0 */ int CreateHeap();
/* 80813EA4 */ void checkBeforeBg(s16);
/* 808143A0 */ void checkBeforeGround();
/* 808144D8 */ void checkInitialWall();
/* 80814758 */ void checkWall();
/* 80814AF0 */ void setHideType();
/* 80814BA4 */ void create();
/* 80814BA4 */ int create();
/* 0x5AC */ u8 field_0x5ac[268];
void setFriendFlag(u8 i_flag) { mFriendFlag |= i_flag; }
u8 getFriendFlag() { return mFriendFlag; }
/* 0x5AC */ request_of_phase_process_class mPhase;
/* 0x5B4 */ mDoExt_McaMorfSO* field_0x5b4;
/* 0x5B8 */ mDoExt_brkAnm* field_0x5b8;
/* 0x5BC */ Z2CreatureEnemy field_0x5bc;
/* 0x660 */ u8 field_0x660[0x664 - 0x660];
/* 0x664 */ fopAc_ac_c* field_0x664;
/* 0x668 */ csXyz field_0x668;
/* 0x66E */ u8 field_0x66E[0x670 - 0x66E];
/* 0x670 */ cXyz field_0x670;
/* 0x67C */ cXyz field_0x67c;
/* 0x688 */ f32 field_0x688;
/* 0x68C */ f32 field_0x68c;
/* 0x690 */ int mAction;
/* 0x694 */ int mLastAction;
/* 0x698 */ int mMode;
/* 0x69C */ u32 field_0x69c;
/* 0x6A0 */ u8 mType;
/* 0x6A1 */ u8 field_0x6a1;
/* 0x6A2 */ u8 mSwitchBit;
/* 0x6A3 */ u8 field_0x6a3;
/* 0x6A4 */ u8 mIsHide;
/* 0x6A5 */ u8 field_0x6a5;
/* 0x6A6 */ u8 field_0x6a6;
/* 0x6A7 */ u8 field_0x6a7;
/* 0x6A8 */ u8 field_0x6a8;
/* 0x6A9 */ u8 field_0x6a9;
/* 0x6AA */ u8 mFriendFlag;
/* 0x6AB */ u8 field_0x6AB[0x6AC - 0x6AB];
/* 0x6AC */ dPath* mpPath;
/* 0x6B0 */ dPath* field_0x6b0;
/* 0x6B4 */ s8 field_0x6b4;
/* 0x6B5 */ u8 field_0x6B5[0x6B8 - 0x6B5];
/* 0x6B8 */ cXyz mTagPos;
/* 0x6C4 */ cXyz* mTagPosP;
/* 0x6C8 */ u8 mTagNo;
/* 0x6C9 */ u8 field_0x6c9;
/* 0x6CA */ u8 mFlyType;
/* 0x6CB */ u8 field_0x6cb;
/* 0x6CC */ u8 field_0x6cc;
/* 0x6CD */ u8 field_0x6CD[0x6CF - 0x6CD];
/* 0x6CF */ u8 field_0x6cf;
/* 0x6D0 */ cXyz* field_0x6d0;
/* 0x6D4 */ f32 field_0x6d4;
/* 0x6D8 */ f32 mDistToPlayer;
/* 0x6DC */ f32 field_0x6dc;
/* 0x6E0 */ f32 field_0x6e0;
/* 0x6E4 */ s16 field_0x6e4;
/* 0x6E6 */ s16 field_0x6e6;
/* 0x6E8 */ s16 field_0x6e8;
/* 0x6EA */ s16 mAngleToPlayer;
/* 0x6EC */ f32 field_0x6ec;
/* 0x6F0 */ s16 field_0x6f0;
/* 0x6F2 */ s16 field_0x6f2;
/* 0x6F4 */ s16 field_0x6f4;
/* 0x6F6 */ s16 field_0x6f6;
/* 0x6F8 */ s16 field_0x6f8;
/* 0x6FA */ s16 field_0x6fa;
/* 0x6FC */ s16 field_0x6fc;
/* 0x6FE */ s16 field_0x6fe;
/* 0x700 */ s16 field_0x700;
/* 0x702 */ u8 field_0x702[0x704 - 0x702];
/* 0x704 */ int field_0x704;
/* 0x708 */ s16 field_0x708;
/* 0x70A */ s16 field_0x70a;
/* 0x70C */ s16 field_0x70c;
/* 0x70E */ s16 field_0x70e;
/* 0x710 */ s16 field_0x710;
/* 0x712 */ u8 field_0x712[0x714 - 0x712];
/* 0x714 */ int field_0x714;
/* 0x718 */ int field_0x718;
/* 0x71C */ u8 field_0x71c;
/* 0x71D */ u8 field_0x71d;
/* 0x71E */ u8 field_0x71E[0x720 - 0x71E];
/* 0x720 */ dBgS_AcchCir field_0x720;
/* 0x760 */ dBgS_ObjAcch field_0x760;
/* 0x938 */ dCcD_Stts field_0x938;
/* 0x974 */ dCcD_Sph mSphCc;
/* 0xAAC */ dCcU_AtInfo mAtInfo;
/* 0xAD0 */ u32 field_0xad0;
/* 0xAD4 */ u32 field_0xad4;
/* 0xAD8 */ u32 field_0xad8;
/* 0xADC */ u32 field_0xadc;
/* 0xAE0 */ u32 field_0xae0;
/* 0xAE4 */ u32 field_0xae4;
/* 0xAE8 */ u32 field_0xae8[3];
/* 0xAF4 */ u8 field_0xaf4;
};
#endif /* D_A_E_YM_H */
include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h
+43 -1
View File
@@ -1,6 +1,48 @@
#ifndef D_A_OBJ_MGATE_H
#define D_A_OBJ_MGATE_H
#include "dolphin/types.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/com/d_com_inf_game.h"
class daObjMGate_c : public dBgS_MoveBgActor {
public:
enum Kind_e {
/* 0 */ KIND_IZUMI, // Spring
/* 1 */ KIND_HASHI, // Bridge
};
enum Type_e {
/* 0 */ TYPE_LEFT,
/* 1 */ TYPE_RIGHT,
};
/* 805935B8 */ void initBaseMtx();
/* 80593630 */ void setBaseMtx();
/* 8059388C */ int create1st();
/* 805937AC */ virtual int CreateHeap();
/* 80593760 */ virtual int Create();
/* 80593988 */ virtual int Execute(f32 (**)[3][4]);
/* 80593C4C */ virtual int Draw();
/* 80593D18 */ virtual int Delete();
u8 getType() { return fopAcM_GetParamBit(this, 0, 1); }
u8 getKind() { return fopAcM_GetParamBit(this, 1, 4); }
bool checkLock() { return fopAcM_GetParamBit(this, 5, 1); }
u8 checkOpen() { return fopAcM_GetParamBit(this, 8, 4); }
private:
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ request_of_phase_process_class mKeyPhase;
/* 0x5B0 */ J3DModel* mpModel;
/* 0x5B4 */ J3DModel* mpKeyModel;
/* 0x5B8 */ u8 mType;
/* 0x5B9 */ u8 mKind;
/* 0x5BA */ csXyz mGateAngle;
/* 0x5C0 */ f32 mGateKeySwingMultiplier;
/* 0x5C4 */ f32 mGateSwingMultiplier;
/* 0x5C8 */ int mCounter;
/* 0x5CC */ s16 mGateKeyAngle;
};
#endif /* D_A_OBJ_MGATE_H */