Updated definitions for multiple card and gx functions/enums/structs

Author: Zephiles

ttyd-tools/rel/include/gc/card.h

@@ -6,36 +6,37 @@ namespace gc::card {
 
 extern "C" {
 
-#define CARD_SLOTA 				0		// Memory card slot A
-#define CARD_SLOTB 				1		// Memory card slot B
+#define CARD_SLOTA 					0		// Memory card slot A
+#define CARD_SLOTB 					1		// Memory card slot B
 
-#define CARD_FILENAMELEN 		32		// Maximum filename length
-#define CARD_MAXICONS 			8
+#define CARD_FILENAMELEN 			32		// Maximum filename length
+#define CARD_MAXICONS 				8
 
-#define CARD_ERROR_UNLOCKED 	1		// Card is being unlocked or is already unlocked
-#define CARD_ERROR_READY		0		// Card is ready
-#define CARD_ERROR_BUSY 		-1		// Card is busy
-#define CARD_ERROR_WRONGDEVICE 	-2		// Wrong device connected in slot
-#define CARD_ERROR_NOCARD 		-3		// No memory card in slot
-#define CARD_ERROR_NOFILE 		-4		// Specified file not found
-#define CARD_ERROR_IOERROR 		-5		// Internal EXI I/O error
-#define CARD_ERROR_BROKEN 		-6		// Directory structure or file entry broken
-#define CARD_ERROR_EXIST 		-7		// File already exists with the specified parameters
-#define CARD_ERROR_NOENT 		-8		// Found no empty block to create the file
-#define CARD_ERROR_INSSPACE 	-9		// Not enough space to write the file to the memory card
-#define CARD_ERROR_NOPERM 		-10		// Not enough permissions to operate on the file
-#define CARD_ERROR_LIMIT 		-11		// Card size limit reached
-#define CARD_ERROR_NAMETOOLONG 	-12		// Filename too long
-#define CARD_ERROR_ENCODING 	-13		// Font encoding PAL/SJIS mismatch
-#define CARD_ERROR_CANCELED 	-14		// Card operation canceled
-#define CARD_ERROR_FATAL_ERROR 	-128	// Fatal error, non-recoverable
+#define CARD_RESULT_UNLOCKED 		1		// Card is being unlocked or is already unlocked
+#define CARD_RESULT_READY			0		// Card is ready
+#define CARD_RESULT_BUSY 			-1		// Card is busy
+#define CARD_RESULT_WRONGDEVICE 	-2		// Wrong device connected in slot
+#define CARD_RESULT_NOCARD 			-3		// No memory card in slot
+#define CARD_RESULT_NOFILE 			-4		// Specified file not found
+#define CARD_RESULT_IOERROR 		-5		// Internal EXI I/O error
+#define CARD_RESULT_BROKEN 			-6		// Directory structure or file entry broken
+#define CARD_RESULT_EXIST 			-7		// File already exists with the specified parameters
+#define CARD_RESULT_NOENT 			-8		// Found no empty block to create the file
+#define CARD_RESULT_INSSPACE 		-9		// Not enough space to write the file to the memory card
+#define CARD_RESULT_NOPERM 			-10		// Not enough permissions to operate on the file
+#define CARD_RESULT_LIMIT 			-11		// Card size limit reached
+#define CARD_RESULT_NAMETOOLONG 	-12		// Filename too long
+#define CARD_RESULT_ENCODING 		-13		// Font encoding PAL/SJIS mismatch
+#define CARD_RESULT_CANCELED 		-14		// Card operation canceled
+#define CARD_RESULT_FATAL_ERROR 	-128	// Fatal error, non-recoverable
 
 typedef struct CARDFileInfo {
 	int32_t 	channel;
 	int32_t 	fileNum;
 	int32_t 	offset;
 	int32_t 	length;
 	uint16_t 	iBlock;
+	uint16_t 	padding;
 } CARDFileInfo;
 
 typedef struct CARDStat {
@@ -53,7 +54,7 @@ typedef struct CARDStat {
 	uint32_t 	offsetBannerTlut;
 	uint32_t 	offsetIcon[CARD_MAXICONS];
 	uint32_t 	offsetIconTlut;
-	uint32_t 	offsetDada;
+	uint32_t 	offsetData;
 } CARDStat;
 
 typedef void (*CARDCallback)(int32_t channel, int32_t result);
@@ -62,12 +63,12 @@ int32_t CARDGetResultCode(int32_t channel);
 int32_t CARDProbeEx(int32_t channel, int32_t *memSize, int32_t *sectorSize);
 int32_t CARDMountAsync(int32_t channel, void *workArea, CARDCallback detachCallback, CARDCallback attachCallback);
 int32_t CARDUnmount(int32_t channel);
-int32_t CARDOpen(int32_t channel, char *fileName, CARDFileInfo *fileInfo);
+int32_t CARDOpen(int32_t channel, const char *fileName, CARDFileInfo *fileInfo);
 int32_t CARDClose(CARDFileInfo *fileInfo);
-int32_t CARDCreateAsync(int32_t channel, char *fileName, uint32_t size, CARDFileInfo *fileInfo, CARDCallback callback);
+int32_t CARDCreateAsync(int32_t channel, const char *fileName, uint32_t size, CARDFileInfo *fileInfo, CARDCallback callback);
 int32_t CARDReadAsync(CARDFileInfo *fileInfo, void *buffer, int32_t length, int32_t offset, CARDCallback callback);
 int32_t CARDWriteAsync(CARDFileInfo *fileInfo, void *buffer, int32_t length, int32_t offset, CARDCallback callback);
-int32_t CARDDelete(int32_t channel, char *fileName);
+int32_t CARDDelete(int32_t channel, const char *fileName);
 int32_t CARDGetStatus(int32_t channel, int32_t fileNum, CARDStat *stat);
 int32_t CARDSetStatusAsync(int32_t channel, int32_t fileNum, CARDStat *stat, CARDCallback callback);
 

ttyd-tools/rel/include/gc/gx.h

@@ -6,18 +6,18 @@ namespace gc::gx {
 
 extern "C" {
 
-enum GXPrimitive
+enum class GXPrimitive
 {
-	GX_POINTS = 0,
-	GX_LINES,
-	GX_LINESTRIP,
-	GX_TRIANGLES,
-	GX_TRIANGLESTRIP,
-	GX_TRIANGLEFAN,
-	GX_QUADS,
+	GX_QUADS 			= 128,
+	GX_TRIANGLES 		= 144,
+	GX_TRIANGLESTRIP 	= 152,
+	GX_TRIANGLEFAN 		= 160,
+	GX_LINES 			= 168,
+	GX_LINESTRIP 		= 176,
+	GX_POINTS 			= 184,
 };
 
-enum GXVtxFmt
+enum class GXVtxFmt
 {
 	GX_VTXFMT0 = 0,
 	GX_VTXFMT1,
@@ -30,7 +30,7 @@ enum GXVtxFmt
 	GX_MAX_VTXFMT,
 };
 
-enum GXChannelID
+enum class GXChannelID
 {
 	GX_COLOR0 = 0,
 	GX_COLOR1,
@@ -41,7 +41,7 @@ enum GXChannelID
 	GX_COLOR_ZERO,
 	GX_ALPHA_BUMP,
 	GX_ALPHA_BUMPN,
-	GX_COLOR_NULL,
+	GX_COLOR_NULL = 255,
 };
 
 void GXBegin(GXPrimitive type, GXVtxFmt vtxFmt, uint16_t nVerts);

ttyd-tools/rel/include/global.h

@@ -572,9 +572,9 @@ struct DisplayActionCommandTiming
 struct MemoryCardStruct
 {
 	uint8_t ReturnCode;
-	char *SettingsFileName;
-	char *SettingsDescription;
-	char *RelFileName;
+	const char *SettingsFileName;
+	const char *SettingsDescription;
+	const char *RelFileName;
 };
 
 struct MemoryWatchStruct

ttyd-tools/rel/include/memcard.h

@@ -14,13 +14,14 @@ int32_t mountCard(int32_t channel);
 
 int32_t unmountCard(int32_t channel);
 
-int32_t openFileFromCard(int32_t channel, char *fileName, gc::card::CARDFileInfo *fileInfo);
+int32_t openFileFromCard(int32_t channel, 
+	const char *fileName, gc::card::CARDFileInfo *fileInfo);
 
 int32_t closeFileFromCard(gc::card::CARDFileInfo *fileInfo);
 
 void closeFileAndUnmountCard(gc::card::CARDFileInfo *fileInfo, int32_t channel);
 
-int32_t createFileOnCard(int32_t channel, char *fileName, 
+int32_t createFileOnCard(int32_t channel, const char *fileName, 
 	uint32_t size, gc::card::CARDFileInfo *fileInfo);
 
 int32_t readFromFileOnCard(gc::card::CARDFileInfo *fileInfo, 
@@ -29,18 +30,19 @@ int32_t readFromFileOnCard(gc::card::CARDFileInfo *fileInfo,
 int32_t writeToFileOnCard(gc::card::CARDFileInfo *fileInfo, 
 	void *buffer, int32_t length, int32_t offset);
 
-int32_t deleteFileOnCard(int32_t channel, char *fileName);
+int32_t deleteFileOnCard(int32_t channel, const char *fileName);
 
 int32_t getFileStatus(int32_t channel, int32_t fileNum, gc::card::CARDStat *stat);
 
 int32_t setFileStatus(int32_t channel, 
 	int32_t fileNum, gc::card::CARDStat *stat);
 
-int32_t loadSettings(char *settingsFileName);
+int32_t loadSettings(const char *settingsFileName);
 
-int32_t writeSettings(char *settingsDescription, char *settingsFileName, char *relFileName);
+int32_t writeSettings(const char *settingsDescription, 
+	const char *settingsFileName, const char *relFileName);
 
-int32_t createSettingsFile(char *settingsFileName, 
-	char *relFileName, gc::card::CARDFileInfo *settingsFileInfo);
+int32_t createSettingsFile(const char *settingsFileName, 
+	const char *relFileName, gc::card::CARDFileInfo *settingsFileInfo);
 
 }

ttyd-tools/rel/source/draw.cpp

@@ -87,7 +87,7 @@ void drawArtAttackHitboxes()
 		uint32_t HitboxLineColor = ttyd::fontmgr::HSV2RGB(HSVA);
 
 		// Set the color of the lines of the current hitbox
-		gc::gx::GXSetChanMatColor(gc::gx::GX_COLOR0A0, reinterpret_cast<uint8_t *>(&HitboxLineColor));
+		gc::gx::GXSetChanMatColor(gc::gx::GXChannelID::GX_COLOR0A0, reinterpret_cast<uint8_t *>(&HitboxLineColor));
 
 		// Adjust the hue for the lines of the next hitbox
 		HSVA[0] += 45;
@@ -191,7 +191,7 @@ void drawArtAttackHitboxes()
 			}
 
 			// Draw the line from corner 1 to corner 2
-			gc::gx::GXBegin(static_cast<gc::gx::GXPrimitive>(168), gc::gx::GX_VTXFMT0, 2);
+			gc::gx::GXBegin(gc::gx::GXPrimitive::GX_LINES, gc::gx::GXVtxFmt::GX_VTXFMT0, 2);
 
 			*WriteGatherPipe = ScreenPointOutLineStart[0];
 			*WriteGatherPipe = ScreenPointOutLineStart[1];

ttyd-tools/rel/source/global.cpp

@@ -1513,18 +1513,17 @@ void initMenuVars()
 	Menu[WARPS_INDEX].PreviousMenu 						= WARPS;
 	Menu[WARPS_INDEX].Line 								= WarpIndexLines;
 
-	// The CARD functions do not modify the strings, so const_cast<char *> can be used
-	MenuSettings.SettingsFileName = const_cast<char *>("rel_settings");
+	MenuSettings.SettingsFileName = "rel_settings";
 
 	#ifdef TTYD_US
-	MenuSettings.SettingsDescription = const_cast<char *>("Practice Codes Settings (US)");
+	MenuSettings.SettingsDescription = "Practice Codes Settings (US)";
 	#elif defined TTYD_JP
-	MenuSettings.SettingsDescription = const_cast<char *>("Practice Codes Settings (JP)");
+	MenuSettings.SettingsDescription = "Practice Codes Settings (JP)";
 	#elif defined TTYD_EU
-	MenuSettings.SettingsDescription = const_cast<char *>("Practice Codes Settings (EU)");
+	MenuSettings.SettingsDescription = "Practice Codes Settings (EU)";
 	#endif
 
-	MenuSettings.RelFileName = const_cast<char *>("rel");
+	MenuSettings.RelFileName = "rel";
 
 	// Set the initial settings
 	setSettings();

ttyd-tools/rel/source/main.cpp

@@ -29,8 +29,7 @@
 namespace mod {
 
 // Assembly overwrite functions
-extern "C"
-{
+extern "C" {
 
 void StartPreventPreBattleSoftlock();
 void StartDisableBattles();