github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-07-16 10:02:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code cleanup and fixes on 64bits

Browse source
This commit is contained in:
Kevin Alexis Contreras 2022-06-13 10:05:42 -05:00
parent af8c5ab978
commit 394939347c
6 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soh/src/code/audio_init_params.c
View file

@ -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] = {
{

3
soh/src/code/audio_load.c
View file

@ -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;

8
soh/src/code/z_bgcheck.c
View file

@ -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);