Skip to content

Commit

Permalink
rndgraph symbols
Browse files Browse the repository at this point in the history
  • Loading branch information
@rjkiv
rjkiv committed Aug 17, 2024
1 parent e6443b5 commit 63d1134
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 33 deletions.
2 changes: 2 additions & 0 deletions config/SZBE69/splits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,8 @@ system/rndobj/Gen.cpp:
system/rndobj/Graph.cpp:
.text start:0x805EF00C end:0x805EFA68
.ctors start:0x807EFFE8 end:0x807EFFEC
.data start:0x80896610 end:0x808966B8
.bss start:0x8098CC90 end:0x8098CD48

system/rndobj/Group.cpp:
.text start:0x805EFA68 end:0x805F1B2C
Expand Down
62 changes: 31 additions & 31 deletions config/SZBE69/symbols.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6110,7 +6110,7 @@ fn_800AB060 = .text:0x800AB060; // type:function size:0x50
fn_800AB0B0 = .text:0x800AB0B0; // type:function size:0x48
fn_800AB0F8 = .text:0x800AB0F8; // type:function size:0x48
fn_800AB140 = .text:0x800AB140; // type:function size:0x19C
fn_800AB2DC = .text:0x800AB2DC; // type:function size:0x8
AddExitCallback__5DebugFPFv_v = .text:0x800AB2DC; // type:function size:0x8
fn_800AB2E4 = .text:0x800AB2E4; // type:function size:0x28
fn_800AB30C = .text:0x800AB30C; // type:function size:0x54
fn_800AB360 = .text:0x800AB360; // type:function size:0x64
Expand Down Expand Up @@ -49404,31 +49404,31 @@ Terminate__8RndGraphFv = .text:0x805EF0D4; // type:function size:0x58
ResetAll__8RndGraphFv = .text:0x805EF12C; // type:function size:0x7C
fn_805EF1A8 = .text:0x805EF1A8; // type:function size:0x30
fn_805EF1D8 = .text:0x805EF1D8; // type:function size:0x3C
fn_805EF214 = .text:0x805EF214; // type:function size:0x54
fn_805EF268 = .text:0x805EF268; // type:function size:0x2C
GetOneFrame__8RndGraphFv = .text:0x805EF214; // type:function size:0x54
_Destroy<9FakeGraph>__11stlpmtx_stdFP9FakeGraph_v = .text:0x805EF268; // type:function size:0x2C
__ct__8RndGraphFPCv = .text:0x805EF294; // type:function size:0x64
__dt__8RndGraphFv = .text:0x805EF2F8; // type:function size:0x68
fn_805EF360 = .text:0x805EF360; // type:function size:0x8C
fn_805EF3EC = .text:0x805EF3EC; // type:function size:0x10
fn_805EF3FC = .text:0x805EF3FC; // type:function size:0x7C
fn_805EF478 = .text:0x805EF478; // type:function size:0x74
fn_805EF4EC = .text:0x805EF4EC; // type:function size:0x74
fn_805EF560 = .text:0x805EF560; // type:function size:0x74
fn_805EF5D4 = .text:0x805EF5D4; // type:function size:0x68
fn_805EF63C = .text:0x805EF63C; // type:function size:0x58
fn_805EF694 = .text:0x805EF694; // type:function size:0x10
fn_805EF6A4 = .text:0x805EF6A4; // type:function size:0x48
fn_805EF6EC = .text:0x805EF6EC; // type:function size:0x58
fn_805EF744 = .text:0x805EF744; // type:function size:0x10
fn_805EF754 = .text:0x805EF754; // type:function size:0x84
fn_805EF7D8 = .text:0x805EF7D8; // type:function size:0x58
fn_805EF830 = .text:0x805EF830; // type:function size:0x58
fn_805EF888 = .text:0x805EF888; // type:function size:0x60
fn_805EF8E8 = .text:0x805EF8E8; // type:function size:0x58
fn_805EF940 = .text:0x805EF940; // type:function size:0x30
fn_805EF970 = .text:0x805EF970; // type:function size:0x30
fn_805EF9A0 = .text:0x805EF9A0; // type:function size:0x60
fn_805EFA00 = .text:0x805EFA00; // type:function size:0x68
Reset__8RndGraphFv = .text:0x805EF360; // type:function size:0x8C
__ct__8DrawableFv = .text:0x805EF3EC; // type:function size:0x10
AddSphere__8RndGraphFRC7Vector3fRCQ23Hmx5Color = .text:0x805EF3FC; // type:function size:0x7C
__ct__10DrawSphereFRC7Vector3fRCQ23Hmx5Color = .text:0x805EF478; // type:function size:0x74
AddString__8RndGraphFPCcRC7Vector2RCQ23Hmx5Color = .text:0x805EF4EC; // type:function size:0x74
__ct__10DrawStringFPCcRC7Vector2RCQ23Hmx5Color = .text:0x805EF560; // type:function size:0x74
__dt__10DrawStringFv = .text:0x805EF5D4; // type:function size:0x68
__dt__10DrawSphereFv = .text:0x805EF63C; // type:function size:0x58
Draw__10DrawSphereFv = .text:0x805EF694; // type:function size:0x10
DrawFixedZ__10DrawSphereFf = .text:0x805EF6A4; // type:function size:0x48
Draw__10DrawStringFv = .text:0x805EF6EC; // type:function size:0x58
DrawFixedZ__10DrawStringFf = .text:0x805EF744; // type:function size:0x10
__sinit_\Graph_cpp = .text:0x805EF754; // type:function size:0x84
__dt__Q211stlpmtx_std58list<9FakeGraph,Q211stlpmtx_std24StlNodeAlloc<9FakeGraph>>Fv = .text:0x805EF7D8; // type:function size:0x58
__dt__Q211stlpmtx_std64_List_impl<9FakeGraph,Q211stlpmtx_std24StlNodeAlloc<9FakeGraph>>Fv = .text:0x805EF830; // type:function size:0x58
__dt__Q211stlpmtx_std64_List_base<9FakeGraph,Q211stlpmtx_std24StlNodeAlloc<9FakeGraph>>Fv = .text:0x805EF888; // type:function size:0x60
__dt__Q211stlpmtx_std162_STLP_alloc_proxy<Q211stlpmtx_std15_List_node_base,Q211stlpmtx_std22_List_node<9FakeGraph>,Q211stlpmtx_std53StlNodeAlloc<Q211stlpmtx_std22_List_node<9FakeGraph>>>Fv = .text:0x805EF8E8; // type:function size:0x58
__ct__Q211stlpmtx_std58list<9FakeGraph,Q211stlpmtx_std24StlNodeAlloc<9FakeGraph>>FRCQ211stlpmtx_std24StlNodeAlloc<9FakeGraph> = .text:0x805EF940; // type:function size:0x30
__ct__Q211stlpmtx_std64_List_impl<9FakeGraph,Q211stlpmtx_std24StlNodeAlloc<9FakeGraph>>FRCQ211stlpmtx_std24StlNodeAlloc<9FakeGraph> = .text:0x805EF970; // type:function size:0x30
__ct__Q211stlpmtx_std64_List_base<9FakeGraph,Q211stlpmtx_std24StlNodeAlloc<9FakeGraph>>FRCQ211stlpmtx_std24StlNodeAlloc<9FakeGraph> = .text:0x805EF9A0; // type:function size:0x60
clear__Q211stlpmtx_std64_List_base<9FakeGraph,Q211stlpmtx_std24StlNodeAlloc<9FakeGraph>>Fv = .text:0x805EFA00; // type:function size:0x68
__ct__8RndGroupFv = .text:0x805EFA68; // type:function size:0x198
Save__8RndGroupFR9BinStream = .text:0x805EFC00; // type:function size:0x4
Load__8RndGroupFR9BinStream = .text:0x805EFC04; // type:function size:0x11C
Expand Down Expand Up @@ -71172,17 +71172,17 @@ lbl_80896158 = .data:0x80896158; // type:object size:0x3E8
@STRING@SetType__12RndGeneratorF6Symbol@0 = .data:0x8089654C; // type:object size:0xC
@STRING@SetType__12RndGeneratorF6Symbol = .data:0x80896558; // type:object size:0x28
lbl_80896580 = .data:0x80896580; // type:object size:0x90
lbl_80896610 = .data:0x80896610; // type:object size:0x14
__vt__10DrawString = .data:0x80896610; // type:object size:0x14
lbl_80896624 = .data:0x80896624; // type:object size:0xC
lbl_80896630 = .data:0x80896630; // type:object size:0x10
lbl_80896640 = .data:0x80896640; // type:object size:0x8
lbl_80896648 = .data:0x80896648; // type:object size:0x14
__RTTI__10DrawString = .data:0x80896640; // type:object size:0x8
__vt__10DrawSphere = .data:0x80896648; // type:object size:0x14
lbl_8089665C = .data:0x8089665C; // type:object size:0xC
lbl_80896668 = .data:0x80896668; // type:object size:0x10
lbl_80896678 = .data:0x80896678; // type:object size:0x8
lbl_80896680 = .data:0x80896680; // type:object size:0x14
__RTTI__10DrawSphere = .data:0x80896678; // type:object size:0x8
__vt__8Drawable = .data:0x80896680; // type:object size:0x14
lbl_80896694 = .data:0x80896694; // type:object size:0xC
lbl_808966A0 = .data:0x808966A0; // type:object size:0x8
__RTTI__8Drawable = .data:0x808966A0; // type:object size:0x8
lbl_808966A8 = .data:0x808966A8; // type:object size:0x10
__vt__8RndGroup = .data:0x808966B8; // type:object size:0x180
lbl_80896838 = .data:0x80896838; // type:object size:0x8
Expand Down Expand Up @@ -85642,7 +85642,7 @@ lbl_80992258 = .bss:0x80992258; // type:object size:0x4 data:4byte
lbl_8099225C = .bss:0x8099225C; // type:object size:0x4 data:4byte
lbl_80992260 = .bss:0x80992260; // type:object size:0x18
lbl_80992278 = .bss:0x80992278; // type:object size:0x2C8
lbl_80992540 = .bss:0x80992540; // type:object size:0x10 data:4byte
TheRnd = .bss:0x80992540; // type:object size:0x10 data:4byte
lbl_80992550 = .bss:0x80992550; // type:object size:0x20
lbl_80992570 = .bss:0x80992570; // type:object size:0x8 data:4byte
lbl_80992578 = .bss:0x80992578; // type:object size:0xB0 data:4byte
Expand Down
4 changes: 2 additions & 2 deletions src/system/rndobj/Graph.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ static DataNode OnGraphReset(DataArray*) {

void RndGraph::Init() {
sGraphs = new std::list<RndGraph>;
TheDebug.mExitCallbacks.push_back(RndGraph::Terminate);
TheDebug.AddExitCallback(RndGraph::Terminate);
DataRegisterFunc("graph_reset", OnGraphReset);
}

Expand Down Expand Up @@ -107,7 +107,7 @@ void DrawString::DrawFixedZ(float) { Draw(); }

void DrawString::Draw() { TheRnd->DrawString(mText.c_str(), mPos, mCol, true); }

void DrawSphere::DrawFixedZ(float f) { UtilDrawSphere(Vector3(mCenter.X(), mCenter.Z(), f), mRadius, mCol); }
void DrawSphere::DrawFixedZ(float f) { UtilDrawSphere(Vector3(mCenter.x, mCenter.z, f), mRadius, mCol); }

void DrawSphere::Draw() { UtilDrawSphere(mCenter, mRadius, mCol); }

Expand Down

0 comments on commit 63d1134

Please sign in to comment.