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

project cleanup (#2895)

Browse Source 
* some wii OS fixes

* remove old dol2asm comments

* remove dol2asm.h

* remove function address comments

* normalize ATTRIBUTE_ALIGN usage

* DECL_WEAK macro

* fix gcc attribute weak macro

* wrap more mwcc specific things in ifdefs

* fixes

* fix revo sdk version flags

* fixes
This commit is contained in:
TakaRikka
2025-11-30 15:23:42 -07:00
committed by GitHub
parent 434415337d
commit a6e76c0841
2375 changed files with 24683 additions and 71069 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_L7demo_dr.h
+14 -14
View File
@@ -15,20 +15,20 @@ class daDr_c : public fopAc_ac_c {
public:
typedef void (daDr_c::*actionFn)();
/* 805A9238 */ void setAction(actionFn);
/* 805A92DC */ void action();
/* 805A9304 */ void mtx_set();
/* 805A93D4 */ int draw();
/* 805A9478 */ void wait();
/* 805A963C */ void pl_walk();
/* 805A9914 */ void pl_turn();
/* 805A9A34 */ void bridge_destroy();
/* 805A9D10 */ void bridge_destroy2();
/* 805A9EE4 */ int execute();
/* 805A9FFC */ int _delete();
/* 805AA084 */ int CreateHeap();
/* 805AA19C */ BOOL check_start();
/* 805AA224 */ int create();
void setAction(actionFn);
void action();
void mtx_set();
int draw();
void wait();
void pl_walk();
void pl_turn();
void bridge_destroy();
void bridge_destroy2();
int execute();
int _delete();
int CreateHeap();
BOOL check_start();
int create();
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ mDoExt_McaMorfSO* mpModelMorf;
include/d/actor/d_a_L7low_dr.h
+9 -9
View File
@@ -15,15 +15,15 @@ class daL7lowDr_c : public fopAc_ac_c {
public:
typedef void (daL7lowDr_c::*actionFn)();
/* 805AA5F8 */ void setAction(actionFn);
/* 805AA69C */ void action();
/* 805AA748 */ int _delete();
/* 805AA7B8 */ void mtx_set();
/* 805AA828 */ void fly();
/* 805AABF8 */ int execute();
/* 805AAC5C */ int CreateHeap();
/* 805AAD58 */ int create();
/* 805AAEA8 */ int draw();
void setAction(actionFn);
void action();
int _delete();
void mtx_set();
void fly();
int execute();
int CreateHeap();
int create();
int draw();
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ mDoExt_McaMorfSO* mpModelMorf;
include/d/actor/d_a_L7op_demo_dr.h
+16 -16
View File
@@ -16,22 +16,22 @@ class daL7ODR_c : public fopAc_ac_c {
public:
typedef void (daL7ODR_c::*actionFn)();
/* 805AB098 */ void setAction(actionFn);
/* 805AB13C */ void action();
/* 805AB164 */ void setDrAction(actionFn);
/* 805AB208 */ void dr_action();
/* 805AB230 */ void mtx_set();
/* 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 */ int execute();
/* 805AD87C */ int _delete();
/* 805AD90C */ int CreateHeap();
/* 805ADA2C */ BOOL check_start();
/* 805ADAC0 */ int create();
void setAction(actionFn);
void action();
void setDrAction(actionFn);
void dr_action();
void mtx_set();
int draw();
void wait();
void pl_walk();
void setZoomOutCamPos(cXyz&, cXyz&, f32);
void dr_wait();
void dr_fly();
int execute();
int _delete();
int CreateHeap();
BOOL check_start();
int create();
/* 0x568 */ dBgS_AcchCir mAcchCir;
/* 0x5A8 */ dBgS_ObjAcch mAcch;
include/d/actor/d_a_alink.h
+1721 -1721
View File
File diff suppressed because it is too large Load Diff
include/d/actor/d_a_alldie.h
+9 -9
View File
@@ -22,15 +22,15 @@ public:
/* 0x5 */ ACT_EVENT,
};
/* 804D5818 */ u8 getEventNo();
/* 804D5824 */ u8 getSwbit();
/* 804D5830 */ int actionWait();
/* 804D5838 */ int actionCheck();
/* 804D5888 */ int actionTimer();
/* 804D5938 */ int actionOrder();
/* 804D59A0 */ int actionEvent();
/* 804D5A44 */ int actionNext();
/* 804D5B10 */ int execute();
u8 getEventNo();
u8 getSwbit();
int actionWait();
int actionCheck();
int actionTimer();
int actionOrder();
int actionEvent();
int actionNext();
int execute();
inline int create();
include/d/actor/d_a_andsw.h
+4 -4
View File
@@ -29,10 +29,10 @@ public:
return fopAcM_GetParamBit(this,24,8);
}
/* 80457978 */ int Create();
/* 804579B8 */ int create();
/* 80457A20 */ int execute();
/* 80457ABC */ int _delete();
int Create();
int create();
int execute();
int _delete();
/* 0x568 */ u8 mSwNo;
/* 0x568 */ u8 mSwNo2;
include/d/actor/d_a_andsw2.h
+13 -13
View File
@@ -22,19 +22,19 @@ public:
ACT_WAIT_e,
};
/* 804D5DF8 */ u8 getEventNo();
/* 804D5E04 */ u8 getSwbit();
/* 804D5E10 */ u8 getSwbit2();
/* 804D5E1C */ u8 getType();
/* 804D5E28 */ u8 getTimer();
/* 804D5E34 */ u8 getNum();
/* 804D5E40 */ u8 getTopSw();
/* 804D5EB0 */ u8 getSwAns();
/* 804D5EBC */ BOOL chkAllSw2();
/* 804D5F64 */ bool chkSwStatus();
/* 804D6024 */ bool chkSwStatus2();
/* 804D60CC */ ~daAndsw2_c();
/* 804D6120 */ int create();
u8 getEventNo();
u8 getSwbit();
u8 getSwbit2();
u8 getType();
u8 getTimer();
u8 getNum();
u8 getTopSw();
u8 getSwAns();
BOOL chkAllSw2();
bool chkSwStatus();
bool chkSwStatus2();
~daAndsw2_c();
int create();
inline int execute();
include/d/actor/d_a_arrow.h
+32 -32
View File
@@ -23,38 +23,38 @@ public:
ARROW_TYPE_SLING = 4,
};
/* 80499C6C */ int createHeap();
/* 80499D8C */ void atHitCallBack(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
/* 80499FBC */ void decAlphaBlur();
/* 8049A04C */ void setBlur();
/* 8049A110 */ void setLightArrowHitMark(cXyz const*);
/* 8049A1EC */ void setLightChargeEffect(int);
/* 8049A370 */ int setArrowWaterNextPos(cXyz*, cXyz*);
/* 8049A76C */ void setArrowAt(f32);
/* 8049A9CC */ void arrowShooting();
/* 8049AC84 */ void setBombArrowExplode(cXyz*);
/* 8049ACE0 */ void setRoomInfo();
/* 8049AD74 */ void clearNearActorData();
/* 8049AD94 */ s16 getVibAngle();
/* 8049AE64 */ void setNormalMatrix();
/* 8049AF18 */ void setSmokePos();
/* 8049AFEC */ void setKeepMatrix();
/* 8049B120 */ fopAc_ac_c* setStopActorMatrix();
/* 8049B214 */ void setBombMoveEffect();
/* 8049B370 */ bool checkReget();
/* 8049B45C */ int procWait();
/* 8049B764 */ int procMove();
/* 8049C700 */ int procReturnInit(int);
/* 8049C874 */ int procReturn();
/* 8049CB70 */ int procBGStop();
/* 8049CC60 */ int procActorStop();
/* 8049CCCC */ int procActorControllStop();
/* 8049CCF0 */ int procSlingHitInit(cXyz*, dCcD_GObjInf*);
/* 8049CE50 */ int procSlingHit();
/* 8049CEA0 */ int execute();
/* 8049D0CC */ int draw();
/* 8049D440 */ cPhs__Step create();
/* 8049D98C */ ~daArrow_c();
int createHeap();
void atHitCallBack(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
void decAlphaBlur();
void setBlur();
void setLightArrowHitMark(cXyz const*);
void setLightChargeEffect(int);
int setArrowWaterNextPos(cXyz*, cXyz*);
void setArrowAt(f32);
void arrowShooting();
void setBombArrowExplode(cXyz*);
void setRoomInfo();
void clearNearActorData();
s16 getVibAngle();
void setNormalMatrix();
void setSmokePos();
void setKeepMatrix();
fopAc_ac_c* setStopActorMatrix();
void setBombMoveEffect();
bool checkReget();
int procWait();
int procMove();
int procReturnInit(int);
int procReturn();
int procBGStop();
int procActorStop();
int procActorControllStop();
int procSlingHitInit(cXyz*, dCcD_GObjInf*);
int procSlingHit();
int execute();
int draw();
cPhs__Step create();
~daArrow_c();
void setBombArrowExplode() { field_0x950 = 0; }
bool checkBombArrow() const { return mArrowType == true; }
include/d/actor/d_a_b_bh.h
+2 -2
View File
@@ -91,8 +91,8 @@ STATIC_ASSERT(sizeof(b_bh_class) == 0xf4c);
class daB_BH_HIO_c : public JORReflexible {
public:
/* 805AE26C */ daB_BH_HIO_c();
/* 805B3098 */ virtual ~daB_BH_HIO_c() {}
daB_BH_HIO_c();
virtual ~daB_BH_HIO_c() {}
void genMessage(JORMContext*);
include/d/actor/d_a_b_bq.h
+1 -1
View File
@@ -17,7 +17,7 @@
class b_bq_class : public fopEn_enemy_c {
public:
/* 805B9B3C */ b_bq_class();
b_bq_class();
/* 0x05AC */ request_of_phase_process_class mPhase;
/* 0x05B4 */ mDoExt_McaMorfSO* mpMorf;
include/d/actor/d_a_b_dr.h
+58 -58
View File
@@ -18,64 +18,64 @@
*/
class daB_DR_c : public fopEn_enemy_c {
public:
/* 805BAF80 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 805BB120 */ static int JointCallBack(J3DJoint*, int);
/* 805BB16C */ int draw();
/* 805BB408 */ void setBck(int, u8, f32, f32);
/* 805BB4B4 */ void setActionMode(int, int);
/* 805BB4CC */ void mGlider_WindPosSet();
/* 805BB540 */ void mBoot_c_tranceSet(bool);
/* 805BB64C */ void mStatusONOFF(int);
/* 805BB6E8 */ void setSe();
/* 805BBFC0 */ void setDeathLightEffect();
/* 805BC0B8 */ void chkPartCreate(bool);
/* 805BC248 */ void mHabatakiAnmSet(int);
/* 805BC57C */ void mGlider_AniSet(bool);
/* 805BC8B4 */ void mGliderAtAniSet();
/* 805BCA10 */ void tail_hit_check();
/* 805BCAD4 */ void week_hit_check();
/* 805BCBD0 */ void mTimerClr();
/* 805BCBF4 */ void mCountClr();
/* 805BCC18 */ void mAllClr();
/* 805BCC4C */ void mHeadAngleSet();
/* 805BCD7C */ bool flapMove(bool);
/* 805BCEA4 */ bool revolutionMove();
/* 805BD05C */ bool mPlayerHighCheck();
/* 805BD15C */ bool mBgFallGroundCheck();
/* 805BD3E4 */ void normalHoverMove();
/* 805BD5FC */ void executeWait();
/* 805BD98C */ void executeFlyWait();
/* 805BDBC4 */ void executeTailHit();
/* 805BE9B4 */ void executeWeekHit();
/* 805BF4C8 */ void mBreathSet();
/* 805BF768 */ bool mBreathHighSet(bool);
/* 805BFA6C */ bool mFeintBreath();
/* 805BFD88 */ void executeBreathAttack();
/* 805C062C */ void executeWindAttack();
/* 805C0CAC */ bool mGliderMoveSub(f32);
/* 805C0EF8 */ void executeGliderAttack();
/* 805C1E0C */ void executePillarSearch();
/* 805C24BC */ void executePillarWait();
/* 805C2BE8 */ bool startDemoCheck();
/* 805C2CD0 */ void executeDamageDemo();
/* 805C3558 */ void executeMiddleDemo();
/* 805C36A4 */ void executeDead();
/* 805C382C */ void executeBullet();
/* 805C39D8 */ void executeParts();
/* 805C3CB0 */ void action();
/* 805C40E0 */ void action_fire();
/* 805C4130 */ void action_parts();
/* 805C41A4 */ void mtx_set();
/* 805C4684 */ void parts_mtx_set();
/* 805C46E0 */ void cc_set();
/* 805C4E14 */ void down_cc_set();
/* 805C4FB4 */ void demo_skip(int);
/* 805C50BC */ static int DemoSkipCallBack(void*, int);
/* 805C50F0 */ int execute();
/* 805C55B0 */ int _delete();
/* 805C56A4 */ int CreateHeap();
/* 805C5974 */ int create();
/* 805C62B0 */ daB_DR_c();
int ctrlJoint(J3DJoint*, J3DModel*);
static int JointCallBack(J3DJoint*, int);
int draw();
void setBck(int, u8, f32, f32);
void setActionMode(int, int);
void mGlider_WindPosSet();
void mBoot_c_tranceSet(bool);
void mStatusONOFF(int);
void setSe();
void setDeathLightEffect();
void chkPartCreate(bool);
void mHabatakiAnmSet(int);
void mGlider_AniSet(bool);
void mGliderAtAniSet();
void tail_hit_check();
void week_hit_check();
void mTimerClr();
void mCountClr();
void mAllClr();
void mHeadAngleSet();
bool flapMove(bool);
bool revolutionMove();
bool mPlayerHighCheck();
bool mBgFallGroundCheck();
void normalHoverMove();
void executeWait();
void executeFlyWait();
void executeTailHit();
void executeWeekHit();
void mBreathSet();
bool mBreathHighSet(bool);
bool mFeintBreath();
void executeBreathAttack();
void executeWindAttack();
bool mGliderMoveSub(f32);
void executeGliderAttack();
void executePillarSearch();
void executePillarWait();
bool startDemoCheck();
void executeDamageDemo();
void executeMiddleDemo();
void executeDead();
void executeBullet();
void executeParts();
void action();
void action_fire();
void action_parts();
void mtx_set();
void parts_mtx_set();
void cc_set();
void down_cc_set();
void demo_skip(int);
static int DemoSkipCallBack(void*, int);
int execute();
int _delete();
int CreateHeap();
int create();
daB_DR_c();
MtxP getMtx() { return mpModelMorf->getModel()->getAnmMtx(15); }
include/d/actor/d_a_b_dre.h
+22 -22
View File
@@ -16,28 +16,28 @@
*/
class daB_DRE_c : public fopEn_enemy_c {
public:
/* 805C7DD4 */ void SetAnm(mDoExt_McaMorfSO*, int, int, f32, f32);
/* 805C7EAC */ bool CameraSet();
/* 805C8008 */ void SetStopingCam();
/* 805C808C */ void SetStopCam(cXyz, f32, f32, s16);
/* 805C8208 */ void SetCMoveCam(cXyz, f32, f32);
/* 805C81B8 */ bool SetCMoveCam(cXyz, f32);
/* 805C8348 */ void SetEyeMoveCam(cXyz, f32, f32, s16, f32, f32);
/* 805C824C */ void SetEyeMoveCam(cXyz, f32, f32, s16, f32);
/* 805C8458 */ void SetMoveCam(f32, f32);
/* 805C8544 */ void SetReleaseCam();
/* 805C85E8 */ void CamAction2();
/* 805C8BF8 */ void DrAction2();
/* 805C8EDC */ void CamAction();
/* 805C9318 */ void Action();
/* 805C9378 */ void DrAction();
/* 805C9B40 */ void SoundChk();
/* 805CA158 */ int Execute();
/* 805CA49C */ void SpeedSet();
/* 805CA4FC */ void BreathSet();
/* 805CA670 */ int Delete();
/* 805CA6C0 */ void setBaseMtx();
/* 805CA944 */ int create();
void SetAnm(mDoExt_McaMorfSO*, int, int, f32, f32);
bool CameraSet();
void SetStopingCam();
void SetStopCam(cXyz, f32, f32, s16);
void SetCMoveCam(cXyz, f32, f32);
bool SetCMoveCam(cXyz, f32);
void SetEyeMoveCam(cXyz, f32, f32, s16, f32, f32);
void SetEyeMoveCam(cXyz, f32, f32, s16, f32);
void SetMoveCam(f32, f32);
void SetReleaseCam();
void CamAction2();
void DrAction2();
void CamAction();
void Action();
void DrAction();
void SoundChk();
int Execute();
void SpeedSet();
void BreathSet();
int Delete();
void setBaseMtx();
int create();
inline int CreateHeap();
inline int Draw();
include/d/actor/d_a_b_ds.h
+71 -71
View File
@@ -108,75 +108,75 @@ public:
/* 0x3E */ ANM_WAIT01_C,
};
/* 805CB314 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 805CB4A4 */ static int JointCallBack(J3DJoint*, int);
/* 805CB4F0 */ int draw();
/* 805CBAC8 */ void setBck(int, u8, f32, f32);
/* 805CBB74 */ void setActionMode(int, int);
/* 805CBB80 */ void mSmokeSet();
/* 805CBD00 */ void mHeadAngle_Clear();
/* 805CBD64 */ void HandHitSoundSet(bool);
/* 805CBED0 */ void handSPosSet(int);
/* 805CC158 */ void hand_smokeSet(u8);
/* 805CC1C4 */ void mZsMoveChk();
/* 805CC454 */ void mZsMoveChk_Guard();
/* 805CC6F4 */ void mTrapScale();
/* 805CC80C */ void mClearTrap(bool);
/* 805CC8A4 */ void mCreateTrap(bool);
/* 805CCEB4 */ void mChangeVer2();
/* 805CD074 */ void damage_check();
/* 805CD628 */ void neck_set();
/* 805CD844 */ bool mCutTypeCheck();
/* 805CD8D8 */ bool startDemoCheck();
/* 805CDA08 */ void setYoMessage(int);
/* 805CDA44 */ bool doYoMessage();
/* 805CDAC0 */ void executeOpeningDemo();
/* 805CFC8C */ bool mHandBreathChk();
/* 805D002C */ void executeWait();
/* 805D0194 */ void executeCircle();
/* 805D02F8 */ void mBreakBoneSUB();
/* 805D0374 */ void damageSet();
/* 805D03EC */ void damageHitCamera();
/* 805D0584 */ void damageDownCheck();
/* 805D074C */ void executeDamage();
/* 805D1E30 */ void executeEtcDamage();
/* 805D203C */ void breath_smokeSet();
/* 805D226C */ void executeBreathAttack();
/* 805D2520 */ void executeHandAttack();
/* 805D272C */ void executeBreathSearch();
/* 805D28D0 */ void executeBattle2OpeningDemo();
/* 805D3900 */ void mFlyBMove(f32);
/* 805D39A4 */ void mFuwafuwaSet(bool);
/* 805D3D14 */ void mBattle2BreathFireSet(u32);
/* 805D3D80 */ bool mNeckAngleSet();
/* 805D3EA0 */ void mSetFirstPos();
/* 805D3F90 */ bool mChkScreenIn();
/* 805D4054 */ bool mRailInOutCheck();
/* 805D41CC */ void executeBattle2Wait();
/* 805D429C */ bool mBattle2MoveFSet();
/* 805D497C */ void executeBattle2FMove();
/* 805D5040 */ void executeBattle2Tired();
/* 805D52D4 */ void executeBattle2Damage();
/* 805D60BC */ bool mDeadMove();
/* 805D6534 */ void executeBattle2Dead();
/* 805D7C10 */ void executeBullet();
/* 805D8078 */ void mBulletAction();
/* 805D80F0 */ void mSoundSE_Set();
/* 805D8D04 */ void action();
/* 805D91A4 */ void mtx_set();
/* 805D951C */ void cc_set();
/* 805D9A40 */ void cc_etc_set();
/* 805D9B74 */ void mBattle2Action();
/* 805D9CFC */ void mBattle2_spinner_damage_check();
/* 805D9FF4 */ bool mBattle2_damage_check();
/* 805DA584 */ void mBattle2_mtx_set();
/* 805DA9A4 */ void mBattle2_cc_etc_set();
/* 805DAA98 */ void mBattle2_cc_set();
/* 805DADC4 */ int execute();
/* 805DB1AC */ int _delete();
/* 805DB264 */ int CreateHeap();
/* 805DB974 */ cPhs__Step create();
/* 805DC1E8 */ daB_DS_c();
int ctrlJoint(J3DJoint*, J3DModel*);
static int JointCallBack(J3DJoint*, int);
int draw();
void setBck(int, u8, f32, f32);
void setActionMode(int, int);
void mSmokeSet();
void mHeadAngle_Clear();
void HandHitSoundSet(bool);
void handSPosSet(int);
void hand_smokeSet(u8);
void mZsMoveChk();
void mZsMoveChk_Guard();
void mTrapScale();
void mClearTrap(bool);
void mCreateTrap(bool);
void mChangeVer2();
void damage_check();
void neck_set();
bool mCutTypeCheck();
bool startDemoCheck();
void setYoMessage(int);
bool doYoMessage();
void executeOpeningDemo();
bool mHandBreathChk();
void executeWait();
void executeCircle();
void mBreakBoneSUB();
void damageSet();
void damageHitCamera();
void damageDownCheck();
void executeDamage();
void executeEtcDamage();
void breath_smokeSet();
void executeBreathAttack();
void executeHandAttack();
void executeBreathSearch();
void executeBattle2OpeningDemo();
void mFlyBMove(f32);
void mFuwafuwaSet(bool);
void mBattle2BreathFireSet(u32);
bool mNeckAngleSet();
void mSetFirstPos();
bool mChkScreenIn();
bool mRailInOutCheck();
void executeBattle2Wait();
bool mBattle2MoveFSet();
void executeBattle2FMove();
void executeBattle2Tired();
void executeBattle2Damage();
bool mDeadMove();
void executeBattle2Dead();
void executeBullet();
void mBulletAction();
void mSoundSE_Set();
void action();
void mtx_set();
void cc_set();
void cc_etc_set();
void mBattle2Action();
void mBattle2_spinner_damage_check();
bool mBattle2_damage_check();
void mBattle2_mtx_set();
void mBattle2_cc_etc_set();
void mBattle2_cc_set();
int execute();
int _delete();
int CreateHeap();
cPhs__Step create();
daB_DS_c();
cXyz getHandPosR();
cXyz getHandPosL();
@@ -339,8 +339,8 @@ STATIC_ASSERT(sizeof(daB_DS_c) == 0x2F28);
class daB_DS_HIO_c {
public:
/* 805CB22C */ daB_DS_HIO_c();
/* 805DC89C */ virtual ~daB_DS_HIO_c() {}
daB_DS_HIO_c();
virtual ~daB_DS_HIO_c() {}
/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 mModelSize;
include/d/actor/d_a_b_gg.h
+73 -73
View File
@@ -16,79 +16,79 @@
*/
class daB_GG_c : public fopEn_enemy_c {
public:
/* 805DE464 */ int CreateHeap();
/* 805DE650 */ void initCc();
/* 805DE7A4 */ void setCcCylinder();
/* 805DE9B8 */ void G_setCcCylinder();
/* 805DEAD0 */ void MoveCo();
/* 805DEB44 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 805DED58 */ int HeadctrlJoint(J3DJoint*, J3DModel*);
/* 805DEF64 */ void SetAnm(int, int, f32, f32);
/* 805DF9F4 */ void Yazirushi();
/* 805DFA48 */ void SpeedClear();
/* 805DFA64 */ void SetAction(u8, u8, u8);
/* 805DFA8C */ u8 GetAction(u8, u8, u8);
/* 805DFACC */ void DemoSkip(int);
/* 805DFC24 */ static int DemoSkipCallBack(void*, int);
/* 805DFC58 */ bool CameraSet();
/* 805DFD78 */ void SetStopingCam();
/* 805DFDFC */ void SetStopCam(cXyz, f32, f32, s16);
/* 805DFF4C */ void SetMoveCam(cXyz, f32, f32, s16, f32, f32);
/* 805E00D4 */ void SetMoveCam1(f32, f32);
/* 805E01F8 */ void SetReleaseCam();
/* 805E029C */ void St_CamAction();
/* 805E0F2C */ void St_DemoAction();
/* 805E18E8 */ void Md_CamAction();
/* 805E1C28 */ void Md_DemoAction();
/* 805E23E8 */ void Gn_CamAction();
/* 805E2974 */ void Gn_DemoAction();
/* 805E2F44 */ void DemoAction();
/* 805E3024 */ void F_WaitAction();
/* 805E31E4 */ void F_FookChk();
/* 805E3448 */ void F_MoveAction();
/* 805E3CAC */ void F_LV7_W_MoveAction();
/* 805E3F0C */ void F_AttackAction();
/* 805E4914 */ void F_DamageAction();
/* 805E5190 */ void AttentionChk();
/* 805E5220 */ void FlyAction();
/* 805E561C */ bool F_A_TargetMove(cXyz);
/* 805E53DC */ bool F_A_TargetMove(cXyz, u8);
/* 805E5808 */ void F_A_MoveAction();
/* 805E5D0C */ void F_A_WaitAction();
/* 805E5D2C */ void F_A_Action();
/* 805E5E78 */ void FookChk();
/* 805E608C */ void CutChk();
/* 805E6174 */ void G_MoveAction();
/* 805E6AB0 */ void FallChk();
/* 805E6E30 */ void G_AttackAction();
/* 805E73A8 */ void G_DamageAction();
/* 805E7D50 */ void G_DeathAction();
/* 805E7F50 */ void G_DeathAction1();
/* 805E82F0 */ void DeathCam();
/* 805E8D48 */ void GroundAction();
/* 805E8EE8 */ void StopAction();
/* 805E92A0 */ void HitChk();
/* 805E9310 */ void Action();
/* 805E9418 */ void HeadAction();
/* 805E9A28 */ void SetHeadAngle();
/* 805E9B48 */ void SoundChk();
/* 805EA344 */ int Execute();
/* 805EA72C */ void ObjHit();
/* 805EA74C */ void At_Check();
/* 805EA938 */ void MoveAt();
/* 805EA9AC */ void F_AtHit();
/* 805EAAFC */ void ChanceTime();
/* 805EB028 */ void ArmAngleSet();
/* 805EB090 */ void Guard();
/* 805EB5E0 */ int Draw();
/* 805EB8A8 */ int Delete();
/* 805EB910 */ void setBaseMtx();
/* 805EB980 */ void setShieldMtx();
/* 805EB9DC */ void setSwordMtx();
/* 805EBA4C */ void setSwordMtx1();
/* 805EBAB8 */ void setHeadMtx();
/* 805EBB30 */ void setHeadMtx1();
/* 805EBBE4 */ int Create();
int CreateHeap();
void initCc();
void setCcCylinder();
void G_setCcCylinder();
void MoveCo();
int ctrlJoint(J3DJoint*, J3DModel*);
int HeadctrlJoint(J3DJoint*, J3DModel*);
void SetAnm(int, int, f32, f32);
void Yazirushi();
void SpeedClear();
void SetAction(u8, u8, u8);
u8 GetAction(u8, u8, u8);
void DemoSkip(int);
static int DemoSkipCallBack(void*, int);
bool CameraSet();
void SetStopingCam();
void SetStopCam(cXyz, f32, f32, s16);
void SetMoveCam(cXyz, f32, f32, s16, f32, f32);
void SetMoveCam1(f32, f32);
void SetReleaseCam();
void St_CamAction();
void St_DemoAction();
void Md_CamAction();
void Md_DemoAction();
void Gn_CamAction();
void Gn_DemoAction();
void DemoAction();
void F_WaitAction();
void F_FookChk();
void F_MoveAction();
void F_LV7_W_MoveAction();
void F_AttackAction();
void F_DamageAction();
void AttentionChk();
void FlyAction();
bool F_A_TargetMove(cXyz);
bool F_A_TargetMove(cXyz, u8);
void F_A_MoveAction();
void F_A_WaitAction();
void F_A_Action();
void FookChk();
void CutChk();
void G_MoveAction();
void FallChk();
void G_AttackAction();
void G_DamageAction();
void G_DeathAction();
void G_DeathAction1();
void DeathCam();
void GroundAction();
void StopAction();
void HitChk();
void Action();
void HeadAction();
void SetHeadAngle();
void SoundChk();
int Execute();
void ObjHit();
void At_Check();
void MoveAt();
void F_AtHit();
void ChanceTime();
void ArmAngleSet();
void Guard();
int Draw();
int Delete();
void setBaseMtx();
void setShieldMtx();
void setSwordMtx();
void setSwordMtx1();
void setHeadMtx();
void setHeadMtx1();
int Create();
/* 0x05AC */ f32 field_0x5ac;
/* 0x05B0 */ u8 field_0x5b0;
include/d/actor/d_a_b_gnd.h
+1 -1
View File
@@ -23,7 +23,7 @@ struct g_himo_s {
class b_gnd_class : public fopEn_enemy_c {
public:
/* 80601960 */ b_gnd_class();
b_gnd_class();
bool checkAttackChance() { return field_0x2740 != 0; }
bool checkPiyo() { return field_0x1e08 != 0; }
include/d/actor/d_a_b_go.h
+3 -3
View File
@@ -43,7 +43,7 @@ enum daB_GO_Action {
*/
class b_go_class : public fopEn_enemy_c {
public:
/* 80603CA0 */ b_go_class();
b_go_class();
/* 0x5AC */ request_of_phase_process_class mPhase;
/* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
@@ -76,8 +76,8 @@ STATIC_ASSERT(sizeof(b_go_class) == 0xD38);
class daB_GO_HIO_c {
public:
/* 806031AC */ daB_GO_HIO_c();
/* 80603F9C */ virtual ~daB_GO_HIO_c() {}
daB_GO_HIO_c();
virtual ~daB_GO_HIO_c() {}
/* 0x04 */ s8 field_0x4;
/* 0x08 */ f32 mSmallSize;
include/d/actor/d_a_b_gos.h
+3 -3
View File
@@ -19,7 +19,7 @@
*/
class b_gos_class : public fopEn_enemy_c {
public:
/* 80605024 */ b_gos_class();
b_gos_class();
/* 0x5AC */ request_of_phase_process_class mPhase;
/* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
@@ -56,8 +56,8 @@ STATIC_ASSERT(sizeof(b_gos_class) == 0xCCC);
class daB_GOS_HIO_c {
public:
public:
/* 8060426C */ daB_GOS_HIO_c();
/* 80605320 */ virtual ~daB_GOS_HIO_c() {}
daB_GOS_HIO_c();
virtual ~daB_GOS_HIO_c() {}
/* 0x4 */ s8 field_0x4;
/* 0x8 */ f32 mSize;
include/d/actor/d_a_b_mgn.h
+56 -56
View File
@@ -32,62 +32,62 @@ public:
ACTION_JUMP_e,
};
/* 8060577C */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 8060584C */ static int JointCallBack(J3DJoint*, int);
/* 80605898 */ int draw();
/* 80605D78 */ void setDashSmokeEffect();
/* 8060601C */ void setBackJumpEffect();
/* 806062C0 */ void setSlideSmokeEffect();
/* 80606424 */ void setBodySlideEffect();
/* 806065D4 */ void setOpeningEffect();
/* 80606754 */ void setStepEffect();
/* 8060688C */ void setFallAttackEffect();
/* 80606A10 */ void setHeadLightEffect();
/* 80606AEC */ void setHeadHitEffect();
/* 80606C6C */ int setHideSmokeEffect(cXyz*, u8);
/* 80606D60 */ void calcHideSmokeEffect();
/* 806071C4 */ void drawHideSmokeEffect();
/* 8060729C */ void setBloodEffect();
/* 80607498 */ void calcBloodMove();
/* 8060778C */ void checkDownBeforeBG();
/* 80607924 */ void setBck(int, u8, f32, f32);
/* 806079CC */ bool checkBck(int);
/* 80607A2C */ void setActionMode(int, int);
/* 80607A80 */ void setExitMode(int);
/* 80607B50 */ void onBodyShield();
/* 80607B80 */ void offBodyShield();
/* 80607BB0 */ void onBodySlideAt();
/* 80607BFC */ void offBodySlideAt();
/* 80607C20 */ bool checkHitSlideAt();
/* 80607CB0 */ void onBodyFallAt();
/* 80607CE4 */ void offBodyFallAt();
/* 80607D08 */ void onBodyCo();
/* 80607D44 */ void offBodyCo();
/* 80607D7C */ cXyz getNearHitPos(cXyz*);
/* 8060819C */ void damage_check();
/* 80608738 */ void calcJointAngle(s16);
/* 806087A8 */ void executeCircle();
/* 80608EF8 */ void executeDash();
/* 80609D70 */ void executeThrown();
/* 8060A670 */ void setDownEnd();
/* 8060A72C */ void executeDown();
/* 8060ACB8 */ void executeDownDamage();
/* 8060B028 */ void executeDownBiteDamage();
/* 8060B430 */ void executeWarp();
/* 8060B544 */ void executeFall();
/* 8060BE6C */ void demo_skip(int);
/* 8060C034 */ static int DemoSkipCallBack(void*, int);
/* 8060C068 */ void executeOpening();
/* 8060D078 */ void executeDeath();
/* 8060D880 */ void executeJump();
/* 8060DAC0 */ void checkStartJump();
/* 8060DDA0 */ void action();
/* 8060E158 */ void mtx_set();
/* 8060E1D0 */ void cc_set();
/* 8060E820 */ int execute();
/* 8060EA38 */ int _delete();
/* 8060EAE0 */ int CreateHeap();
/* 8060F0D0 */ int create();
int ctrlJoint(J3DJoint*, J3DModel*);
static int JointCallBack(J3DJoint*, int);
int draw();
void setDashSmokeEffect();
void setBackJumpEffect();
void setSlideSmokeEffect();
void setBodySlideEffect();
void setOpeningEffect();
void setStepEffect();
void setFallAttackEffect();
void setHeadLightEffect();
void setHeadHitEffect();
int setHideSmokeEffect(cXyz*, u8);
void calcHideSmokeEffect();
void drawHideSmokeEffect();
void setBloodEffect();
void calcBloodMove();
void checkDownBeforeBG();
void setBck(int, u8, f32, f32);
bool checkBck(int);
void setActionMode(int, int);
void setExitMode(int);
void onBodyShield();
void offBodyShield();
void onBodySlideAt();
void offBodySlideAt();
bool checkHitSlideAt();
void onBodyFallAt();
void offBodyFallAt();
void onBodyCo();
void offBodyCo();
cXyz getNearHitPos(cXyz*);
void damage_check();
void calcJointAngle(s16);
void executeCircle();
void executeDash();
void executeThrown();
void setDownEnd();
void executeDown();
void executeDownDamage();
void executeDownBiteDamage();
void executeWarp();
void executeFall();
void demo_skip(int);
static int DemoSkipCallBack(void*, int);
void executeOpening();
void executeDeath();
void executeJump();
void checkStartJump();
void action();
void mtx_set();
void cc_set();
int execute();
int _delete();
int CreateHeap();
int create();
bool isDown() { return mDownFlag != 0; }
bool isAppear() { return mAppearFlag != 0; }
include/d/actor/d_a_b_tn.h
+61 -61
View File
@@ -69,67 +69,67 @@ public:
/* 0x6B */ ACTION2_107_e,
};
/* 8061EC58 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 8061ED10 */ static int JointCallBack(J3DJoint*, int);
/* 8061ED5C */ void calcNeckAngle();
/* 8061EE14 */ void calcWaistAngle();
/* 8061EEC8 */ int draw();
/* 8061F200 */ void setBreakPart(int);
/* 8061F31C */ void setBreakHeadPart(int);
/* 8061F3D0 */ void setPartLandEffect(int, int);
/* 8061F520 */ void calcShieldMove();
/* 8061F9F4 */ void calcSwordMoveA();
/* 8061FD7C */ void calcSwordMoveB();
/* 8061FFE0 */ void calcOtherPartMove(int);
/* 8062070C */ void calcPartMove();
/* 806208C8 */ void setBck(int, u8, f32, f32);
/* 8062096C */ int checkBck(int);
/* 806209C8 */ void setActionMode(int, int);
/* 806209E0 */ void setSwordAtBit(int);
/* 80620AE4 */ void setSwordAtBreak(int);
/* 80620B4C */ void setBodyShield();
/* 80620E90 */ bool checkNormalAttackAble();
/* 80620FA0 */ u32 getCutType();
/* 80621070 */ void setDamage(dCcD_Sph*, int);
/* 8062138C */ void setShieldEffect(dCcD_Sph*);
/* 806213FC */ void damage_check();
/* 806227D0 */ int checkMoveArea();
/* 80622B60 */ bool checkMoveAngle();
/* 80622BE0 */ void setAttackBlurEffect(int);
/* 80622CE4 */ void setArmorBreakEffect(int);
/* 80622F64 */ void demo_skip(int);
/* 8062318C */ static int DemoSkipCallBack(void*, int);
/* 806231C0 */ void executeRoomDemo();
/* 80623920 */ void executeOpening();
/* 806246E8 */ void executeWaitH();
/* 806247D8 */ void setAwaitSound();
/* 80624890 */ void executeChaseH();
/* 80625394 */ void checkStartAttackH();
/* 806255F0 */ void executeAttackH();
/* 80625C74 */ void executeAttackShieldH();
/* 80625E40 */ void executeGuardH();
/* 80626034 */ void executeDamageH();
/* 80626320 */ void executeChangeDemo();
/* 80627100 */ void executeZakoChangeDemo();
/* 80627790 */ void setWalkDir();
/* 8062799C */ void initChaseL(int);
/* 80627CBC */ bool checkAttackAble();
/* 80627D3C */ bool checkNextMove();
/* 8062868C */ void executeChaseL();
/* 806292F8 */ void executeAttackL();
/* 80629D20 */ void executeAttackShieldL();
/* 80629FB0 */ void executeGuardL();
/* 8062A3D0 */ void executeDamageL();
/* 8062A71C */ void executeYoroke();
/* 8062A950 */ void executeEnding();
/* 8062B344 */ void executeZakoEnding();
/* 8062B6A8 */ void action();
/* 8062BA5C */ void mtx_set();
/* 8062BDCC */ void cc_set();
/* 8062C5B4 */ int execute();
/* 8062C7C8 */ int _delete();
/* 8062C868 */ int CreateHeap();
/* 8062CD78 */ int create();
int ctrlJoint(J3DJoint*, J3DModel*);
static int JointCallBack(J3DJoint*, int);
void calcNeckAngle();
void calcWaistAngle();
int draw();
void setBreakPart(int);
void setBreakHeadPart(int);
void setPartLandEffect(int, int);
void calcShieldMove();
void calcSwordMoveA();
void calcSwordMoveB();
void calcOtherPartMove(int);
void calcPartMove();
void setBck(int, u8, f32, f32);
int checkBck(int);
void setActionMode(int, int);
void setSwordAtBit(int);
void setSwordAtBreak(int);
void setBodyShield();
bool checkNormalAttackAble();
u32 getCutType();
void setDamage(dCcD_Sph*, int);
void setShieldEffect(dCcD_Sph*);
void damage_check();
int checkMoveArea();
bool checkMoveAngle();
void setAttackBlurEffect(int);
void setArmorBreakEffect(int);
void demo_skip(int);
static int DemoSkipCallBack(void*, int);
void executeRoomDemo();
void executeOpening();
void executeWaitH();
void setAwaitSound();
void executeChaseH();
void checkStartAttackH();
void executeAttackH();
void executeAttackShieldH();
void executeGuardH();
void executeDamageH();
void executeChangeDemo();
void executeZakoChangeDemo();
void setWalkDir();
void initChaseL(int);
bool checkAttackAble();
bool checkNextMove();
void executeChaseL();
void executeAttackL();
void executeAttackShieldL();
void executeGuardL();
void executeDamageL();
void executeYoroke();
void executeEnding();
void executeZakoEnding();
void action();
void mtx_set();
void cc_set();
int execute();
int _delete();
int CreateHeap();
int create();
private:
/* 0x05AC */ request_of_phase_process_class mPhaseReq1;
include/d/actor/d_a_b_yo.h
+46 -46
View File
@@ -20,52 +20,52 @@ class msg_class;
*/
class daB_YO_c : public fopEn_enemy_c {
public:
/* 8062F51C */ int draw();
/* 8062FBEC */ void onIceBreak(u16);
/* 8062FC08 */ void setBck(int, u8, f32, f32);
/* 8062FE0C */ void setActionMode(int, int);
/* 8062FE18 */ void damage_check();
/* 806300F4 */ void setBreakFrizad();
/* 8063022C */ void setIcicleOperate(int);
/* 806302B4 */ void setIcicleSubNumber();
/* 80630330 */ void setWindowBreakEffect(int);
/* 8063040C */ void setHensinEffect();
/* 806305B8 */ void setLandingEffect(f32);
/* 806306F0 */ void setBreakIceEffect();
/* 8063089C */ void setWallHitEffect();
/* 80630A9C */ void setChillEffect();
/* 80630BF0 */ void setApperEffect();
/* 80630CA0 */ void setApperEffect2();
/* 80630DD8 */ void demo_skip(int);
/* 80630E3C */ static int DemoSkipCallBack(void*, int);
/* 80630E70 */ void setYoMessage(int);
/* 80630EAC */ int doYoMessage();
/* 80630F28 */ void executeOpening();
/* 80632598 */ void reflectFreeMove();
/* 80632660 */ void calcFreeMove(f32);
/* 8063290C */ void setReflectAngle();
/* 806329CC */ void executeChase();
/* 806331CC */ void executeSeriousDemo();
/* 80633EDC */ u8 checkIcecleRevival();
/* 80633F50 */ void createIcecleRevival(u8);
/* 80634040 */ void executeJump();
/* 80634548 */ void executeAttackIce();
/* 8063476C */ void executeAttackYose();
/* 80634CEC */ void checkDamageWithIceBreak();
/* 80634E04 */ void executeAttackBody();
/* 806352C8 */ void executeDemoRevival();
/* 80635798 */ void executeDamage();
/* 80635ABC */ void executeDeath();
/* 80636E9C */ void reviseIceCenterPos(cXyz*);
/* 80637048 */ void calcPlayerBufPos();
/* 806374BC */ void action();
/* 80637990 */ void mtx_set();
/* 80637B30 */ void cc_set();
/* 80637E10 */ int execute();
/* 80637FC8 */ int _delete();
/* 806380F8 */ int CreateHeap();
/* 806388A0 */ int CreateHeap2();
/* 806389C0 */ cPhs__Step create();
int draw();
void onIceBreak(u16);
void setBck(int, u8, f32, f32);
void setActionMode(int, int);
void damage_check();
void setBreakFrizad();
void setIcicleOperate(int);
void setIcicleSubNumber();
void setWindowBreakEffect(int);
void setHensinEffect();
void setLandingEffect(f32);
void setBreakIceEffect();
void setWallHitEffect();
void setChillEffect();
void setApperEffect();
void setApperEffect2();
void demo_skip(int);
static int DemoSkipCallBack(void*, int);
void setYoMessage(int);
int doYoMessage();
void executeOpening();
void reflectFreeMove();
void calcFreeMove(f32);
void setReflectAngle();
void executeChase();
void executeSeriousDemo();
u8 checkIcecleRevival();
void createIcecleRevival(u8);
void executeJump();
void executeAttackIce();
void executeAttackYose();
void checkDamageWithIceBreak();
void executeAttackBody();
void executeDemoRevival();
void executeDamage();
void executeDeath();
void reviseIceCenterPos(cXyz*);
void calcPlayerBufPos();
void action();
void mtx_set();
void cc_set();
int execute();
int _delete();
int CreateHeap();
int CreateHeap2();
cPhs__Step create();
u8 getModelNo() { return mModelNo; }
s16 getFrizadRollAngle() { return mIceAngle; }

Some files were not shown because too many files have changed in this diff Show More