diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2023-02-16 13:09:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-16 14:09:22 -0700 |
| commit | 52d84413bb0186d773d9f14b926bdab4eb6caf38 (patch) | |
| tree | 696bffd1ae8761a76aa2065b2dc456d3c0bb9175 /libs/Z2AudioLib/Z2SoundObject.cpp | |
| parent | 2e3352a3a39025243bc00eb8028c70707e6b9d7b (diff) | |
d_a_alink_swim work / fix JASGlobalInstance (#288)
* daalink / z2linkmgr wip
* first cleanup of JASGlobalInstance data
* fix sInstance stuff part 2
* more d_a_alink_swim work
* remove asm
Diffstat (limited to 'libs/Z2AudioLib/Z2SoundObject.cpp')
| -rw-r--r-- | libs/Z2AudioLib/Z2SoundObject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp index 41a56257d9..d876f9f290 100644 --- a/libs/Z2AudioLib/Z2SoundObject.cpp +++ b/libs/Z2AudioLib/Z2SoundObject.cpp @@ -105,6 +105,7 @@ extern "C" extern Z2SoundInfo* data_80450B4C; extern "C" extern u8 data_80450B60[4]; extern "C" extern Z2SoundStarter* data_80450B74; extern "C" extern u8 data_80450B88[4]; +extern "C" extern u8 __OSReport_disable; // // Declarations: @@ -176,7 +177,7 @@ Z2SoundObjBase::Z2SoundObjBase() { //! structure layout order, indicating original code didn't use initializer list. mSoundPos = NULL; mIsInitialized = false; - mSoundStarter = data_80450B74; // sInstance + mSoundStarter = JASGlobalInstance<Z2SoundStarter>::getInstance(); // sInstance field_0x1c = 0; field_0x1e = 0; } |