hacktools 0.38.1__tar.gz → 0.38.3__tar.gz

{hacktools-0.38.1/hacktools.egg-info → hacktools-0.38.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: hacktools
-Version: 0.38.1
+Version: 0.38.3
 Summary: A set of utilities and tools for rom hacking and translations.
 Home-page: https://github.com/Illidanz/hacktools
 Author: Illidan

hacktools-0.38.3/hacktools/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.38.3"

{hacktools-0.38.1 → hacktools-0.38.3}/hacktools/common.py

@@ -969,7 +969,7 @@ def detectASCIIString(f, encoding="ascii", startascii=[]):
     return ret
 
 
-def writeEncodedString(f, s, maxlen=0, encoding="shift_jis"):
+def writeEncodedString(f, s, maxlen=0, encoding="shift_jis", zerobytes=1):
     i = 0
     x = 0
     s = s.replace("～", "〜")
@@ -1000,7 +1000,8 @@ def writeEncodedString(f, s, maxlen=0, encoding="shift_jis"):
             f.write(c.encode(encoding))
             i += 2
         x += 1
-    f.writeByte(0x00)
+    if zerobytes > 0:
+        f.writeZero(zerobytes)
     return i
 
 

{hacktools-0.38.1 → hacktools-0.38.3}/hacktools/nitro.py

@@ -113,19 +113,20 @@ def repackIMG(workfolder, infolder, outfolder, extensions=".NCGR", readfunc=None
         common.copyFile(infolder + file, outfolder + file)
         transptile = False
         if writefunc is not None:
-            image, map, cell, width, height, transptile = writefunc(file, image, map, cell, width, height)
-        if map is None and cell is None:
-            writeNCGR(outfolder + file, image, workfolder + pngfile, palettes, width, height)
-        elif cell is None:
-            common.copyFile(infolder + mapfile, outfolder + mapfile)
-            writeMappedNSCR(outfolder + file, outfolder + mapfile, image, map, workfolder + pngfile, palettes, width, height, transptile)
-        else:
-            if os.path.isfile(workfolder + cellfile):
-                cell = readNCER(workfolder + cellfile)
-                common.copyFile(workfolder + cellfile, outfolder + cellfile)
+            image, palettes, map, cell, width, height, transptile = writefunc(workfolder, infolder, outfolder, file, image, palettes, map, cell, width, height)
+        if image is not None:
+            if map is None and cell is None:
+                writeNCGR(outfolder + file, image, workfolder + pngfile, palettes, width, height)
+            elif cell is None:
+                common.copyFile(infolder + mapfile, outfolder + mapfile)
+                writeMappedNSCR(outfolder + file, outfolder + mapfile, image, map, workfolder + pngfile, palettes, width, height, transptile)
             else:
-                common.copyFile(infolder + cellfile, outfolder + cellfile)
-            writeNCER(outfolder + file, outfolder + cellfile, image, cell, workfolder + pngfile, palettes, width, height)
+                if os.path.isfile(workfolder + cellfile):
+                    cell = readNCER(workfolder + cellfile)
+                    common.copyFile(workfolder + cellfile, outfolder + cellfile)
+                else:
+                    common.copyFile(infolder + cellfile, outfolder + cellfile)
+                writeNCER(outfolder + file, outfolder + cellfile, image, cell, workfolder + pngfile, palettes, width, height)
     common.logMessage("Done!")
 
 

{hacktools-0.38.1 → hacktools-0.38.3/hacktools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: hacktools
-Version: 0.38.1
+Version: 0.38.3
 Summary: A set of utilities and tools for rom hacking and translations.
 Home-page: https://github.com/Illidanz/hacktools
 Author: Illidan

hacktools-0.38.1/hacktools/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.38.1"