diff --git a/tools/ZAPD/.gitrepo b/tools/ZAPD/.gitrepo
index aba7c73a4b..c9bb5bb13f 100644
--- a/tools/ZAPD/.gitrepo
+++ b/tools/ZAPD/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/zeldaret/ZAPD.git
 	branch = master
-	commit = cd4a8760b64474a2603c2d164ab7fb7bcd88385c
-	parent = 9b82d8ffae16a4b6c5a7ff86019eae84ce4638fc
+	commit = 440ed2684bb9d02837bfef0c41e6c59e479897a4
+	parent = 1f7bebfc05c42cc4f100a1992970e78ef7055dbd
 	method = merge
 	cmdver = 0.4.3
diff --git a/tools/ZAPD/ZAPD/ZSkeleton.cpp b/tools/ZAPD/ZAPD/ZSkeleton.cpp
index 7d41b51689..7e524ba64d 100644
--- a/tools/ZAPD/ZAPD/ZSkeleton.cpp
+++ b/tools/ZAPD/ZAPD/ZSkeleton.cpp
@@ -211,7 +211,7 @@ std::string ZSkeleton::GetSourceOutputCode(std::string prefix)
 			if (parent->HasDeclaration(limb->address))
 				limbName = parent->GetDeclarationName(limb->address);
 
-			parent->AddDeclaration(limb->address, DeclarationAlignment::None, 12, entryType, limbName, entryStr);
+			parent->AddDeclaration(limb->address, DeclarationAlignment::None, limb->GetRawDataSize(), entryType, limbName, entryStr);
 		}
 
 		// Table
diff --git a/tools/ZAPD/ZAPD/ZTexture.cpp b/tools/ZAPD/ZAPD/ZTexture.cpp
index cf802a24cd..ad61ba9148 100644
--- a/tools/ZAPD/ZAPD/ZTexture.cpp
+++ b/tools/ZAPD/ZAPD/ZTexture.cpp
@@ -348,9 +348,9 @@ void ZTexture::PrepareBitmapPalette4()
 				else
 					paletteIndex = (uint8_t)((rawData[pos] & 0x0F));
 
-				bmpRgb[(((y * width) + x) * 3) + 0] = paletteIndex * 16;
-				bmpRgb[(((y * width) + x) * 3) + 1] = paletteIndex * 16;
-				bmpRgb[(((y * width) + x) * 3) + 2] = paletteIndex * 16;
+				bmpRgb[(((y * width) + x + i) * 3) + 0] = paletteIndex * 16;
+				bmpRgb[(((y * width) + x + i) * 3) + 1] = paletteIndex * 16;
+				bmpRgb[(((y * width) + x + i) * 3) + 2] = paletteIndex * 16;
 			}
 		}
 	}