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
This commit is contained in:
TakaRikka
2023-02-16 13:09:22 -08:00
committed by GitHub
parent ebc54b9a93
commit af684e72c6
301 changed files with 2061 additions and 3166 deletions
+2 -1
View File
@@ -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;
}