mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-15 04:33:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

match c_bg_s, fix d_kankyo_rain double branches

Browse Source
This commit is contained in:
LagoLunatic
2023-11-30 20:22:55 -05:00
parent a8d10408a2
commit ac7c20cab4
3 changed files with 241 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SSystem/SComponent/c_bg_s.cpp
+12 -11
View File
@@ -76,19 +76,17 @@ static void dummy() {
}
/* 80246600-8024669C .text Release__4cBgSFP4cBgW */
int cBgS::Release(cBgW* bgw) {
bool cBgS::Release(cBgW* bgw) {
if (bgw == NULL)
return true;
if (bgw->ChkUsed() && bgw->GetId() >= 0 && bgw->GetId() < 0x100 && m_chk_element[bgw->GetId()].ChkUsed()) {
m_chk_element[bgw->GetId()].Release();
bgw->SetId(256);
goto done;
} else {
return true;
}
return true;
done:
return false;
}
@@ -136,8 +134,8 @@ f32 cBgS::GroundCross(cBgS_GndChk* chk) {
chk->ClearPi();
chk->mWallPrecheck = (chk->mFlag & 0x02);
chk->mGndPrecheck = (chk->mFlag & 0x01);
for (s32 bg_index = 0; bg_index < (s32)ARRAY_SIZE(m_chk_element); bg_index++) {
cBgS_ChkElm* elm = &m_chk_element[bg_index];
cBgS_ChkElm* elm = m_chk_element;
for (s32 bg_index = 0; bg_index < (s32)ARRAY_SIZE(m_chk_element); bg_index++, elm++) {
if (elm->ChkUsed() && elm->m_bgw_base_ptr->pm_vtx_tbl != NULL && !chk->ChkSameActorPid(elm->m_actor_id)) {
if (elm->m_bgw_base_ptr->GroundCrossGrpRp(chk, elm->m_bgw_base_ptr->m_rootGrpIdx, 1)) {
chk->SetActorInfo(bg_index, elm->m_bgw_base_ptr, elm->m_actor_id);
@@ -150,10 +148,13 @@ f32 cBgS::GroundCross(cBgS_GndChk* chk) {
/* 80246A14-80246C98 .text ConvDzb__4cBgSFPv */
void* cBgS::ConvDzb(void* work) {
cBgD_t * pbgd = (cBgD_t *)work;
if (pbgd->flag & 0x80000000)
return;
pbgd->flag |= 0x80000000;
if (((pbgd->flag & 0x80000000) == 0)) {
pbgd->flag |= 0x80000000;
} else {
return pbgd;
}
JUT_ASSERT(0x214, ((int)pbgd->m_v_tbl % 4) == 0);
JUT_ASSERT(0x215, ((int)pbgd->m_t_tbl % 2) == 0);
JUT_ASSERT(0x216, ((int)pbgd->m_b_tbl % 2) == 0);
@@ -173,7 +174,7 @@ void* cBgS::ConvDzb(void* work) {
for (s32 i = 0; i < pbgd->m_g_num; i++) {
pbgd->m_g_tbl[i].m_name = (char*)((u32)pbgd + (u32)pbgd->m_g_tbl[i].m_name);
}
return pbgd;
}