card_rename_async - Use __CARDIsWritable instead of __CARDAccess

Zephiles · Zephiles · commit 2cf055be7846 · 2022-05-15T19:34:51.000-05:00
Newer versions of this function use __CARDIsWritable, which does additional permission checks if the game id and/or maker codes do not match.
diff --git a/ttyd-tools/rel/include/gc/card.h b/ttyd-tools/rel/include/gc/card.h
@@ -89,6 +89,7 @@ void *__CARDGetDirBlock(void *card);
 int32_t __CARDUpdateDir(int32_t channel, CARDCallback callback);
 bool __CARDCompareFileName(void *dirBlock, const char *fileName);
 int32_t __CARDAccess(void *card, void *dirBlock);
+int32_t __CARDIsWritable(void *card, void *dirBlock);
 }
 
 // Manually-written functions
diff --git a/ttyd-tools/rel/include/lst/ttyd.eu.lst b/ttyd-tools/rel/include/lst/ttyd.eu.lst
@@ -2403,7 +2403,7 @@
 // 802B479C:CARDFormatAsync
 802B47E4:__CARDCompareFileName
 802B484C:__CARDAccess
-// 802B48E0:__CARDIsWritable
+802B48E0:__CARDIsWritable
 // 802B4A14:__CARDIsReadable
 // 802B4B08:__CARDGetFileNo
 802B4C58:CARDOpen
diff --git a/ttyd-tools/rel/include/lst/ttyd.jp.lst b/ttyd-tools/rel/include/lst/ttyd.jp.lst
@@ -2403,7 +2403,7 @@
 // 802AA91C:CARDFormatAsync
 802AA964:__CARDCompareFileName
 802AA9CC:__CARDAccess
-// 802AAA60:__CARDIsWritable
+802AAA60:__CARDIsWritable
 // 802AAB94:__CARDIsReadable
 // 802AAC88:__CARDGetFileNo
 802AADD8:CARDOpen
diff --git a/ttyd-tools/rel/include/lst/ttyd.us.lst b/ttyd-tools/rel/include/lst/ttyd.us.lst
@@ -2403,7 +2403,7 @@ unused:winFontSetCenter
 // 802B0720:CARDFormatAsync
 802B0768:__CARDCompareFileName
 802B07D0:__CARDAccess
-// 802B0864:__CARDIsWritable
+802B0864:__CARDIsWritable
 // 802B0998:__CARDIsReadable
 // 802B0A8C:__CARDGetFileNo
 802B0BDC:CARDOpen
diff --git a/ttyd-tools/rel/source/gc/card.cpp b/ttyd-tools/rel/source/gc/card.cpp
@@ -91,7 +91,7 @@ int32_t card_rename_async(int32_t channel, const char *oldName, const char *newN
     // Make sure this game has proper access to the file that is being renamed
     uint8_t *CurrentDirBlock = reinterpret_cast<uint8_t *>(DirBlock + (OldNameFileIndex * 0x40));
     
-    ReturnCode = __CARDAccess(Card, CurrentDirBlock);
+    ReturnCode = __CARDIsWritable(Card, CurrentDirBlock);
     if (ReturnCode != CARD_RESULT_READY)
     {
         __CARDPutControlBlock(Card, ReturnCode);
diff --git a/ttyd-tools/rel/source/global.cpp b/ttyd-tools/rel/source/global.cpp
@@ -5,7 +5,7 @@
 
 namespace mod {
 
-const char *VersionNumber = "v3.0.54";
+const char *VersionNumber = "v3.0.55d";
 
 const char *RootLines[] = 
 {

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ void __CARDGetDirBlock(void card);`
`89`	`89`	`int32_t __CARDUpdateDir(int32_t channel, CARDCallback callback);`
`90`	`90`	`bool __CARDCompareFileName(void dirBlock, const char fileName);`
`91`	`91`	`int32_t __CARDAccess(void card, void dirBlock);`
	`92`	`+int32_t __CARDIsWritable(void card, void dirBlock);`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`// Manually-written functions`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ int32_t card_rename_async(int32_t channel, const char oldName, const char newN`
`91`	`91`	`// Make sure this game has proper access to the file that is being renamed`
`92`	`92`	`uint8_t CurrentDirBlock = reinterpret_cast<uint8_t >(DirBlock + (OldNameFileIndex * 0x40));`
`93`	`93`
`94`		`- ReturnCode = __CARDAccess(Card, CurrentDirBlock);`
	`94`	`+ ReturnCode = __CARDIsWritable(Card, CurrentDirBlock);`
`95`	`95`	`if (ReturnCode != CARD_RESULT_READY)`
`96`	`96`	`{`
`97`	`97`	`__CARDPutControlBlock(Card, ReturnCode);`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace mod {`
`7`	`7`
`8`		`-const char *VersionNumber = "v3.0.54";`
	`8`	`+const char *VersionNumber = "v3.0.55d";`
`9`	`9`
`10`	`10`	`const char *RootLines[] =`
`11`	`11`	`{`