hacktools 0.38.2__tar.gz → 0.38.4__tar.gz

{hacktools-0.38.2/hacktools.egg-info → hacktools-0.38.4}/PKG-INFO

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

hacktools-0.38.4/hacktools/__init__.py

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

{hacktools-0.38.2 → hacktools-0.38.4}/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!")
 
 
@@ -1006,7 +1007,7 @@ def writeNCGR(file, ncgr, infile, palettes, width=-1, height=-1):
                 writeNCGRTile(f, pixels, width, ncgr, i, j, palettes[0])
 
 
-def writeNSCR(file, ncgr, nscr, infile, palettes, width=-1, height=-1):
+def writeNSCR(file, ncgr, nscr, infile, palettes, width=-1, height=-1, skipfirst=False):
     try:
         from PIL import Image
     except ImportError:
@@ -1028,10 +1029,16 @@ def writeNSCR(file, ncgr, nscr, infile, palettes, width=-1, height=-1):
                 if map.xflip or map.yflip:
                     x += 1
                     continue
+                if skipfirst and x == 0:
+                    x += 1
+                    continue
                 # Write the tile if it's a new one
                 if map.tile not in donetiles:
                     donetiles.append(map.tile)
-                    f.seek(ncgr.tileoffset + map.tile * (8 * ncgr.bpp))
+                    tilenum = map.tile
+                    if skipfirst:
+                        tilenum -= 1
+                    f.seek(ncgr.tileoffset + tilenum * (8 * ncgr.bpp))
                     writeNCGRTile(f, pixels, width, ncgr, i, j, palettes[map.pal])
                 x += 1
 

{hacktools-0.38.2 → hacktools-0.38.4/hacktools.egg-info}/PKG-INFO

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

hacktools-0.38.2/hacktools/__init__.py

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