gcipack: Fix block count being calculated incorrectly

Author: PistonMiner

ttyd-tools/gcipack/gcipack.py

@@ -9,26 +9,6 @@
 inputBuffer = ctypes.create_string_buffer(inputFile.read())[:-1]
 inputFile.close()
 
-blockCount = math.ceil((0x2040 + len(inputBuffer)) / 0x2000)
-
-# Create header
-headerBuffer = ctypes.create_string_buffer(0x40)
-struct.pack_into(">L",  headerBuffer,  0x00, 0x47384D45)	# game code
-struct.pack_into(">H",  headerBuffer,  0x04, 0x3031)		# maker code
-struct.pack_into(">B",  headerBuffer,  0x06, 0xFF)			# unused
-struct.pack_into(">B",  headerBuffer,  0x07, 2)				# banner flags (RGB5A3)
-struct.pack_into("32s", headerBuffer,  0x08, sys.argv[2].encode())	# filename
-struct.pack_into(">L",  headerBuffer,  0x28, 0)				# modified time
-struct.pack_into(">L",  headerBuffer,  0x2C, 0)				# image offset
-struct.pack_into(">H",  headerBuffer,  0x30, 2)				# icon format
-struct.pack_into(">H",  headerBuffer,  0x32, 3)				# animation speed (1 icon for 12 frames)
-struct.pack_into(">B",  headerBuffer,  0x34, 4)				# permissions
-struct.pack_into(">B",  headerBuffer,  0x35, 0)				# copy counter
-struct.pack_into(">H",  headerBuffer,  0x36, 0)				# first block number
-struct.pack_into(">H",  headerBuffer,  0x38, blockCount)	# block count
-struct.pack_into(">H",  headerBuffer,  0x3A, 0xFF)			# unused
-struct.pack_into(">L",  headerBuffer,  0x3C, 0x2000)		# comment address
-
 # Load banner and icon
 bannerFile = open(sys.argv[5], "rb")
 bannerBuffer = ctypes.create_string_buffer(bannerFile.read())[:-1]
@@ -51,12 +31,31 @@
 fileInfoBuffer = ctypes.create_string_buffer(0x200 - 0x40)
 struct.pack_into(">L", fileInfoBuffer, 0, len(inputBuffer))
 
-
 # Pad to block boundary
-paddingLength = blockCount * 0x2000 - (len(bannerBuffer) + len(iconBuffer) + len(commentBuffer) + len(fileInfoBuffer) + len(inputBuffer))
+fileLength = len(bannerBuffer) + len(iconBuffer) + len(commentBuffer) + len(fileInfoBuffer) + len(inputBuffer)
+blockCount = math.ceil(fileLength / 0x2000)
+paddingLength = blockCount * 0x2000 - fileLength
 paddingBuffer = ctypes.create_string_buffer(paddingLength)
 
-outputFilename = os.path.splitext(os.path.splitext(inputFilename)[0])[0] + ".gci"
+# Create header
+headerBuffer = ctypes.create_string_buffer(0x40)
+struct.pack_into(">L",  headerBuffer,  0x00, 0x47384D45)	# game code
+struct.pack_into(">H",  headerBuffer,  0x04, 0x3031)		# maker code
+struct.pack_into(">B",  headerBuffer,  0x06, 0xFF)			# unused
+struct.pack_into(">B",  headerBuffer,  0x07, 2)				# banner flags (RGB5A3)
+struct.pack_into("32s", headerBuffer,  0x08, sys.argv[2].encode())	# filename
+struct.pack_into(">L",  headerBuffer,  0x28, 0)				# modified time
+struct.pack_into(">L",  headerBuffer,  0x2C, 0)				# image offset
+struct.pack_into(">H",  headerBuffer,  0x30, 2)				# icon format
+struct.pack_into(">H",  headerBuffer,  0x32, 3)				# animation speed (1 icon for 12 frames)
+struct.pack_into(">B",  headerBuffer,  0x34, 4)				# permissions
+struct.pack_into(">B",  headerBuffer,  0x35, 0)				# copy counter
+struct.pack_into(">H",  headerBuffer,  0x36, 0)				# first block number
+struct.pack_into(">H",  headerBuffer,  0x38, blockCount)	# block count
+struct.pack_into(">H",  headerBuffer,  0x3A, 0xFF)			# unused
+struct.pack_into(">L",  headerBuffer,  0x3C, 0x2000)		# comment address
+
+outputFilename = os.path.splitext(inputFilename)[0] + ".gci"
 outputFile = open(outputFilename, "wb")
 outputFile.write(bytearray(headerBuffer))
 outputFile.write(bytearray(bannerBuffer))