diff --git a/tools/ZAPD/.gitrepo b/tools/ZAPD/.gitrepo
index bb5ac2efe1..801b2b6383 100644
--- a/tools/ZAPD/.gitrepo
+++ b/tools/ZAPD/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/zeldaret/ZAPD.git
 	branch = master
-	commit = c04562d30aae565e98d538fd4c1e5c08699c8d48
-	parent = cfe1e4db6e1a4b561ac1ed0e87f250c83b5a3c69
+	commit = 35ea376daf003fdd3297a2e7355ad82e70ec1e8c
+	parent = b97a21c2532622a83e9153996e303c3edc2727a8
 	method = merge
-	cmdver = 0.4.9
+	cmdver = 0.4.6
diff --git a/tools/ZAPD/ZAPD/ZTexture.cpp b/tools/ZAPD/ZAPD/ZTexture.cpp
index 0ecda1a8ce..0d66ba7da3 100644
--- a/tools/ZAPD/ZAPD/ZTexture.cpp
+++ b/tools/ZAPD/ZAPD/ZTexture.cpp
@@ -131,7 +131,7 @@ void ZTexture::ParseXML(tinyxml2::XMLElement* reader)
 
 void ZTexture::ParseRawData()
 {
-	if (rawDataIndex % 8 != 0)
+	if ((parent->baseAddress + rawDataIndex) % 8 != 0)
 		dWordAligned = false;
 
 	switch (format)