Fix up JP splits and link a lot more TUs (#2636)

This commit is contained in:
Max Roncace
2025-09-09 10:15:45 -04:00
committed by GitHub
parent 6b1f5b95de
commit 2d5ae111b7
135 changed files with 365 additions and 309 deletions
+4
View File
@@ -572,6 +572,10 @@ static void e_mk_shoot(e_mk_class* i_this) {
i_this->mSound.startCreatureVoice(Z2SE_EN_MK_V_CATCH_BOOM, -1);
i_this->mSound.startCreatureSound(Z2SE_EN_MK_CATCH_BOOM, 0, -1);
#if VERSION == VERSION_GCN_JPN
return;
#endif
}
}
+1 -1
View File
@@ -1510,7 +1510,7 @@ static int daE_YK_Create(fopAc_ac_c* i_this) {
} else {
if (yk->mPathIdx != 0xff) {
yk->mpPath = dPath_GetRoomPath(yk->mPathIdx,fopAcM_GetRoomNo(yk));
if (!yk->mpPath) {
return cPhs_ERROR_e;
}
+4
View File
@@ -3904,7 +3904,11 @@ static int daMg_Fish_Create(fopAc_ac_c* i_this) {
a_this->mResName = "O_gD_bott";
}
#if VERSION == VERSION_GCN_JPN
lit_1008 = 0;
#else
lit_1008 = 1;
#endif
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&a_this->mPhaseReq, a_this->mResName);
cPhs__Step retval = phase;