mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-13 03:59:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

misc match

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-12-30 15:44:47 -08:00
parent 0aa03af22b
commit 72c61dd705
2 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JUtility/JUTException.cpp
+4 -4
View File
@@ -881,7 +881,6 @@ bool JUTException::queryMapAddress_single(char* mapPath, u32 address, s32 sectio
section_idx++;
while (true) {
char* src;
char* dst;
while (true) {
int length = file.fgets(buffer, ARRAY_SIZE(buffer));
@@ -893,11 +892,12 @@ bool JUTException::queryMapAddress_single(char* mapPath, u32 address, s32 sectio
int i = 0;
src = buffer + 1;
dst = section_name;
for (; *src != '\0'; i++, dst++, src++) {
*dst = *src;
while (*src != '\0') {
section_name[i] = *src;
if (*src == ' ' || i == 0xf)
break;
i++;
src++;
}
section_name[i] = 0;
src/m_Do/m_Do_audio.cpp
+20 -22
View File
@@ -108,7 +108,6 @@ mDoDvdThd_mountArchive_c* l_arcCommand;
/* 80007090-80007224 .text mDoAud_Create__Fv */
void mDoAud_Create() {
/* Nonmatching */
if (!l_affCommand) {
l_affCommand = mDoDvdThd_toMainRam_c::create("/Audiores/JaiInit.aaf", 2, NULL);
if (!l_affCommand) {
@@ -123,28 +122,27 @@ void mDoAud_Create() {
return;
}
}
if (!l_affCommand->sync() || !l_arcCommand->sync()) {
return;
if (l_affCommand->sync() && l_arcCommand->sync()) {
JAIGlobalParameter::setParamInitDataPointer(l_affCommand->getMemAddress());
JAInter::SequenceMgr::setArchivePointer(l_arcCommand->getArchive());
mDoAud_setupStreamBuffer();
if (g_mDoAud_audioHeap) {
JKRSetCurrentHeap(NULL);
g_mDoAud_zelAudio.init(g_mDoAud_audioHeap, 0x00a00000);
JKRSetCurrentHeap(zeldaHeap);
g_mDoAud_audioHeap->adjustSize();
} else {
OSReport_Error("ヒープ確保失敗につきオーディオ初期化できません\n");
}
g_mDoAud_zelAudio.setEventBit(g_dComIfG_gameInfo.save.getEvent().getPEventBit());
g_mDoAud_zelAudio.reset();
JAIZelBasic::zel_basic->setOutputMode(OSGetSoundMode());
JKRHeap::free(l_affCommand->getMemAddress(), NULL);
delete l_affCommand;
delete l_arcCommand;
mDoAud_zelAudio_c::onInitFlag();
mDoDvdThd::SyncWidthSound = 1;
}
JAIGlobalParameter::setParamInitDataPointer(l_affCommand->getMemAddress());
JAInter::SequenceMgr::setArchivePointer(l_arcCommand->getArchive());
mDoAud_setupStreamBuffer();
if (g_mDoAud_audioHeap) {
JKRSetCurrentHeap(NULL);
g_mDoAud_zelAudio.init(g_mDoAud_audioHeap, 0x00a00000);
JKRSetCurrentHeap(zeldaHeap);
g_mDoAud_audioHeap->adjustSize();
} else {
OSReport_Error("ヒープ確保失敗につきオーディオ初期化できません\n");
}
g_mDoAud_zelAudio.setEventBit(g_dComIfG_gameInfo.save.getEvent().getPEventBit());
g_mDoAud_zelAudio.reset();
JAIZelBasic::zel_basic->setOutputMode(OSGetSoundMode());
JKRHeap::free(l_affCommand->getMemAddress(), NULL);
delete l_affCommand;
delete l_arcCommand;
mDoAud_zelAudio_c::onInitFlag();
mDoDvdThd::SyncWidthSound = 1;
}
/* 80007224-80007268 .text mDoAud_Execute__Fv */