mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

ZAPD hotfix (#599)

Browse source 
* change parent

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "440ed2684"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "440ed2684"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
This commit is contained in:
fig02 2021-01-03 17:29:44 -05:00 committed by GitHub
parent 2b346a1f6a
commit 794538f6f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/ZAPD/.gitrepo
View file

@ -6,7 +6,7 @@
[subrepo] [subrepo]
remote = https://github.com/zeldaret/ZAPD.git remote = https://github.com/zeldaret/ZAPD.git
branch = master branch = master
commit = cd4a8760b64474a2603c2d164ab7fb7bcd88385c commit = 440ed2684bb9d02837bfef0c41e6c59e479897a4
parent = 9b82d8ffae16a4b6c5a7ff86019eae84ce4638fc parent = 1f7bebfc05c42cc4f100a1992970e78ef7055dbd
method = merge method = merge
cmdver = 0.4.3 cmdver = 0.4.3

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

@ -211,7 +211,7 @@ std::string ZSkeleton::GetSourceOutputCode(std::string prefix)
if (parent->HasDeclaration(limb->address)) if (parent->HasDeclaration(limb->address))
limbName = parent->GetDeclarationName(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 // Table

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

@ -348,9 +348,9 @@ void ZTexture::PrepareBitmapPalette4()
else else
paletteIndex = (uint8_t)((rawData[pos] & 0x0F)); paletteIndex = (uint8_t)((rawData[pos] & 0x0F));
bmpRgb[(((y * width) + x) * 3) + 0] = paletteIndex * 16; bmpRgb[(((y * width) + x + i) * 3) + 0] = paletteIndex * 16;
bmpRgb[(((y * width) + x) * 3) + 1] = paletteIndex * 16; bmpRgb[(((y * width) + x + i) * 3) + 1] = paletteIndex * 16;
bmpRgb[(((y * width) + x) * 3) + 2] = paletteIndex * 16; bmpRgb[(((y * width) + x + i) * 3) + 2] = paletteIndex * 16;
} }
} }
} }