diff options
| author | Kevin Alexis Contreras <36680385+KiritoDv@users.noreply.github.com> | 2022-06-13 10:05:42 -0500 |
|---|---|---|
| committer | Kevin Alexis Contreras <36680385+KiritoDv@users.noreply.github.com> | 2022-06-13 10:05:42 -0500 |
| commit | 394939347c152b7a682bc7b8481b0fb80a932e90 (patch) | |
| tree | 76009e53a5cdac375b0f0a6eb6dbbe037780a38c /soh/src/code | |
| parent | af8c5ab9781c3329e14ca826628fb77cde8b05ef (diff) | |
Code cleanup and fixes on 64bits
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/audio_init_params.c | 4 | ||||
| -rw-r--r-- | soh/src/code/audio_load.c | 3 | ||||
| -rw-r--r-- | soh/src/code/z_bgcheck.c | 8 |
3 files changed, 11 insertions, 4 deletions
diff --git a/soh/src/code/audio_init_params.c b/soh/src/code/audio_init_params.c index 6b8bc18fe..fa8f17a07 100644 --- a/soh/src/code/audio_init_params.c +++ b/soh/src/code/audio_init_params.c @@ -10,7 +10,11 @@ const s16 D_8014A6C0[] = { 0x0030, // gTatumsPerBeat }; +#ifdef _SOH64 const AudioContextInitSizes D_8014A6C4 = { 0x57F00, 0x2E0E0, 0xFCE0 }; +#else +const AudioContextInitSizes D_8014A6C4 = { 0x37F00, 0xE0E0, 0xBCE0 }; +#endif ReverbSettings D_80133420[][3] = { { diff --git a/soh/src/code/audio_load.c b/soh/src/code/audio_load.c index 587eb4194..b0e538334 100644 --- a/soh/src/code/audio_load.c +++ b/soh/src/code/audio_load.c @@ -718,8 +718,7 @@ uintptr_t AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) { if (ret != NULL) { *didAllocate = false; status = 2; - } else - { + } else { char* seqData = 0; SoundFont* fnt; diff --git a/soh/src/code/z_bgcheck.c b/soh/src/code/z_bgcheck.c index 7c8d86dfa..0fca4a29d 100644 --- a/soh/src/code/z_bgcheck.c +++ b/soh/src/code/z_bgcheck.c @@ -1516,7 +1516,11 @@ void BgCheck_Allocate(CollisionContext* colCtx, GlobalContext* globalCtx, Collis if (globalCtx->sceneNum == SCENE_MALON_STABLE) { // "/* BGCheck LonLon Size %dbyte */\n" osSyncPrintf("/* BGCheck LonLonサイズ %dbyte */\n", 0x3520); - colCtx->memSize = 0x3520 * (sizeof(void*) / 4); // 64-bit build needs more memory + #ifdef _SOH64 + colCtx->memSize = 0x3520 * (sizeof(void*) / 4); + #else + colCtx->memSize = 0x3520; + #endif } else { // "/* BGCheck Mini Size %dbyte */\n" osSyncPrintf("/* BGCheck ミニサイズ %dbyte */\n", 0x4E20); @@ -3787,7 +3791,7 @@ void CollisionHeader_SegmentedToVirtual(CollisionHeader* colHeader) { /** * Convert CollisionHeader Segmented to Virtual addressing */ -void CollisionHeader_GetVirtual(void* colHeader, CollisionHeader** dest) +void CollisionHeader_GetVirtual(void* colHeader, CollisionHeader** dest) { if (ResourceMgr_OTRSigCheck(colHeader)) colHeader = ResourceMgr_LoadColByName(colHeader); |