d_a_player_dproc.inc - All except two fully matching. (#713)

* d_a_player_dproc.inc - All except two fully matching.

* Addressed review comments.

* Missed two mCurProc checks.

* Second review.

---------

Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
This commit is contained in:
123456789758
2025-03-30 14:08:11 -04:00
committed by GitHub
parent a0536371e6
commit f4587892ff
8 changed files with 1819 additions and 155 deletions
+1
View File
@@ -143,6 +143,7 @@ public:
};
enum daPy_RFLG0 {
daPyRFlg0_UNK1 = 0x00000001,
daPyRFlg0_UNK2 = 0x00000002,
daPyRFlg0_ROPE_GRAB_RIGHT_HAND = 0x00000004,
daPyRFlg0_UNK10 = 0x00000010,
+1 -1
View File
@@ -1044,7 +1044,7 @@ public:
/* 0x00 */ s16 field_0x0;
/* 0x02 */ s16 field_0x2;
/* 0x04 */ s16 field_0x4;
/* 0x06 */ f32 field_0x6;
/* 0x08 */ f32 field_0x8;
/* 0x0C */ f32 field_0xC;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
+2 -2
View File
@@ -1176,14 +1176,14 @@ public:
void endFlameDamageEmitter();
void endDamageEmitter();
static u32 setItemWaterEffect(fopAc_ac_c*, int, int);
void getDemoLookActor();
fopAc_ac_c* getDemoLookActor();
void setTinkleCeiverModel();
void setTalismanModel();
void setLetterModel();
BOOL checkCaughtShapeHide();
void setShapeAngleToTalkActor();
BOOL checkEndMessage(u32);
void setTalkStartBack();
int setTalkStartBack();
BOOL dProcTool_init();
BOOL dProcTool();
BOOL dProcTalk_init();
+2 -1
View File
@@ -120,7 +120,8 @@ public:
void onCrashFlg() {}
void onFantomGanonBattle() {}
void onJumpRideFlg() {}
void onLinkSit() {}
//TODO: Is this right?
void onLinkSit() { onStateFlg(daSFLG_UNK4000000_e); }
void onSceneChange() {}
void onShortHitFlg() {}
void onStateFlg(daSHIP_SFLG flag) { mStateFlag |= flag; }
+3
View File
@@ -56,6 +56,7 @@ enum daPy__PlayerStatus0 {
daPyStts0_UNK2000000_e = 0x02000000,
daPyStts0_UNK4000000_e = 0x04000000,
daPyStts0_CRAWL_e = 0x08000000,
daPyStts0_UNK10000000_e = 0x10000000,
daPyStts0_UNK20000000_e = 0x20000000,
daPyStts0_SPIN_ATTACK_e = 0x40000000,
};
@@ -66,6 +67,7 @@ enum daPy__PlayerStatus1 {
daPyStts1_DEKU_LEAF_FLY_e = 0x00000020,
daPyStts1_DEKU_LEAF_FAN_e = 0x00000040,
daPyStts1_SAIL_e = 0x00000400,
daPyStts1_UNK4000_e = 0x00004000,
daPyStts1_UNK8000_e = 0x00008000,
daPyStts1_UNK10000_e = 0x00010000,
daPyStts1_UNK40000_e = 0x00040000,
@@ -793,6 +795,7 @@ extern GXColor g_saftyWhiteColor;
*/
void dComIfGs_gameStart();
void dComIfGs_setGameStartStage();
u8 dComIfGs_checkGetItem(u8);
inline void dComIfGs_init() {
+1
View File
@@ -419,6 +419,7 @@ void dKy_custom_colset(u8 param_0, u8 param_1, f32 i_blend);
void dKy_pship_existense_set();
void dKy_pship_existense_cut();
u8 dKy_pship_existense_chk();
void dKy_Itemgetcol_chg_on();
void dKy_Itemgetcol_chg_off();
void dKy_Itemgetcol_chg_move();
void dKy_arrowcol_chg_on(cXyz*, int);
+1
View File
@@ -369,6 +369,7 @@ void dKyw_evt_wind_set(s16 i_windX, s16 i_windY);
void dKyw_evt_wind_set_go();
void dKyw_get_AllWind_vec(cXyz* param_0, cXyz* i_direction, f32* i_power);
cXyz dKyw_get_AllWind_vecpow(cXyz* param_0);
int dKyw_get_tactwind_dir();
BOOL dKyw_gbwind_use_check();
void dKyw_tornado_Notice(cXyz* param_0);
File diff suppressed because it is too large Load Diff