Move m_card progress from old branch, m_card 46%

include/audio_defs.h

@@ -92,7 +92,7 @@ typedef enum audio_sound_effects {
     NA_SE_REGISTER = 0x50,
     NA_SE_51 = 0x51,
     NA_SE_52 = 0x52,
-
+    NA_SE_53 = 0x53,
     NA_SE_54 = 0x54,
 
     NA_SE_ITEM_HORIDASHI = 0x57,

include/libjsys/jsyswrapper.h

@@ -136,6 +136,10 @@ extern u32 JC_JKRHeap_getFreeSize(void* heap);
 extern void* JC_JKRHeap_alloc(void* heap, u32 size, int align);
 extern void JC_JKRHeap_free(void* heap, void* mem);
 
+extern void* JC__JKRAllocFromAram(size_t size);
+extern u8* JC__JKRAramToMainRam_block(void* aramBlock, u8* ramDst, size_t size);
+extern void* JC__JKRMainRamToAram_block(u8* ramAddr, void* aramBlock, size_t size);
+
 extern void* JW_Alloc(size_t size, int align);
 extern void JW_Free(void* ptr);
 extern s32 JW_Resize(void* ptr, size_t new_size);

include/m_card.h

@@ -185,11 +185,11 @@ typedef struct {
     int loaded_file_type;
     u32 workArea_size;
     void* workArea;
-    int _0010;
+    u8 _0010;
     int load_proc;
     u8 _0018[0x0054 - 0x0018];
     mCD_memMgr_card_info_c cards[CARD_NUM_CHANS];
-    int _017C;
+    u32 _017C;
     int land_saved;
     int copy_protect;
     int _0188;
@@ -207,6 +207,12 @@ typedef struct {
 /* Bonus letter */
 #define mCD_PRESENT_MAX 9
 
+typedef struct memcard_header_s {
+    char comment[CARD_COMMENT_SIZE];
+    u8 banner[0xE00];
+    u8 icon[0x600];
+} MemcardHeader_c;
+
 typedef struct present_save_s {
     u16 checksum;
     u16 present_count;
@@ -215,9 +221,7 @@ typedef struct present_save_s {
 
 typedef union {
     struct {
-        char comment[CARD_COMMENT_SIZE];
-        u8 banner[0xE00];
-        u8 icon[0x600];
+        MemcardHeader_c header;
         PresentSave_c save;
     };
     u8 __align_sector[mCD_MEMCARD_SECTORSIZE];
@@ -255,9 +259,12 @@ extern int mCD_EraseBrokenLand_bg(void*);
 extern int mCD_EraseLand_bg(int* slot);
 extern int mCD_ErasePassportFile_bg(int slot);
 extern int mCD_SaveErasePlayer_bg(int* slot);
-extern int mCD_card_format_bg(u8);
+extern int mCD_card_format_bg(s32 chan);
 extern void mCD_ReCheckLoadLand(GAME_PLAY* play);
 
+extern int mCD_save_data_aram_to_main(void* dst, u32 size, u32 idx);
+extern int mCD_save_data_main_to_aram(void* src, u32 size, u32 idx);
+
 #ifdef __cplusplus
 }
 #endif