diff --git a/port/include/romdata.h b/port/include/romdata.h index 545190eb8..6f64a602c 100644 --- a/port/include/romdata.h +++ b/port/include/romdata.h @@ -6,15 +6,6 @@ extern u8 *g_RomFile; extern u32 g_RomFileSize; -typedef enum { - FT_BG, - FT_TILES, - FT_LANG, - FT_SETUP, - FT_PADS, - FT_MODEL -} FileType; - s32 romdataInit(void); u8 *romdataFileLoad(s32 fileNum, u32 *outSize); @@ -30,7 +21,7 @@ s32 romdataFileGetNumForName(const char *name); u8 *romdataSegGetData(const char *segName); u8 *romdataSegGetDataEnd(const char *segName); u32 romdataSegGetSize(const char *segName); -u32 romdataFileGetEstimatedSize(u32 size, FileType filetype); +u32 romdataFileGetEstimatedSize(const u32 size, const u32 loadtype); s32 romdataCheckGbcRom(void); diff --git a/port/src/preprocess/filelang.c b/port/src/preprocess/filelang.c index 408d9402b..f9fd434ad 100644 --- a/port/src/preprocess/filelang.c +++ b/port/src/preprocess/filelang.c @@ -76,7 +76,7 @@ u32 convertLangFile(u8 *dst, u8 *src, size_t srclen) } u8 *preprocessLangFile(u8 *data, u32 size, u32 *outSize) { - u32 newSizeEstimated = romdataFileGetEstimatedSize(size, FT_LANG); + u32 newSizeEstimated = romdataFileGetEstimatedSize(size, LOADTYPE_LANG); u8 *dst = sysMemZeroAlloc(newSizeEstimated); u32 newSize = convertLangFile(dst, data, size); diff --git a/port/src/preprocess/filemodel.c b/port/src/preprocess/filemodel.c index ff006cd53..ddab206da 100644 --- a/port/src/preprocess/filemodel.c +++ b/port/src/preprocess/filemodel.c @@ -987,7 +987,7 @@ u8 *preprocessModelFile(u8 *data, u32 size, u32 *outSize) { gbiReset(); - u32 newSizeEstimated = romdataFileGetEstimatedSize(size, FT_MODEL); + u32 newSizeEstimated = romdataFileGetEstimatedSize(size, LOADTYPE_MODEL); u8 *dst = sysMemZeroAlloc(newSizeEstimated); u32 newSize = convertModel(dst, data, size); @@ -1008,7 +1008,7 @@ u8 *preprocessGunFile(u8 *data, u32 size, u32 *outSize) { gbiReset(); - u32 newSizeEstimated = romdataFileGetEstimatedSize(size, FT_MODEL); + u32 newSizeEstimated = romdataFileGetEstimatedSize(size, LOADTYPE_MODEL); u8 *dst = sysMemZeroAlloc(newSizeEstimated+128); u32 newSize = convertModel(dst, data, size); diff --git a/port/src/preprocess/filepads.c b/port/src/preprocess/filepads.c index 3441740cb..bcbbe1c69 100644 --- a/port/src/preprocess/filepads.c +++ b/port/src/preprocess/filepads.c @@ -310,7 +310,7 @@ static int convertPadsFile(u8 *dst, u8 *src) } u8* preprocessPadsFile(u8 *data, u32 size, u32 *outSize) { - u32 newSizeEstimated = romdataFileGetEstimatedSize(size, FT_PADS); + u32 newSizeEstimated = romdataFileGetEstimatedSize(size, LOADTYPE_PADS); u8* dst = sysMemZeroAlloc(newSizeEstimated); u32 newSize = convertPadsFile(dst, data); diff --git a/port/src/preprocess/filesetup.c b/port/src/preprocess/filesetup.c index d4d0727bc..1ffd46d46 100644 --- a/port/src/preprocess/filesetup.c +++ b/port/src/preprocess/filesetup.c @@ -1181,7 +1181,7 @@ static int convertSetup(u8 *dst, u8 *src, u32 srclen) } u8 *preprocessSetupFile(u8 *data, u32 size, u32 *outSize) { - u32 newSizeEstimated = romdataFileGetEstimatedSize(size, FT_SETUP); + u32 newSizeEstimated = romdataFileGetEstimatedSize(size, LOADTYPE_SETUP); u8 *dst = sysMemZeroAlloc(newSizeEstimated); u32 newSize = convertSetup(dst, data, size); diff --git a/port/src/preprocess/filetiles.c b/port/src/preprocess/filetiles.c index df261536d..db0e66f69 100644 --- a/port/src/preprocess/filetiles.c +++ b/port/src/preprocess/filetiles.c @@ -88,7 +88,7 @@ u32 convertTiles(u8 *dst, u8 *src, size_t srclen) u8 *preprocessTilesFile(u8 *data, u32 size, u32 *outSize) { - u32 newSizeEstimated = romdataFileGetEstimatedSize(size, FT_TILES); + u32 newSizeEstimated = romdataFileGetEstimatedSize(size, LOADTYPE_TILES); u8 *dst = sysMemZeroAlloc(newSizeEstimated); u32 newSize = convertTiles(dst, data, size); diff --git a/port/src/romdata.c b/port/src/romdata.c index e16315714..455659110 100644 --- a/port/src/romdata.c +++ b/port/src/romdata.c @@ -587,20 +587,20 @@ u32 romdataSegGetSize(const char *segName) return romdataGetSeg(segName)->size; } -u32 romdataFileGetEstimatedSize(u32 size, FileType filetype) +u32 romdataFileGetEstimatedSize(const u32 size, const u32 loadtype) { #ifdef PLATFORM_64BIT - switch (filetype) { - case FT_BG: return (u32)(size * 1.1); - case FT_TILES: return (u32)(size * 1.1); - case FT_LANG: return (u32)(size * 1.3); - case FT_SETUP: return (u32)(size * 1.5); - case FT_PADS: return (u32)(size * 1.7); - case FT_MODEL: return (u32)(size * 1.7); + switch (loadtype) { + case LOADTYPE_BG: return (u32)(size * 1.1f); + case LOADTYPE_TILES: return (u32)(size * 1.1f); + case LOADTYPE_LANG: return (u32)(size * 1.3f); + case LOADTYPE_SETUP: return (u32)(size * 1.5f); + case LOADTYPE_PADS: return (u32)(size * 1.7f); + case LOADTYPE_MODEL: return (u32)(size * 1.7f); + case LOADTYPE_GUN: return (u32)(size * 1.7f); default: - sysLogPrintf(LOG_WARNING, "wrong file type in romdataFileGetEstimatedSize: %d", filetype); + sysLogPrintf(LOG_WARNING, "romdataFileGetEstimatedSize: wrong loadtype %d", loadtype); } #endif return size; } - diff --git a/src/game/bg.c b/src/game/bg.c index 1ad070d12..0b71bbdf4 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -1512,7 +1512,7 @@ void bgReset(s32 stagenum) var8007fc54 -= 0xc; #ifdef PLATFORM_64BIT - inflatedsize = romdataFileGetEstimatedSize(inflatedsize, FT_BG); + inflatedsize = romdataFileGetEstimatedSize(inflatedsize, LOADTYPE_BG); #endif inflatedsize = ALIGN16(inflatedsize); diff --git a/src/game/bondgun.c b/src/game/bondgun.c index f82473f3a..857dc7a54 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -3832,7 +3832,7 @@ void bgunTickGunLoad(void) *player->gunctrl.loadmemptr = ptr; *player->gunctrl.loadmemremaining = remaining; - loadsize = ALIGN64(fileGetInflatedSize(player->gunctrl.loadfilenum, FT_MODEL)) + 0x8000; + loadsize = ALIGN64(fileGetInflatedSize(player->gunctrl.loadfilenum, LOADTYPE_MODEL)) + 0x8000; osSyncPrintf("BriGun: Loading - %s, pMem 0x%08x Size %d\n"); @@ -3934,7 +3934,7 @@ void bgunTickGunLoad(void) modeldef0f1a7560(modeldef, player->gunctrl.loadfilenum, 0x05000000, modeldef, &player->gunctrl.texpool, false); - fileGetInflatedSize(player->gunctrl.loadfilenum, FT_MODEL); + fileGetInflatedSize(player->gunctrl.loadfilenum, LOADTYPE_MODEL); fileGetLoadedSize(player->gunctrl.loadfilenum); fileGetLoadedSize(player->gunctrl.loadfilenum); fileGetLoadedSize(player->gunctrl.loadfilenum); diff --git a/src/game/file.c b/src/game/file.c index 825ebf7c1..95e486c25 100644 --- a/src/game/file.c +++ b/src/game/file.c @@ -4255,7 +4255,7 @@ void fileLoadPartToAddr(u16 filenum, void *memaddr, s32 offset, u32 len) } } -u32 fileGetInflatedSize(s32 filenum, FileType filetype) +u32 fileGetInflatedSize(s32 filenum, u32 loadtype) { u8 *ptr; u8 buffer[0x50]; @@ -4283,7 +4283,7 @@ u32 fileGetInflatedSize(s32 filenum, FileType filetype) } if (rzipIs1173(ptr)) { - return romdataFileGetEstimatedSize((ptr[2] << 16) | (ptr[3] << 8) | ptr[4], filetype); + return romdataFileGetEstimatedSize((ptr[2] << 16) | (ptr[3] << 8) | ptr[4], loadtype); } #if VERSION < VERSION_NTSC_1_0 @@ -4300,7 +4300,7 @@ u32 fileGetInflatedSize(s32 filenum, FileType filetype) return 0; } -void *fileLoadToNew(s32 filenum, u32 method, FileType filetype) +void *fileLoadToNew(s32 filenum, u32 method, u32 loadtype) { struct fileinfo *info = &g_FileInfo[filenum]; u32 stack; @@ -4308,7 +4308,7 @@ void *fileLoadToNew(s32 filenum, u32 method, FileType filetype) if (method == FILELOADMETHOD_EXTRAMEM || method == FILELOADMETHOD_DEFAULT) { if (info->loadedsize == 0) { - info->loadedsize = (fileGetInflatedSize(filenum, filetype) + 0x20) & 0xfffffff0; + info->loadedsize = (fileGetInflatedSize(filenum, loadtype) + 0x20) & 0xfffffff0; if (method == FILELOADMETHOD_EXTRAMEM) { info->loadedsize += 0x8000; diff --git a/src/game/lang.c b/src/game/lang.c index f7d61f336..b4c7bbd20 100644 --- a/src/game/lang.c +++ b/src/game/lang.c @@ -377,7 +377,7 @@ s32 langGetFileId(s32 bank) void langLoad(s32 bank) { #if VERSION >= VERSION_PAL_BETA - s32 len = fileGetInflatedSize(langGetFileId(bank), FT_LANG); + s32 len = fileGetInflatedSize(langGetFileId(bank), LOADTYPE_LANG); if ((uintptr_t)g_LangBuffer + len + g_LangBufferSize - (uintptr_t)g_LangBufferPos >= 0) { s32 len2 = (uintptr_t)g_LangBuffer + g_LangBufferSize - (uintptr_t)g_LangBufferPos; @@ -391,7 +391,7 @@ void langLoad(s32 bank) #else s32 file_id = langGetFileId(bank); g_LoadType = LOADTYPE_LANG; - g_LangBanks[bank] = fileLoadToNew(file_id, FILELOADMETHOD_DEFAULT, FT_LANG); + g_LangBanks[bank] = fileLoadToNew(file_id, FILELOADMETHOD_DEFAULT, LOADTYPE_LANG); #endif } diff --git a/src/game/langreset.c b/src/game/langreset.c index a85afd8dd..beabbde03 100644 --- a/src/game/langreset.c +++ b/src/game/langreset.c @@ -57,26 +57,26 @@ void langReset(s32 stagenum) #else // Versions prior to PAL load the language directly g_LoadType = LOADTYPE_LANG; // find be a better way to do this.. - g_LangBanks[LANGBANK_GUN] = fileLoadToNew(langGetFileId(LANGBANK_GUN), FILELOADMETHOD_DEFAULT, FT_LANG); + g_LangBanks[LANGBANK_GUN] = fileLoadToNew(langGetFileId(LANGBANK_GUN), FILELOADMETHOD_DEFAULT, LOADTYPE_LANG); g_LoadType = LOADTYPE_LANG; - g_LangBanks[LANGBANK_MPMENU] = fileLoadToNew(langGetFileId(LANGBANK_MPMENU), FILELOADMETHOD_DEFAULT, FT_LANG); + g_LangBanks[LANGBANK_MPMENU] = fileLoadToNew(langGetFileId(LANGBANK_MPMENU), FILELOADMETHOD_DEFAULT, LOADTYPE_LANG); g_LoadType = LOADTYPE_LANG; - g_LangBanks[LANGBANK_PROPOBJ] = fileLoadToNew(langGetFileId(LANGBANK_PROPOBJ), FILELOADMETHOD_DEFAULT, FT_LANG); + g_LangBanks[LANGBANK_PROPOBJ] = fileLoadToNew(langGetFileId(LANGBANK_PROPOBJ), FILELOADMETHOD_DEFAULT, LOADTYPE_LANG); g_LoadType = LOADTYPE_LANG; - g_LangBanks[LANGBANK_MPWEAPONS] = fileLoadToNew(langGetFileId(LANGBANK_MPWEAPONS), FILELOADMETHOD_DEFAULT, FT_LANG); + g_LangBanks[LANGBANK_MPWEAPONS] = fileLoadToNew(langGetFileId(LANGBANK_MPWEAPONS), FILELOADMETHOD_DEFAULT, LOADTYPE_LANG); g_LoadType = LOADTYPE_LANG; - g_LangBanks[LANGBANK_OPTIONS] = fileLoadToNew(langGetFileId(LANGBANK_OPTIONS), FILELOADMETHOD_DEFAULT, FT_LANG); + g_LangBanks[LANGBANK_OPTIONS] = fileLoadToNew(langGetFileId(LANGBANK_OPTIONS), FILELOADMETHOD_DEFAULT, LOADTYPE_LANG); g_LoadType = LOADTYPE_LANG; - g_LangBanks[LANGBANK_MISC] = fileLoadToNew(langGetFileId(LANGBANK_MISC), FILELOADMETHOD_DEFAULT, FT_LANG); + g_LangBanks[LANGBANK_MISC] = fileLoadToNew(langGetFileId(LANGBANK_MISC), FILELOADMETHOD_DEFAULT, LOADTYPE_LANG); if (stagenum == STAGE_CREDITS) { g_LoadType = LOADTYPE_LANG; - g_LangBanks[LANGBANK_TITLE] = fileLoadToNew(langGetFileId(LANGBANK_TITLE), FILELOADMETHOD_DEFAULT, FT_LANG); + g_LangBanks[LANGBANK_TITLE] = fileLoadToNew(langGetFileId(LANGBANK_TITLE), FILELOADMETHOD_DEFAULT, LOADTYPE_LANG); } #endif } diff --git a/src/game/menu.c b/src/game/menu.c index 8df5e4478..694b4fc63 100644 --- a/src/game/menu.c +++ b/src/game/menu.c @@ -1870,7 +1870,7 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) bodyfilenum = g_HeadsAndBodies[bodynum].filenum; - totalfilelen = fileGetInflatedSize(bodyfilenum, FT_MODEL); + totalfilelen = fileGetInflatedSize(bodyfilenum, LOADTYPE_MODEL); totalfilelen = ALIGN64(totalfilelen); if (g_HeadsAndBodies[bodynum].unk00_01) { @@ -1878,7 +1878,7 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) headfilenum = 0xffff; } else { headfilenum = g_HeadsAndBodies[headnum].filenum; - totalfilelen += ALIGN64(fileGetInflatedSize(headfilenum, FT_MODEL)); + totalfilelen += ALIGN64(fileGetInflatedSize(headfilenum, LOADTYPE_MODEL)); } #ifdef PLATFORM_64BIT @@ -1916,7 +1916,7 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) body0f02ce8c(bodynum, headnum, menumodel->bodymodeldef, menumodel->headmodeldef, totalfilelen * 0, &menumodel->bodymodel, false, 1); } else { - totalfilelen = ALIGN64(fileGetInflatedSize(menumodel->newparams, FT_MODEL)) + 0x4000; + totalfilelen = ALIGN64(fileGetInflatedSize(menumodel->newparams, LOADTYPE_MODEL)) + 0x4000; if (1); texInitPool(&texpool, &menumodel->allocstart[(u32)totalfilelen], menumodel->alloclen - totalfilelen); diff --git a/src/game/modeldef.c b/src/game/modeldef.c index ef2d13023..b3c3307a6 100644 --- a/src/game/modeldef.c +++ b/src/game/modeldef.c @@ -190,7 +190,7 @@ struct modeldef *modeldefLoad(u16 fileid, u8 *dst, s32 size, struct texpool *arg if (dst) { modeldef = fileLoadToAddr(fileid, FILELOADMETHOD_EXTRAMEM, dst, size); } else { - modeldef = fileLoadToNew(fileid, FILELOADMETHOD_EXTRAMEM, FT_MODEL); + modeldef = fileLoadToNew(fileid, FILELOADMETHOD_EXTRAMEM, LOADTYPE_MODEL); } modelPromoteTypeToPointer(modeldef); diff --git a/src/game/player.c b/src/game/player.c index 4d2eb6389..b2fdf891b 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -1434,14 +1434,14 @@ void playerTickChrBody(void) offset1 += sizeof(struct weaponobj); offset1 = ALIGN64(offset1); - offset2 = offset1 + ALIGN64(fileGetInflatedSize(g_HeadsAndBodies[bodynum].filenum, FT_MODEL)); + offset2 = offset1 + ALIGN64(fileGetInflatedSize(g_HeadsAndBodies[bodynum].filenum, LOADTYPE_MODEL)); if (headnum >= 0) { - offset2 += ALIGN64(fileGetInflatedSize(g_HeadsAndBodies[headnum].filenum, FT_MODEL)); + offset2 += ALIGN64(fileGetInflatedSize(g_HeadsAndBodies[headnum].filenum, LOADTYPE_MODEL)); } if (weaponmodelnum >= 0) { - offset2 += ALIGN64(fileGetInflatedSize(g_ModelStates[weaponmodelnum].fileid, FT_MODEL)); + offset2 += ALIGN64(fileGetInflatedSize(g_ModelStates[weaponmodelnum].fileid, LOADTYPE_MODEL)); } offset2 += 0x4000; diff --git a/src/game/setup.c b/src/game/setup.c index 491ca501f..ddf49953b 100644 --- a/src/game/setup.c +++ b/src/game/setup.c @@ -1319,7 +1319,7 @@ void setupLoadFiles(s32 stagenum) g_LoadType = LOADTYPE_SETUP; - g_GeCreditsData = (u8 *)fileLoadToNew(filenum, FILELOADMETHOD_DEFAULT, FT_SETUP); + g_GeCreditsData = (u8 *)fileLoadToNew(filenum, FILELOADMETHOD_DEFAULT, LOADTYPE_SETUP); setup = (struct stagesetup *)g_GeCreditsData; langLoad(langGetLangBankIndexFromStagenum(stagenum)); @@ -1330,7 +1330,7 @@ void setupLoadFiles(s32 stagenum) g_LoadType = LOADTYPE_PADS; - g_StageSetup.padfiledata = fileLoadToNew(g_Stages[g_StageIndex].padsfileid, FILELOADMETHOD_DEFAULT, FT_PADS); + g_StageSetup.padfiledata = fileLoadToNew(g_Stages[g_StageIndex].padsfileid, FILELOADMETHOD_DEFAULT, LOADTYPE_PADS); g_StageSetup.waypoints = NULL; g_StageSetup.waygroups = NULL; diff --git a/src/game/tilesreset.c b/src/game/tilesreset.c index c87400ed0..f88795a12 100644 --- a/src/game/tilesreset.c +++ b/src/game/tilesreset.c @@ -18,7 +18,7 @@ void tilesReset(void) } g_LoadType = LOADTYPE_TILES; - g_TileFileData.u8 = fileLoadToNew(g_Stages[index].tilefileid, FILELOADMETHOD_DEFAULT, FT_TILES); + g_TileFileData.u8 = fileLoadToNew(g_Stages[index].tilefileid, FILELOADMETHOD_DEFAULT, LOADTYPE_TILES); g_TileNumRooms = *g_TileFileData.u32; g_TileRooms = g_TileFileData.u32 + 1; diff --git a/src/include/game/file.h b/src/include/game/file.h index 22908feb9..24fee6c0a 100644 --- a/src/include/game/file.h +++ b/src/include/game/file.h @@ -12,8 +12,8 @@ romptr_t fileGetRomAddress(s32 filenum); s32 fileGetRomSize(s32 filenum); void filesInit(void); void fileLoadPartToAddr(u16 filenum, void *memaddr, s32 offset, u32 len); -u32 fileGetInflatedSize(s32 filenum, FileType filetype); -void *fileLoadToNew(s32 filenum, u32 method, FileType filetype); +u32 fileGetInflatedSize(s32 filenum, u32 loadtype); +void *fileLoadToNew(s32 filenum, u32 method, u32 loadtype); void *fileLoadToAddr(s32 filenum, s32 method, u8 *ptr, u32 size); u32 fileGetLoadedSize(s32 filenum); u32 fileGetAllocationSize(s32 filenum);