diff --git a/config/SZBE69/objects.json b/config/SZBE69/objects.json index 3b7b7542..b6a0b269 100644 --- a/config/SZBE69/objects.json +++ b/config/SZBE69/objects.json @@ -61,6 +61,7 @@ "system/rndobj/ScreenMask.cpp": "NonMatching", "system/rndobj/Set.cpp": "NonMatching", "system/rndobj/ShaderOptions.cpp": "NonMatching", + "system/rndobj/SIVideo.cpp": "NonMatching", "system/rndobj/SoftParticles.cpp": "NonMatching", "system/rndobj/Tex.cpp": "NonMatching", "system/rndobj/TexBlendController.cpp": "NonMatching", diff --git a/config/SZBE69/splits.txt b/config/SZBE69/splits.txt index 5b6e2bab..04125b16 100644 --- a/config/SZBE69/splits.txt +++ b/config/SZBE69/splits.txt @@ -1210,11 +1210,14 @@ system/rndobj/MatAnim.cpp: .bss start:0x8098CEE8 end:0x8098CEF0 system/rndobj/Mesh.cpp: - .text start:0x805FCEC8 end:0x80606C98 + .text start:0x805FCEC0 end:0x80606C98 .ctors start:0x807EFFF0 end:0x807EFFF4 system/rndobj/MeshAnim.cpp: - .text start:0x80606C98 end:0x8060DD84 + .text start:0x80606C98 end:0x8060DD24 + +system/rndobj/MeshDeform.cpp: + .text start:0x8060DD24 end:0x80610528 system/rndobj/Morph.cpp: .text start:0x80610528 end:0x80613A80 @@ -1260,6 +1263,10 @@ system/rndobj/Poll.cpp: system/rndobj/PollAnim.cpp: .text start:0x806238C0 end:0x80624574 +system/rndobj/PostProc.cpp: + .text start:0x80624574 end:0x806273E0 + .ctors start:0x807F0000 end:0x807F0004 + system/rndobj/PropKeys.cpp: .text start:0x806273E0 end:0x806319D0 .ctors start:0x807F0004 end:0x807F0008 @@ -1283,6 +1290,12 @@ system/rndobj/ShaderOptions.cpp: .data start:0x80899360 end:0x80899860 .bss start:0x8098D4F8 end:0x8098D560 +system/rndobj/ShadowMap.cpp: + .text start:0x8063F464 end:0x8063F490 + +system/rndobj/SIVideo.cpp: + .text start:0x8063F490 end:0x8063F6C4 + system/rndobj/Tex.cpp: .text start:0x8063F6C4 end:0x806412A8 .data start:0x80899860 end:0x80899B30 diff --git a/config/SZBE69/symbols.txt b/config/SZBE69/symbols.txt index 6867de73..46e3c2e0 100644 --- a/config/SZBE69/symbols.txt +++ b/config/SZBE69/symbols.txt @@ -27673,7 +27673,7 @@ fn_80353DE4 = .text:0x80353DE4; // type:function size:0x34 _MemAlloc__Fii = .text:0x80353E18; // type:function size:0x370 fn_80354188 = .text:0x80354188; // type:function size:0x30 MemAllocTemp__Fii = .text:0x803541B8; // type:function size:0x80 -MemFree__FPv = .text:0x80354238; // type:function size:0xD8 +_MemFree__FPv = .text:0x80354238; // type:function size:0xD8 fn_80354310 = .text:0x80354310; // type:function size:0x108 fn_80354418 = .text:0x80354418; // type:function size:0xC0 MemRealloc__FPvii = .text:0x803544D8; // type:function size:0xCC @@ -51920,13 +51920,13 @@ ClassName__6RndSetCFv = .text:0x8063F084; // type:function size:0x4 SetType__6RndSetF6Symbol = .text:0x8063F088; // type:function size:0x128 InitShaderOptions__Fv = .text:0x8063F1B0; // type:function size:0x294 __sinit_\ShaderOptions_cpp = .text:0x8063F444; // type:function size:0x20 scope:local -fn_8063F464 = .text:0x8063F464; // type:function size:0x8 -fn_8063F46C = .text:0x8063F46C; // type:function size:0x24 -fn_8063F490 = .text:0x8063F490; // type:function size:0x5C -fn_8063F4EC = .text:0x8063F4EC; // type:function size:0x128 -fn_8063F614 = .text:0x8063F614; // type:function size:0x18 -fn_8063F62C = .text:0x8063F62C; // type:function size:0x40 -fn_8063F66C = .text:0x8063F66C; // type:function size:0x58 +PrepShadow__12RndShadowMapFP11RndDrawableP10RndEnviron = .text:0x8063F464; // type:function size:0x8 +EndShadow__12RndShadowMapFv = .text:0x8063F46C; // type:function size:0x24 +Reset__7SIVideoFv = .text:0x8063F490; // type:function size:0x5C +Load__7SIVideoFR9BinStreamb = .text:0x8063F4EC; // type:function size:0x128 +Bpp__7SIVideoCFv = .text:0x8063F614; // type:function size:0x18 +FrameSize__7SIVideoCFv = .text:0x8063F62C; // type:function size:0x40 +Frame__7SIVideoFi = .text:0x8063F66C; // type:function size:0x58 __ct__6RndTexFv = .text:0x8063F6C4; // type:function size:0x88 __dt__6RndTexFv = .text:0x8063F74C; // type:function size:0xAC PlatformBppOrder__6RndTexFPCcRiRib = .text:0x8063F7F8; // type:function size:0x38 diff --git a/src/system/rndobj/SIVideo.cpp b/src/system/rndobj/SIVideo.cpp index 62d93e0f..37afac12 100644 --- a/src/system/rndobj/SIVideo.cpp +++ b/src/system/rndobj/SIVideo.cpp @@ -41,8 +41,8 @@ void SIVideo::Load(BinStream& bs, bool load_data) { mData = 0; } if (!load_data) { - mData = (char*)_MemAlloc(mHeight * (mMagic * mWidth * Bpp() >> 3), 0); - bs.Read(mData, mHeight * (mMagic * mWidth * Bpp() >> 3)); + mData = (char*)_MemAlloc(mHeight * FrameSize(), 0); + bs.Read(mData, mHeight * FrameSize()); } } @@ -53,7 +53,7 @@ DECOMP_FORCEBLOCK(SIVideo, (const SIVideo* s), s->Bpp(); s->FrameSize();) char* SIVideo::Frame(int i) { if (mData) { - return &mData[((mMagic * mWidth * Bpp()) >> 3) * i]; + return &mData[FrameSize() * i]; } else return NULL; }