mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-04 19:24:28 +00:00
Code Issues Projects Releases Wiki Activity

git subrepo pull --force tools/ZAPD (#2441)

Browse source 
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"
This commit is contained in:
cadmic 2025-01-24 11:02:44 -08:00 • committed by GitHub
parent f448a48cd6
commit f8d050bf7f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/ZAPD/.gitrepo
View file

@ -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

2
tools/ZAPD/ZAPD/ZTexture.cpp
View file

@ -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)