diff options
| author | TakaRikka <takarikka@outlook.com> | 2022-06-01 04:23:39 -0700 |
|---|---|---|
| committer | TakaRikka <takarikka@outlook.com> | 2022-06-01 04:23:39 -0700 |
| commit | 32cea78625839c5285a5f22eec6e7bbeef005c3c (patch) | |
| tree | 6171308ac96c3cbb1917c43167ac09dc86135df1 /libs/Z2AudioLib | |
| parent | 3f22fa448376893fffd83815ecd4cdccb197f1a4 (diff) | |
format
Diffstat (limited to 'libs/Z2AudioLib')
| -rw-r--r-- | libs/Z2AudioLib/Z2AudioMgr.cpp | 2 | ||||
| -rw-r--r-- | libs/Z2AudioLib/Z2WolfHowlMgr.cpp | 17 |
2 files changed, 8 insertions, 11 deletions
diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp index f79fda6e72..b6424a7e29 100644 --- a/libs/Z2AudioLib/Z2AudioMgr.cpp +++ b/libs/Z2AudioLib/Z2AudioMgr.cpp @@ -409,7 +409,7 @@ asm bool Z2AudioMgr::hasReset() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -//asm void Z2AudioMgr::startSound(JAISoundID param_0, JAISoundHandle* param_1, +// asm void Z2AudioMgr::startSound(JAISoundID param_0, JAISoundHandle* param_1, // JGeometry::TVec3<f32> const* param_2) { extern "C" asm void func_802CDB1C() { nofralloc diff --git a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp index 64a40bbf2d..e99da12893 100644 --- a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -130,15 +130,9 @@ SECTION_DATA static u16 sNewSong3[9] = { /* 803CBCC0-803CBD08 -00001 0048+00 1/1 0/0 0/0 .data sGuideData */ SECTION_DATA static Z2WolfHowlData sGuideData[9] = { - {4, sHowlTobikusa}, - {6, sHowlUmakusa}, - {6, sHowlZeldaSong}, - {6, sHealingSong}, - {6, sHowlSoulRequiem}, - {6, sHowlLightPrelude}, - {7, sNewSong1}, - {8, sNewSong2}, - {9, sNewSong3}, + {4, sHowlTobikusa}, {6, sHowlUmakusa}, {6, sHowlZeldaSong}, + {6, sHealingSong}, {6, sHowlSoulRequiem}, {6, sHowlLightPrelude}, + {7, sNewSong1}, {8, sNewSong2}, {9, sNewSong3}, }; /* 80450880-80450884 000300 0004+00 2/2 0/0 0/0 .sdata cPitchDown */ @@ -182,7 +176,10 @@ SECTION_SDATA static f32 sStickCenter = 1.0f / 5.0f; /* 804508A0-804508A8 000320 0008+00 1/0 0/0 0/0 .sdata sHowlTobikusa */ SECTION_SDATA static u16 sHowlTobikusa[4] = { - 0x011E, 0x031E, 0x011E, 0x031E, + 0x011E, + 0x031E, + 0x011E, + 0x031E, }; /* 80455E60-80455E64 004460 0004+00 8/8 0/0 0/0 .sdata2 @3485 */ |