ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix auto import raw (uncompressed) no$gba saves;

This commit is contained in:
mtabachenko 2013-11-19 10:32:58 +00:00
parent b3586a0a98
commit 63406703aa
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
desmume/src/mc.cpp
View File

@ -271,6 +271,8 @@ BackupDevice::BackupDevice()
{ {
if (no_gba_unpack(buf, sz)) if (no_gba_unpack(buf, sz))
printf("Converted from no$gba save.\n"); printf("Converted from no$gba save.\n");
else
sz = trim(buf, sz);
if (fwrite(buf, 1, sz, fpOut->get_fp()) == sz) if (fwrite(buf, 1, sz, fpOut->get_fp()) == sz)
{ {
@ -1069,6 +1071,8 @@ u32 BackupDevice::get_save_nogba_size(u8 *data)
return *((u32*)(data+0x48)); return *((u32*)(data+0x48));
if (compressMethod == 1) if (compressMethod == 1)
return *((u32*)(data+0x4C)); return *((u32*)(data+0x4C));
return 0xFFFFFFFF;
} }
static int no_gba_unpackSAV(void *in_buf, u32 fsize, void *out_buf, u32 &size) static int no_gba_unpackSAV(void *in_buf, u32 fsize, void *out_buf, u32 &size)
@ -1151,7 +1155,7 @@ static int no_gba_unpackSAV(void *in_buf, u32 fsize, void *out_buf, u32 &size)
return (200); return (200);
} }
static u32 no_gba_savTrim(void *buf, u32 size) u32 BackupDevice::trim(void *buf, u32 size)
{ {
u32 rows = size / 16; u32 rows = size / 16;
u32 pos = (size - 16); u32 pos = (size - 16);
@ -1174,7 +1178,7 @@ static u32 no_gba_savTrim(void *buf, u32 size)
return (size); return (size);
} }
static u32 no_gba_fillLeft(u32 size) u32 BackupDevice::fillLeft(u32 size)
{ {
for (u32 i = 1; i < ARRAY_SIZE(save_types); i++) for (u32 i = 1; i < ARRAY_SIZE(save_types); i++)
{ {
@ -1211,9 +1215,9 @@ bool BackupDevice::import_no_gba(const char *fname, u32 force_size)
if (force_size > 0) if (force_size > 0)
size = force_size; size = force_size;
//printf("New size %i byte(s)\n", size); //printf("New size %i byte(s)\n", size);
size = no_gba_savTrim(out_buf, size); size = trim(out_buf, size);
//printf("--- new size after trim %i byte(s)\n", size); //printf("--- new size after trim %i byte(s)\n", size);
size = no_gba_fillLeft(size); size = fillLeft(size);
//printf("--- new size after fill %i byte(s)\n", size); //printf("--- new size after fill %i byte(s)\n", size);
raw_applyUserSettings(size, (force_size > 0)); raw_applyUserSettings(size, (force_size > 0));
saveBuffer(out_buf, size, true, true); saveBuffer(out_buf, size, true, true);
@ -1241,8 +1245,8 @@ bool BackupDevice::no_gba_unpack(u8 *&buf, u32 &size)
{ {
if (no_gba_unpackSAV(buf, size, out_buf, out_size) == 0) if (no_gba_unpackSAV(buf, size, out_buf, out_size) == 0)
{ {
out_size = no_gba_savTrim(out_buf, out_size); out_size = trim(out_buf, out_size);
out_size = no_gba_fillLeft(out_size); out_size = fillLeft(out_size);
delete [] buf; delete [] buf;
buf = out_buf; buf = out_buf;
size = out_size; size = out_size;

3
desmume/src/mc.h
View File

@ -114,6 +114,9 @@ public:
static u32 pad_up_size(u32 startSize); static u32 pad_up_size(u32 startSize);
void raw_applyUserSettings(u32& size, bool manual = false); void raw_applyUserSettings(u32& size, bool manual = false);
u32 trim(void *buf, u32 size);
u32 fillLeft(u32 size);
u32 get_save_duc_size(const char* filename); u32 get_save_duc_size(const char* filename);
u32 get_save_nogba_size(const char* filename); u32 get_save_nogba_size(const char* filename);
u32 get_save_nogba_size(u8 *data); u32 get_save_nogba_size(u8 *data);