encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07: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-02 00:36:02 +03:00
committed by GitHub
parent 497c9c49de
commit 476c893475
14 changed files with 2263 additions and 2465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+3 -3
View File
@@ -1598,9 +1598,9 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01"), "d_a_tag_spring"),
ActorRel(MatchingFor("GZ2E01"), "d_a_tag_statue_evt"),
ActorRel(NonMatching, "d_a_ykgr"),
ActorRel(NonMatching, "d_a_L7demo_dr"),
ActorRel(NonMatching, "d_a_L7low_dr"),
ActorRel(NonMatching, "d_a_L7op_demo_dr"),
ActorRel(MatchingFor("GZ2E01"), "d_a_L7demo_dr"),
ActorRel(MatchingFor("GZ2E01"), "d_a_L7low_dr"),
ActorRel(Equivalent, "d_a_L7op_demo_dr"), # weak func order
ActorRel(MatchingFor("GZ2E01"), "d_a_b_bh"),
ActorRel(NonMatching, "d_a_b_bq"),
ActorRel(Equivalent, "d_a_b_dr"), # weak func order
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; }
src/d/actor/d_a_L7demo_dr.cpp
+349 -381
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_L7low_dr.cpp
+153 -222
View File
@@ -4,282 +4,215 @@
*/
#include "d/actor/d_a_L7low_dr.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" void setAction__11daL7lowDr_cFM11daL7lowDr_cFPCvPv_v();
extern "C" void action__11daL7lowDr_cFv();
extern "C" void _delete__11daL7lowDr_cFv();
extern "C" static void daL7lowDr_Delete__FP11daL7lowDr_c();
extern "C" void mtx_set__11daL7lowDr_cFv();
extern "C" void fly__11daL7lowDr_cFv();
extern "C" void execute__11daL7lowDr_cFv();
extern "C" static void daL7lowDr_Execute__FP11daL7lowDr_c();
extern "C" static void useHeapInit__FP10fopAc_ac_c();
extern "C" void CreateHeap__11daL7lowDr_cFv();
extern "C" void create__11daL7lowDr_cFv();
extern "C" static void daL7lowDr_Create__FP11daL7lowDr_c();
extern "C" void draw__11daL7lowDr_cFv();
extern "C" static void daL7lowDr_Draw__FP11daL7lowDr_c();
extern "C" static bool daL7lowDr_IsDelete__FP11daL7lowDr_c();
extern "C" extern char const* const d_a_L7low_dr__stringBase0;
//
// External References:
//
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz();
extern "C" void
__ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl();
extern "C" void setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff();
extern "C" void play__16mDoExt_McaMorfSOFUlSc();
extern "C" void entryDL__16mDoExt_McaMorfSOFv();
extern "C" void modelCalc__16mDoExt_McaMorfSOFv();
extern "C" void stopZelAnime__16mDoExt_McaMorfSOFv();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void isDungeonItem__12dSv_memBit_cCFi();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void cM_rndF__Ff();
extern "C" void cM_rndFX__Ff();
extern "C" void cLib_chaseAngleS__FPsss();
extern "C" void cLib_targetAngleY__FPC3VecPC3Vec();
extern "C" void __ct__15Z2CreatureEnemyFv();
extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc();
extern "C" void* __nw__FUl();
extern "C" void __ptmf_test();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" u8 sincosTable___5JMath[65536];
//
// Declarations:
//
#include "d/d_com_inf_game.h"
/* 805AA5F8-805AA69C 000078 00A4+00 1/1 0/0 0/0 .text
* setAction__11daL7lowDr_cFM11daL7lowDr_cFPCvPv_v */
void daL7lowDr_c::setAction(void (daL7lowDr_c::*param_0)()) {
// NONMATCHING
void daL7lowDr_c::setAction(daL7lowDr_c::actionFn i_action) {
if (mAction != NULL) {
field_0x63c = -1;
(this->*mAction)();
}
field_0x630 = mAction;
mAction = i_action;
field_0x63c = 0;
(this->*mAction)();
}
/* 805AA69C-805AA748 00011C 00AC+00 1/1 0/0 0/0 .text action__11daL7lowDr_cFv */
void daL7lowDr_c::action() {
// NONMATCHING
if (field_0x640 != 0) {
field_0x640--;
}
(this->*mAction)();
shape_angle = current.angle;
fopAcM_posMoveF(this, NULL);
mpModelMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
mtx_set();
eyePos = current.pos;
}
/* ############################################################################################## */
/* 805AAFB0-805AAFB0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_805AAFB0 = "L7lowDr";
#pragma pop
/* 805AA748-805AA798 0001C8 0050+00 1/1 0/0 0/0 .text _delete__11daL7lowDr_cFv */
void daL7lowDr_c::_delete() {
// NONMATCHING
int daL7lowDr_c::_delete() {
dComIfG_resDelete(&mPhase, "L7lowDr");
if (heap != NULL) {
mpModelMorf->stopZelAnime();
}
return 1;
}
/* 805AA798-805AA7B8 000218 0020+00 1/0 0/0 0/0 .text daL7lowDr_Delete__FP11daL7lowDr_c
*/
static void daL7lowDr_Delete(daL7lowDr_c* param_0) {
// NONMATCHING
static int daL7lowDr_Delete(daL7lowDr_c* i_this) {
return i_this->_delete();
}
/* 805AA7B8-805AA828 000238 0070+00 1/1 0/0 0/0 .text mtx_set__11daL7lowDr_cFv */
void daL7lowDr_c::mtx_set() {
// NONMATCHING
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
J3DModel* model = mpModelMorf->getModel();
model->setBaseScale(scale);
model->setBaseTRMtx(mDoMtx_stack_c::get());
mpModelMorf->modelCalc();
}
/* ############################################################################################## */
/* 805AAF74-805AAF78 000000 0004+00 1/1 0/0 0/0 .rodata @3769 */
SECTION_RODATA static f32 const lit_3769 = 32768.0f;
COMPILER_STRIP_GATE(0x805AAF74, &lit_3769);
/* 805AAF78-805AAF7C 000004 0004+00 0/1 0/0 0/0 .rodata @3770 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3770 = 2800.0f;
COMPILER_STRIP_GATE(0x805AAF78, &lit_3770);
#pragma pop
/* 805AAF7C-805AAF80 000008 0004+00 0/1 0/0 0/0 .rodata @3771 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3771 = 8000.0f;
COMPILER_STRIP_GATE(0x805AAF7C, &lit_3771);
#pragma pop
/* 805AAF80-805AAF84 00000C 0004+00 0/1 0/0 0/0 .rodata @3772 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3772 = 20.0f;
COMPILER_STRIP_GATE(0x805AAF80, &lit_3772);
#pragma pop
/* 805AAF84-805AAF88 000010 0004+00 2/3 0/0 0/0 .rodata @3773 */
SECTION_RODATA static f32 const lit_3773 = 1.0f;
COMPILER_STRIP_GATE(0x805AAF84, &lit_3773);
/* 805AAF88-805AAF8C 000014 0004+00 0/1 0/0 0/0 .rodata @3774 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3774[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x805AAF88, &lit_3774);
#pragma pop
/* 805AAF8C-805AAF90 000018 0004+00 0/1 0/0 0/0 .rodata @3775 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3775 = -1.0f;
COMPILER_STRIP_GATE(0x805AAF8C, &lit_3775);
#pragma pop
/* 805AAF90-805AAF94 00001C 0004+00 0/1 0/0 0/0 .rodata @3776 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3776 = 30.0f;
COMPILER_STRIP_GATE(0x805AAF90, &lit_3776);
#pragma pop
/* 805AAF94-805AAF98 000020 0004+00 0/1 0/0 0/0 .rodata @3777 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3777 = 210.0f;
COMPILER_STRIP_GATE(0x805AAF94, &lit_3777);
#pragma pop
/* 805AAF98-805AAF9C 000024 0004+00 0/1 0/0 0/0 .rodata @3778 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3778 = 60.0f;
COMPILER_STRIP_GATE(0x805AAF98, &lit_3778);
#pragma pop
/* 805AAF9C-805AAFA0 000028 0004+00 0/1 0/0 0/0 .rodata @3779 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3779 = 3.0f;
COMPILER_STRIP_GATE(0x805AAF9C, &lit_3779);
#pragma pop
/* 805AAFA0-805AAFA4 00002C 0004+00 0/1 0/0 0/0 .rodata @3780 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3780 = 33.0f;
COMPILER_STRIP_GATE(0x805AAFA0, &lit_3780);
#pragma pop
/* 805AAFA4-805AAFA8 000030 0004+00 0/1 0/0 0/0 .rodata @3781 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3781 = 2.0f;
COMPILER_STRIP_GATE(0x805AAFA4, &lit_3781);
#pragma pop
/* 805AAFA8-805AAFAC 000034 0004+00 0/1 0/0 0/0 .rodata @3782 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3782 = 180.0f;
COMPILER_STRIP_GATE(0x805AAFA8, &lit_3782);
#pragma pop
/* 805AAFAC-805AAFB0 000038 0004+00 0/1 0/0 0/0 .rodata @3783 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3783 = 67.0f;
COMPILER_STRIP_GATE(0x805AAFAC, &lit_3783);
#pragma pop
/* 805AA828-805AABF8 0002A8 03D0+00 1/0 0/0 0/0 .text fly__11daL7lowDr_cFv */
void daL7lowDr_c::fly() {
// NONMATCHING
if (field_0x63c == 0) {
s16 var_r28 = cM_rndFX(32768.0f);
current.pos.set(cM_ssin(var_r28) * 2800.0f, 8000.0f, cM_scos(var_r28) * 2800.0f);
current.pos += home.pos;
current.angle.y = cLib_targetAngleY(&current.pos, &home.pos) + 0x4000;
mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("L7lowDr", 4), 2, 20.0f, 1.0f, 0.0f, -1.0f);
speedF = 30.0f;
field_0x640 = cM_rndFX(60.0f) + 210.0f;
field_0x63c++;
} else if (field_0x63c != -1) {
current.angle.y = cLib_targetAngleY(&current.pos, &home.pos) + 0x4000;
fopAcM_posMoveF(this, NULL);
if (field_0x63c == 1) {
cLib_chaseAngleS(&current.angle.z, 0, 0x20);
if (mpModelMorf->isStop()) {
mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("L7lowDr", 4), 2, 3.0f, 1.0f, 0.0f, -1.0f);
}
if (field_0x640 == 0 && mpModelMorf->getFrame() >= 33.0f) {
if ((int)cM_rndF(2.0f) != 0) {
field_0x640 = cM_rndFX(60.0f) + 210.0f;
} else {
mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("L7lowDr", 5), 0, 3.0f, 1.0f, 0.0f, -1.0f);
field_0x640 = cM_rndFX(60.0f) + 180.0f;
field_0x63c++;
}
}
} else {
cLib_chaseAngleS(&current.angle.z, 0x1000, 0x20);
if (mpModelMorf->isStop()) {
mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("L7lowDr", 6), 2, 3.0f, 1.0f, 0.0f, -1.0f);
}
if (field_0x640 == 0 && mpModelMorf->getFrame() >= 67.0f) {
mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("L7lowDr", 7), 0, 3.0f, 1.0f, 0.0f, -1.0f);
field_0x640 = cM_rndFX(60.0f) + 210.0f;
field_0x63c = 1;
}
}
}
}
/* 805AABF8-805AAC1C 000678 0024+00 1/1 0/0 0/0 .text execute__11daL7lowDr_cFv */
void daL7lowDr_c::execute() {
// NONMATCHING
int daL7lowDr_c::execute() {
action();
return 1;
}
/* 805AAC1C-805AAC3C 00069C 0020+00 2/1 0/0 0/0 .text daL7lowDr_Execute__FP11daL7lowDr_c
*/
static void daL7lowDr_Execute(daL7lowDr_c* param_0) {
// NONMATCHING
static int daL7lowDr_Execute(daL7lowDr_c* i_this) {
return i_this->execute();
}
/* 805AAC3C-805AAC5C 0006BC 0020+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
static void useHeapInit(fopAc_ac_c* param_0) {
// NONMATCHING
static int useHeapInit(fopAc_ac_c* i_this) {
daL7lowDr_c* a_this = (daL7lowDr_c*)i_this;
return a_this->CreateHeap();
}
/* 805AAC5C-805AAD58 0006DC 00FC+00 1/1 0/0 0/0 .text CreateHeap__11daL7lowDr_cFv */
void daL7lowDr_c::CreateHeap() {
// NONMATCHING
int daL7lowDr_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L7lowDr", 10);
JUT_ASSERT(244, modelData != 0);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("L7lowDr", 4), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
}
J3DModel* model = mpModelMorf->getModel();
model->setUserArea((u32)this);
return 1;
}
/* ############################################################################################## */
/* 805AAFB8-805AAFC4 -00001 000C+00 1/1 0/0 0/0 .data @3832 */
SECTION_DATA static void* lit_3832[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)fly__11daL7lowDr_cFv,
};
/* 805AAD58-805AAE88 0007D8 0130+00 1/1 0/0 0/0 .text create__11daL7lowDr_cFv */
void daL7lowDr_c::create() {
// NONMATCHING
int daL7lowDr_c::create() {
fopAcM_SetupActor(this, daL7lowDr_c);
int phase_state = dComIfG_resLoad(&mPhase, "L7lowDr");
if (phase_state == cPhs_COMPLEATE_e) {
OS_REPORT("////////////// L7lowDr ///////////////////\n");
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x1D20)) {
return cPhs_ERROR_e;
}
OS_REPORT("//////////// L7lowDr SET OK //////////////\n");
if (dComIfGs_isStageBossEnemy()) {
OS_REPORT("L7俯瞰翼竜：ボス死んでるのでセットしない\n");
return cPhs_ERROR_e;
}
scale.setall(1.0f);
attention_info.flags = 0;
mSound.init(&current.pos, &eyePos, 3, 1);
setAction(&daL7lowDr_c::fly);
daL7lowDr_Execute(this);
}
return phase_state;
}
/* 805AAE88-805AAEA8 000908 0020+00 1/0 0/0 0/0 .text daL7lowDr_Create__FP11daL7lowDr_c
*/
static void daL7lowDr_Create(daL7lowDr_c* param_0) {
// NONMATCHING
static int daL7lowDr_Create(daL7lowDr_c* i_this) {
return i_this->create();
}
/* 805AAEA8-805AAF44 000928 009C+00 1/1 0/0 0/0 .text draw__11daL7lowDr_cFv */
void daL7lowDr_c::draw() {
// NONMATCHING
int daL7lowDr_c::draw() {
if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[510])) {
return 1;
}
J3DModel* model = mpModelMorf->getModel();
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model, &tevStr);
mpModelMorf->entryDL();
return 1;
}
/* 805AAF44-805AAF64 0009C4 0020+00 1/0 0/0 0/0 .text daL7lowDr_Draw__FP11daL7lowDr_c */
static void daL7lowDr_Draw(daL7lowDr_c* param_0) {
// NONMATCHING
static int daL7lowDr_Draw(daL7lowDr_c* i_this) {
return i_this->draw();
}
/* 805AAF64-805AAF6C 0009E4 0008+00 1/0 0/0 0/0 .text daL7lowDr_IsDelete__FP11daL7lowDr_c
*/
static bool daL7lowDr_IsDelete(daL7lowDr_c* param_0) {
return true;
static int daL7lowDr_IsDelete(daL7lowDr_c* i_this) {
return 1;
}
/* ############################################################################################## */
/* 805AAFC4-805AAFE4 -00001 0020+00 1/0 0/0 0/0 .data l_daL7lowDr_Method */
static actor_method_class l_daL7lowDr_Method = {
(process_method_func)daL7lowDr_Create__FP11daL7lowDr_c,
(process_method_func)daL7lowDr_Delete__FP11daL7lowDr_c,
(process_method_func)daL7lowDr_Execute__FP11daL7lowDr_c,
(process_method_func)daL7lowDr_IsDelete__FP11daL7lowDr_c,
(process_method_func)daL7lowDr_Draw__FP11daL7lowDr_c,
(process_method_func)daL7lowDr_Create,
(process_method_func)daL7lowDr_Delete,
(process_method_func)daL7lowDr_Execute,
(process_method_func)daL7lowDr_IsDelete,
(process_method_func)daL7lowDr_Draw,
};
/* 805AAFE4-805AB014 -00001 0030+00 0/0 0/0 1/0 .data g_profile_L7lowDr */
@@ -299,5 +232,3 @@ extern actor_process_profile_definition g_profile_L7lowDr = {
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 805AAFB0-805AAFB0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_L7op_demo_dr.cpp
+777 -882
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_hozelda.cpp
+834 -913
View File
File diff suppressed because it is too large Load Diff