From 4d60c93bebae3d5a96dce2470c58e3d0cf6d02de Mon Sep 17 00:00:00 2001
From: Raf <>
Date: Thu, 8 Aug 2024 20:54:59 +0800
Subject: [PATCH] portx64: romdata: proper estimated size for setup files,
 renamed getEstimatedFileSize function

---
 .gitignore             | 1 +
 port/include/romdata.h | 2 +-
 port/src/romdata.c     | 6 +++---
 src/game/bg.c          | 2 +-
 src/game/file.c        | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 040d48862..c81aec73a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ src/generated
 tools/mkrom/mkrom
 /.vs
 CppProperties.json
+.idea
diff --git a/port/include/romdata.h b/port/include/romdata.h
index da0d81da0..6d604803f 100644
--- a/port/include/romdata.h
+++ b/port/include/romdata.h
@@ -30,6 +30,6 @@ s32 romdataFileGetNumForName(const char *name);
 u8 *romdataSegGetData(const char *segName);
 u8 *romdataSegGetDataEnd(const char *segName);
 u32 romdataSegGetSize(const char *segName);
-u32 romdataGetEstimatedFileSize(u32 size, FileType filetype);
+u32 romdataFileGetEstimatedSize(u32 size, FileType filetype);
 
 #endif
diff --git a/port/src/romdata.c b/port/src/romdata.c
index 515fff581..03b617b21 100644
--- a/port/src/romdata.c
+++ b/port/src/romdata.c
@@ -537,18 +537,18 @@ u32 romdataSegGetSize(const char *segName)
 	return romdataGetSeg(segName)->size;
 }
 
-u32 romdataGetEstimatedFileSize(u32 size, FileType filetype)
+u32 romdataFileGetEstimatedSize(u32 size, FileType filetype)
 {
 #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 * 3.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);
 	default:
-		sysLogPrintf(LOG_WARNING, "wrong file type in romdataGetEstimatedFileSize: %d", filetype);
+		sysLogPrintf(LOG_WARNING, "wrong file type in romdataFileGetEstimatedSize: %d", filetype);
 	}
 #endif
 	return size;
diff --git a/src/game/bg.c b/src/game/bg.c
index 86c5011e0..a3cd5047a 100644
--- a/src/game/bg.c
+++ b/src/game/bg.c
@@ -1511,7 +1511,7 @@ void bgReset(s32 stagenum)
 	var8007fc54 -= 0xc;
 
 #ifdef PLATFORM_64BIT
-	inflatedsize = romdataGetEstimatedFileSize(inflatedsize, FT_BG);
+	inflatedsize = romdataFileGetEstimatedSize(inflatedsize, FT_BG);
 #endif
 
 	inflatedsize = ALIGN16(inflatedsize);
diff --git a/src/game/file.c b/src/game/file.c
index 79ebd40ce..6c188338c 100644
--- a/src/game/file.c
+++ b/src/game/file.c
@@ -4283,7 +4283,7 @@ u32 fileGetInflatedSize(s32 filenum, FileType filetype)
 	}
 
 	if (rzipIs1173(ptr)) {
-		return romdataGetEstimatedFileSize((ptr[2] << 16) | (ptr[3] << 8) | ptr[4], filetype);
+		return romdataFileGetEstimatedSize((ptr[2] << 16) | (ptr[3] << 8) | ptr[4], filetype);
 	}
 
 #if VERSION < VERSION_NTSC_1_0