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

almost all of daAlink_demo done (#1987)

Browse Source 
* almost all of alink_demo done

* remove asm

* decideDoStatus OK
This commit is contained in:
TakaRikka
2023-11-18 06:02:04 +02:00
committed by GitHub
parent 187eaa2c55
commit 519e780f66
39 changed files with 3874 additions and 1269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_alink.h
+42 -22
View File
@@ -650,6 +650,7 @@ public:
};
enum daAlink_FTANM {
FTANM_UNK_0 = 0,
FTANM_UNK_3 = 3,
FTANM_UNK_4 = 4,
FTANM_UNK_8 = 8,
@@ -667,11 +668,15 @@ public:
FTANM_UNK_8A = 0x8A,
FTANM_UNK_90 = 0x90,
FTANM_UNK_96 = 0x96,
FTANM_UNK_9C = 0x9C,
FTANM_UNK_9D = 0x9D,
FTANM_UNK_9F = 0x9F,
FTANM_UNK_A0 = 0xA0,
};
enum daAlink_WARP_MAT_MODE {
WARP_MAT_MODE_1 = 1,
WARP_MAT_MODE_0,
WARP_MAT_MODE_1,
};
enum daAlink_WANM {
@@ -1340,7 +1345,7 @@ public:
/* 800AC738 */ void setDoubleAnimeBlendRatio(f32);
/* 800AC754 */ void commonDoubleAnime(J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*,
J3DAnmTransform*, f32, f32, f32, int);
/* 800ACA14 */ void setDoubleAnime(f32, f32, f32, daAlink_c::daAlink_ANM,
/* 800ACA14 */ int setDoubleAnime(f32, f32, f32, daAlink_c::daAlink_ANM,
daAlink_c::daAlink_ANM, int, f32);
/* 800ACD40 */ void commonSingleAnime(J3DAnmTransform*, J3DAnmTransform*, f32, f32, s16);
/* 800ACF80 */ void setSingleAnimeBase(daAlink_c::daAlink_ANM anmID);
@@ -1483,7 +1488,7 @@ public:
/* 800B994C */ BOOL checkItemChangeFromButton();
/* 800B9D2C */ BOOL checkNextActionFromButton();
/* 800B9F50 */ BOOL checkGroundSpecialMode();
/* 800BA09C */ void commonCheckNextAction(int);
/* 800BA09C */ int commonCheckNextAction(int);
/* 800BA0D0 */ int checkNextAction(int);
/* 800BA6A0 */ void commonChangeItem();
/* 800BA914 */ void setItemAction();
@@ -1702,7 +1707,7 @@ public:
/* 800D23C0 */ int checkCutAction();
/* 800D26EC */ int getCutDirection();
/* 800D2760 */ BOOL checkCutCancelNextMode(int);
/* 800D27E4 */ void checkDoCutAction();
/* 800D27E4 */ BOOL checkDoCutAction();
/* 800D2890 */ BOOL checkCutBackState();
/* 800D28F4 */ BOOL checkCutHeadState();
/* 800D29D4 */ BOOL checkDownAttackState();
@@ -1818,7 +1823,7 @@ public:
/* 800DDBA8 */ int procGuardAttack();
/* 800DDE58 */ int procGuardBreakInit();
/* 800DDF2C */ int procGuardBreak();
/* 800DE008 */ bool procTurnMoveInit(int);
/* 800DE008 */ int procTurnMoveInit(int);
/* 800DE380 */ int procTurnMove();
/* 800DE64C */ void getArrowFlyData(f32*, f32*, int) const;
/* 800DE740 */ f32 getArrowIncAtR() const;
@@ -1935,7 +1940,7 @@ public:
/* 800E3800 */ f32 getBombWaterMaxFallSpeed() const;
/* 800E3810 */ f32 getBombExplodeWaterEffectLimit() const;
/* 800E3820 */ s16 getBombInsectLimitAngle() const;
/* 800E38EC */ void checkGrabLineCheck();
/* 800E38EC */ BOOL checkGrabLineCheck();
/* 800E3BCC */ f32 getGrabThrowRate();
/* 800E3C1C */ BOOL checkGrabThrowAnime() const;
/* 800E3C6C */ BOOL checkGrabAnime() const;
@@ -1973,7 +1978,7 @@ public:
/* 800E6E0C */ int procGrabRebound();
/* 800E6EEC */ int procGrabStandInit();
/* 800E6FE0 */ int procGrabStand();
/* 800E70C0 */ bool checkInsectActorName(fopAc_ac_c*);
/* 800E70C0 */ BOOL checkInsectActorName(fopAc_ac_c*);
/* 800E70FC */ int procInsectCatchInit();
/* 800E71D4 */ bool procInsectCatch();
/* 800E7254 */ int procPickUpInit();
@@ -1983,7 +1988,7 @@ public:
/* 800E7894 */ void checkSetChainPullAnime(s16);
/* 800E794C */ s16 getChainStickAngleY(s16) const;
/* 800E7994 */ u8 checkChainEmphasys();
/* 800E79F8 */ u8 searchFmChainPos();
/* 800E79F8 */ BOOL searchFmChainPos();
/* 800E7AEC */ void setFmChainPosFromOut(fopAc_ac_c*, cXyz*, int);
/* 800E7C30 */ int procFmChainUpInit();
/* 800E7CC0 */ int procFmChainUp();
@@ -1991,8 +1996,8 @@ public:
/* 800E7E50 */ int procFmChainStrongPull();
/* 800E7ED0 */ void setWallGrabStatus(u8, u8);
/* 800E7EE4 */ int getWallGrabStatus();
/* 800E7EF4 */ void wallGrabTrigger();
/* 800E7F18 */ void wallGrabButton();
/* 800E7EF4 */ BOOL wallGrabTrigger();
/* 800E7F18 */ BOOL wallGrabButton();
/* 800E7F3C */ void setPushPullKeepData(dBgW_Base::PushPullLabel, int);
/* 800E80A4 */ void checkPushPullTurnBlock();
/* 800E8148 */ void checkPullBehindWall();
@@ -2337,7 +2342,7 @@ public:
/* 80101D70 */ void swimBgCheck(f32);
/* 801023E4 */ void setSpeedAndAngleSwim();
/* 801029C8 */ int checkNextActionSwim();
/* 80102B1C */ void checkSwimAction(int);
/* 80102B1C */ int checkSwimAction(int);
/* 80103058 */ int checkSwimUpAction();
/* 801032C8 */ void swimOutAfter(int);
/* 80103398 */ bool checkSwimFall();
@@ -2557,7 +2562,7 @@ public:
/* 80118FF8 */ void setHighModelBck(mDoExt_bckAnm*, u16);
/* 801190A4 */ void setHighModelFaceBtk(u16);
/* 80119134 */ void setDemoBrk(J3DAnmTevRegKey**, J3DModel*, u16);
/* 801191C4 */ void setStickAnmData(J3DAnmBase*, int, int, u16, int);
/* 801191C4 */ f32 setStickAnmData(J3DAnmBase*, int, int, u16, int);
/* 801195C0 */ int procDemoCommon();
/* 801195F8 */ int procCoToolDemoInit();
/* 801196D8 */ int procCoToolDemo();
@@ -2644,13 +2649,13 @@ public:
/* 8011F658 */ bool checkAcceptWarp();
/* 8011F7D8 */ void dungeonReturnWarp();
/* 8011F9EC */ void checkWarpStart();
/* 8011FBC0 */ void warpModelTexScroll();
/* 8011FBC0 */ int warpModelTexScroll();
/* 8011FD4C */ int procCoWarpInit(int, int);
/* 80120124 */ int procCoWarp();
/* 80120440 */ void commonWaitTurnInit();
/* 80120440 */ int commonWaitTurnInit();
/* 80120474 */ int commonGrabPutInit();
/* 80120500 */ void commonLargeDamageUpInit(int, int, s16, s16);
/* 80120534 */ void commonFallInit(int);
/* 80120500 */ int commonLargeDamageUpInit(int, int, s16, s16);
/* 80120534 */ int commonFallInit(int);
/* 80120580 */ JPABaseEmitter* setEmitter(u32*, u16, cXyz const*, csXyz const*);
/* 80120634 */ JPABaseEmitter* setEmitterPolyColor(u32*, u16, cBgS_PolyInfo&, cXyz const*, csXyz const*);
/* 801206C4 */ JPABaseEmitter* setEmitterColor(u32*, u16, cXyz const*, csXyz const*);
@@ -3083,7 +3088,7 @@ public:
virtual bool checkCanoeFishingGetRight() const;
virtual u8 checkBeeChildDrink() const;
virtual void skipPortalObjWarp();
virtual bool checkTreasureRupeeReturn(int) const;
virtual BOOL checkTreasureRupeeReturn(int) const;
virtual void setSumouReady(fopAc_ac_c*);
virtual bool checkAcceptDungeonWarpAlink(int);
virtual s16 getSumouCounter() const;
@@ -3180,6 +3185,7 @@ public:
bool checkBoomerangCatchAnime() const { return checkUpperAnime(0x52); }
BOOL checkCopyRodReadyAnime() const { return mEquipItem == COPY_ROD && checkUpperAnime(0x54); }
BOOL checkCanoeFishingWaitAnime() const { return checkUpperAnime(0x5D) || checkUpperAnime(0x260); }
BOOL checkCopyRodControllAnime() const { return checkUpperAnime(0x202); }
s16 checkWolfEyeUp() const { return mWolfEyeUp; }
void onModeFlg(u32 flag) { mModeFlg |= flag; }
@@ -3206,6 +3212,13 @@ public:
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 setFaceDemoBck(u16 param_0) { setFaceBck(param_0, 0, 0); }
void setFaceDemoBtp(u16 param_0) { setFaceBtp(param_0, 0, 0); }
void setFaceDemoBtk(u16 param_0) { setFaceBtk(param_0, 0, 0); }
void setGrabStatus(u8 i_status, u8 param_1) { setWallGrabStatus(i_status, param_1); }
void setChainGrabStatus(u8 i_status) { setGrabStatus(i_status, 2); }
void cancelFmChainGrabFromOut() {
field_0x2fa3 = 0;
field_0x2844.clearData();
@@ -3280,6 +3293,8 @@ public:
bool checkGrabGlide() { return checkGrabRooster(); }
bool checkCopyRodRevive() const { return mProcID == PROC_COPY_ROD_REVIVE; }
bool checkHorseGetOffMode() const { return mProcID == PROC_HORSE_GETOFF; }
bool checkHorseRideOn() const { return mProcID == PROC_HORSE_RIDE; }
BOOL i_checkRideOn() const { return mRideStatus != 0; }
@@ -3346,7 +3361,13 @@ public:
static u8 const m_handLeftInSidePos[12];
static u8 const m_handRightInSidePos[12];
static u8 m_procInitTable[5632];
#ifdef NONMATCHING
static daAlink_procFunc m_demoInitTable[];
#else
static u8 m_demoInitTable[1140];
#endif
static u8 m_fEffParamProc[72];
private:
@@ -3375,7 +3396,7 @@ private:
/* 0x0068C */ J3DAnmTextureSRTKey* field_0x068c;
/* 0x00690 */ mDoExt_bckAnm* mpDemoFCTmpBck;
/* 0x00694 */ J3DDeformData* mpDemoFCTmpBls;
/* 0x00698 */ void* field_0x0698;
/* 0x00698 */ J3DAnmCluster* field_0x0698;
/* 0x0069C */ mDoExt_blkAnm* field_0x069c;
/* 0x006A0 */ J3DModel* mpDemoHLTmpModel;
/* 0x006A4 */ mDoExt_bckAnm* mpDemoHLTmpBck;
@@ -3399,7 +3420,7 @@ private:
/* 0x006EC */ J3DShape* field_0x06ec;
/* 0x006F0 */ J3DShape* field_0x06f0;
/* 0x006F4 */ J3DAnmTevRegKey* field_0x06f4;
/* 0x006F8 */ J3DAnmBase* field_0x06f8;
/* 0x006F8 */ J3DAnmTevRegKey* field_0x06f8;
/* 0x006FC */ J3DModel* field_0x06fc; // related to human link
/* 0x00700 */ J3DModel* field_0x0700;
/* 0x00704 */ J3DAnmBase* field_0x0704;
@@ -3510,7 +3531,7 @@ private:
/* 0x0285C */ daPy_actorKeep_c field_0x285c;
/* 0x02864 */ dMsgFlow_c mMsgFlow;
/* 0x028B0 */ int field_0x28b0[0x10];
/* 0x028F0 */ u32 mMsgClassID;
/* 0x028F0 */ unsigned int mMsgClassID;
/* 0x028F4 */ int mAtnActorID;
/* 0x028F8 */ int field_0x28f8;
/* 0x028FC */ int field_0x28fc;
@@ -3818,8 +3839,7 @@ private:
/* 0x03220 */ u32 field_0x3220;
/* 0x03224 */ u32 field_0x3224;
/* 0x03228 */ u32 field_0x3228[2][3];
/* 0x03240 */ u32 field_0x3240;
/* 0x03244 */ u8 field_0x3244[20];
/* 0x03240 */ u32 field_0x3240[6];
/* 0x03258 */ u32 field_0x3258;
/* 0x0325C */ u32 field_0x325c;
/* 0x03260 */ u32 field_0x3260[2];
include/d/a/d_a_player.h
+21 -1
View File
@@ -140,6 +140,11 @@ class daBoomerang_c;
class daPy_demo_c {
public:
enum {
DEMO_LAST_e = 0x5F,
DEMO_NEW_ANM0_e = 0x200,
};
void setSpecialDemoType();
void setDemoType(u16 pType) { mDemoType = pType; }
@@ -147,6 +152,7 @@ public:
void setDemoMode(u32 mode) { mDemoMode = mode; }
u32 getDemoMode() const { return mDemoMode; }
int getParam1() const { return mParam1; }
s16 getParam2() const { return mParam2; }
void setOriginalDemoType() { setDemoType(3); }
void i_setSpecialDemoType() { setDemoType(5); }
void setSystemDemoType() { setDemoType(2); }
@@ -159,6 +165,12 @@ public:
void setParam1(int value) { mParam1 = value;}
void setParam2(int value) { mParam2 = value;}
void setPos0(const cXyz* pos) { mDemoPos0 = *pos;}
void setToolDemoType() { setDemoType(1); }
s16 getTimer() const { return mTimer; }
void decTimer() { mTimer--; }
void setTimer(s16 i_timer) { mTimer = i_timer; }
cXyz* getPos0() { return &mDemoPos0; }
void resetDemoType() { setDemoType(0); }
private:
/* 0x00 */ u16 mDemoType;
@@ -215,6 +227,7 @@ public:
FLG0_UNK_10000000 = 0x10000000,
FLG0_UNK_1000000 = 0x1000000,
FLG0_UNDERWATER = 0x800000,
FLG0_UNK_200000 = 0x200000,
FLG0_UNK_100000 = 0x100000,
FLG0_UNK_80000 = 0x80000,
FLG0_UNK_40000 = 0x40000,
@@ -224,6 +237,7 @@ public:
FLG0_UNK_2000 = 0x2000,
FLG0_MAGNE_BOOTS_ON = 0x1000,
FLG0_PUSH_PULL_KEEP = 0x800,
FLG0_UNK_400 = 0x400,
FLG0_UNK_100 = 0x100,
FLG0_UNK_80 = 0x80,
FLG0_UNK_40 = 0x40,
@@ -235,6 +249,7 @@ public:
FLG0_HVY_STATE = FLG0_UNK_40000000 | FLG0_EQUIP_HVY_BOOTS | FLG0_UNK_20000,
FLG0_UNK_14000 = 0x14000,
FLG0_UNK_10400 = 0x10400,
FLG0_UNK_18 = FLG0_UNK_10 | FLG0_UNK_8,
};
@@ -251,6 +266,7 @@ public:
FLG1_UNK_2000 = 0x2000,
FLG1_UNK_1000 = 0x1000,
FLG1_UNK_800 = 0x800,
FLG1_UNK_200 = 0x200,
FLG1_UNK_80 = 0x80,
FLG1_UNK_40 = 0x40,
FLG1_UNK_20 = 0x20,
@@ -346,6 +362,7 @@ public:
ERFLG1_UNK_20000000 = 0x20000000,
ERFLG1_UNK_10000000 = 0x10000000,
ERFLG1_UNK_4000000 = 0x4000000,
ERFLG1_UNK_100000 = 0x100000,
ERFLG1_UNK_40000 = 0x40000,
ERFLG1_UNK_2000 = 0x2000,
ERFLG1_UNK_800 = 0x800,
@@ -371,6 +388,7 @@ public:
enum daPy_RFLG0 {
RFLG0_UNK_8000000 = 0x8000000,
RFLG0_UNK_4000000 = 0x4000000,
RFLG0_UNK_20000 = 0x20000,
RFLG0_UNK_4000 = 0x4000,
RFLG0_FRONT_ROLL_CRASH = 0x2000,
RFLG0_ENEMY_ATTN_LOCK = 0x1000,
@@ -380,10 +398,12 @@ public:
RFLG0_UNK_80 = 0x80,
RFLG0_UNK_40 = 0x40,
RFLG0_UNK_10 = 0x10,
RFLG0_UNK_8 = 0x8,
RFLG0_UNK_2 = 0x2,
};
enum daPy_RFLG1 {
RFLG1_UNK_100 = 0x100,
RFLG1_UNK_30 = 0x30,
RFLG1_UNK_2 = 0x2,
RFLG1_WOLF_ATTACK_REVERSE = 0x1,
@@ -654,7 +674,7 @@ public:
virtual bool checkCanoeFishingGetRight() const;
virtual u8 checkBeeChildDrink() const;
virtual void skipPortalObjWarp();
virtual bool checkTreasureRupeeReturn(int) const;
virtual BOOL checkTreasureRupeeReturn(int) const;
virtual void setSumouReady(fopAc_ac_c*);
virtual bool checkAcceptDungeonWarpAlink(int);
virtual s16 getSumouCounter() const;
include/d/bg/d_bg_s_acch.h
+2
View File
@@ -161,6 +161,8 @@ public:
void SetWallHit() { m_flags |= WALL_HIT; }
void ClrWallNone() { m_flags &= ~WALL_NONE; }
void OnLineCheckNone() { m_flags |= LINE_CHECK_NONE; }
void OffLineCheckNone() { m_flags &= ~LINE_CHECK_NONE; }
void SetWallNone() { m_flags |= WALL_NONE; }
cM3dGCyl* GetWallBmdCylP() { return &m_wall_cyl; }
// inline dupe
include/d/com/d_com_inf_game.h
+12
View File
@@ -3002,6 +3002,14 @@ inline void dComIfGp_evmng_cutEnd(int param_0) {
dComIfGp_getPEvtManager()->cutEnd(param_0);
}
inline cXyz* dComIfGp_evmng_getGoal() {
return dComIfGp_getPEvtManager()->getGoal();
}
inline BOOL i_dComIfGp_evmng_startCheck(char const* i_event) {
return g_dComIfG_gameInfo.play.getEvtManager().startCheckOld(i_event);
}
inline BOOL dComIfGp_evmng_endCheck(const char* event) {
return g_dComIfG_gameInfo.play.getEvtManager().endCheckOld(event);
}
@@ -3022,6 +3030,10 @@ inline void dComIfGp_event_setItemPartnerId(unsigned int id) {
g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id);
}
inline u8 dComIfGp_event_getGtItm() {
return g_dComIfG_gameInfo.play.getEvent().getGtItm();
}
inline int dComIfGp_evmng_startDemo(int param_0) {
return dComIfGp_getPEvtManager()->setStartDemo(param_0);
}
include/d/d_demo.h
+2 -1
View File
@@ -56,7 +56,7 @@ public:
/* 80038128 */ fopAc_ac_c* getActor();
/* 8003815C */ void setActor(fopAc_ac_c*);
/* 8003819C */ f32 getPrm_Morf();
/* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*);
/* 80038338 */ int getDemoIDData(int*, int*, int*, u16*, u8*);
/* 80038098 */ virtual ~dDemo_actor_c();
/* 800387EC */ virtual void JSGSetData(u32, void const*, u32);
@@ -280,6 +280,7 @@ public:
static void onStatus(u32 status) { m_status |= status; }
static void offStatus(u32 status) { m_status &= ~status; }
static void setBranchData(const u8* p_data) { m_branchData = p_data; }
static s16 getBranchId() { return m_branchId; }
static s16 m_branchId;
static dDemo_system_c* m_system;
include/d/d_gameover.h
+16
View File
@@ -80,6 +80,7 @@ public:
/* 8019B864 */ int _delete();
s32 deleteCheck() { return mProc == 8; }
void animeStart() { mIsDemoSave = true; }
/* 0x0FC */ dMenu_save_c* dMs_c;
/* 0x100 */ dDlst_GameOverScrnDraw_c* dgo_screen_c;
@@ -109,4 +110,19 @@ inline s32 d_GameOver_CheckDelete(unsigned int& id) {
return 0;
}
inline s32 d_GameOver_animeStart(unsigned int& id) {
if (id != UINT32_MAX) {
dGameover_c* gameover = (dGameover_c*)fopMsgM_SearchByID(id);
if (gameover != NULL) {
gameover->animeStart();
return 1;
} else {
return 0;
}
}
return 0;
}
#endif /* D_D_GAMEOVER_H */
include/d/event/d_event.h
+1
View File
@@ -161,6 +161,7 @@ public:
fopAc_ac_c* getPtT() { return convPId(mPtT); }
bool isChangeOK(void* param_0) { return mChangeOK == param_0; }
u8 getPreItemNo() { return mPreItemNo; }
u8 getGtItm() { return mGtItm; }
public:
/* 0x000 */ u8 field_0x0[4];
include/d/kankyo/d_kankyo.h
+1
View File
@@ -50,6 +50,7 @@ static void dKy_twilight_camelight_set();
u8 dKy_shadow_mode_check(u8 mode);
void dKy_shadow_mode_set(u8 mode);
void dKy_shadow_mode_reset(u8 mode);
void dKy_Itemgetcol_chg_on();
struct LIGHT_INFLUENCE {
/* 0x00 */ cXyz mPosition;
include/d/meter/d_meter2_info.h
+1 -1
View File
@@ -30,7 +30,7 @@ class J2DPicture;
class dMeterMap_c;
enum dMeter2Info_warpStatus {
/* 0x3 */ WARP_DECIDED = 3,
/* 0x3 */ WARP_STATUS_DECIDED_e = 3,
};
class dMeter2Info_c {