Skip to content

canoe done #2417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hatal175 merged 2 commits into from
May 3, 2025
Merged

canoe done #2417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1738dca
d_a_canoe done
TakaRikka May 3, 2025
65f3933
fix debug
TakaRikka May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1524,7 +1524,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(MatchingFor("GZ2E01"), "d_a_alldie"),
ActorRel(MatchingFor("GZ2E01"), "d_a_andsw2"),
ActorRel(NonMatching, "d_a_bd"),
ActorRel(NonMatching, "d_a_canoe"),
ActorRel(MatchingFor("GZ2E01"), "d_a_canoe"),
ActorRel(NonMatching, "d_a_cstaF"),
ActorRel(NonMatching, "d_a_demo_item"),
ActorRel(MatchingFor("GZ2E01"), "d_a_door_bossL1"),
Expand Down
11 changes: 11 additions & 0 deletions include/d/actor/d_a_alink.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3281,6 +3281,14 @@ class daAlink_c : public daPy_py_c {
virtual bool checkCopyRodEquip() const { return mEquipItem == fpcNm_ITEM_COPY_ROD; }
virtual BOOL checkCutJumpMode() const { return mProcID == PROC_CUT_JUMP; }

static BOOL checkDebugMoveInput() {
if (mDoCPd_c::isConnect(PAD_3)) {
return mDoCPd_c::getHoldB(PAD_1) && mDoCPd_c::getAnalogR(PAD_1) > 0.8f && mDoCPd_c::getTrigA(PAD_1);
}

return FALSE;
}

u32 checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
BOOL checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
BOOL checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
Expand Down Expand Up @@ -3538,6 +3546,8 @@ class daAlink_c : public daPy_py_c {
return mProcID == PROC_SPINNER_WAIT && mProcVar2.field_0x300c == 0;
}
bool checkRoofSwitchHang() const { return mProcID == PROC_ROOF_SWITCH_HANG; }
bool checkCanoeWait() const { return mProcID == PROC_CANOE_WAIT; }
bool checkCanoeSubjectivity() const { return mProcID == PROC_CANOE_SUBJECTIVITY; }

fopAc_ac_c* getCopyRodActor() { return mCopyRodAcKeep.getActor(); }
fopAc_ac_c* getHookshotRoofWaitActor() { return mCargoCarryAcKeep.getActor(); }
Expand All @@ -3555,6 +3565,7 @@ class daAlink_c : public daPy_py_c {

void seStartSystem(u32 i_seID) { mDoAud_seStart(i_seID, NULL, 0, 0); }
bool checkIronBallEquip() const { return mEquipItem == fpcNm_ITEM_IRONBALL; }
BOOL checkFishingRodEquip() const { return checkFishingRodItem(mEquipItem); }

f32 getAnmSpeedStickRate(f32 param_0, f32 param_1) const {
return param_0 + (field_0x33a8 * (param_1 - param_0));
Expand Down
73 changes: 38 additions & 35 deletions include/d/actor/d_a_canoe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/
class daCanoe_c : public fopAc_ac_c {
public:
/* 804DA5F4 */ void createHeap();
/* 804DA740 */ void create();
/* 804DA5F4 */ int createHeap();
/* 804DA740 */ int create();
/* 804DAEA8 */ ~daCanoe_c();
/* 804DB008 */ void setRoomInfo();
/* 804DB0B0 */ void setMatrix();
Expand All @@ -28,8 +28,8 @@ class daCanoe_c : public fopAc_ac_c {
/* 804DB828 */ void frontBackBgCheck();
/* 804DC330 */ void setPaddleEffect();
/* 804DC554 */ void setCanoeSliderEffect();
/* 804DC7B4 */ void execute();
/* 804DD35C */ void draw();
/* 804DC7B4 */ int execute();
/* 804DD35C */ int draw();

J3DModel* getModel() { return mpModel; }
MtxP getModelMtx() { return mpModel->getBaseTRMtx(); }
Expand All @@ -38,54 +38,55 @@ class daCanoe_c : public fopAc_ac_c {
void incShapeOffsetY(f32 offset) { mShapeOffsetY += offset; }
void incShapeAngleZ(s16 incZ) { shape_angle.z += incZ; }
void onRodID(fpc_ProcID i_rodID) { mRodID = i_rodID; }
void setWaterFallDownSe() { field_0x141c.startSound(Z2SE_AL_CANOE_FALL_DW, 0, -1); }
void setWaterFallDownSe() { mSound.startSound(Z2SE_AL_CANOE_FALL_DW, 0, -1); }
bool checkPaddleChangeWater() { return mPaddleWaterType == 3; }
void startInitPaddleWater() { mPaddleWaterType = 4; }
fpc_ProcID getRodID() { return mRodID; }

void setAimSpeed(f32 i_speed) { mAimSpeed = i_speed; }
void setAimAngle(s16 i_angle) {
mAimAngle = i_angle;
field_0x1442 = 1;
mIsForceAimAngle = TRUE;
}

void setPosAndAngle(cXyz const* i_pos, s16 i_angle) {
field_0x14d0 = *i_pos;
field_0x144a = i_angle;
field_0x1446 = 1;
mForcePos = *i_pos;
mForceAngle = i_angle;
mIsForcePosAngle = TRUE;
}

void setPaddleOffsetRight() {
field_0x1454 = 0x40;
field_0x1456 = 0xF;
field_0x1454 = 64;
field_0x1456 = 15;
}

void setPaddleOffsetLeft() {
field_0x1454 = -0x40;
field_0x1456 = 0xF;
field_0x1454 = -64;
field_0x1456 = 15;
}

private:
/* 0x0568 */ request_of_phase_process_class mPhaseReq;
/* 0x0570 */ J3DModel* mpModel;
/* 0x0574 */ J3DModel* mpPaddleModel;
/* 0x0578 */ J3DModel* mpMaskModel;
/* 0x057C */ dCcD_Stts field_0x57c;
/* 0x05B8 */ dBgS_AcchCir field_0x5b8[9];
/* 0x07F8 */ dBgS_LinkAcch field_0x7f8[3];
/* 0x0D80 */ dCcD_Cyl field_0xd80[5];
/* 0x13AC */ dBgS_LinkLinChk field_0x13ac;
/* 0x141C */ Z2SoundObjSimple field_0x141c;
/* 0x143C */ char* mResName;
/* 0x057C */ dCcD_Stts mCcStts;
/* 0x05B8 */ dBgS_AcchCir mAcchCir[3][3];
/* 0x07F8 */ dBgS_LinkAcch mAcch[3];
/* 0x0D80 */ dCcD_Cyl mCcCyl[5];
/* 0x13AC */ dBgS_LinkLinChk mLineChk;
/* 0x141C */ Z2SoundObjSimple mSound;
/* 0x143C */ const char* mArcName;
/* 0x1440 */ u8 mPaddleWaterType;
/* 0x1441 */ u8 field_0x1441;
/* 0x1442 */ u8 field_0x1442;
/* 0x1442 */ u8 mIsForceAimAngle;
/* 0x1443 */ u8 mJumpRideFlg;
/* 0x1444 */ u8 field_0x1444;
/* 0x1445 */ u8 mReverb;
/* 0x1446 */ u8 field_0x1446;
/* 0x1445 */ s8 mReverb;
/* 0x1446 */ u8 mIsForcePosAngle;
/* 0x1447 */ u8 mIsSliderHit;
/* 0x1448 */ s16 field_0x1448;
/* 0x144A */ s16 field_0x144a;
/* 0x144A */ s16 mForceAngle;
/* 0x144C */ s16 mAimAngle;
/* 0x144E */ s16 field_0x144e;
/* 0x1450 */ s16 field_0x1450;
Expand All @@ -94,24 +95,26 @@ class daCanoe_c : public fopAc_ac_c {
/* 0x1456 */ s16 field_0x1456;
/* 0x1458 */ s16 field_0x1458;
/* 0x145A */ s16 field_0x145a;
/* 0x145C */ s16 field_0x145c;
/* 0x145E */ s16 field_0x145e;
/* 0x145C */ s16 mHitInvulnerabilityTimer;
/* 0x145E */ u16 mHitCount;
/* 0x1460 */ s16 field_0x1460;
/* 0x1464 */ fpc_ProcID mRodID;
/* 0x1468 */ f32 mAimSpeed;
/* 0x146C */ f32 mShapeOffsetY;
/* 0x1470 */ f32 field_0x1470;
/* 0x1474 */ u32 field_0x1474;
/* 0x1478 */ u8 field_0x1478[0x1480 - 0x1478];
/* 0x1474 */ u32 mShadowId;
/* 0x1478 */ u32 field_0x1478;
/* 0x147C */ u8 field_0x147c[0x1480 - 0x147C];
/* 0x1480 */ u32 field_0x1480;
/* 0x1484 */ u8 field_0x1484[0x1490 - 0x1484];
/* 0x1484 */ u8 field_0x1484[0x1488 - 0x1484];
/* 0x1488 */ u32 field_0x1488[2];
/* 0x1490 */ u32 field_0x1490;
/* 0x1494 */ cXyz field_0x1494;
/* 0x14A0 */ cXyz field_0x14a0;
/* 0x14AC */ cXyz field_0x14ac;
/* 0x14B8 */ cXyz field_0x14b8;
/* 0x14C4 */ cXyz field_0x14c4;
/* 0x14D0 */ cXyz field_0x14d0;
/* 0x1494 */ cXyz mFrontPos;
/* 0x14A0 */ cXyz mBackPos;
/* 0x14AC */ cXyz mOldFrontPos;
/* 0x14B8 */ cXyz mOldBackPos;
/* 0x14C4 */ cXyz mWaterSpeed;
/* 0x14D0 */ cXyz mForcePos;
};

STATIC_ASSERT(sizeof(daCanoe_c) == 0x14dc);
Expand Down
2 changes: 2 additions & 0 deletions include/d/actor/d_a_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,6 +1046,8 @@ class daPy_py_c : public fopAc_ac_c {
void onForceSubjectCancel() { onEndResetFlg0(ERFLG0_FORCE_SUBJECT_CANCEL); }
void onEnemyDead() { onEndResetFlg0(ERFLG0_ENEMY_DEAD); }
void offDkCaught2() { offNoResetFlg0(FLG0_UNK_20000); }
void onWaterFallFrontHit() { onEndResetFlg1(ERFLG1_UNK_800); }
void onCanoeItemCancel() { onEndResetFlg1(ERFLG1_UNK_20000000); }

u32 checkBoarSingleBattle() const { return checkNoResetFlg2(daPy_FLG2(FLG2_UNK_1000000 | FLG2_BOAR_SINGLE_BATTLE)); }
u32 checkWolfDashAutoJump() const { return checkNoResetFlg2(FLG2_WOLF_DASH_AUTO_JUMP); }
Expand Down
8 changes: 6 additions & 2 deletions include/d/d_meter2_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class dMeter2Info_c {
void setMsgTimeMs(u32 msgTime) { mMsgTimeMs = msgTime; }
void setTimeMs(s32 i_time) { mTimeMs = i_time; }
u32 getTimeMs() { return mTimeMs; }
int getNowCount() { return mNowCount; }
u8 getNowCount() { return mNowCount; }
int getMaxCount() { return mMaxCount; }
void setScopeZoomPointer(u8 param_0) { mScopeZoomPointer = param_0; }
u8 getItemExplainWindowStatus() { return mItemExplainWindowStatus; }
Expand Down Expand Up @@ -635,7 +635,7 @@ inline void dMeter2Info_setTimeMs(s32 i_time) {
g_meter2_info.setTimeMs(i_time);
}

inline int dMeter2Info_getNowCount() {
inline u8 dMeter2Info_getNowCount() {
return g_meter2_info.getNowCount();
}

Expand Down Expand Up @@ -816,6 +816,10 @@ inline void dMeter2Info_setFloatingMessage(u16 pMessageID, s16 pMessageTimer, bo
g_meter2_info.setFloatingMessage(pMessageID, pMessageTimer, pWakuVisible);
}

inline void dMeter2Info_setMiniGameCount(s8 i_count) {
g_meter2_info.setMiniGameCount(i_count);
}

const char* dMeter2Info_getPlusTextureName();
const char* dMeter2Info_getNumberTextureName(int pIndex);
int dMeter2Info_recieveLetter();
Expand Down
2 changes: 1 addition & 1 deletion src/d/actor/d_a_L7demo_dr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ int daDr_c::create() {
if (dComIfG_play_c::getLayerNo(0) == 3) {
phase_state = dComIfG_resLoad(&mPhase, "B_dr");
if (phase_state == cPhs_COMPLEATE_e) {
OS_REPORT("dr PARAM %x\n", fopAcM_GetParam());
OS_REPORT("dr PARAM %x\n", fopAcM_GetParam(this));
OS_REPORT("dr//////////////DR SET 1 !!\n");

if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x68C0)) {
Expand Down
Loading