From ed1ee30dd20ab15ba73b987f1e59b0dfc16d09b2 Mon Sep 17 00:00:00 2001 From: Julgodis <> Date: Tue, 6 Apr 2021 18:00:35 +0200 Subject: building RELs --- src/d/d_model.cpp | 89 ++++++++++--------------------------------------------- 1 file changed, 15 insertions(+), 74 deletions(-) (limited to 'src/d/d_model.cpp') diff --git a/src/d/d_model.cpp b/src/d/d_model.cpp index 691c83f055..3c14aad301 100644 --- a/src/d/d_model.cpp +++ b/src/d/d_model.cpp @@ -62,18 +62,11 @@ extern "C" void remove__10dMdl_mng_cFv(); extern "C" void reset__10dMdl_mng_cFv(); extern "C" void entry__10dMdl_mng_cFP12J3DModelDataUsi(); extern "C" void __ct__6dMdl_cFv(); -extern "C" extern void* __vt__6dMdl_c[5 + 1 /* padding */]; // // External References: // -void dKy_setLight_nowroom_actor(dKy_tevstr_c*); -void dKy_setLight_again(); -void dKy_GxFog_tevstr_set(dKy_tevstr_c*); -void* operator new(u32); -void operator delete(void*); - extern "C" void dKy_setLight_nowroom_actor__FP12dKy_tevstr_c(); extern "C" void dKy_setLight_again__Fv(); extern "C" void dKy_GxFog_tevstr_set__FP12dKy_tevstr_c(); @@ -105,28 +98,10 @@ extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; // /* ############################################################################################## */ -/* 80456B70-80456B78 0004+04 s=1 e=0 z=0 None .sbss2 @3621 */ +/* 80456B70-80456B78 000010 0004+04 1/1 0/0 0/0 .sbss2 @3621 */ SECTION_SBSS2 static u8 lit_3621[4 + 4 /* padding */]; -/* 8009C4FC-8009C650 0154+00 s=1 e=0 z=0 None .text draw__6dMdl_cFv */ -// 8009C50C: 803621D8 (_savegpr_28) -// 8009C51C: 80434AC8 (j3dSys) -// 8009C520: 80434AC8 (j3dSys) -// 8009C53C: 804515D0 (sOldVcdVatCmd__8J3DShape) -// 8009C56C: 80315300 (loadPreDrawSetting__8J3DShapeCFv) -// 8009C570: 80456B70 (lit_3621) -// 8009C5AC: 8035D960 (GXSetChanAmbColor) -// 8009C5B0: 80450608 (g_whiteColor) -// 8009C5C0: 8035DA48 (GXSetChanMatColor) -// 8009C5C8: 801A6E9C (dKy_setLight_nowroom_actor__FP12dKy_tevstr_c) -// 8009C5CC: 801A75C0 (dKy_setLight_again__Fv) -// 8009C5D4: 801A8650 (dKy_GxFog_tevstr_set__FP12dKy_tevstr_c) -// 8009C5DC: 80434AC8 (j3dSys) -// 8009C5E0: 80434AC8 (j3dSys) -// 8009C5F4: 803464E4 (PSMTXConcat) -// 8009C600: 8036024C (GXLoadPosMtxImm) -// 8009C60C: 8036029C (GXLoadNrmMtxImm) -// 8009C63C: 80362224 (_restgpr_28) +/* 8009C4FC-8009C650 096E3C 0154+00 1/0 0/0 0/0 .text draw__6dMdl_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -136,7 +111,7 @@ asm void dMdl_c::draw() { } #pragma pop -/* 8009C650-8009C668 0018+00 s=1 e=0 z=1 None .text +/* 8009C650-8009C668 096F90 0018+00 1/1 0/0 1/1 .text * create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c */ #pragma push #pragma optimization_level 0 @@ -147,10 +122,7 @@ asm void dMdl_c::create(J3DModelData* param_0, u16 param_1, dKy_tevstr_c* param_ } #pragma pop -/* 8009C668-8009C6DC 0074+00 s=0 e=0 z=5 None .text entryObj__6dMdl_cFP10dMdl_obj_c */ -// 8009C690: 804061C0 (g_dComIfG_gameInfo) -// 8009C694: 804061C0 (g_dComIfG_gameInfo) -// 8009C6A4: 8032548C (entryImm__13J3DDrawBufferFP9J3DPacketUs) +/* 8009C668-8009C6DC 096FA8 0074+00 0/0 0/0 5/5 .text entryObj__6dMdl_cFP10dMdl_obj_c */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -160,7 +132,7 @@ asm void dMdl_c::entryObj(dMdl_obj_c* param_0) { } #pragma pop -/* 8009C6DC-8009C724 0048+00 s=1 e=0 z=0 None .text +/* 8009C6DC-8009C724 09701C 0048+00 1/1 0/0 0/0 .text * search__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c */ #pragma push #pragma optimization_level 0 @@ -171,12 +143,8 @@ asm void dMdl_mng_c::search(J3DModelData* param_0, u16 param_1, dKy_tevstr_c* pa } #pragma pop -/* 8009C724-8009C7AC 0088+00 s=1 e=0 z=0 None .text +/* 8009C724-8009C7AC 097064 0088+00 1/1 0/0 0/0 .text * entry__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c */ -// 8009C734: 803621D4 (_savegpr_27) -// 8009C748: 8009C6DC (search__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c) -// 8009C780: 8009C650 (create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c) -// 8009C798: 80362220 (_restgpr_27) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -187,17 +155,10 @@ asm void dMdl_mng_c::entry(J3DModelData* param_0, u16 param_1, dKy_tevstr_c* par #pragma pop /* ############################################################################################## */ -/* 80450FA0-80450FA8 0004+04 s=4 e=0 z=0 None .sbss m_myObj__10dMdl_mng_c */ +/* 80450FA0-80450FA8 0004A0 0004+04 4/4 0/0 0/0 .sbss m_myObj__10dMdl_mng_c */ static u8 m_myObj__10dMdl_mng_c[4 + 4 /* padding */]; -/* 8009C7AC-8009C808 005C+00 s=0 e=1 z=0 None .text create__10dMdl_mng_cFv */ -// 8009C7C0: 802CEC4C (__nw__FUl) -// 8009C7CC: 8009C930 (__ct__6dMdl_cFv) -// 8009C7D0: 8009C930 (__ct__6dMdl_cFv) -// 8009C7D4: 8009C808 (__dt__6dMdl_cFv) -// 8009C7D8: 8009C808 (__dt__6dMdl_cFv) -// 8009C7E4: 80361D60 (__construct_array) -// 8009C7F0: 80450FA0 (m_myObj__10dMdl_mng_c) +/* 8009C7AC-8009C808 0970EC 005C+00 0/0 1/1 0/0 .text create__10dMdl_mng_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -208,8 +169,8 @@ asm void dMdl_mng_c::create() { #pragma pop /* ############################################################################################## */ -/* 803AF978-803AF990 0014+04 s=2 e=0 z=1 None .data __vt__6dMdl_c */ -SECTION_DATA void* __vt__6dMdl_c[5 + 1 /* padding */] = { +/* 803AF978-803AF990 00CA98 0014+04 2/2 0/0 1/1 .data __vt__6dMdl_c */ +SECTION_DATA extern void* __vt__6dMdl_c[5 + 1 /* padding */] = { (void*)NULL /* RTTI */, (void*)NULL, (void*)entry__9J3DPacketFP13J3DDrawBuffer, @@ -219,12 +180,7 @@ SECTION_DATA void* __vt__6dMdl_c[5 + 1 /* padding */] = { NULL, }; -/* 8009C808-8009C864 005C+00 s=3 e=0 z=0 None .text __dt__6dMdl_cFv */ -// 8009C820: 803AF978 (__vt__6dMdl_c) -// 8009C824: 803AF978 (__vt__6dMdl_c) -// 8009C830: 803CD97C (__vt__9J3DPacket) -// 8009C834: 803CD97C (__vt__9J3DPacket) -// 8009C848: 802CED3C (__dl__FPv) +/* 8009C808-8009C864 097148 005C+00 3/2 0/0 0/0 .text __dt__6dMdl_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -234,13 +190,7 @@ asm dMdl_c::~dMdl_c() { } #pragma pop -/* 8009C864-8009C8C0 005C+00 s=0 e=1 z=0 None .text remove__10dMdl_mng_cFv */ -// 8009C874: 80450FA0 (m_myObj__10dMdl_mng_c) -// 8009C888: 8009C808 (__dt__6dMdl_cFv) -// 8009C88C: 8009C808 (__dt__6dMdl_cFv) -// 8009C898: 80361CE8 (__destroy_arr) -// 8009C8A0: 802CED3C (__dl__FPv) -// 8009C8A8: 80450FA0 (m_myObj__10dMdl_mng_c) +/* 8009C864-8009C8C0 0971A4 005C+00 0/0 1/1 0/0 .text remove__10dMdl_mng_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -250,8 +200,7 @@ asm void dMdl_mng_c::remove() { } #pragma pop -/* 8009C8C0-8009C8D8 0018+00 s=0 e=1 z=0 None .text reset__10dMdl_mng_cFv */ -// 8009C8C0: 80450FA0 (m_myObj__10dMdl_mng_c) +/* 8009C8C0-8009C8D8 097200 0018+00 0/0 1/1 0/0 .text reset__10dMdl_mng_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -261,11 +210,7 @@ asm void dMdl_mng_c::reset() { } #pragma pop -/* 8009C8D8-8009C930 0058+00 s=0 e=0 z=4 None .text entry__10dMdl_mng_cFP12J3DModelDataUsi */ -// 8009C8EC: 80450FA0 (m_myObj__10dMdl_mng_c) -// 8009C904: 803F6094 (mStatus__20dStage_roomControl_c) -// 8009C908: 803F6094 (mStatus__20dStage_roomControl_c) -// 8009C91C: 8009C724 (entry__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c) +/* 8009C8D8-8009C930 097218 0058+00 0/0 0/0 4/4 .text entry__10dMdl_mng_cFP12J3DModelDataUsi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -275,11 +220,7 @@ asm void dMdl_mng_c::entry(J3DModelData* param_0, u16 param_1, int param_2) { } #pragma pop -/* 8009C930-8009C964 0034+00 s=1 e=0 z=0 None .text __ct__6dMdl_cFv */ -// 8009C930: 803CD97C (__vt__9J3DPacket) -// 8009C934: 803CD97C (__vt__9J3DPacket) -// 8009C94C: 803AF978 (__vt__6dMdl_c) -// 8009C950: 803AF978 (__vt__6dMdl_c) +/* 8009C930-8009C964 097270 0034+00 1/1 0/0 0/0 .text __ct__6dMdl_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -- cgit v1.2.3