mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-24 01:31:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

another d_a_alink pass (#305)

Browse Source 
* big pass on many d_a_alink files

* remove asm

* fix d_a_tag_spring

* fix

---------

Co-authored-by: root <root@DESKTOP-BTVP2BC>
This commit is contained in:
TakaRikka
2023-03-07 10:44:25 -08:00
committed by GitHub
parent d7ab9423ad
commit 6c2e18af70
116 changed files with 2109 additions and 4931 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_alink.h
+45 -29
View File
@@ -153,6 +153,9 @@ public:
/* 8009D90C */ virtual void calc(J3DMaterial*) const;
static void decMorfFrame() {}
static void setMorfFrame(u8 i_frame) { m_morf_frame = i_frame; }
static u8 m_morf_frame;
private:
/* 0x0F4 */ f32 field_0xf4;
@@ -164,15 +167,20 @@ private:
struct daAlink_BckData {
/* 0x0 */ u16 m_underID;
/* 0x0 */ u16 m_upperID;
/* 0x2 */ u16 m_upperID;
};
struct daAlink_FaceTexData {
/* 0x0 */ u16 m_btpID;
/* 0x2 */ u16 m_btkID;
};
struct daAlink_AnmData {
/* 0x0 */ daAlink_BckData field_0x0;
/* 0x4 */ u8 field_0x4;
/* 0x5 */ u8 field_0x5;
/* 0x6 */ u16 field_0x6;
/* 0x8 */ u16 field_0x8;
/* 0x6 */ u16 m_faceTexID;
/* 0x8 */ u16 m_faceBckID;
/* 0xA */ u16 field_0xa;
}; // Size: 0xC
@@ -649,9 +657,13 @@ public:
FTANM_UNK_27 = 0x27,
FTANM_UNK_2D = 0x2D,
FTANM_UNK_48 = 0x48,
FTANM_UNK_75 = 0x75,
FTANM_UNK_76 = 0x76,
FTANM_UNK_77 = 0x77,
FTANM_UNK_7A = 0x7A,
FTANM_UNK_7B = 0x7B,
FTANM_UNK_7C = 0x7C,
FTANM_UNK_8A = 0x8A,
FTANM_UNK_90 = 0x90,
FTANM_UNK_96 = 0x96,
FTANM_UNK_9F = 0x9F,
@@ -1247,7 +1259,7 @@ public:
/* 8009EB18 */ void resetRootMtx();
/* 8009EB58 */ bool modelCallBack(int);
/* 8009ECA0 */ void headModelCallBack(int);
/* 8009EF7C */ void wolfModelCallBack(int);
/* 8009EF7C */ int wolfModelCallBack(int);
/* 8009F034 */ void setHatAngle();
/* 8009FFF8 */ void calcHairAngle(s16*);
/* 800A002C */ void setHairAngle(cXyz*, f32, f32);
@@ -1290,8 +1302,8 @@ public:
/* 800A6DCC */ void iceSlipBgCheck();
/* 800A7050 */ void setIceSlipSpeed();
/* 800A7358 */ void setPolygonSpeed();
/* 800A7950 */ void checkWindSpeedOnAngle() const;
/* 800A79EC */ void checkWindSpeedOnAngleAnime(int) const;
/* 800A7950 */ bool checkWindSpeedOnAngle() const;
/* 800A79EC */ bool checkWindSpeedOnAngleAnime(int) const;
/* 800A7A5C */ bool checkDashAnime() const;
/* 800A7ABC */ void checkWindWallRate(cXyz const&);
/* 800A7CB0 */ void setWindSpeed();
@@ -1346,7 +1358,7 @@ public:
/* 800AD8F4 */ void setUnderAnimeMorf(f32);
/* 800AD964 */ int setUnderAnime(u16, daAlink_c::daAlink_UNDER, f32, f32, s16, f32);
/* 800ADAB8 */ int setUnderAnimeParam(u16, daAlink_c::daAlink_UNDER, daAlinkHIO_anm_c const*);
/* 800ADAEC */ void resetUnderAnime(daAlink_c::daAlink_UNDER, f32);
/* 800ADAEC */ int resetUnderAnime(daAlink_c::daAlink_UNDER, f32);
/* 800ADB78 */ void setOldRootQuaternion(s16, s16, s16);
/* 800ADC50 */ BOOL checkAtnLeftAnime();
/* 800ADCEC */ BOOL checkAtnRightAnime();
@@ -1368,7 +1380,7 @@ public:
/* 800AFCBC */ void resetFacePriAnime();
/* 800AFCF0 */ void playFaceTextureAnime();
/* 800B0098 */ s16 getGroundAngle(cBgS_PolyInfo*, s16);
/* 800B0150 */ void getRoofAngle(cBgS_PolyInfo*, s16);
/* 800B0150 */ s16 getRoofAngle(cBgS_PolyInfo*, s16);
/* 800B01FC */ void getWallEdgePos(cXyz const&, cM3dGPla*, cM3dGPla*, cXyz*, int);
/* 800B02BC */ void setFrontWallType();
/* 800B1488 */ BOOL checkWaterPolygonUnder();
@@ -1402,7 +1414,7 @@ public:
/* 800B3298 */ void setBStatus(u8);
/* 800B32B0 */ BOOL checkAtnWaitAnime();
/* 800B3358 */ void setTiredVoice(daPy_frameCtrl_c*);
/* 800B33E4 */ void checkRestHPAnime();
/* 800B33E4 */ BOOL checkRestHPAnime();
/* 800B3494 */ static int getDirectionFromAngle(s16 angle);
/* 800B3500 */ bool checkAttentionState();
/* 800B3630 */ s16 getShapeAngleYAtnActor();
@@ -1410,7 +1422,7 @@ public:
/* 800B3844 */ void initServiceWaitTime();
/* 800B3904 */ bool checkZeroSpeedF() const;
/* 800B3924 */ void setNormalSpeedF(f32, f32);
/* 800B3F2C */ void getStickAngleDistanceRate();
/* 800B3F2C */ f32 getStickAngleDistanceRate();
/* 800B3FD4 */ void setSpeedAndAngleNormal();
/* 800B444C */ void setSpeedAndAngleAtn();
/* 800B477C */ int checkRequestTalkActor(dAttList_c*, fopAc_ac_c*);
@@ -1472,7 +1484,7 @@ public:
/* 800BA0D0 */ int checkNextAction(int);
/* 800BA6A0 */ void commonChangeItem();
/* 800BA914 */ void setItemAction();
/* 800BAF08 */ bool checkNextActionFromCrouch(int);
/* 800BAF08 */ BOOL checkNextActionFromCrouch(int);
/* 800BAF80 */ int checkUpperReadyThrowAnime() const;
/* 800BB020 */ void getBodyAngleXBasePos(cXyz*);
/* 800BB084 */ s16 getBodyAngleXAtnActor(int);
@@ -1749,7 +1761,7 @@ public:
/* 800D7768 */ static bool checkIcePolygonDamage(cBgS_PolyInfo*);
/* 800D77C8 */ BOOL checkMagicArmorNoDamage();
/* 800D7820 */ void checkPolyDamage();
/* 800D7A98 */ void checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**);
/* 800D7A98 */ bool checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**);
/* 800D7B18 */ void damageTimerCount();
/* 800D7BE8 */ bool checkHugeAttack(int) const;
/* 800D7C14 */ bool checkLargeAttack(int) const;
@@ -2191,16 +2203,16 @@ public:
/* 800F7814 */ int procFishingCast();
/* 800F7988 */ int procFishingFoodInit();
/* 800F7AA8 */ int procFishingFood();
/* 800F7C50 */ void getCrawlMoveAnmSpeed();
/* 800F7C74 */ void getCrawlMoveSpeed();
/* 800F7C50 */ f32 getCrawlMoveAnmSpeed();
/* 800F7C74 */ f32 getCrawlMoveSpeed();
/* 800F7CE8 */ void setCrawlMoveDirectionArrow();
/* 800F7E48 */ void changeCrawlAutoMoveProc(cXyz*);
/* 800F81C0 */ void getCrawlMoveVec(cXyz*, cXyz*, cXyz*, int, int, u8*);
/* 800F81C0 */ int getCrawlMoveVec(cXyz*, cXyz*, cXyz*, int, int, u8*);
/* 800F85C0 */ void crawlBgCheck(cXyz*, cXyz*, int);
/* 800F8700 */ void checkCrawlSideWall(cXyz*, cXyz*, cXyz*, cXyz*, s16*, s16*);
/* 800F88F8 */ void decideCrawlDoStatus();
/* 800F89E0 */ void checkNotCrawlStand(cXyz*);
/* 800F8A50 */ void checkNotCrawlStand(cXyz*, cXyz*);
/* 800F89E0 */ BOOL checkNotCrawlStand(cXyz*);
/* 800F8A50 */ BOOL checkNotCrawlStand(cXyz*, cXyz*);
/* 800F8B00 */ void checkCrawlInHoll(cXyz*, cXyz*, cXyz*, int);
/* 800F8D04 */ void setCrawlMoveHoll();
/* 800F8DBC */ void setCrawlMoveAngle();
@@ -2524,14 +2536,14 @@ public:
/* 80118170 */ BOOL checkFlyAtnWait();
/* 801181A0 */ void setGetItemFace(u16);
/* 801182D4 */ BOOL checkGrabTalkActor(fopAc_ac_c*);
/* 80118308 */ void setTalkStartBack(cXyz*);
/* 80118308 */ int setTalkStartBack(cXyz*);
/* 8011856C */ void setShapeAngleToTalkActor();
/* 80118654 */ void setTalkAnime();
/* 801186D4 */ void setTradeItemAnime();
/* 801186D4 */ u8 setTradeItemAnime();
/* 80118778 */ void setTradeItemOutHand();
/* 801187B4 */ BOOL checkEndMessage(u32);
/* 80118840 */ void setDemoRightHandIndex(u16);
/* 801188B0 */ void setDemoLeftHandIndex(u16);
/* 80118840 */ u8 setDemoRightHandIndex(u16);
/* 801188B0 */ u8 setDemoLeftHandIndex(u16);
/* 8011894C */ void setDemoRide(u16);
/* 801189F8 */ void setDemoBodyBck(dDemo_actor_c*, u16);
/* 80118AD0 */ static BOOL checkFinalBattle();
@@ -2603,7 +2615,7 @@ public:
/* 8011DED8 */ int procLookAroundTurn();
/* 8011DF68 */ int procTradeItemOutInit();
/* 8011E060 */ int procTradeItemOut();
/* 8011E3D8 */ void checkLetterItem(int);
/* 8011E3D8 */ static BOOL checkLetterItem(int);
/* 8011E448 */ int procNotUseItemInit(int);
/* 8011E57C */ int procNotUseItem();
/* 8011E6E0 */ int procSwordReadyInit();
@@ -2612,7 +2624,7 @@ public:
/* 8011E8E0 */ int procSwordPushInit();
/* 8011E960 */ int procSwordPush();
/* 8011E9F8 */ int procGanonFinishInit();
/* 8011EA78 */ bool procGanonFinish();
/* 8011EA78 */ int procGanonFinish();
/* 8011EAE8 */ int procCutFastReadyInit();
/* 8011EB8C */ int procCutFastReady();
/* 8011EBDC */ int procMasterSwordStickInit();
@@ -3183,8 +3195,11 @@ public:
return mNowAnmPackUpper[param_0].getAnmTransform();
}
void setFacePriBck(u16 param_0) { setFaceBck(param_0, 1, 0xFFFF); }
void setFacePriBtp(u16 param_0) { setFaceBtp(param_0, 1, 0xFFFF); }
void setFacePriBtk(u16 param_0) { setFaceBtk(param_0, 1, 0xFFFF); }
void setFaceBasicBck(u16 param_0) { setFaceBck(param_0, 0, 0xFFFF); }
void setFaceBasicBtp(u16 param_0) { setFaceBtp(param_0, 0, 0xFFFF); }
void setFaceBasicBtk(u16 param_0) { setFaceBtk(param_0, 0, 0xFFFF); }
void cancelFmChainGrabFromOut() {
field_0x2fa3 = 0;
field_0x2844.clearData();
@@ -3193,6 +3208,7 @@ public:
u16 getMidnaMsgNum() const { return mMidnaMsgNum; }
u32 getStartEvent() { return fopAcM_GetParam(this) >> 0x18; }
const daAlink_AnmData* getAnmData(daAlink_ANM anmID) const { return &m_anmDataTable[anmID]; }
const daAlink_FaceTexData* getFaceTexData(daAlink_FTANM i_anmID) const { return &m_faceTexDataTable[i_anmID]; }
BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
int getGrassHowlEventActor() const { return field_0x3198; }
@@ -3316,7 +3332,7 @@ public:
static daAlink_BckData const m_mainBckFishing[28];
static daAlink_AnmData const m_anmDataTable[414];
static daAlink_WlAnmData const m_wlAnmDataTable[147];
static u8 const m_faceTexDataTable[652];
static daAlink_FaceTexData const m_faceTexDataTable[];
static u8 const m_handLeftOutSidePos[12];
static u8 const m_handRightOutSidePos[12];
static u8 const m_handLeftInSidePos[12];
@@ -3449,11 +3465,11 @@ private:
/* 0x02064 */ daAlink_sight_c mSight;
/* 0x020F0 */ daPy_anmHeap_c mAnmHeap3;
/* 0x02104 */ daPy_anmHeap_c mAnmHeap4;
/* 0x02118 */ daPy_anmHeap_c mAnmHeap5;
/* 0x0212C */ daPy_anmHeap_c mAnmHeap6;
/* 0x02140 */ daPy_anmHeap_c mAnmHeap7;
/* 0x02118 */ daPy_anmHeap_c mFaceBtpHeap;
/* 0x0212C */ daPy_anmHeap_c mFaceBtkHeap;
/* 0x02140 */ daPy_anmHeap_c mFaceBckHeap;
/* 0x02154 */ J3DAnmTexPattern* field_0x2154;
/* 0x02158 */ J3DAnmTextureSRTKey* field_0x2158;
/* 0x02158 */ J3DAnmTextureSRTKey* mpFaceBtk;
/* 0x0215C */ daPy_frameCtrl_c* field_0x215c;
/* 0x02160 */ s8* field_0x2160;
/* 0x02164 */ mDoExt_bckAnm field_0x2164;
@@ -3952,7 +3968,7 @@ private:
/* 0x03848 */ void* field_0x3848;
/* 0x0384C */ cXyz* field_0x384c;
/* 0x03850 */ daAlink_procFunc mpProcFunc;
}; // Size: 0x38BC
}; // Size: 0x385C
static bool daAlink_checkLightBallA(fopAc_ac_c* p_actor);
static bool daAlink_checkLightBallB(fopAc_ac_c* p_actor);
include/d/a/d_a_player.h
+3
View File
@@ -85,6 +85,7 @@ public:
void setBuffer(u8* buf) { mBuffer = buf; }
u8* getBuffer() { return mBuffer; }
bool checkNoSetIdx() const { return mIdx == 0xFFFF; }
bool checkNoSetPriIdx() const { return mPriIdx == 0xFFFF; }
private:
/* 0x00 */ u16 mIdx;
@@ -244,6 +245,7 @@ public:
FLG1_UNK_10000 = 0x10000,
FLG1_UNK_8000 = 0x8000,
FLG1_THROW_DAMAGE = 0x4000,
FLG1_UNK_2000 = 0x2000,
FLG1_UNK_80 = 0x80,
FLG1_UNK_40 = 0x40,
FLG1_UNK_20 = 0x20,
@@ -331,6 +333,7 @@ public:
enum daPy_ERFLG1 {
ERFLG1_GANON_FINISH = 0x80000000,
ERFLG1_UNK_40000000 = 0x40000000,
ERFLG1_UNK_20000000 = 0x20000000,
ERFLG1_UNK_10000000 = 0x10000000,
ERFLG1_UNK_4000000 = 0x4000000,
ERFLG1_UNK_40000 = 0x40000,
include/d/bg/d_bg_s_acch.h
+1
View File
@@ -156,6 +156,7 @@ public:
void ClrGrndNone() { m_flags &= ~GRND_NONE; }
bool ChkMoveBGOnly() const { return m_flags & MOVE_BG_ONLY; }
void SetWallHit() { m_flags |= WALL_HIT; }
void ClrWallNone() { m_flags &= ~WALL_NONE; }
// inline dupe
void i_ClrGroundHit() { m_flags &= ~GROUND_HIT; }
include/d/com/d_com_inf_game.h
+4
View File
@@ -2528,6 +2528,10 @@ inline BOOL dComIfGp_evmng_endCheck(s16 eventID) {
return g_dComIfG_gameInfo.play.getEvtManager().endCheck(eventID);
}
inline u8 dComIfGp_event_getPreItemNo() {
return g_dComIfG_gameInfo.play.getEvent().getPreItemNo();
}
inline void dComIfGp_event_setItemPartnerId(unsigned int id) {
g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id);
}
include/d/d_camera.h
+1 -1
View File
@@ -216,7 +216,7 @@ public:
/* 801614C4 */ void QuickStart();
/* 801614D0 */ void Stop();
/* 801614E8 */ void Stay();
/* 801614F4 */ void ChangeModeOK(s32);
/* 801614F4 */ u8 ChangeModeOK(s32);
/* 80161550 */ void initPad();
/* 801617B0 */ void updatePad();
/* 80161D84 */ void initMonitor();
include/d/event/d_event.h
+1
View File
@@ -125,6 +125,7 @@ public:
void* getPt2() { return convPId(mPt2); }
void* getPtT() { return convPId(mPtT); }
bool isChangeOK(void* param_0) { return mChangeOK == param_0; }
u8 getPreItemNo() { return mPreItemNo; }
public:
/* 0x000 */ u8 field_0x0[4];
include/f_op/f_op_camera_mng.h
+4
View File
@@ -58,6 +58,10 @@ void fopCamM_SetBank(camera_class* cam, s16 bank) {
cam->mBank = bank;
} */
inline s16 fopCamM_GetAngleY(camera_class* i_camera) {
return i_camera->mAngle.y;
}
u32 fopCamM_Create(int i_cameraIdx, s16 pProcName, void* param_3);
void fopCamM_Management(void);
u32 fopCamM_GetParam(camera_class* pCamera);
include/m_Do/m_Do_ext.h
+2
View File
@@ -378,6 +378,8 @@ public:
f32 getOldFrameRate() { return mOldFrameRate; }
J3DTransformInfo* getOldFrameTransInfo(int i) { return &mOldFrameTransInfo[i]; }
u16 getOldFrameStartJoint() { return mOldFrameStartJoint; }
Quaternion* getOldFrameQuaternion(int i_no) { return &mOldFrameQuaternion[i_no]; }
private:
/* 0x00 */ bool mOldFrameFlg;
include/m_Do/m_Do_mtx.h
+2
View File
@@ -25,6 +25,7 @@ void mDoMtx_lookAt(f32 (*param_0)[4], Vec const* param_1, Vec const* param_2, Ve
void mDoMtx_concatProjView(f32 const (*param_0)[4], f32 const (*param_1)[4], f32 (*param_2)[4]);
void mDoMtx_ZrotM(Mtx mtx, s16 z);
void mDoMtx_inverseTranspose(f32 const (*param_0)[4], f32 (*param_1)[4]);
void mDoMtx_QuatConcat(Quaternion const* param_0, Quaternion const* param_1, Quaternion* param_2);
inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) {
PSMTXMultVecSR(m, src, dst);
@@ -96,6 +97,7 @@ public:
static void ZXYrotM(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotM(now, x, y, z); }
static void YrotM(s16 y) { mDoMtx_YrotM(now, y); }
static void YrotS(s16 y) { mDoMtx_YrotS(now, y); }
static void XrotS(s16 x) { mDoMtx_XrotS(now, x); }
static void XrotM(s16 x) { mDoMtx_XrotM(now, x); }
static void ZrotM(s16 z) { mDoMtx_ZrotM(now, z); }
static void inverse() { PSMTXInverse(now, now); }
include/rel/d/a/d_a_horse/d_a_horse.h
+1
View File
@@ -160,6 +160,7 @@ public:
void i_changeOriginalDemo() { field_0x16b8 = 3; field_0x1728 = 0; }
void i_setHorsePosAndAngle(cXyz const* i_pos, s16 i_angle) { (this->*mpSetHorsePosAngleFn)(i_pos, i_angle); }
void onRideFlg() { (this->*mpOnRideFlgFn)(); }
void offRideFlg() { (this->*mpOffRideFlgFn)(); }
void onStateFlg0(daHorse_FLG0 flag) { mStateFlg0 |= flag; }
void offStateFlg0(daHorse_FLG0 flag) { mStateFlg0 &= ~flag; }
void offNoDrawWait() { offStateFlg0(NO_DRAW_WAIT); }
include/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h
+3 -4
View File
@@ -2,8 +2,6 @@
#define D_A_TAG_SPRING_H
#include "d/com/d_com_inf_game.h"
#include "d/d_procname.h"
#include "f_op/f_op_actor_mng.h"
class daTagSpring_c : public fopAc_ac_c {
public:
@@ -14,9 +12,10 @@ public:
/* 805A6B5C */ int execute();
/* 805A6C84 */ u8 checkArea();
/* 805A6DFC */ int _delete();
u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
/* 0x568 */ u8 mTimer;
u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
/* 0x568 */ u8 mTimer;
}; // Size: 0x56C
#endif /* D_A_TAG_SPRING_H */