mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-09 12:37:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

l7demo_dr, l7low_dr, l7op_demo_dr done / hozelda almost (#2414)

Browse Source 
* l7demo_dr, l7low_dr, l7op_demo_dr

* hozelda mostly done
This commit is contained in:
TakaRikka
2025-05-01 14:36:02 -07:00
committed by GitHub
parent 1aba90e76c
commit a46b157acf
14 changed files with 2263 additions and 2465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_L7demo_dr.h
+21 -10
View File
@@ -1,7 +1,6 @@
#ifndef D_A_L7DEMO_DR_H
#define D_A_L7DEMO_DR_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
/**
@@ -14,23 +13,35 @@
*/
class daDr_c : public fopAc_ac_c {
public:
/* 805A9238 */ void setAction(void (daDr_c::*)());
typedef void (daDr_c::*actionFn)();
/* 805A9238 */ void setAction(actionFn);
/* 805A92DC */ void action();
/* 805A9304 */ void mtx_set();
/* 805A93D4 */ void draw();
/* 805A93D4 */ int draw();
/* 805A9478 */ void wait();
/* 805A963C */ void pl_walk();
/* 805A9914 */ void pl_turn();
/* 805A9A34 */ void bridge_destroy();
/* 805A9D10 */ void bridge_destroy2();
/* 805A9EE4 */ void execute();
/* 805A9FFC */ void _delete();
/* 805AA084 */ void CreateHeap();
/* 805AA19C */ void check_start();
/* 805AA224 */ void create();
/* 805A9EE4 */ int execute();
/* 805A9FFC */ int _delete();
/* 805AA084 */ int CreateHeap();
/* 805AA19C */ BOOL check_start();
/* 805AA224 */ int create();
private:
/* 0x568 */ u8 field_0x568[0x65c - 0x568];
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ mDoExt_McaMorfSO* mpModelMorf;
/* 0x574 */ Z2CreatureEnemy mSound;
/* 0x618 */ cXyz field_0x618;
/* 0x624 */ cXyz mDemoCamEye;
/* 0x630 */ cXyz mDemoCamCenter;
/* 0x63C */ actionFn mAction;
/* 0x648 */ actionFn mPrevAction;
/* 0x654 */ int field_0x654;
/* 0x658 */ u8 mIsHide;
/* 0x659 */ u8 mTimer;
/* 0x65A */ u8 field_0x65a;
};
STATIC_ASSERT(sizeof(daDr_c) == 0x65c);
include/d/actor/d_a_L7low_dr.h
+16 -9
View File
@@ -1,7 +1,6 @@
#ifndef D_A_L7LOW_DR_H
#define D_A_L7LOW_DR_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
/**
@@ -14,18 +13,26 @@
*/
class daL7lowDr_c : public fopAc_ac_c {
public:
/* 805AA5F8 */ void setAction(void (daL7lowDr_c::*)());
typedef void (daL7lowDr_c::*actionFn)();
/* 805AA5F8 */ void setAction(actionFn);
/* 805AA69C */ void action();
/* 805AA748 */ void _delete();
/* 805AA748 */ int _delete();
/* 805AA7B8 */ void mtx_set();
/* 805AA828 */ void fly();
/* 805AABF8 */ void execute();
/* 805AAC5C */ void CreateHeap();
/* 805AAD58 */ void create();
/* 805AAEA8 */ void draw();
/* 805AABF8 */ int execute();
/* 805AAC5C */ int CreateHeap();
/* 805AAD58 */ int create();
/* 805AAEA8 */ int draw();
private:
/* 0x568 */ u8 field_0x568[0x644 - 0x568];
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ mDoExt_McaMorfSO* mpModelMorf;
/* 0x574 */ Z2CreatureEnemy mSound;
/* 0x618 */ u8 field_0x618[0x624 - 0x618];
/* 0x624 */ actionFn mAction;
/* 0x630 */ actionFn field_0x630;
/* 0x63C */ int field_0x63c;
/* 0x640 */ u16 field_0x640;
};
STATIC_ASSERT(sizeof(daL7lowDr_c) == 0x644);
include/d/actor/d_a_L7op_demo_dr.h
+37 -11
View File
@@ -1,8 +1,8 @@
#ifndef D_A_L7OP_DEMO_DR_H
#define D_A_L7OP_DEMO_DR_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_acch.h"
/**
* @ingroup actors-unsorted
@@ -14,25 +14,51 @@
*/
class daL7ODR_c : public fopAc_ac_c {
public:
/* 805AB098 */ void setAction(void (daL7ODR_c::*)());
typedef void (daL7ODR_c::*actionFn)();
/* 805AB098 */ void setAction(actionFn);
/* 805AB13C */ void action();
/* 805AB164 */ void setDrAction(void (daL7ODR_c::*)());
/* 805AB164 */ void setDrAction(actionFn);
/* 805AB208 */ void dr_action();
/* 805AB230 */ void mtx_set();
/* 805AB2E8 */ void draw();
/* 805AB2E8 */ int draw();
/* 805AB3F0 */ void wait();
/* 805AB520 */ void pl_walk();
/* 805ABC2C */ void setZoomOutCamPos(cXyz&, cXyz&, f32);
/* 805ABCF8 */ void dr_wait();
/* 805ABE0C */ void dr_fly();
/* 805AD7B4 */ void execute();
/* 805AD87C */ void _delete();
/* 805AD90C */ void CreateHeap();
/* 805ADA2C */ void check_start();
/* 805ADAC0 */ void create();
/* 805AD7B4 */ int execute();
/* 805AD87C */ int _delete();
/* 805AD90C */ int CreateHeap();
/* 805ADA2C */ BOOL check_start();
/* 805ADAC0 */ int create();
private:
/* 0x568 */ u8 field_0x568[0x8b8 - 0x568];
/* 0x568 */ dBgS_AcchCir mAcchCir;
/* 0x5A8 */ dBgS_ObjAcch mAcch;
/* 0x780 */ request_of_phase_process_class mPhase;
/* 0x788 */ mDoExt_McaMorfSO* mpModelMorf;
/* 0x78C */ Z2CreatureEnemy mSound;
/* 0x830 */ cXyz field_0x830;
/* 0x83C */ cXyz mDemoCamEye;
/* 0x848 */ cXyz mDemoCamCenter;
/* 0x854 */ u8 field_0x854[0x858 - 0x854];
/* 0x858 */ actionFn mAction;
/* 0x864 */ actionFn mPrevAction;
/* 0x870 */ actionFn mDrAction;
/* 0x87C */ actionFn mPrevDrAction;
/* 0x888 */ int field_0x888;
/* 0x88C */ int field_0x88c;
/* 0x890 */ int field_0x890;
/* 0x894 */ u32 mShadowKey;
/* 0x898 */ f32 field_0x898;
/* 0x89C */ f32 field_0x89c;
/* 0x8A0 */ f32 field_0x8a0;
/* 0x8A4 */ f32 field_0x8a4;
/* 0x8A8 */ u8 field_0x8A8[0x8B4 - 0x8A8];
/* 0x8B4 */ u8 field_0x8b4;
/* 0x8B5 */ u8 field_0x8b5;
/* 0x8B6 */ u8 field_0x8b6;
/* 0x8B7 */ u8 field_0x8b7;
};
STATIC_ASSERT(sizeof(daL7ODR_c) == 0x8b8);
include/d/actor/d_a_arrow.h
+2
View File
@@ -71,6 +71,8 @@ public:
void setShoot() { fopAcM_SetParam(this, 1); }
void setChargeShoot() { fopAcM_SetParam(this, 2); }
void deleteArrow() { field_0x93f = 1; }
static fopAc_ac_c* makeArrow(fopAc_ac_c* i_actor, u16 param_1) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW,
param_1 << 8,
include/d/actor/d_a_b_gnd.h
+3
View File
@@ -26,6 +26,9 @@ public:
/* 80601960 */ b_gnd_class();
bool checkAttackChance() { return field_0x2740 != 0; }
bool checkPiyo() { return field_0x1e08 != 0; }
bool checkRide() { return mDrawHorse != 0; }
BOOL checkZeldaEndDemoCut() { return FALSE; }
/* 0x05AC */ request_of_phase_process_class mPhaseReq;
/* 0x05B4 */ request_of_phase_process_class mHorsePhaseReq;
include/d/actor/d_a_horse.h
+9
View File
@@ -255,6 +255,7 @@ public:
int callHorse(const cXyz* param_0) { return (this->*m_callHorse)(param_0); }
daHoZelda_c* getZeldaActor() { return (daHoZelda_c*)m_zeldaActorKeep.getActor(); }
void setZeldaActor(fopAc_ac_c* i_actor) { m_zeldaActorKeep.setData(i_actor); }
bool checkTurnStandCamera() const { return checkResetStateFlg0(RFLG0_TURN_STAND_CAMERA); }
bool checkTurnStand() const { return checkResetStateFlg0(RFLG0_TURN_STAND); }
@@ -325,6 +326,14 @@ public:
bool checkInputOnR() const { return m_padStickValue > 0.05f; }
void onBagMaterial() {
m_modelData->getMaterialNodePointer(5)->getShape()->show();
}
void offBagMaterial() {
m_modelData->getMaterialNodePointer(5)->getShape()->hide();
}
static u16 const m_footJointTable[];
static f32 const m_callLimitDistance2;
include/d/actor/d_a_hozelda.h
+47 -32
View File
@@ -2,15 +2,33 @@
#define D_A_HOZELDA_H
#include "f_op/f_op_actor_mng.h"
#include "d/actor/d_a_player.h"
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
class daHoZelda_matAnm_c : public J3DMaterialAnm {
public:
daHoZelda_matAnm_c() {
init();
}
/* 80845EAC */ void init();
/* 80848D54 */ virtual ~daHoZelda_matAnm_c();
void setNowOffsetX(f32 i_offsetX) { mNowOffsetX = i_offsetX; }
void setNowOffsetY(f32 i_offsetY) { mNowOffsetY = i_offsetY; }
f32* getNowOffsetXP() { return &mNowOffsetX; }
f32* getNowOffsetYP() { return &mNowOffsetY; }
/* 80848D54 */ virtual ~daHoZelda_matAnm_c() {}
/* 80845EDC */ virtual void calc(J3DMaterial*) const;
static bool getEyeMoveFlg() { return mEyeMoveFlg; }
static void offEyeMoveFlg() { mEyeMoveFlg = false; }
static void onEyeMoveFlg() { mEyeMoveFlg = true; }
static u8 getMorfFrame() { return mMorfFrame; }
static void setMorfFrame(u8 i_frame) { mMorfFrame = i_frame; }
static void decMorfFrame() { cLib_calcTimer<u8>(&mMorfFrame); }
static bool mEyeMoveFlg;
static u8 mMorfFrame;
@@ -20,7 +38,9 @@ public:
/* 0x100 */ f32 mNowOffsetY;
};
class daHoZelda_hio_c;
class daHoZelda_hio_c {
public:
};
/**
* @ingroup actors-unsorted
@@ -32,14 +52,14 @@ class daHoZelda_hio_c;
*/
class daHoZelda_c : public fopAc_ac_c {
public:
/* 80846000 */ void createHeap();
/* 80846000 */ int createHeap();
/* 80846718 */ void modelCallBack(u16);
/* 808469B0 */ void create();
/* 808469B0 */ int create();
/* 80846DB0 */ ~daHoZelda_c();
/* 80846F4C */ void setDoubleAnime(f32, f32, f32, u16, u16, f32);
/* 8084718C */ void setUpperAnime(u16);
/* 80846F4C */ int setDoubleAnime(f32, f32, f32, u16, u16, f32);
/* 8084718C */ int setUpperAnime(u16);
/* 80847234 */ void resetUpperAnime();
/* 808472C0 */ void setSingleAnime(u16, f32, f32, s16, f32);
/* 808472C0 */ int setSingleAnime(u16, f32, f32, s16, f32);
/* 80847430 */ void animePlay();
/* 80847574 */ void setEyeBtp(u16);
/* 808475F0 */ void setEyeBtk(u16, u8);
@@ -55,15 +75,15 @@ public:
/* 80848254 */ void setEyeMove(cXyz const*, s16, s16);
/* 808484B8 */ void setNeckAngle();
/* 80848774 */ void searchBodyAngle();
/* 808489CC */ void execute();
/* 80848B64 */ void draw();
/* 808489CC */ int execute();
/* 80848B64 */ int draw();
MtxP getRightHandMtx() { return mpZeldaModel->getAnmMtx(22); }
MtxP getRightFingerMtx() { return mpZeldaModel->getAnmMtx(23); }
u8 checkBowMode() const { return field_0x6d8; }
void setDamageInit() { field_0x6db = 1; }
u8 checkSingleRide() const { return field_0x6df; }
u8 checkBowMode() const { return mBowMode; }
void setDamageInit() { mDamageInit = 1; }
u8 checkSingleRide() const { return mIsSingleRide; }
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ J3DModel* mpZeldaModel;
@@ -71,37 +91,32 @@ public:
/* 0x578 */ mDoExt_btpAnm mEyeBtp;
/* 0x590 */ mDoExt_btkAnm mEyeBtk;
/* 0x5A8 */ mDoExt_MtxCalcAnmBlendTblOld* field_0x5a8;
/* 0x5AC */ mDoExt_AnmRatioPack field_0x5ac[3];
/* 0x5AC */ mDoExt_AnmRatioPack mAnmRatioPack[3];
/* 0x5C4 */ mDoExt_MtxCalcOldFrame* field_0x5c4;
/* 0x5C8 */ daPy_frameCtrl_c field_0x5c8[3];
/* 0x610 */ daHoZelda_matAnm_c* field_0x610[2];
/* 0x5C8 */ daPy_frameCtrl_c mFrameCtrl[3];
/* 0x610 */ daHoZelda_matAnm_c* mpMatAnm[2];
/* 0x618 */ Z2Creature mSound;
/* 0x6A8 */ mDoExt_bckAnm mBowBck;
/* 0x6C4 */ daPy_actorKeep_c mArrowAcKeep;
/* 0x6CC */ daPy_actorKeep_c field_0x6cc;
/* 0x6CC */ daPy_actorKeep_c mGndAcKeep;
/* 0x6D4 */ daHoZelda_hio_c* mpHIO;
/* 0x6D8 */ u8 field_0x6d8;
/* 0x6D9 */ u8 field_0x6d9;
/* 0x6D8 */ u8 mBowMode;
/* 0x6D9 */ u8 mAnmTimer;
/* 0x6DA */ u8 field_0x6da;
/* 0x6DB */ u8 field_0x6db;
/* 0x6DC */ u8 field_0x6DC[0x6DD - 0x6DC];
/* 0x6DB */ u8 mDamageInit;
/* 0x6DC */ u8 field_0x6dc;
/* 0x6DD */ u8 field_0x6dd;
/* 0x6DE */ u8 field_0x6de;
/* 0x6DF */ u8 field_0x6df;
/* 0x6DF */ u8 mIsSingleRide;
/* 0x6E0 */ s8 mReverb;
/* 0x6E1 */ u8 field_0x6E1[0x6E4 - 0x6E1];
/* 0x6E4 */ u16 field_0x6e4;
/* 0x6E6 */ u16 field_0x6e6;
/* 0x6E4 */ u16 field_0x6e4[2];
/* 0x6E8 */ u16 mUpperAnmID;
/* 0x6EA */ s16 mBowAnmID;
/* 0x6EC */ s16 field_0x6ec;
/* 0x6EE */ s16 field_0x6ee;
/* 0x6F0 */ u8 field_0x6F0[0x6F2 - 0x6F0];
/* 0x6F2 */ s16 field_0x6f2;
/* 0x6F4 */ s16 field_0x6f4;
/* 0x6F6 */ u8 field_0x6F6[0x6F8 - 0x6F6];
/* 0x6F8 */ Vec field_0x6f8;
/* 0x704 */ Vec* mpRideOffset;
/* 0x6EA */ u16 mBowAnmID;
/* 0x6EC */ csXyz mNeckAngle;
/* 0x6F2 */ csXyz mBodyAngle;
/* 0x6F8 */ cXyz field_0x6f8;
/* 0x704 */ const Vec* mpRideOffset;
};
#endif /* D_A_HOZELDA_H */
include/d/actor/d_a_obj_lv7bridge.h
+6 -1
View File
@@ -27,8 +27,13 @@ public:
/* 80C87304 */ void Draw();
/* 80C87458 */ void Delete();
void setDestroyAnmA() { field_0xa94 = 0; }
void setDestroyAnmB() { field_0xa94 = 1; }
private:
/* 0x568 */ u8 field_0x568[0xaa4 - 0x568];
/* 0x568 */ u8 field_0x568[0xa94 - 0x568];
/* 0xA94 */ u8 field_0xa94;
/* 0xA95 */ u8 field_0xa95[0xaa4 - 0xA95];
};
STATIC_ASSERT(sizeof(daObjLv7Brg_c) == 0xaa4);
include/d/actor/d_a_player.h
+6 -1
View File
@@ -757,7 +757,7 @@ public:
virtual BOOL checkGrassWhistle() const { return FALSE; }
virtual BOOL checkBoarRun() const { return FALSE; }
virtual bool checkFmChainPut() const { return FALSE; }
virtual bool checkHorseElecDamage() const { return FALSE; }
virtual BOOL checkHorseElecDamage() const { return FALSE; }
virtual f32 getBaseAnimeFrameRate() const { return 1.0f; }
virtual f32 getBaseAnimeFrame() const { return 0.0f; }
virtual void setAnimeFrame(f32) {}
@@ -890,6 +890,8 @@ public:
mDemo.setDemoMode(1);
}
u32 getDemoMode() const { return mDemo.getDemoMode(); }
u8 getCutCount() const { return mComboCutCount; }
bool checkStatusWindowDraw() { return checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); }
@@ -938,6 +940,9 @@ public:
void offWolfEnemyHangBite() { offNoResetFlg2(FLG2_WOLF_ENEMY_HANG_BITE); }
bool onWolfEnemyHangBite(fopAc_ac_c* param_0) { return onWolfEnemyBiteAll(param_0, FLG2_WOLF_ENEMY_HANG_BITE); }
void offHorseZelda() { offNoResetFlg2(FLG2_HORSE_ZELDA); }
void onHorseZelda() { onNoResetFlg2(FLG2_HORSE_ZELDA); }
u32 checkItemSightBgHit() const { return checkResetFlg0(RFLG0_UNK_2000000); }
void setCanoeSlider() { mSpecialMode = 0x2D; }