Handle the size of the settings file needing to be adjusted

Zephiles · Zephiles · commit e8eb6e075667 · 2019-03-06T23:12:18.000-06:00
diff --git a/ttyd-tools/rel/include/gc/card.h b/ttyd-tools/rel/include/gc/card.h
@@ -73,11 +73,12 @@ int32_t CARDGetResultCode(int32_t chn);
 int32_t CARDProbeEx(int32_t chn, int32_t *mem_size, int32_t *sect_size);
 int32_t CARDMountAsync(int32_t chn, void *workarea, cardcallback detach_cb, cardcallback attach_cb);
 int32_t CARDUnmount(int32_t chn);
-int32_t CARDOpen(int32_t chn, const char *fileName, card_file *file);
+int32_t CARDOpen(int32_t chn, char *fileName, card_file *file);
 int32_t CARDClose(card_file *file);
-int32_t CARDCreateAsync(int32_t chn, const char *fileName, uint32_t size, card_file *file, cardcallback callback);
+int32_t CARDCreateAsync(int32_t chn, char *fileName, uint32_t size, card_file *file, cardcallback callback);
 int32_t CARDReadAsync(card_file *file, void *buffer, int32_t len, int32_t offset, cardcallback callback);
 int32_t CARDWriteAsync(card_file *file, void *buffer, int32_t len, int32_t offset, cardcallback callback);
+int32_t CARDDelete(int32_t chn, char *fileName);
 int32_t CARDGetStatus(int32_t chn, int32_t fileNo, card_stat *stats);
 int32_t CARDSetStatusAsync(int32_t chn, int32_t fileNo, card_stat *stats, cardcallback callback);
 
diff --git a/ttyd-tools/rel/include/global.h b/ttyd-tools/rel/include/global.h
@@ -489,8 +489,8 @@ struct MemoryCardStruct
 	// uint8_t CurrentAction;
 	gc::card::card_file FileInfo[1];
 	uint8_t *WorkArea;
-	const char *FileName;
-	const char *Description;
+	char *FileName;
+	char *Description;
 };
 
 struct SettingsStruct
diff --git a/ttyd-tools/rel/include/memcard.h b/ttyd-tools/rel/include/memcard.h
@@ -15,19 +15,19 @@ int32_t readFromCard(gc::card::card_file *file, void *buffer, int32_t len,
 int32_t writeToCard(gc::card::card_file *file, void *buffer, int32_t len, 
 	int32_t offset, gc::card::cardcallback callback);
 
-int32_t createFile(int32_t chn, const char *fileName, uint32_t size, 
+int32_t createFile(int32_t chn, char *fileName, uint32_t size, 
 	gc::card::card_file *file, gc::card::cardcallback callback);
 
 int32_t setFileStatus(int32_t chn, int32_t fileNo, gc::card::card_stat *stats, 
 	gc::card::cardcallback callback);
 
 int32_t loopUntilSynced();
 
-int32_t loadSettings(const char *fileName, gc::card::card_file *fileInfo, uint8_t *workArea);
+int32_t loadSettings(char *fileName, gc::card::card_file *fileInfo, uint8_t *workArea);
 
-int32_t writeSettings(const char *description, const char *fileName, 
+int32_t writeSettings(char *description, char *fileName, 
 	gc::card::card_file *fileInfo, uint8_t *workArea);
 
-int32_t createSettingsFile(const char *fileName, const char *description, gc::card::card_file *fileInfo);
+int32_t createSettingsFile(char *fileName, char *description, gc::card::card_file *fileInfo);
 
 }
diff --git a/ttyd-tools/rel/include/ttyd.eu.lst b/ttyd-tools/rel/include/ttyd.eu.lst
@@ -1386,7 +1386,7 @@
 // CARDDelete.c
 // 802B590C:DeleteCallback
 // 802B59B0:CARDDeleteAsync
-// 802B5AC0:CARDDelete
+802B5AC0:CARDDelete
 
 // CARDStat.c
 // 802B5B08:UpdateIconOffsets
diff --git a/ttyd-tools/rel/include/ttyd.jp.lst b/ttyd-tools/rel/include/ttyd.jp.lst
@@ -1378,7 +1378,7 @@
 // CARDDelete.c
 // 802ABA8C:DeleteCallback
 // 802ABB30:CARDDeleteAsync
-// 802ABC40:CARDDelete
+802ABC40:CARDDelete
 
 // CARDStat.c
 // 802ABC88:UpdateIconOffsets
diff --git a/ttyd-tools/rel/include/ttyd.us.lst b/ttyd-tools/rel/include/ttyd.us.lst
@@ -1384,7 +1384,7 @@
 // CARDDelete.c
 // 802B1890:DeleteCallback
 // 802B1934:CARDDeleteAsync
-// 802B1A44:CARDDelete
+802B1A44:CARDDelete
 
 // CARDStat.c
 // 802B1A8C:UpdateIconOffsets
diff --git a/ttyd-tools/rel/source/global.cpp b/ttyd-tools/rel/source/global.cpp
@@ -6,7 +6,7 @@
 
 namespace mod {
 
-const char *VersionNumber = "v3.0.13";
+const char *VersionNumber = "v3.0.14";
 
 const char *RootLines[] = 
 {
@@ -1026,14 +1026,14 @@ void initMenuVars()
 																*reinterpret_cast<uint32_t *>(
 																	WorkAreaAddress) + 0x4));
 	#ifdef TTYD_US
-	MenuSettings.Description 							= "Practice Codes Settings (US)";
+	MenuSettings.Description 							= const_cast<char *>("Practice Codes Settings (US)");
 	#elif defined TTYD_JP
-	MenuSettings.Description 							= "Practice Codes Settings (JP)";
+	MenuSettings.Description 							= const_cast<char *>("Practice Codes Settings (JP)");
 	#elif defined TTYD_EU
-	MenuSettings.Description 							= "Practice Codes Settings (EU)";
+	MenuSettings.Description 							= const_cast<char *>("Practice Codes Settings (EU)");
 	#endif
 	
-	MenuSettings.FileName 								= "rel_settings";
+	MenuSettings.FileName 								= const_cast<char *>("rel_settings");
 	
 	// Try to open the settings file
 	int32_t ReturnCode = loadSettings(MenuSettings.FileName, 
diff --git a/ttyd-tools/rel/source/memcard.cpp b/ttyd-tools/rel/source/memcard.cpp
@@ -46,7 +46,7 @@ int32_t writeToCard(gc::card::card_file *file, void *buffer, int32_t len,
 	return ReturnCode;
 }
 
-int32_t createFile(int32_t chn, const char *fileName, uint32_t size, 
+int32_t createFile(int32_t chn, char *fileName, uint32_t size, 
 	gc::card::card_file *file, gc::card::cardcallback callback)
 {
 	int32_t ReturnCode = gc::card::CARDCreateAsync(chn, fileName, size, file, callback);
@@ -81,7 +81,7 @@ int32_t loopUntilSynced()
 	return ReturnCode;
 }
 
-int32_t loadSettings(const char *fileName, gc::card::card_file *fileInfo, uint8_t *workArea)
+int32_t loadSettings(char *fileName, gc::card::card_file *fileInfo, uint8_t *workArea)
 {
 	// Load the settings file
 	int32_t ReturnCode = gc::card::CARDProbeEx(CARD_SLOTA, nullptr, nullptr);
@@ -156,7 +156,7 @@ int32_t loadSettings(const char *fileName, gc::card::card_file *fileInfo, uint8_
 	return CARD_ERROR_READY;
 }
 
-int32_t writeSettings(const char *description, const char *fileName, 
+int32_t writeSettings(char *description, char *fileName, 
 	gc::card::card_file *fileInfo, uint8_t *workArea)
 {
 	// Load the settings file
@@ -173,12 +173,72 @@ int32_t writeSettings(const char *description, const char *fileName,
 		return ReturnCode;
 	}
 	
+	uint32_t SettingsStructSize;
+	uint32_t SettingsStructSizeAdjusted;
+	
 	// Open the settings file if it exists
 	ReturnCode = gc::card::CARDOpen(CARD_SLOTA, fileName, fileInfo);
 	switch (ReturnCode)
 	{
 		case CARD_ERROR_READY:
 		{
+			// Set up the array to hold the area of the file that contains the size
+			char *tempFileData = new char[0x200];
+			clearMemory(tempFileData, 0x200);
+			
+			// Get the data from the area that holds the size
+			ReturnCode = readFromCard(fileInfo, tempFileData, 0x200, 0x2000, nullptr);
+			if (ReturnCode != CARD_ERROR_READY)
+			{
+				delete[] (tempFileData);
+				gc::card::CARDClose(fileInfo);
+				gc::card::CARDUnmount(CARD_SLOTA);
+				return ReturnCode;
+			}
+			
+			// Get the size of the file
+			uint32_t CurrentFileSize = *reinterpret_cast<uint32_t *>(&tempFileData[0x40]);
+			
+			// Delete the data that holds the size, as it's not needed anymore
+			delete[] (tempFileData);
+			
+			// Adjust the file size to be in multiples of 0x2000, rounding up
+			uint32_t CurrentFileSizeAdjusted = (CurrentFileSize + 0x2000 - 1) & ~(0x2000 - 1);
+			
+			// Get the size thats going to be written
+			SettingsStructSize = sizeof(struct SettingsStruct);
+			
+			// Adjust the file size to be in multiples of 0x2000, rounding up
+			SettingsStructSizeAdjusted = (SettingsStructSize + 0x2000 - 1) & ~(0x2000 - 1);
+			
+			// Make sure the size being written does not exceed the current size
+			if (SettingsStructSizeAdjusted > CurrentFileSizeAdjusted)
+			{
+				// The new size exceeds the current size, so a new file must be made created
+				// Close the file
+				ReturnCode = gc::card::CARDClose(fileInfo);
+				if (ReturnCode != CARD_ERROR_READY)
+				{
+					gc::card::CARDUnmount(CARD_SLOTA);
+					return ReturnCode;
+				}
+				
+				// Delete the current file
+				ReturnCode = gc::card::CARDDelete(CARD_SLOTA, fileName);
+				if (ReturnCode != CARD_ERROR_READY)
+				{
+					gc::card::CARDUnmount(CARD_SLOTA);
+					return ReturnCode;
+				}
+				
+				// Make the new file
+				// createSettingsFile keeps the file open, but closes and unmounts if it fails to create the file
+				ReturnCode = createSettingsFile(fileName, description, fileInfo);
+				if (ReturnCode != CARD_ERROR_READY)
+				{
+					return ReturnCode;
+				}
+			}
 			break;
 		}
 		case CARD_ERROR_NOFILE:
@@ -190,6 +250,12 @@ int32_t writeSettings(const char *description, const char *fileName,
 			{
 				return ReturnCode;
 			}
+			
+			// Get the size thats going to be written
+			SettingsStructSize = sizeof(struct SettingsStruct);
+			
+			// Adjust the file size to be in multiples of 0x2000, rounding up
+			SettingsStructSizeAdjusted = (SettingsStructSize + 0x2000 - 1) & ~(0x2000 - 1);
 			break;
 		}
 		default:
@@ -198,25 +264,17 @@ int32_t writeSettings(const char *description, const char *fileName,
 		}
 	}
 	
-	// Get the size of the file
-	uint32_t SettingsStructSize = sizeof(struct SettingsStruct);
-	uint32_t FileSize = 0x2000 + SettingsStructSize + 0x200;
-	
-	// Adjust the file size to be in multiples of 0x2000, rounding up
-	uint32_t FileSizeAdjusted = (FileSize + 0x2000 - 1) & ~(0x2000 - 1);
-	
 	// Set up the memory to be written to the file
-	uint32_t MiscDataSize = FileSizeAdjusted - 0x2000; // Remove the extra 0x2000 from the banner and icon
-	char *MiscData = new char[MiscDataSize];
-	clearMemory(MiscData, MiscDataSize);
+	char *MiscData = new char[SettingsStructSizeAdjusted];
+	clearMemory(MiscData, SettingsStructSizeAdjusted);
 	
 	// Copy the name, description, and file size into the memory
 	ttyd::string::strcpy(MiscData, "Paper Mario");
 	ttyd::string::strcpy(&MiscData[0x20], description);
+	*reinterpret_cast<uint32_t *>(&MiscData[0x40]) = SettingsStructSize + 0x200;
 	
 	// Set up the struct to hold the variables to store
-	SettingsStruct *Settings = new SettingsStruct;
-	clearMemory(Settings, SettingsStructSize);
+	SettingsStruct *Settings = reinterpret_cast<SettingsStruct *>(&MiscData[0x200]);
 	
 	// Copy the desired variables to the struct
 	uint32_t CheatsSize = sizeof(Cheat) / sizeof(Cheat[0]);
@@ -237,25 +295,20 @@ int32_t writeSettings(const char *description, const char *fileName,
 	Settings->DisplaysButtonCombos[ONSCREEN_TIMER] 		= OnScreenTimer.ButtonCombo[0];
 	Settings->DisplaysButtonCombos[ONSCREEN_TIMER + 1] 	= OnScreenTimer.ButtonCombo[1];
 	
-	// Copy the struct contents into the memory
-	ttyd::__mem::memcpy(&MiscData[0x200], Settings, SettingsStructSize);
-	
-	// Delete the struct holding the variables, as they're no longer needed
-	delete[] (Settings);
-	
 	// Write the data to the file
-	ReturnCode = writeToCard(fileInfo, MiscData, MiscDataSize, 0x2000, nullptr);
+	ReturnCode = writeToCard(fileInfo, MiscData, SettingsStructSizeAdjusted, 0x2000, nullptr);
 	
 	delete[] (MiscData);
 	gc::card::CARDClose(fileInfo);
 	gc::card::CARDUnmount(CARD_SLOTA);
 	return ReturnCode;
 }
 
-int32_t createSettingsFile(const char *fileName, const char *description, gc::card::card_file *fileInfo)
+int32_t createSettingsFile(char *fileName, char *description, gc::card::card_file *fileInfo)
 {
 	// Get the banner and icon data from the current REL file
-	int32_t ReturnCode = gc::card::CARDOpen(CARD_SLOTA, "rel", fileInfo);
+	char *relFileName = const_cast<char *>("rel");
+	int32_t ReturnCode = gc::card::CARDOpen(CARD_SLOTA, relFileName, fileInfo);
 	if (ReturnCode != CARD_ERROR_READY)
 	{
 		gc::card::CARDUnmount(CARD_SLOTA);
