From c3ad069ff8cefe776ff534f6874d17116e71969d Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 7 Jan 2024 03:41:22 -0500 Subject: [PATCH] JPN fix --- include/JAZelAudio/JAIZelBasic.h | 3 +++ src/m_Do/m_Do_audio.cpp | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/include/JAZelAudio/JAIZelBasic.h b/include/JAZelAudio/JAIZelBasic.h index 49d49d1e4..92ff20714 100644 --- a/include/JAZelAudio/JAIZelBasic.h +++ b/include/JAZelAudio/JAIZelBasic.h @@ -186,7 +186,10 @@ public: /* 0x0021 */ u8 field_0x0021; /* 0x0022 */ u8 field_0x0022[0x0024 - 0x0022]; /* 0x0024 */ int field_0x0024; +#if VERSION != VERSION_JPN /* 0x0028 */ int field_0x0028; +#endif + /* Offsets below are for USA/PAL */ /* 0x002C */ u8 mHour; /* 0x002D */ u8 mMinute; /* 0x002E */ u8 mWeekday; diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index a87bdc622..c3f692cd2 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -8,6 +8,7 @@ #include "JSystem/JAudio/JAISequenceMgr.h" #include "JSystem/JAudio/JAIStreamMgr.h" #include "JSystem/JKernel/JKRSolidHeap.h" +#include "JSystem/JUtility/JUTConsole.h" #include "SSystem/SComponent/c_lib.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_controller_pad.h" @@ -129,9 +130,15 @@ void mDoAud_Create() { JAInter::SequenceMgr::setArchivePointer(l_arcCommand->getArchive()); mDoAud_setupStreamBuffer(); if (g_mDoAud_audioHeap) { +#if VERSION == VERSION_JPN + JUTReportConsole("mDoAud_Create g_mDoAud_zelAudio.init before\n"); +#endif JKRSetCurrentHeap(NULL); g_mDoAud_zelAudio.init(g_mDoAud_audioHeap, 0x00a00000); JKRSetCurrentHeap(zeldaHeap); +#if VERSION == VERSION_JPN + JUTReportConsole("mDoAud_Create g_mDoAud_zelAudio.init after\n"); +#endif g_mDoAud_audioHeap->adjustSize(); } else { OSReport_Error("ヒープ確保失敗につきオーディオ初期化できません\n");