Skip to content

Add 3 GameAudio::Main methods implementation #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SwareJonge merged 4 commits into from
Jul 27, 2026
Merged

Add 3 GameAudio::Main methods implementation #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6407a84
Implement GameAudio::Main::bootDSP
joakim-d Jul 5, 2026
eb51664
Implement GameAudio::Main::isActive
joakim-d Jul 5, 2026
96e2dc3
Implement GameAudio::Main::isWaveLoaded
joakim-d Jul 5, 2026
0f7f4cc
Address comments
joakim-d Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/Inagaki/GameAudioMain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ class Main
JAISoundHandle _24[4]; //
JAISoundHandle _34[4]; //
FxLineConfig *mConfig; // 44
u8 _48[4]; //
u8 mState; // 48
u8 _padding[3]; //
PAUSE_STATUS mPauseStatus; // 4C
int _50; //
u8 _54[0x64 - 0x54]; //
Expand Down
31 changes: 27 additions & 4 deletions src/Inagaki/GameAudioMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#include "Inagaki/GameAudioMain.h"
#include "Inagaki/GameMapSoundMgr.h"

#include "JSystem/JAudio/System/JASAudioThread.h"
#include "JSystem/JAudio/System/JASWaveArcLoader.h"
#include "JSystem/JAudio/System/JASWaveBank.h"

namespace GameAudio {

Expand All @@ -12,9 +15,13 @@ Main::Main() {

void Main::init(JKRSolidHeap *, u32, void *, void *, u32) {}

void Main::bootDSP() {}
void Main::bootDSP() {
JASAudioThread::bootDSP();
}

bool Main::isActive() {}
bool Main::isActive() {
return mState & 0x10;
}

void Main::initRaceSound() {}

Expand All @@ -24,7 +31,23 @@ void Main::changeSection(u32) {}

void Main::checkSection() {}

bool Main::isWaveLoaded(WS_ID) {}
bool Main::isWaveLoaded(WS_ID id) {
JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::sInstance;
if(sectionHeap != nullptr)
{
JASWaveBank* bank = sectionHeap->sectionHeapData_.waveBankTable.getWaveBank(id);

if(bank != nullptr)
{
JASWaveArc* arc = bank->getWaveArc(0);
if (arc->_4c == 2) {
return true;
}
}
}

return false;
}

void Main::checkCourceOnRace() {}

Expand Down
Loading