mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-23 06:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-03-31 13:49:02 -04:00
parent f4587892ff
commit a601fa33e5
12 changed files with 57 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_player_main.h
+4 -4
View File
@@ -1403,17 +1403,17 @@ public:
BOOL checkNextModeSwim();
BOOL changeSwimProc();
BOOL changeSwimUpProc();
void swimOutAfter(int);
void swimOutAfter(BOOL);
BOOL checkSwimFallCheck();
BOOL changeSwimOutProc();
void setSwimMoveAnime(daPy_ANM);
f32 getSwimTimerRate();
void setSwimTimerStartStop();
BOOL procSwimUp_init(int);
BOOL procSwimUp_init(BOOL);
BOOL procSwimUp();
BOOL procSwimWait_init(int);
BOOL procSwimWait_init(BOOL);
BOOL procSwimWait();
BOOL procSwimMove_init(int);
BOOL procSwimMove_init(BOOL);
BOOL procSwimMove();
void setSpecialBattle(int);
void changeSpecialBattle();
include/d/d_stage.h
+1 -1
View File
@@ -277,7 +277,7 @@ public:
struct dStage_dPnt_c {
/* 0x0 */ int num;
/* 0x4 */ u32 m_pnt_offset;
}; // Size: 0x10
}; // Size: 0x8
struct dStage_FloorInfo_entry_c {
/* 0x00 */ int field_0x00;
src/d/actor/d_a_player_dproc.inc
+11 -12
View File
@@ -178,7 +178,9 @@ BOOL daPy_lk_c::dProcTool_init() {
}
/* 8012D3C4-8012DA3C .text dProcTool__9daPy_lk_cFv */
BOOL daPy_lk_c::dProcTool() { /* Nonmatching */ }
BOOL daPy_lk_c::dProcTool() {
/* Nonmatching */
}
/* 8012DA3C-8012DBD0 .text dProcTalk_init__9daPy_lk_cFv */
BOOL daPy_lk_c::dProcTalk_init() {
@@ -839,10 +841,10 @@ BOOL daPy_lk_c::dProcDead_init() {
return true;
}
int iVar4 = checkShipRideUseItem(0);
uint uVar2 = checkModeFlg(ModeFlg_SWIM);
uint uVar3 = mNoResetFlg0 & 0x100;
u32 uVar2 = checkModeFlg(ModeFlg_SWIM);
u32 uVar3 = mNoResetFlg0 & 0x100;
if (uVar2 != 0) {
swimOutAfter(0);
swimOutAfter(FALSE);
}
commonProcInit(daPyProc_DEMO_DEAD_e);
if (dComIfGp_event_compulsory(this)) {
@@ -1970,8 +1972,8 @@ BOOL daPy_lk_c::dProcGetDance() {
dComIfGp_evmng_cutEnd(mStaffIdx);
return true;
}
if (!(!(mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= 11.0f) ||
!(mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() <= 17.0f))) {
if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= 11.0f &&
mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() <= 17.0f) {
if (m34D0 == 0) {
m34D0 = 1;
mDoAud_subBgmStart(JA_BGM_GET_SONG);
@@ -2057,9 +2059,7 @@ BOOL daPy_lk_c::dProcBottleOpenFairy() {
} else {
dComIfGs_setEquipBottleItemEmpty(dItemBtn_Z_e);
}
fopAc_ac_c *fa1 = (fopAc_ac_c *)fopAcM_fastCreate(
PROC_NPC_FA1, 3, &mLeftHandPos, fopAcM_GetRoomNo(this),
&shape_angle);
fopAcM_fastCreate(PROC_NPC_FA1, 3, &mLeftHandPos, fopAcM_GetRoomNo(this), &shape_angle);
}
}
}
@@ -2202,8 +2202,7 @@ BOOL daPy_lk_c::dProcPowerUp() {
if (m3574 != 0) {
dComIfGp_evmng_cutEnd(mStaffIdx);
return true;
} else if (!(!(mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= 11.0f) ||
(m34D0 != 0))) {
} else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= 11.0f && m34D0 == 0) {
m34D0 = 1;
mDoAud_subBgmStart(JA_BGM_ITEM_GET);
// mItemLifeCountType? (according to TP)
@@ -2298,7 +2297,7 @@ BOOL daPy_lk_c::dProcLastCombo() {
}
if (frameCtrl.getFrame() >= 26.0f) {
if (frameCtrl.getFrame() < 35.0f) {
if (!(checkNoResetFlg0(daPyFlg0_CUT_AT_FLG))) {
if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) {
onResetFlg0(daPyRFlg0_UNK1);
}
onResetFlg0(daPyRFlg0_UNK2);
src/d/actor/d_a_player_food.inc
+1 -1
View File
@@ -125,7 +125,7 @@ BOOL daPy_lk_c::procFoodThrow() {
dCam_getBody()->EndEventCamera(playerPID);
endDemoMode();
}
} else if (frameCtrl.checkPass(9.0f)) {
} else if (frameCtrl.checkPass(8.0f)) {
seStartOnlyReverb(JA_SE_LK_ESA_THROW);
void* esa = fopAcM_fastCreate(PROC_ESA, 0xFFFF0014, &mLeftHandPos, fopAcM_GetRoomNo(this), &shape_angle);
if (esa) {
src/d/actor/d_a_player_main.cpp
+5 -5
View File
@@ -923,7 +923,7 @@ BOOL daPy_lk_c::draw() {
} else {
hideHatAndBackle(link_root_joint->getMesh());
}
if (!checkNormalSwordEquip() && dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) != dStageType_FF1_e ||
if ((!checkNormalSwordEquip() && dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) != dStageType_FF1_e) ||
checkCaughtShapeHide() || checkDemoShieldNoDraw())
{
mpCLModelData->getJointNodePointer(0x0D)->getMesh()->getShape()->hide(); // cl_podA joint
@@ -1877,7 +1877,7 @@ BOOL daPy_lk_c::changeDamageProc() {
}
if (checkModeFlg(ModeFlg_04000000)) {
if (r30 || mCyl.ChkTgHit() && !checkSuccessGuard(spl)) {
if (r30 || (mCyl.ChkTgHit() && !checkSuccessGuard(spl))) {
setDamagePoint(-damage);
mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x2;
@@ -2297,7 +2297,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) {
freeHookshotItem();
}
if (temp_r28 && !checkModeFlg(ModeFlg_SWIM)) {
swimOutAfter(0);
swimOutAfter(FALSE);
}
dComIfGp_setAdvanceDirection(0);
@@ -3073,7 +3073,7 @@ void daPy_lk_c::setBgCheckParam() {
/* 801200F8-8012010C .text setParamData__9daPy_lk_cFiiii */
u32 daPy_lk_c::setParamData(int roomNo, int spawnType, int eventInfoIdx, int extraParams) {
return roomNo & 0x3F | (spawnType & 0xF) << 0xC | eventInfoIdx << 0x18 | extraParams;
return (roomNo & 0x3F) | (spawnType & 0xF) << 0xC | eventInfoIdx << 0x18 | extraParams;
}
/* 8012010C-8012024C .text checkLavaFace__9daPy_lk_cFP4cXyzi */
@@ -3956,7 +3956,7 @@ void daPy_lk_c::initTextureScroll() {
m_texMtxAnm[no].setAnmTransform(btk);
m_texMtxAnm[no].setAnmIndex(no);
tmtx->getTexMtxInfo().mInfo = tmtx->getTexMtxInfo().mInfo & 0x7F | btk->getTexMtxCalcType() << 7;
tmtx->getTexMtxInfo().mInfo = (tmtx->getTexMtxInfo().mInfo & 0x7F) | btk->getTexMtxCalcType() << 7;
// Fakematch? The codegen doesn't match unless a temp variable is used and assigned to multiple times.
Vec* temp = &btk->getSRTCenter(no);
tmtx->getTexMtxInfo().mCenter.x = temp->x;
src/d/actor/d_a_player_swim.inc
+17 -18
View File
@@ -161,10 +161,10 @@ BOOL daPy_lk_c::changeSwimProc() {
local_18.z = current.pos.z;
fopKyM_createWpillar(&local_18, 1.0f, oldSpeedY, 0);
seStartOnlyReverb(JA_SE_LK_INTO_WATER);
res = procSwimWait_init(0);
res = procSwimWait_init(FALSE);
}
else {
res = procSwimUp_init(0);
res = procSwimUp_init(FALSE);
}
}
else {
@@ -190,13 +190,13 @@ BOOL daPy_lk_c::changeSwimUpProc() {
current.pos.y = m35D0;
return TRUE;
}
return procSwimUp_init(1);
return procSwimUp_init(TRUE);
}
return FALSE;
}
/* 8013D2AC-8013D314 .text swimOutAfter__9daPy_lk_cFi */
void daPy_lk_c::swimOutAfter(int param_1) {
void daPy_lk_c::swimOutAfter(BOOL param_1) {
onNoResetFlg0(daPyFlg0_UNK100);
m35C4 = 0.0f;
if (param_1) {
@@ -230,19 +230,19 @@ BOOL daPy_lk_c::changeSwimOutProc() {
current.pos.y += m35C4;
}
swimOutAfter(1);
swimOutAfter(TRUE);
return procFall_init(1, l_HIO_wallCatch_c0.m.field_0x54);
}
else {
if (!checkNoResetFlg0(daPyFlg0_UNK80) || pcVar1 && pcVar1->mNormal.y >= 0.5f && m35D0 - mAcch.GetGroundH() < l_HIO_swim_c0.m.field_0x24 - 5.0f) {
if (!checkNoResetFlg0(daPyFlg0_UNK80) || (pcVar1 && pcVar1->mNormal.y >= 0.5f && m35D0 - mAcch.GetGroundH() < l_HIO_swim_c0.m.field_0x24 - 5.0f)) {
current.pos.y = m35D0;
if (mCurProc == daPyProc_SWIM_MOVE_e && m34B8) {
current.pos.y += m35C4;
}
swimOutAfter(1);
swimOutAfter(TRUE);
return checkNextMode(0);
}
@@ -320,7 +320,7 @@ void daPy_lk_c::setSwimTimerStartStop() {
}
/* 8013D814-8013DA18 .text procSwimUp_init__9daPy_lk_cFi */
BOOL daPy_lk_c::procSwimUp_init(int param_1) {
BOOL daPy_lk_c::procSwimUp_init(BOOL param_1) {
JPABaseEmitter* mEmitter;
static JGeometry::TVec3<f32> splash_scale(0.4f, 0.4f, 0.4f);
@@ -357,26 +357,25 @@ BOOL daPy_lk_c::procSwimUp_init(int param_1) {
mEmitter->setGlobalParticleScale(ripple_scale);
}
}
m3570 = 0;
return TRUE;
}
/* 8013DA18-8013DB24 .text procSwimUp__9daPy_lk_cFv */
BOOL daPy_lk_c::procSwimUp() {
int iVar1;
J3DFrameCtrl* mFrameCtrl = mFrameCtrlUnder;
setSpeedAndAngleSwim();
if (!changeSwimOutProc()) {
if (mFrameCtrl->getRate() < 0.01f) {
procSwimWait_init(0);
procSwimWait_init(FALSE);
}
else {
if (mFrameCtrl->getFrame() > l_HIO_swim_c0.m.field_0x34) {
if (mStickDistance > 0.05f) {
procSwimMove_init(0);
procSwimMove_init(FALSE);
}
}
else {
@@ -397,7 +396,7 @@ BOOL daPy_lk_c::procSwimUp() {
}
/* 8013DB24-8013DCDC .text procSwimWait_init__9daPy_lk_cFi */
BOOL daPy_lk_c::procSwimWait_init(int param_1) {
BOOL daPy_lk_c::procSwimWait_init(BOOL param_1) {
float fVar2;
u32 uVar3;
@@ -471,7 +470,7 @@ BOOL daPy_lk_c::procSwimWait() {
mFrameCtrlUnder[0].setRate((float)(getSwimTimerRate() * l_HIO_swim_c0.m.field_0x70) + l_HIO_swim_c0.m.field_0x40);
if (mStickDistance > 0.05f) {
procSwimMove_init(1);
procSwimMove_init(TRUE);
}
setSwimTimerStartStop();
@@ -481,10 +480,10 @@ BOOL daPy_lk_c::procSwimWait() {
}
/* 8013DE8C-8013DF60 .text procSwimMove_init__9daPy_lk_cFi */
BOOL daPy_lk_c::procSwimMove_init(int param_1) {
BOOL daPy_lk_c::procSwimMove_init(BOOL param_1) {
commonProcInit(daPyProc_SWIM_MOVE_e);
if (param_1 == 0) {
if (!param_1) {
mFrameCtrlUnder[0].setFrame(0.0f);
}
@@ -597,12 +596,12 @@ BOOL daPy_lk_c::procSwimMove() {
}
if (changeFrontWallTypeProc()) {
swimOutAfter(1);
swimOutAfter(TRUE);
return TRUE;
}
if (mStickDistance <= 0.05f) {
procSwimWait_init(1);
procSwimWait_init(TRUE);
}
else if ((!m34B8 && mFrameCtrl->checkPass(20.0f)) || (m34B8 && mFrameCtrl->checkPass(0.0f))) {
seStartOnlyReverb(JA_SE_LK_SWIM);
src/d/actor/d_a_tag_so.cpp
-3
View File
@@ -11,7 +11,6 @@
daTag_So_HIO_c::daTag_So_HIO_c() {
mNo = -1;
m05 = 0;
return;
}
static daTag_So_HIO_c l_HIO;
@@ -27,7 +26,6 @@ void daTag_So_c::debugDraw() {
actorPos.y += 20.0f;
if (m298 == 1)
dLib_debugDrawFan(actorPos, shape_angle.y, 0x3500, mRadius, (GXColor){0xFF, 0x00, 0x00, 0x80});
return;
}
/* 0000018C-000001C4 .text _draw__10daTag_So_cFv */
@@ -52,7 +50,6 @@ void daTag_So_c::getArg() {
else {
mRadius = paramRadius * 100;
}
return;
}
/* 00000224-0000027C .text _create__10daTag_So_cFv */
src/d/d_bg_s_wtr_chk.cpp
-2
View File
@@ -4,10 +4,8 @@
//
#include "d/d_bg_s_wtr_chk.h"
#include "dolphin/types.h"
/* 800A5BDC-800A5C3C .text __ct__11dBgS_WtrChkFv */
dBgS_WtrChk::dBgS_WtrChk() {
OnWaterGrp();
}
src/d/d_event.cpp
+6 -6
View File
@@ -71,16 +71,16 @@ s32 dEvt_control_c::order(u16 eventType, u16 priority, u16 flag, u16 hindFlag, v
/* 8007002C-8007015C .text setParam__14dEvt_control_cFP12dEvt_order_c */
void dEvt_control_c::setParam(dEvt_order_c* order) {
dStage_EventInfo_c* stageEventInfo = dComIfGp_getStageEventInfo();
mPt1 = getPId(order->mActor1);
mPt2 = getPId(order->mActor2);
setPt1(order->mActor1);
setPt2(order->mActor2);
mEventId = order->mEventId;
mHindFlag = order->mHindFlag;
if (dComIfGp_getPlayer(0) != order->mActor1) {
mPtTalk = getPId(order->mActor1);
mPtItem = getPId(order->mActor1);
setPtT(order->mActor1);
setPtI(order->mActor1);
} else {
mPtTalk = getPId(order->mActor2);
mPtItem = getPId(order->mActor2);
setPtT(order->mActor2);
setPtI(order->mActor2);
}
mEventInfoIdx = order->mEventInfoIdx;
src/d/d_kankyo_wether.cpp
+8 -4
View File
@@ -590,10 +590,14 @@ void wether_move_snow() {
/* 80088A50-80088D08 .text wether_move_star__Fv */
void wether_move_star() {
if (dComIfGp_checkStatus(1) && (!g_env_light.mbVrboxInvisible &&
strcmp(dComIfGp_getStartStageName(), "M_DragB") != 0) ||
strcmp(dComIfGp_getStartStageName(), "Name") == 0)
{
if (
(
dComIfGp_checkStatus(1) &&
!g_env_light.mbVrboxInvisible &&
strcmp(dComIfGp_getStartStageName(), "M_DragB") != 0
) ||
strcmp(dComIfGp_getStartStageName(), "Name") == 0
) {
f32 time = g_env_light.getDaytime();
f32 target;
src/d/d_ovlp_fade2.cpp
+1 -1
View File
@@ -130,7 +130,7 @@ void dOvlpFd2_c::execFirstSnap() {
void dOvlpFd2_c::execFadeOut() {
dComIfGp_setWindowNum(0);
cLib_chaseAngleS(&field_0x112, 2000, 100);
s16 r5 = ((field_0x110 + 0x4000) & 0x8000 | 0x4000) - field_0x112;
s16 r5 = (((field_0x110 + 0x4000) & 0x8000) | 0x4000) - field_0x112;
field_0x110 += field_0x112;
s16 r0_1 = r5 - field_0x110;
if (field_0x112 * r0_1 < 0) {
src/f_op/f_op_actor_mng.cpp
+3 -3
View File
@@ -933,7 +933,7 @@ fpc_ProcID fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz
}
i_itemNo = check_itemno(i_itemNo);
u32 params = (i_itemBitNo & 0x7F) << 0x08 | i_itemNo & 0xFF | (param_7 & 0xF) << 0xF;
u32 params = (i_itemBitNo & 0x7F) << 0x08 | (i_itemNo & 0xFF) | (param_7 & 0xF) << 0xF;
return fopAcM_create(PROC_RACEITEM, params, pos, roomNo, angle, scale);
}
@@ -944,7 +944,7 @@ fpc_ProcID fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz
return fpcM_ERROR_PROCESS_ID_e;
}
u32 params = i_itemNo & 0xFF | (i_itemBitNo & 0x7F) << 0x08 | (argFlag & 0xFF) << 0x10;
u32 params = (i_itemNo & 0xFF) | (i_itemBitNo & 0x7F) << 0x08 | (argFlag & 0xFF) << 0x10;
return fopAcM_create(PROC_Demo_Item, params, pos, roomNo, angle, scale);
}
@@ -1274,7 +1274,7 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) {
/* 80027A9C-80027B24 .text fopAcM_createDisappear__FP10fopAc_ac_cP4cXyzUcUcUc */
fpc_ProcID fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health, u8 i_itemBitNo) {
u32 params = (i_itemBitNo & 0xFF) << 0x10 | (i_scale & 0xFF) << 0x08 | i_health & 0xFF;
u32 params = (i_itemBitNo & 0xFF) << 0x10 | (i_scale & 0xFF) << 0x08 | (i_health & 0xFF);
fopAc_ac_c* disappear = (fopAc_ac_c*)fopAcM_fastCreate(PROC_DISAPPEAR, params, p_pos, fopAcM_GetRoomNo(i_actor), fopAcM_GetAngle_p(i_actor));
if (disappear) {
disappear->itemTableIdx = i_actor->itemTableIdx;