diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-06-23 16:45:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 16:45:44 -0400 |
| commit | b1f0bcd9a98f021f42bab606665425332576d9ce (patch) | |
| tree | 2c26a927de1882406a7fc2890bc9bc20c5cfbaef /ZAPD/ZDisplayList.cpp | |
| parent | d7f580bdf9661ea5b1b7e7e93672f8c363049ef4 (diff) | |
Add support to `LegacyLimb`s and `LegacyAnimation`, making `object_human` extractable (#152)
* proof of concept
* Add hex type to ZScalar
* minor fixes
* BetaAnimation proof of concept
* FrameData and JointKey
* Fix warnings
* Rename betalimb to legacylimb and move with the rest of limbs
* Rename BetaAnimation to LegacyAnimation
* Add verboseunaccounted
* Add limb table
* Use ZLimbTable in ZSkeleton
* run format
* Update docs
* AnimationHeader2 -> LegacyAnimationHeader
Diffstat (limited to 'ZAPD/ZDisplayList.cpp')
| -rw-r--r-- | ZAPD/ZDisplayList.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ZAPD/ZDisplayList.cpp b/ZAPD/ZDisplayList.cpp index 7f3e895..4de6af6 100644 --- a/ZAPD/ZDisplayList.cpp +++ b/ZAPD/ZDisplayList.cpp @@ -510,7 +510,7 @@ int32_t ZDisplayList::OptimizationCheck_LoadTextureBlock(int32_t startIndex, std fmt = (__ & 0xE0) >> 5; siz = (__ & 0x18) >> 3; texAddr = Seg2Filespace(data, parent->baseAddress); - int32_t segmentNumber = GETSEGNUM(data); + uint32_t segmentNumber = GETSEGNUM(data); lastTexSeg = segmentNumber; @@ -1660,7 +1660,7 @@ static int32_t GfxdCallback_Texture(segptr_t seg, int32_t fmt, int32_t siz, int3 { ZDisplayList* self = static_cast<ZDisplayList*>(gfxd_udata_get()); uint32_t texOffset = Seg2Filespace(seg, self->parent->baseAddress); - int32_t texSegNum = GETSEGNUM(seg); + uint32_t texSegNum = GETSEGNUM(seg); self->lastTexWidth = width; self->lastTexHeight = height; @@ -1696,7 +1696,7 @@ static int32_t GfxdCallback_Palette(uint32_t seg, int32_t idx, int32_t count) { ZDisplayList* self = static_cast<ZDisplayList*>(gfxd_udata_get()); uint32_t palOffset = Seg2Filespace(seg, self->parent->baseAddress); - int32_t palSegNum = GETSEGNUM(seg); + uint32_t palSegNum = GETSEGNUM(seg); self->lastTexWidth = sqrt(count); self->lastTexHeight = sqrt(count); @@ -1732,7 +1732,7 @@ static int32_t GfxdCallback_DisplayList(uint32_t seg) { ZDisplayList* self = static_cast<ZDisplayList*>(gfxd_udata_get()); uint32_t dListOffset = GETSEGOFFSET(seg); - int32_t dListSegNum = GETSEGNUM(seg); + uint32_t dListSegNum = GETSEGNUM(seg); if ((dListSegNum <= 6) && Globals::Instance->HasSegment(dListSegNum)) { |