mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-11 14:38:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

player_main work

Browse Source
This commit is contained in:
LagoLunatic
2023-11-09 18:51:06 -05:00
parent 4186e645d2
commit 15f4354f6a
5 changed files with 1894 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_player_main.cpp
+1831 -10
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_tag_ret.cpp
+9 -7
View File
@@ -47,18 +47,20 @@ namespace daTagRet {
struct Act_c : public fopAc_ac_c {
public:
enum Prm_e {
PRM_PLAYER_ID_W = 8,
PRM_PLAYER_ID_S = 0,
PRM_LINK_ID_W = 8,
PRM_LINK_ID_S = 0,
};
s32 _create();
bool _delete();
void set_mtx();
bool _execute();
bool _draw();
u32 prm_get_linkID() const { return daObj::PrmAbstract(this, PRM_LINK_ID_W, PRM_LINK_ID_S); }
public:
u8 unknown_padding[0xC];
/* 0x290 */ u8 m290[0x29C - 0x290];
/* 0x29C */ dCcD_Stts mStts;
/* 0x2D8 */ dCcD_Cyl mCyl;
};
@@ -98,8 +100,8 @@ namespace daTagRet {
dComIfG_Ccsp()->Set(&mCyl);
if (mCyl.ChkCoHit()) {
u32 playerId = daObj::PrmAbstract(this, PRM_PLAYER_ID_W, PRM_PLAYER_ID_S);
daPy_getPlayerLinkActorClass()->onDekuSpReturnFlg(playerId);
u32 linkId = prm_get_linkID();
daPy_getPlayerLinkActorClass()->onDekuSpReturnFlg(linkId);
}
set_mtx();
src/d/d_com_inf_game.cpp
+1 -2
View File
@@ -1103,7 +1103,6 @@ BOOL dComIfGs_checkSeaLandingEvent(s8 i_roomNo) {
}
/* 800548FC-80054C70 .text dComIfGs_setGameStartStage__Fv */
// NONMATCHING - one tiny reg swap
void dComIfGs_setGameStartStage() {
struct check_data {
/* 0x0 */ u8 mbHasEvent;
@@ -1148,7 +1147,7 @@ void dComIfGs_setGameStartStage() {
dKy_set_nexttime(120.0f);
} else if (stage_type == 7) {
daPy_lk_c* player_p = daPy_getPlayerLinkActorClass();
point = player_p->m3594;
point = player_p->mRestartPoint;
s8 temp_r3 = player_p->current.roomNo;
room_no = temp_r3;