From f8d050bf7f8817c94d21865a70aa40669480fa57 Mon Sep 17 00:00:00 2001 From: cadmic Date: Fri, 24 Jan 2025 11:02:44 -0800 Subject: [PATCH] git subrepo pull --force tools/ZAPD (#2441) subrepo: subdir: "tools/ZAPD" merged: "35ea376da" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "35ea376da" git-subrepo: version: "0.4.6" origin: "git@github.com:ingydotnet/git-subrepo.git" commit: "110b9eb" --- tools/ZAPD/.gitrepo | 6 +++--- tools/ZAPD/ZAPD/ZTexture.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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)