Replicate changes in 5e82233 to correctly fix resolvedefines and getw…

…rittenblocks
RPGHacker · Jul 31, 2024 · 3d48a4e · 3d48a4e
1 parent 52f1011
commit 3d48a4e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/asar/interface-lib.cpp b/src/asar/interface-lib.cpp
@@ -493,11 +493,14 @@ EXPORT const char * asar_getdefine(const char * name)
 EXPORT const char * asar_resolvedefines(const char * data)
 {
 	static string out;
+	out = "";
 	try
 	{
 		resolvedefines(out, data);
 	}
-	catch(errfatal&){}
+	catch(errfatal&){
+		out = "";
+	}
 	return out;
 }
 

diff --git a/src/asar/libsmw.cpp b/src/asar/libsmw.cpp
@@ -40,6 +40,7 @@ static int findromwritepos(int snesoffset, int searchstartpos, int searchendpos)
 
 static void addromwriteforbank(int snesoffset, int numbytes)
 {
+	if (numbytes == 0) return;
 	int currentbank = (snesoffset & 0xFF0000);
 
 	int insertpos = findromwritepos(snesoffset, 0, writtenblocks.count);