Adjusted several variables and function definitions

Author: Zephiles

ttyd-tools/rel/include/global.h

@@ -561,7 +561,7 @@ struct ReloadRoomStruct
 
 struct SpawnItems
 {
-	uint16_t SpawnItemCounter;
+	uint32_t SpawnItemCounter;
 	bool InAdjustableValueMenu;
 };
 
@@ -581,7 +581,7 @@ struct ClearCacheForBattlesStruct
 struct TrickDisplay
 {
 	uint32_t MainTimer;
-	uint16_t ResetTimer;
+	uint32_t ResetTimer;
 	bool TimerPaused;
 	bool TimerStopped;
 
@@ -595,7 +595,7 @@ struct BlimpTicketSkipStruct
 {
 	uint32_t UpRightTimer;
 	uint32_t StraightUpTimer;
-	uint16_t ResetTimer;
+	uint32_t ResetTimer;
 	bool TimersPaused;
 	bool UpRightTimerStopped;
 	bool StraightUpTimerStopped;
@@ -634,6 +634,21 @@ struct MemoryCardStruct
 	const char *SettingsFileName;
 	const char *SettingsDescription;
 	const char *RelFileName;
+	
+	MemoryCardStruct()
+	{
+		SettingsFileName = "rel_settings";
+		
+		#ifdef TTYD_US
+		SettingsDescription = "Practice Codes Settings (US)";
+		#elif defined TTYD_JP
+		SettingsDescription = "Practice Codes Settings (JP)";
+		#elif defined TTYD_EU
+		SettingsDescription = "Practice Codes Settings (EU)";
+		#endif
+		
+		RelFileName = "rel";
+	}
 };
 
 struct MemoryWatchStruct
@@ -764,7 +779,7 @@ extern const char ButtonInputDisplay[];
 #endif
 
 void initMenuVars();
-void setSettings();
+void setInitialSettings();
 void initAddressOverwrites();
 
 }

ttyd-tools/rel/include/memcard.h

@@ -33,12 +33,10 @@ int32_t getFileStatus(int32_t fileNum, gc::card::CARDStat *stat);
 
 int32_t setFileStatus(int32_t fileNum, gc::card::CARDStat *stat);
 
-int32_t loadSettings(const char *settingsFileName);
+int32_t createSettingsFile(gc::card::CARDFileInfo *settingsFileInfo);
 
-int32_t writeSettings(const char *settingsDescription, 
-	const char *settingsFileName, const char *relFileName);
+int32_t saveSettings();
 
-int32_t createSettingsFile(const char *settingsFileName, 
-	const char *relFileName, gc::card::CARDFileInfo *settingsFileInfo);
+int32_t loadSettings();
 
 }

ttyd-tools/rel/source/codes.cpp

@@ -706,12 +706,13 @@ void spawnItem()
 				float ItemCoordinateY = player->playerPosition[1];
 				float ItemCoordinateZ = player->playerPosition[2];
 
-				SpawnItem.SpawnItemCounter++;
-				
 				char *tempDisplayBuffer = DisplayBuffer;
+				uint32_t tempTimer = SpawnItem.SpawnItemCounter;
+				SpawnItem.SpawnItemCounter = tempTimer + 1;
+				
 				sprintf(tempDisplayBuffer,
-					"C_Item%" PRIu16,
-					SpawnItem.SpawnItemCounter);
+					"C_Item%" PRIu32,
+					tempTimer);
 
 				ttyd::itemdrv::itemEntry(tempDisplayBuffer, MenuVar.MenuSecondaryValue, 16, 
 					-1, nullptr, ItemCoordinateX, ItemCoordinateY, ItemCoordinateZ);

ttyd-tools/rel/source/global.cpp

@@ -1419,26 +1419,14 @@ void initMenuVars()
 	Menu[WARPS_INDEX].ColumnSplitAmount 				= Menu[WARPS_INDEX].TotalMenuOptions;
 	Menu[WARPS_INDEX].Line 								= WarpIndexLines;
 
-	MenuSettings.SettingsFileName = "rel_settings";
-	
-	#ifdef TTYD_US
-	MenuSettings.SettingsDescription = "Practice Codes Settings (US)";
-	#elif defined TTYD_JP
-	MenuSettings.SettingsDescription = "Practice Codes Settings (JP)";
-	#elif defined TTYD_EU
-	MenuSettings.SettingsDescription = "Practice Codes Settings (EU)";
-	#endif
-	
-	MenuSettings.RelFileName = "rel";
-	
 	// Set the initial settings
-	setSettings();
+	setInitialSettings();
 
 	// Load the custom settings from the settings file if it exists
-	loadSettings(MenuSettings.SettingsFileName);
+	loadSettings();
 }
 
-void setSettings()
+void setInitialSettings()
 {
 	// Set the Cheats bools
 	Cheat[WALK_THROUGH_WALLS].Active 			= false;