mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-01 00:13:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

More work on d_a_myna (#2005)

Browse Source
This commit is contained in:
Jacob Patzer
2023-12-17 15:24:36 -08:00
committed by GitHub
parent ff6d09d6ae
commit 269c2f7a06
33 changed files with 1111 additions and 1201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_obj_ss_base.h
+6 -15
View File
@@ -11,21 +11,12 @@ public:
/* 8015E4C8 */ virtual void setSoldOut();
/* 8015E4B0 */ virtual u32 getProcessID();
void* getParentPtr() {
return mpParentPtr;
}
void setFlowNodeNumber(u16 flowNodeNum) {
mFlowNodeNum = flowNodeNum;
}
u16 getValueNumber() {
return mValueNum;
}
void setValueNumber(u16 valueNum) {
mValueNum = valueNum;
}
void* getParentPtr() { return mpParentPtr; }
void setParentPtr(void* parentPtr) { mpParentPtr = parentPtr; }
u16 getFlowNodeNumber() { return mFlowNodeNum; }
void setFlowNodeNumber(u16 flowNodeNum) { mFlowNodeNum = flowNodeNum; }
u16 getValueNumber() { return mValueNum; }
void setValueNumber(u16 valueNum) { mValueNum = valueNum; }
private:
/* 0x56C */ void* mpParentPtr;
include/d/a/d_a_player.h
+20 -21
View File
@@ -94,9 +94,7 @@ private:
class daPy_actorKeep_c {
public:
daPy_actorKeep_c() {
clearData();
}
daPy_actorKeep_c() { clearData(); }
void setActor();
void setData(fopAc_ac_c*);
@@ -161,10 +159,10 @@ public:
s16 getMoveAngle() const { return mDemoMoveAngle; }
f32 getStick() { return mStick; }
int getParam0() const { return mParam0; }
void setParam0(int value) { mParam0 = value;}
void setParam1(int value) { mParam1 = value;}
void setParam2(int value) { mParam2 = value;}
void setPos0(const cXyz* pos) { mDemoPos0 = *pos;}
void setParam0(int value) { mParam0 = value; }
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--; }
@@ -410,6 +408,7 @@ public:
RFLG0_UNK_100 = 0x100,
RFLG0_UNK_80 = 0x80,
RFLG0_UNK_40 = 0x40,
RFLG0_GRAB_UP_END = 0x20,
RFLG0_UNK_10 = 0x10,
RFLG0_UNK_8 = 0x8,
RFLG0_UNK_2 = 0x2,
@@ -539,11 +538,12 @@ public:
void changeDemoParam2(s16);
void cancelOriginalDemo();
void changeOriginalDemo();
cXyz getHeadTopPos() const;
/* 801829E0 */ void checkThrowDamage() const;
/* 80182A10 */ void checkGoronSideMove() const;
/* 80182AAC */ void getRightFootPosP();
/* 80182AB4 */ void getLeftFootPosP();
/* 80182ABC */ //u32 getMidnaActor();
/* 80182ABC */ // u32 getMidnaActor();
/* 80182AC4 */ void checkCopyRodThrowAfter() const;
/* 80182AD8 */ void checkRide() const;
/* 80182B9C */ void getRightHandPos() const;
@@ -727,7 +727,6 @@ public:
virtual BOOL checkCopyRodTopUse();
virtual bool checkCopyRodEquip() const;
virtual BOOL checkCutJumpMode() const;
virtual cXyz getHeadTopPos() const;
bool getSumouCameraMode() const {
bool sumouCameraMode = false;
@@ -758,13 +757,14 @@ public:
bool checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); }
bool checkFreezeDamage() const { return i_checkNoResetFlg1(FLG1_UNK_40000000); }
bool checkWolfTagLockJumpReady() const { return i_checkResetFlg0(RFLG0_UNK_20000); }
bool getGrabUpEnd() const { return i_checkResetFlg0(RFLG0_GRAB_UP_END); }
void onForceAutoJump() { i_onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); }
void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); }
void onNotHang() { i_onEndResetFlg0(ERFLG0_NOT_HANG); }
void onShieldBackBone() { i_onEndResetFlg1(ERFLG1_GANON_FINISH); }
void onFogFade() { i_onNoResetFlg2(FLG2_UNK_4000); }
void offCargoCarry() {
if (checkCargoCarry()) {
mSpecialMode = 0;
@@ -788,35 +788,35 @@ public:
u32 i_checkNoResetFlg1(daPy_FLG1 i_flag) const { return mNoResetFlg1 & i_flag; }
u32 i_checkNoResetFlg2(daPy_FLG2 i_flag) const { return mNoResetFlg2 & i_flag; }
u32 i_checkNoResetFlg3(daPy_FLG3 i_flag) const { return mNoResetFlg3 & i_flag; }
void i_onNoResetFlg0(int i_flag) { mNoResetFlg0 |= i_flag; }
void i_onNoResetFlg1(int i_flag) { mNoResetFlg1 |= i_flag; }
void i_onNoResetFlg2(int i_flag) { mNoResetFlg2 |= i_flag; }
void i_onNoResetFlg3(int i_flag) { mNoResetFlg3 |= i_flag; }
void i_offNoResetFlg0(int i_flag) { mNoResetFlg0 &= ~i_flag; }
void i_offNoResetFlg1(int i_flag) { mNoResetFlg1 &= ~i_flag; }
void i_offNoResetFlg2(int i_flag) { mNoResetFlg2 &= ~i_flag; }
void i_offNoResetFlg3(int i_flag) { mNoResetFlg3 &= ~i_flag; }
void i_offResetFlg0(int flag) { mResetFlg0 &= ~flag; }
void i_offResetFlg1(int flag) { mResetFlg1 &= ~flag; }
void i_onResetFlg0(int flag) { mResetFlg0 |= flag; }
void i_onResetFlg1(int flag) { mResetFlg1 |= flag; }
void i_onEndResetFlg0(int i_flag) { mEndResetFlg0 |= i_flag; }
void i_onEndResetFlg2(int i_flag) { mEndResetFlg2 |= i_flag; }
void i_offEndResetFlg2(daPy_ERFLG2 i_flag) { mEndResetFlg2 &= ~i_flag; }
u32 i_checkResetFlg0(daPy_py_c::daPy_RFLG0 i_flag) const { return mResetFlg0 & i_flag; }
u32 checkResetFlg1(daPy_py_c::daPy_RFLG1 i_flag) const { return mResetFlg1 & i_flag; }
u32 i_checkEndResetFlg0(daPy_py_c::daPy_ERFLG0 i_flag) const { return mEndResetFlg0 & i_flag; }
u32 i_checkEndResetFlg1(daPy_py_c::daPy_ERFLG1 i_flag) const { return mEndResetFlg1 & i_flag; }
u32 i_checkEndResetFlg2(daPy_py_c::daPy_ERFLG2 i_flag) const { return mEndResetFlg2 & i_flag; }
void i_onEndResetFlg1(daPy_ERFLG1 i_flag) { mEndResetFlg1 |= i_flag; }
u32 i_checkWolf() const { return i_checkNoResetFlg1(FLG1_IS_WOLF); }
BOOL i_checkEquipHeavyBoots() const { return i_checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
BOOL i_checkMagneBootsOn() const { return i_checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); }
@@ -826,7 +826,6 @@ public:
void i_onPushPullKeep() { i_onNoResetFlg0(FLG0_PUSH_PULL_KEEP); }
void i_offPushPullKeep() { i_offNoResetFlg0(FLG0_PUSH_PULL_KEEP); }
u32 i_checkBoarSingleBattle() const { return i_checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); }
void i_changeOriginalDemo() {
@@ -834,7 +833,7 @@ public:
mDemo.setParam0(0);
}
void i_changeDemoMode(u32 i_demoMode,int i_param0,int i_param1,s16 i_param2) {
void i_changeDemoMode(u32 i_demoMode, int i_param0, int i_param1, s16 i_param2) {
mDemo.setDemoMode(i_demoMode);
mDemo.setParam0(i_param0);
mDemo.setParam1(i_param1);
include/d/msg/d_msg_object.h
+25 -12
View File
@@ -117,8 +117,8 @@ public:
/* 802380C4 */ static void changeGroup(s16);
/* 8023806C */ static void demoMessageGroup();
/* 80238098 */ void endFlowGroup();
/* 802380F4 */ static bool getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*,
char*, char*, s16*);
/* 802380F4 */ static bool getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
char*, char*, char*, s16*);
/* 80238174 */ static u8* getMsgDtPtr();
/* 80238188 */ static void setProcessID(unsigned int);
/* 8023819C */ static fopAc_ac_c* getActor();
@@ -164,26 +164,34 @@ public:
s16 getInputValueLocal() { return mInputValue; }
void setInputValueLocal(s16 i_inputValue) { mInputValue = i_inputValue; }
s16 getNowTotalPriceLocal() { return mNowTotalPrice; }
void setNowTotalPriceLocal(s16 i_nowTotalPrice) { mNowTotalPrice = i_nowTotalPrice; }
s16 getNowTotalPaymentLocal() { return mNowTotalPayment; }
void setNowTotalPaymentLocal(s16 i_nowTotalPayment) { mNowTotalPayment = i_nowTotalPayment; }
void onInputFlagLocal() { mInputFlag = 1; }
void offPaymentFlagLocal() { mPaymentFlag = 0; }
void offAutoMessageFlagLocal() { mAutoMessageFlag = 0; }
void onAutoMessageFlagLocal() { mAutoMessageFlag = 1; }
void setFundRaisingValueLocal(s16 i_value) { mFundRaisingValue = i_value; }
u16 getPortalMessageIDLocal() { return mPortalMessageID; }
bool isAutoMessageFlagLocal() { return mAutoMessageFlag; }
bool isPaymentFlagLocal() { return mPaymentFlag; }
u8 getSelectPushFlag() { return mSelectPushFlag; }
u8 getSelectCancelPos() { return mSelectCancelPos; }
s16 getInputValue() { return getInputValueLocal(); }
void setInputValue(s16 i_inputValue) { setInputValueLocal(i_inputValue); }
s16 getNowTotalPrice() { return getNowTotalPriceLocal(); }
void setNowTotalPrice(s16 i_nowTotalPrice) { setNowTotalPriceLocal(i_nowTotalPrice); }
s16 getNowTotalPayment() { return getNowTotalPaymentLocal(); }
void setNowTotalPayment(s16 i_nowTotalPayment) { setNowTotalPaymentLocal(i_nowTotalPayment); }
void onInputFlag() { onInputFlagLocal(); }
void offPaymentFlag() { offPaymentFlagLocal(); }
void offAutoMessageFlag() { offAutoMessageFlagLocal(); }
void onAutoMessageFlag() { onAutoMessageFlagLocal(); }
void setFundRaisingValue(s16 i_value) { setFundRaisingValueLocal(i_value); }
u16 getPortalMessageID() { return getPortalMessageIDLocal(); }
bool isAutoMessageFlag() { return isAutoMessageFlagLocal(); }
bool isPaymentFlag() { return isPaymentFlagLocal(); }
jmessage_tSequenceProcessor* getSequenceProcessor() { return mpSeqProc; }
@@ -276,6 +284,10 @@ u16 dMsgObject_getFundRaising();
void dMsgObject_addOffering(s16 param_0);
u16 dMsgObject_getOffering();
void dMsgObject_addTotalPrice(s16 param_0);
u16 dMsgObject_getTotalPrice();
void dMsgObject_setTotalPrice(u16 param_0);
u16 dMsgObject_getTotalPayment();
void dMsgObject_setTotalPayment(u16 param_0);
inline dMsgObject_c* dMsgObject_getMsgObjectClass() {
return dComIfGp_getMsgObjectClass();
@@ -325,11 +337,8 @@ inline void dMsgObject_setTalkActor(fopAc_ac_c* actor) {
inline bool dMsgObject_getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2,
JUTFont* param_3, COutFont_c* param_4, char* param_5,
char* param_6, char* param_7, s16* param_8) {
return dMsgObject_c::getString(
param_0, param_1, param_2, param_3,
param_4, param_5, param_6, param_7,
param_8
);
return dMsgObject_c::getString(param_0, param_1, param_2, param_3, param_4, param_5, param_6,
param_7, param_8);
}
inline void dMsgObject_onKillMessageFlag() {
@@ -348,7 +357,7 @@ inline void dMsgObject_setSmellType(u8 type) {
dMsgObject_c::setSmellType(type);
}
inline void dMsgObject_setTalkPartner(fopAc_ac_c *actor) {
inline void dMsgObject_setTalkPartner(fopAc_ac_c* actor) {
dMsgObject_getMsgObjectClass()->setTalkPartner(actor);
}
@@ -486,7 +495,8 @@ public:
/* 0x0DC */ f32 mBoxItemTextSizeY;
/* 0x0E0 */ f32 mBoxItemTextPosX;
/* 0x0E4 */ f32 mBoxItemTextPosY;
/* 0x0E8 */ JUtility::TColor mBoxStartBlack[10]; // talk, navi, midna, item, stone, wood, book, wolf,
/* 0x0E8 */ JUtility::TColor
mBoxStartBlack[10]; // talk, navi, midna, item, stone, wood, book, wolf,
/* 0x110 */ JUtility::TColor mBoxEndBlack[10];
/* 0x138 */ JUtility::TColor mBoxStartWhite[10];
/* 0x160 */ JUtility::TColor mBoxEndWhite[10];
@@ -510,7 +520,8 @@ public:
/* 0x1CC */ f32 mStageTitleBaseAlpha;
/* 0x1D0 */ f32 mBossNameBaseAlpha;
/* 0x1D4 */ f32 mChoicePos[3][10]; // down, mid, top
/* 0x24C */ f32 mBoxPos[3][10]; // down, mid, top // talk, navi, midna, item, stone, wood, book, wolf,
/* 0x24C */ f32
mBoxPos[3][10]; // down, mid, top // talk, navi, midna, item, stone, wood, book, wolf,
/* 0x2C4 */ f32 mPortalIconScale;
/* 0x2C8 */ f32 mTextPosX;
/* 0x2CC */ f32 mTextPosY;
@@ -548,10 +559,12 @@ public:
/* 0x31E */ bool mSaveSeqMsgDebug;
/* 0x31F */ bool mMsgDebug;
/* 0x320 */ bool mTextColorDebug;
/* 0x321 */ u8 mTextColorUpperR[9]; // Default, Red, Green, Blue, Yellow, L.Blue, Purple, Grey, Orange,
/* 0x321 */ u8
mTextColorUpperR[9]; // Default, Red, Green, Blue, Yellow, L.Blue, Purple, Grey, Orange,
/* 0x32A */ u8 mTextColorUpperG[9];
/* 0x333 */ u8 mTextColorUpperB[9];
/* 0x33C */ u8 mTextColorLowerR[9]; // Default, Red, Green, Blue, Yellow, L.Blue, Purple, Grey, Orange,
/* 0x33C */ u8
mTextColorLowerR[9]; // Default, Red, Green, Blue, Yellow, L.Blue, Purple, Grey, Orange,
/* 0x345 */ u8 mTextColorLowerG[9];
/* 0x34E */ u8 mTextColorLowerB[9];
/* 0x357 */ u8 mDisplaySpeed;
include/rel/d/a/d_a_myna/d_a_myna.h
+6 -4
View File
@@ -81,8 +81,8 @@ public:
/* 809486F8 */ void attack2_talk_init();
/* 80948734 */ void attack2_talk_move();
/* 809487EC */ void soldoutItem(unsigned int);
/* 80948828 */ void fly_attack_move();
/* 80948ADC */ void fly_return_move();
/* 80948828 */ bool fly_attack_move();
/* 80948ADC */ bool fly_return_move();
/* 80948DFC */ void fly_body_wave();
/* 80948E84 */ void talkAnime(msg_class*);
/* 80948FAC */ int chkEvent();
@@ -115,6 +115,8 @@ public:
daMyna_c(){};
void onEventFlag(u8 flag) { field_0x92F |= (1 << flag); }
void offEventFlag(u8 flag) { field_0x92F &= ~(1 << flag); }
bool isEventFlag(u8 flag) { return field_0x92F & (1 << flag); }
typedef void (daMyna_c::*ProcFunc)();
typedef int (daMyna_c::*BaseMotionFunc)(int);
@@ -135,8 +137,8 @@ public:
/* 0x66C */ cBgS_GndChk mGndChk;
/* 0x6A8 */ dCcD_Stts mStatus;
/* 0x6E4 */ dCcD_Sph mSph;
/* 0x81C */ u32 field_0x81C;
/* 0x820 */ u32 field_0x820;
/* 0x81C */ s32 field_0x81C;
/* 0x820 */ s32 field_0x820;
/* 0x824 */ u32 field_0x824;
/* 0x828 */ fopAc_ac_c* field_0x828;
/* 0x82C */ cXyz field_0x82C;
include/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.h
+2
View File
@@ -22,6 +22,8 @@ public:
return var1 & 0xFF;
}
bool getTurnOnFlag() { return mTurnOnFlag; }
/* 0x568 */ // vtable
/* 0x56C */ f32 field_0x56c;
/* 0x570 */ JPABaseEmitter* field_0x570[2];