Skip to content

Commit

Permalink
animfilter symbols
Browse files Browse the repository at this point in the history
  • Loading branch information
@rjkiv
rjkiv committed Aug 15, 2024
1 parent 8d94d27 commit a7a567a
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 36 deletions.
1 change: 1 addition & 0 deletions config/SZBE69/objects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"system/math/Key.cpp": "NonMatching",

"system/rndobj/Anim.cpp": "NonMatching",
"system/rndobj/AnimFilter.cpp": "NonMatching",
"system/rndobj/Dir.cpp": "NonMatching",
"system/rndobj/DOFProc.cpp": "NonMatching",
"system/rndobj/Draw.cpp": "NonMatching",
Expand Down
2 changes: 2 additions & 0 deletions config/SZBE69/splits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1109,6 +1109,8 @@ system/rndobj/Anim.cpp:

system/rndobj/AnimFilter.cpp:
.text start:0x805C8850 end:0x805C9A68
.data start:0x80894738 end:0x808947F0
.sbss start:0x808E4BC8 end:0x808E4BD0

system/rndobj/Bitmap.cpp:
.text start:0x805C9A68 end:0x805CAC4C
Expand Down
70 changes: 35 additions & 35 deletions config/SZBE69/symbols.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ fn_8000EE40 = .text:0x8000EE40; // type:function size:0x8
fn_8000EE48 = .text:0x8000EE48; // type:function size:0x8
fn_8000EE50 = .text:0x8000EE50; // type:function size:0x8
fn_8000EE58 = .text:0x8000EE58; // type:function size:0x8
__as__Q23Hmx4QuatFRCQ23Hmx4Quat = .text:0x8000EE60; // type:function size:0x24
MergedAssign4FloatStruct__FPvRCv = .text:0x8000EE60; // type:function size:0x24
__ct__Q23Hmx5ColorFfff = .text:0x8000EE84; // type:function size:0x1C
fn_8000EEA0 = .text:0x8000EEA0; // type:function size:0x18
Start__5TimerFv = .text:0x8000EEB8; // type:function size:0x20
Expand Down Expand Up @@ -930,8 +930,8 @@ fn_8000FF10 = .text:0x8000FF10; // type:function size:0x50
fn_8000FF60 = .text:0x8000FF60; // type:function size:0x24
fn_8000FF84 = .text:0x8000FF84; // type:function size:0x44
MergedGet0xC__FPv = .text:0x8000FFC8; // type:function size:0x8
fn_8000FFD0 = .text:0x8000FFD0; // type:function size:0x8
fn_8000FFD8 = .text:0x8000FFD8; // type:function size:0x8
FirstFromStart__35KeylessHash<PCc,Q29ObjectDir5Entry>Fv = .text:0x8000FFD0; // type:function size:0x8
FirstFromNext__35KeylessHash<PCc,Q29ObjectDir5Entry>FPQ29ObjectDir5Entry = .text:0x8000FFD8; // type:function size:0x8
__ct__7MessageF6Symbol = .text:0x8000FFE0; // type:function size:0x9C scope:weak
fn_8001007C = .text:0x8001007C; // type:function size:0x10
__ct__7MessageF6SymbolRC8DataNode = .text:0x8001008C; // type:function size:0xB4 scope:weak
Expand Down Expand Up @@ -5911,7 +5911,7 @@ __ls__9BinStreamFUi = .text:0x800A7638; // type:function size:0x3C
Load__19MatchmakingSettingsFR9BinStream = .text:0x800A7674; // type:function size:0xBC
__rs__9BinStreamFRUc = .text:0x800A7730; // type:function size:0x34
__rs__9BinStreamFRb = .text:0x800A7764; // type:function size:0x50
__rs__9BinStreamFRi = .text:0x800A77B4; // type:function size:0x34
MergedBinStreamReadWord = .text:0x800A77B4; // type:function size:0x34
fn_800A77E8 = .text:0x800A77E8; // type:function size:0x5C
__dt__19MatchmakingSettingsFv = .text:0x800A7844; // type:function size:0x68
fn_800A78AC = .text:0x800A78AC; // type:function size:0x58
Expand Down Expand Up @@ -9928,7 +9928,7 @@ fn_8011660C = .text:0x8011660C; // type:function size:0xF4
MergedGetF0x0__FPv = .text:0x80116700; // type:function size:0x8
fn_80116708 = .text:0x80116708; // type:function size:0x8
fn_80116710 = .text:0x80116710; // type:function size:0x8
fn_80116718 = .text:0x80116718; // type:function size:0x8
MergedSet0x8__FPvPv = .text:0x80116718; // type:function size:0x8
OnForeachActivePlayer__4GameFP9DataArray = .text:0x80116720; // type:function size:0x110
OnAdjustForVocalPhrases__4GameFP9DataArray = .text:0x80116830; // type:function size:0xCC
StatsSynced__4GameFv = .text:0x801168FC; // type:function size:0x8
Expand Down Expand Up @@ -10840,7 +10840,7 @@ fn_80134330 = .text:0x80134330; // type:function size:0x4C
fn_8013437C = .text:0x8013437C; // type:function size:0x10
fn_8013438C = .text:0x8013438C; // type:function size:0x10
fn_8013439C = .text:0x8013439C; // type:function size:0xF4
GetNodeAtIndex__12DataArrayPtrCFi = .text:0x80134490; // type:function size:0x8
Node__12DataArrayPtrCFi = .text:0x80134490; // type:function size:0x8
fn_80134498 = .text:0x80134498; // type:function size:0x74
fn_8013450C = .text:0x8013450C; // type:function size:0x3BC
fn_801348C8 = .text:0x801348C8; // type:function size:0x30
Expand Down Expand Up @@ -25998,7 +25998,7 @@ fn_8032014C = .text:0x8032014C; // type:function size:0x4
DataMacroElem__FP9DataArray = .text:0x80320150; // type:function size:0xA4
__dt__15DataMergeFilterFv = .text:0x803201F4; // type:function size:0x58
DataMergeDirs__FP9DataArray = .text:0x8032024C; // type:function size:0x94
GetDerivedObjAtIndex<9ObjectDir>__FP9DataArrayi_P9ObjectDir = .text:0x803202E0; // type:function size:0x34
Obj<9ObjectDir>__9DataArrayCFi_P9ObjectDir = .text:0x803202E0; // type:function size:0x34
__ct__15DataMergeFilterFP8DataNodei = .text:0x80320314; // type:function size:0x144
__ct__11MergeFilterFii = .text:0x80320458; // type:function size:0x18
DataReplaceObject__FP9DataArray = .text:0x80320470; // type:function size:0xFC
Expand Down Expand Up @@ -26295,7 +26295,7 @@ fn_803294B0 = .text:0x803294B0; // type:function size:0x3C
fn_803294EC = .text:0x803294EC; // type:function size:0x70
__dt__9ObjectDirFv = .text:0x8032955C; // type:function size:0x1C0
FindEntry__9ObjectDirFPCcb = .text:0x8032971C; // type:function size:0xA8
fn_803297C4 = .text:0x803297C4; // type:function size:0xAC
NextSubDir__9ObjectDirFRi = .text:0x803297C4; // type:function size:0xAC
fn_80329870 = .text:0x80329870; // type:function size:0x44
fn_803298B4 = .text:0x803298B4; // type:function size:0x24
fn_803298D8 = .text:0x803298D8; // type:function size:0x90
Expand Down Expand Up @@ -29966,7 +29966,7 @@ fn_803B064C = .text:0x803B064C; // type:function size:0x40
fn_803B068C = .text:0x803B068C; // type:function size:0xC0
Copy__9BandLabelFPCQ23Hmx6ObjectQ33Hmx6Object8CopyType = .text:0x803B074C; // type:function size:0x70
fn_803B07BC = .text:0x803B07BC; // type:function size:0x74
fn_803B0830 = .text:0x803B0830; // type:function size:0x8
MergedObjPtrAssignOpConstObjPtr = .text:0x803B0830; // type:function size:0x8
Save__9BandLabelFR9BinStream = .text:0x803B0838; // type:function size:0x4
Load__9BandLabelFR9BinStream = .text:0x803B083C; // type:function size:0x5C
fn_803B0898 = .text:0x803B0898; // type:function size:0x3E0
Expand Down Expand Up @@ -30036,8 +30036,8 @@ PropSync<7RndMesh>__FR27ObjPtr<7RndMesh,9ObjectDir>R8DataNodeP9DataArrayi6PropOp
PropSync<6RndMat>__FR26ObjPtr<6RndMat,9ObjectDir>R8DataNodeP9DataArrayi6PropOp_b = .text:0x803B2B24; // type:function size:0xC0
fn_803B2BE4 = .text:0x803B2BE4; // type:function size:0x4
fn_803B2BE8 = .text:0x803B2BE8; // type:function size:0x138
fn_803B2D20 = .text:0x803B2D20; // type:function size:0x40
fn_803B2D60 = .text:0x803B2D60; // type:function size:0x104
__rs<13RndAnimatable>__FR9BinStreamR34ObjPtr<13RndAnimatable,9ObjectDir>_R9BinStream = .text:0x803B2D20; // type:function size:0x40
Load__34ObjPtr<13RndAnimatable,9ObjectDir>FR9BinStreambP9ObjectDir = .text:0x803B2D60; // type:function size:0x104
fn_803B2E64 = .text:0x803B2E64; // type:function size:0x40
fn_803B2EA4 = .text:0x803B2EA4; // type:function size:0x104
fn_803B2FA8 = .text:0x803B2FA8; // type:function size:0xFC
Expand Down Expand Up @@ -48265,37 +48265,37 @@ ClassName__8AnimTaskCFv = .text:0x805C87AC; // type:function size:0x4
@16@28@Handle__13RndAnimatableFP9DataArrayb = .text:0x805C8814; // type:function size:0x14
@16@28@SetType__13RndAnimatableF6Symbol = .text:0x805C8828; // type:function size:0x14
@16@28@ClassName__13RndAnimatableCFv = .text:0x805C883C; // type:function size:0x14
fn_805C8850 = .text:0x805C8850; // type:function size:0x90
SetAnim__13RndAnimFilterFP13RndAnimatable = .text:0x805C8850; // type:function size:0x90
ListAnimChildren__13RndAnimFilterCFRQ211stlpmtx_std70list<P13RndAnimatable,Q211stlpmtx_std30StlNodeAlloc<P13RndAnimatable>> = .text:0x805C88E0; // type:function size:0x58
Copy__13RndAnimFilterFPCQ23Hmx6ObjectQ33Hmx6Object8CopyType = .text:0x805C8938; // type:function size:0xD0
Save__13RndAnimFilterFR9BinStream = .text:0x805C8A08; // type:function size:0x4
Load__13RndAnimFilterFR9BinStream = .text:0x805C8A0C; // type:function size:0xF4
fn_805C8B00 = .text:0x805C8B00; // type:function size:0x80
fn_805C8B80 = .text:0x805C8B80; // type:function size:0x30
Scale__13RndAnimFilterFv = .text:0x805C8B00; // type:function size:0x80
FrameOffset__13RndAnimFilterFv = .text:0x805C8B80; // type:function size:0x30
SetFrame__13RndAnimFilterFff = .text:0x805C8BB0; // type:function size:0x1BC
fn_805C8D6C = .text:0x805C8D6C; // type:function size:0x90
StartFrame__13RndAnimFilterFv = .text:0x805C8DFC; // type:function size:0x8C
EndFrame__13RndAnimFilterFv = .text:0x805C8E88; // type:function size:0xA4
__ct__13RndAnimFilterFv = .text:0x805C8F2C; // type:function size:0xCC
Handle__13RndAnimFilterFP9DataArrayb = .text:0x805C8FF8; // type:function size:0x17C
OnSafeAnims__13RndAnimFilterFP9DataArray = .text:0x805C9174; // type:function size:0x18C
fn_805C9300 = .text:0x805C9300; // type:function size:0x50
fn_805C9350 = .text:0x805C9350; // type:function size:0xD0
fn_805C9420 = .text:0x805C9420; // type:function size:0x78
__pp__26ObjDirItr<13RndAnimatable>Fv = .text:0x805C9300; // type:function size:0x50
Advance__26ObjDirItr<13RndAnimatable>Fv = .text:0x805C9350; // type:function size:0xD0
__ct__26ObjDirItr<13RndAnimatable>FP9ObjectDirb = .text:0x805C9420; // type:function size:0x78
SyncProperty__13RndAnimFilterFR8DataNodeP9DataArrayi6PropOp = .text:0x805C9498; // type:function size:0x320
__dt__13RndAnimFilterFv = .text:0x805C97B8; // type:function size:0x8C
Loop__13RndAnimFilterFv = .text:0x805C9844; // type:function size:0x1C
AnimTarget__13RndAnimFilterFv = .text:0x805C9860; // type:function size:0x30
SetType__13RndAnimFilterF6Symbol = .text:0x805C9890; // type:function size:0x134
ClassName__13RndAnimFilterCFv = .text:0x805C99C4; // type:function size:0x4
fn_805C99C8 = .text:0x805C99C8; // type:function size:0x14
fn_805C99DC = .text:0x805C99DC; // type:function size:0x14
fn_805C99F0 = .text:0x805C99F0; // type:function size:0x14
fn_805C9A04 = .text:0x805C9A04; // type:function size:0x14
fn_805C9A18 = .text:0x805C9A18; // type:function size:0x14
fn_805C9A2C = .text:0x805C9A2C; // type:function size:0x14
fn_805C9A40 = .text:0x805C9A40; // type:function size:0x14
fn_805C9A54 = .text:0x805C9A54; // type:function size:0x14
@64@28@Load__13RndAnimFilterFR9BinStream = .text:0x805C99C8; // type:function size:0x14
@64@28@Copy__13RndAnimFilterFPCQ23Hmx6ObjectQ33Hmx6Object8CopyType = .text:0x805C99DC; // type:function size:0x14
@64@28@Save__13RndAnimFilterFR9BinStream = .text:0x805C99F0; // type:function size:0x14
@64@28@__dt__13RndAnimFilterFv = .text:0x805C9A04; // type:function size:0x14
@64@28@SyncProperty__13RndAnimFilterFR8DataNodeP9DataArrayi6PropOp = .text:0x805C9A18; // type:function size:0x14
@64@28@Handle__13RndAnimFilterFP9DataArrayb = .text:0x805C9A2C; // type:function size:0x14
@64@28@SetType__13RndAnimFilterF6Symbol = .text:0x805C9A40; // type:function size:0x14
@64@28@ClassName__13RndAnimFilterCFv = .text:0x805C9A54; // type:function size:0x14
Load__9RndBitmapFR9BinStreamRc = .text:0x805C9A68; // type:function size:0xCC
fn_805C9B34 = .text:0x805C9B34; // type:function size:0x94
fn_805C9BC8 = .text:0x805C9BC8; // type:function size:0x54
Expand Down Expand Up @@ -52433,7 +52433,7 @@ fn_8065476C = .text:0x8065476C; // type:function size:0x3C
fn_806547A8 = .text:0x806547A8; // type:function size:0x8C
fn_80654834 = .text:0x80654834; // type:function size:0x30
fn_80654864 = .text:0x80654864; // type:function size:0x30
fn_80654894 = .text:0x80654894; // type:function size:0x118
AnimContains__FPC13RndAnimatablePC13RndAnimatable = .text:0x80654894; // type:function size:0x118
fn_806549AC = .text:0x806549AC; // type:function size:0xD0
fn_80654A7C = .text:0x80654A7C; // type:function size:0x9C
fn_80654B18 = .text:0x80654B18; // type:function size:0x3C
Expand Down Expand Up @@ -71075,8 +71075,8 @@ __vt__13RndAnimatable = .data:0x80894618; // type:object size:0xA8
@STRING@SetType__13RndAnimatableF6Symbol = .data:0x808946E8; // type:object size:0x8 data:string
lbl_808946F0 = .data:0x808946F0; // type:object size:0x48
__vt__13RndAnimFilter = .data:0x80894738; // type:object size:0xA8
lbl_808947E0 = .data:0x808947E0; // type:object size:0x8
lbl_808947E8 = .data:0x808947E8; // type:object size:0x8 data:string
@STRING@SetType__13RndAnimFilterF6Symbol@0 = .data:0x808947E0; // type:object size:0x8
@STRING@SetType__13RndAnimFilterF6Symbol = .data:0x808947E8; // type:object size:0x8 data:string
lbl_808947F0 = .data:0x808947F0; // type:object size:0x228
__vt__6RndCam = .data:0x80894A18; // type:object size:0xAC
lbl_80894AC4 = .data:0x80894AC4; // type:object size:0xC
Expand Down Expand Up @@ -74328,7 +74328,7 @@ lbl_808E3CE1 = .sbss:0x808E3CE1; // type:object size:0x1 data:byte
lbl_808E3CE2 = .sbss:0x808E3CE2; // type:object size:0x1 data:byte
lbl_808E3CE3 = .sbss:0x808E3CE3; // type:object size:0x1 data:byte
lbl_808E3CE4 = .sbss:0x808E3CE4; // type:object size:0x1 data:byte
lbl_808E3CE5 = .sbss:0x808E3CE5; // type:object size:0x1 data:byte
@GUARD@SetType__13RndAnimFilterF6Symbol@types = .sbss:0x808E3CE5; // type:object size:0x1 data:byte
@GUARD@StaticClassName__13RndAnimFilterFv@name = .sbss:0x808E3CE6; // type:object size:0x1 data:byte
lbl_808E3CE7 = .sbss:0x808E3CE7; // type:object size:0x1 data:byte
lbl_808E3CE8 = .sbss:0x808E3CE8; // type:object size:0x1 data:byte
Expand Down Expand Up @@ -76028,8 +76028,8 @@ lbl_808E4BBA = .sbss:0x808E4BBA; // type:object size:0x6 data:2byte
gRev__13RndAnimatable = .sbss:0x808E4BC0; // type:object size:0x2 data:2byte
gAltRev__13RndAnimatable = .sbss:0x808E4BC2; // type:object size:0x2 data:2byte
@GUARD@StaticClassName__8AnimTaskFv@name = .sbss:0x808E4BC4; // type:object size:0x1 data:byte
lbl_808E4BC8 = .sbss:0x808E4BC8; // type:object size:0x2 data:2byte
lbl_808E4BCA = .sbss:0x808E4BCA; // type:object size:0x6 data:2byte
gRev__13RndAnimFilter = .sbss:0x808E4BC8; // type:object size:0x2 data:2byte
gAltRev__13RndAnimFilter = .sbss:0x808E4BCA; // type:object size:0x6 data:2byte
lbl_808E4BD0 = .sbss:0x808E4BD0; // type:object size:0x1 data:byte
lbl_808E4BD1 = .sbss:0x808E4BD1; // type:object size:0x1 data:byte
lbl_808E4BD2 = .sbss:0x808E4BD2; // type:object size:0x2 data:2byte
Expand Down Expand Up @@ -77463,7 +77463,7 @@ lbl_808F06CC = .bss:0x808F06CC; // type:object size:0x4 data:4byte
lbl_808F06D0 = .bss:0x808F06D0; // type:object size:0x4 data:4byte
lbl_808F06D4 = .bss:0x808F06D4; // type:object size:0x4 data:4byte
lbl_808F06D8 = .bss:0x808F06D8; // type:object size:0x4 data:4byte
lbl_808F06DC = .bss:0x808F06DC; // type:object size:0x4 data:4byte
@LOCAL@SetType__13RndAnimFilterF6Symbol@types = .bss:0x808F06DC; // type:object size:0x4 data:4byte
@LOCAL@StaticClassName__13RndAnimFilterFv@name = .bss:0x808F06E0; // type:object size:0x4 data:4byte
lbl_808F06E4 = .bss:0x808F06E4; // type:object size:0x4 data:4byte
lbl_808F06E8 = .bss:0x808F06E8; // type:object size:0x4 data:4byte
Expand Down Expand Up @@ -84758,7 +84758,7 @@ lbl_809853EC = .bss:0x809853EC; // type:object size:0x8
lbl_809853F4 = .bss:0x809853F4; // type:object size:0x4
lbl_809853F8 = .bss:0x809853F8; // type:object size:0x4 data:4byte
lbl_809853FC = .bss:0x809853FC; // type:object size:0x4 data:4byte
lbl_80985400 = .bss:0x80985400; // type:object size:0x4
safe_anims = .bss:0x80985400; // type:object size:0x4
lbl_80985404 = .bss:0x80985404; // type:object size:0x4 data:4byte
lbl_80985408 = .bss:0x80985408; // type:object size:0x4
lbl_8098540C = .bss:0x8098540C; // type:object size:0x4
Expand Down Expand Up @@ -85448,14 +85448,14 @@ lbl_809890F8 = .bss:0x809890F8; // type:object size:0x8 data:4byte
lbl_80989100 = .bss:0x80989100; // type:object size:0x8 data:4byte
lbl_80989108 = .bss:0x80989108; // type:object size:0x18
lbl_80989120 = .bss:0x80989120; // type:object size:0x48
lbl_80989168 = .bss:0x80989168; // type:object size:0x8 data:4byte
sCurrent__6RndCam = .bss:0x80989168; // type:object size:0x8 data:4byte
lbl_80989170 = .bss:0x80989170; // type:object size:0x30
lbl_809891A0 = .bss:0x809891A0; // type:object size:0x4 data:4byte
lbl_809891A4 = .bss:0x809891A4; // type:object size:0x4 data:4byte
lbl_809891A8 = .bss:0x809891A8; // type:object size:0x8 data:4byte
lbl_809891B0 = .bss:0x809891B0; // type:object size:0x8
TheDOFProc = .bss:0x809891B8; // type:object size:0x4 data:4byte
lbl_809891C0 = .bss:0x809891C0; // type:object size:0x4 data:4byte
sHighlightStyle__11RndDrawable = .bss:0x809891C0; // type:object size:0x4 data:4byte
lbl_809891C4 = .bss:0x809891C4; // type:object size:0x4
lbl_809891C8 = .bss:0x809891C8; // type:object size:0x4 data:4byte
lbl_809891CC = .bss:0x809891CC; // type:object size:0xC
Expand Down
2 changes: 1 addition & 1 deletion src/system/rndobj/AnimFilter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ INIT_REVS(RndAnimFilter);
void RndAnimFilter::SetAnim(RndAnimatable* anim){
mAnim = anim;
if(mAnim.operator->()){
mRate = mAnim->mRate;
SetRate(mAnim->GetRate());
mStart = mAnim->StartFrame();
mEnd = mAnim->EndFrame();
}
Expand Down

0 comments on commit a7a567a

Please sign in to comment.