mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-05 12:53:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-04-03 15:04:22 -04:00
parent 458d027fc9
commit 02f0aafbe4
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_agbsw0.cpp
+3 -3
View File
@@ -1079,11 +1079,11 @@ BOOL daAgbsw0_c::ExeSubMW() {
#if VERSION == VERSION_PAL
if (dComIfGp_getAgb()->field_0x67d ||
daPy_getPlayerLinkActorClass()->checkNoControll() ||
dComIfGp_checkPlayerStatus0(0, 0x08000000) ||
dComIfGp_checkPlayerStatus0(0, daPyStts0_CRAWL_e) ||
(
daPy_getPlayerActorClass()->checkPlayerFly() &&
!dComIfGp_checkPlayerStatus0(0, 0x00100000) &&
!dComIfGp_checkPlayerStatus0(0, 0x00010000)
!dComIfGp_checkPlayerStatus0(0, daPyStts0_SWIM_e) &&
!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)
)
) {
return TRUE;
src/d/actor/d_a_player_boomerang.inc
+5 -5
View File
@@ -16,7 +16,7 @@
/* 8014956C-80149590 .text checkBoomerangAnime__9daPy_lk_cCFv */
BOOL daPy_lk_c::checkBoomerangAnime() const {
return (checkBoomerangReadyAnime()) || (checkBoomerangThrowAnime());
return checkBoomerangReadyAnime() || checkBoomerangThrowAnime();
}
/* 80149590-80149698 .text throwBoomerang__9daPy_lk_cFv */
@@ -73,7 +73,7 @@ int daPy_lk_c::returnBoomerang() {
/* 801497A4-8014984C .text checkNextActionBoomerangReady__9daPy_lk_cFv */
BOOL daPy_lk_c::checkNextActionBoomerangReady() {
if ((!itemButton()) && (mpAttnActorLockOn != NULL || (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x10)))) {
if (!itemButton() && (mpAttnActorLockOn != NULL || dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x10))) {
setActAnimeUpper(
LKANM_BCK_BOOMTHROW,
UPPER_MOVE2_e,
@@ -93,7 +93,7 @@ BOOL daPy_lk_c::checkNextActionBoomerangFly() {
if (checkBoomerangReadyAnime()) {
checkNextActionBoomerangReady();
} else {
if ((itemTrigger()) && (mEquipItem == getReadyItem())) {
if (itemTrigger() && mEquipItem == getReadyItem()) {
setActAnimeUpper(
LKANM_BCK_BOOMWAIT,
UPPER_MOVE2_e,
@@ -121,8 +121,8 @@ BOOL daPy_lk_c::checkNextBoomerangMode() {
/* 80149964-80149A44 .text changeBoomerangCatchProc__9daPy_lk_cFv */
int daPy_lk_c::changeBoomerangCatchProc() {
if (checkNoResetFlg0(daPyFlg0_UNK20)) {
if ((((!dComIfGp_event_runCheck()) && (mDemo.getDemoType() == 0)) && (checkModeFlg(ModeFlg_00020000))) &&
(m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xffff || (checkBoomerangThrowAnime())))
if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 && checkModeFlg(ModeFlg_00020000) &&
(m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xffff || checkBoomerangThrowAnime()))
{
setActAnimeUpper(
LKANM_BCK_BOOMCATCH,
src/d/actor/d_a_ship.cpp
+10 -11
View File
@@ -4150,10 +4150,9 @@ BOOL daShip_c::execute() {
}
}
if (
!(!dComIfGs_isEventBit(0x2D10) ||
daPy_getPlayerLinkActorClass()->checkMasterSwordEquip()) ||
!(!dComIfGs_isEventBit(0x3804) || dComIfGs_isEventBit(0x2D02)) ||
!(!dComIfGs_isEventBit(0x3E10) || dComIfGs_isEventBit(0x3F80))
(dComIfGs_isEventBit(0x2D10) && !daPy_getPlayerLinkActorClass()->checkMasterSwordEquip()) ||
(dComIfGs_isEventBit(0x3804) && !dComIfGs_isEventBit(0x2D02)) ||
(dComIfGs_isEventBit(0x3E10) && !dComIfGs_isEventBit(0x3F80))
) {
attention_info.flags &= ~fopAc_Attn_ACTION_SHIP_e;
}
@@ -4238,20 +4237,20 @@ BOOL daShip_c::execute() {
cyl->SetC(sp9C);
dComIfG_Ccsp()->Set(cyl);
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) {
cyl->SetTgGrp(4);
cyl->SetTgGrp(cCcD_AtSPrm_VsPlayer_e);
}
else {
cyl->SetTgGrp(0xC);
cyl->SetTgGrp(cCcD_AtSPrm_VsPlayer_e | cCcD_AtSPrm_VsOther_e);
}
}
cMtx_multVec(m029C->getModel()->getAnmMtx(8), &sph_offset, &sp9C);
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) {
mSph.SetTgGrp(4);
mSph.SetTgGrp(cCcD_AtSPrm_VsPlayer_e);
}
else {
mSph.SetTgGrp(0xC);
mSph.SetTgGrp(cCcD_AtSPrm_VsPlayer_e | cCcD_AtSPrm_VsOther_e);
}
mSph.SetC(sp9C);
@@ -4264,12 +4263,12 @@ BOOL daShip_c::execute() {
}
if (mShipMode == Sailing) {
dComIfGp_setPlayerStatus1(0, 0x400);
dComIfGp_setPlayerStatus1(0, daPyStts1_SAIL_e);
mDoAud_setShipSailState(1);
}
else {
dComIfGp_clearPlayerStatus1(0, 0x400);
dComIfGp_clearPlayerStatus1(0, daPyStts1_SAIL_e);
mDoAud_setShipSailState(0);
}
@@ -4306,7 +4305,7 @@ BOOL daShip_c::shipDelete() {
mDoAud_seDeleteObject(&m102C);
mDoAud_seDeleteObject(&m1020);
mDoAud_seDeleteObject(&m1038);
dComIfGp_clearPlayerStatus1(0, 0x400);
dComIfGp_clearPlayerStatus1(0, daPyStts1_SAIL_e);
dComIfG_resDelete(&mPhs, l_arcName);
return TRUE;
}