diff options
Diffstat (limited to 'src/d/d_simple_model.cpp')
| -rw-r--r-- | src/d/d_simple_model.cpp | 422 |
1 files changed, 344 insertions, 78 deletions
diff --git a/src/d/d_simple_model.cpp b/src/d/d_simple_model.cpp index 383a2c268f..6c8d91ccc1 100644 --- a/src/d/d_simple_model.cpp +++ b/src/d/d_simple_model.cpp @@ -1,103 +1,249 @@ -// +// // Generated By: dol2asm // Translation Unit: d/d_simple_model -// +// -#include "d/d_simple_model.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "d/d_simple_model.h" -// +// // Types: -// +// -struct modelList_c {}; +struct modelList_c { +}; -struct J3DModelData {}; +struct J3DModelData { +}; struct diff_model_c { - /* 80048D60 */ diff_model_c(); - /* 800490EC */ void create(J3DModelData*, int, u8); - /* 800491F4 */ void getModelData(); - /* 80049210 */ void remove(int); - /* 80049270 */ void draw(); - /* 80049368 */ void init(); - /* 80049388 */ void isSame(J3DModelData*, int); - /* 800493FC */ void getRoomNo(); - /* 80049408 */ void insert(modelList_c*); + /* 80048D60 */ // True False +diff_model_c(); + /* 800490EC */ // True False +// J3DModelData* False +// J3DModelData False +// int False +// u8 False +void create(J3DModelData*, int, u8); + /* 800491F4 */ // True False +void getModelData(); + /* 80049210 */ // True False +// int False +void remove(int); + /* 80049270 */ // True False +void draw(); + /* 80049368 */ // True False +void init(); + /* 80049388 */ // True False +// J3DModelData* False +// J3DModelData False +// int False +void isSame(J3DModelData*, int); + /* 800493FC */ // True False +void getRoomNo(); + /* 80049408 */ // True False +// modelList_c* False +// modelList_c False +void insert(modelList_c*); }; -struct J3DModel {}; +struct J3DModel { +}; struct dSmplMdl_draw_c { - /* 80048CB4 */ dSmplMdl_draw_c(); - /* 80048D80 */ ~dSmplMdl_draw_c(); - /* 80048E0C */ void draw(); - /* 80048EBC */ void entry(J3DModel*, int); - /* 80048F70 */ void addModel(J3DModelData*, int, u8); - /* 80049058 */ void removeModel(J3DModelData*, int); + /* 80048CB4 */ // False False +dSmplMdl_draw_c(); + /* 80048D80 */ // True False +~dSmplMdl_draw_c(); + /* 80048E0C */ // False False +void draw(); + /* 80048EBC */ // False False +// J3DModel* False +// J3DModel False +// int False +void entry(J3DModel*, int); + /* 80048F70 */ // False False +// J3DModelData* False +// J3DModelData False +// int False +// u8 False +void addModel(J3DModelData*, int, u8); + /* 80049058 */ // False False +// J3DModelData* False +// J3DModelData False +// int False +void removeModel(J3DModelData*, int); }; -struct dKy_tevstr_c {}; +struct dKy_tevstr_c { +}; struct dScnKy_env_light_c { - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); + /* 801A4DA0 */ // False False +// J3DModelData* False +// J3DModelData False +// dKy_tevstr_c* False +// dKy_tevstr_c False +void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); }; -struct JKRSolidHeap {}; +struct JKRSolidHeap { +}; -// +// // Forward References: -// +// +// True False +// J3DModel* False +// J3DModel False static void dSmplMdl_modelUpdateDL(J3DModel*); +// True False +// J3DModel* False +// J3DModel False extern "C" static void dSmplMdl_modelUpdateDL__FP8J3DModel(); +// False False extern "C" void __ct__15dSmplMdl_draw_cFv(); +// True False extern "C" void __ct__12diff_model_cFv(); +// True False extern "C" void __dt__15dSmplMdl_draw_cFv(); +// False False extern "C" void draw__15dSmplMdl_draw_cFv(); +// False False +// J3DModel* False +// J3DModel False +// int False extern "C" void entry__15dSmplMdl_draw_cFP8J3DModeli(); +// False False +// J3DModelData* False +// J3DModelData False +// int False +// u8 False extern "C" void addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc(); +// False False +// J3DModelData* False +// J3DModelData False +// int False extern "C" void removeModel__15dSmplMdl_draw_cFP12J3DModelDatai(); +// True False +// J3DModelData* False +// J3DModelData False +// int False +// u8 False extern "C" void create__12diff_model_cFP12J3DModelDataiUc(); +// True False extern "C" void getModelData__12diff_model_cFv(); +// True False +// int False extern "C" void remove__12diff_model_cFi(); +// True False extern "C" void draw__12diff_model_cFv(); +// True False extern "C" void init__12diff_model_cFv(); +// True False +// J3DModelData* False +// J3DModelData False +// int False extern "C" void isSame__12diff_model_cFP12J3DModelDatai(); +// True False extern "C" void getRoomNo__12diff_model_cFv(); +// True False +// modelList_c* False +// modelList_c False extern "C" void insert__12diff_model_cFP11modelList_c(); +extern "C" extern void* __vt__15dSmplMdl_draw_c[3 + 1 /* padding */]; -// +// // External References: -// +// +// False False +// J3DModel* False +// J3DModel False void mDoExt_modelUpdateDL(J3DModel*); +// False False +// u32 False +// u32 False void mDoExt_createSolidHeapFromGameToCurrent(u32, u32); +// False False +// JKRSolidHeap* False +// JKRSolidHeap False void mDoExt_adjustSolidHeapToSystem(JKRSolidHeap*); +// False False +// JKRSolidHeap* False +// JKRSolidHeap False void mDoExt_destroySolidHeap(JKRSolidHeap*); +// False False void mDoExt_restoreCurrentHeap(); +// False False +// J3DModelData* False +// J3DModelData False +// u32 False +// u32 False void mDoExt_J3DModel__create(J3DModelData*, u32, u32); +// False False +// void False +// void* False +// void False void operator delete(void*); +// False False +// J3DModel* False +// J3DModel False extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); +// False False +// u32 False +// u32 False extern "C" void mDoExt_createSolidHeapFromGameToCurrent__FUlUl(); +// False False +// JKRSolidHeap* False +// JKRSolidHeap False extern "C" void mDoExt_adjustSolidHeapToSystem__FP12JKRSolidHeap(); +// False False +// JKRSolidHeap* False +// JKRSolidHeap False extern "C" void mDoExt_destroySolidHeap__FP12JKRSolidHeap(); +// False False extern "C" void mDoExt_restoreCurrentHeap__Fv(); +// False False +// J3DModelData* False +// J3DModelData False +// u32 False +// u32 False extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); +// False False +// J3DModelData* False +// J3DModelData False +// dKy_tevstr_c* False +// dKy_tevstr_c False extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); +// False False +// void False +// void* False +// void False extern "C" void __dl__FPv(); +// False False extern "C" void PSMTXCopy(); +// False False extern "C" void __construct_array(); +// False False extern "C" void _savegpr_25(); +// False False extern "C" void _savegpr_26(); +// False False extern "C" void _savegpr_28(); +// False False extern "C" void _savegpr_29(); +// False False extern "C" void _restgpr_25(); +// False False extern "C" void _restgpr_26(); +// False False extern "C" void _restgpr_28(); +// False False extern "C" void _restgpr_29(); extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; @@ -105,187 +251,307 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 j3dSys[284]; -// +// // Declarations: -// +// -/* 80048C54-80048CB4 0060+00 s=1 e=0 z=0 None .text dSmplMdl_modelUpdateDL__FP8J3DModel */ +/* 80048C54-80048CB4 0060+00 s=1 e=0 z=0 None .text dSmplMdl_modelUpdateDL__FP8J3DModel */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False +// J3DModel* False +// J3DModel False asm static void dSmplMdl_modelUpdateDL(J3DModel* param_0) { - nofralloc + nofralloc #include "asm/d/d_simple_model/dSmplMdl_modelUpdateDL__FP8J3DModel.s" } #pragma pop + /* ############################################################################################## */ -/* 803A82F8-803A8308 000C+04 s=2 e=0 z=0 None .data __vt__15dSmplMdl_draw_c */ -SECTION_DATA static void* __vt__15dSmplMdl_draw_c[3 + 1 /* padding */] = { - (void*)NULL, - (void*)NULL, - (void*)__dt__15dSmplMdl_draw_cFv, - /* padding */ - NULL, +/* 803A82F8-803A8308 000C+04 s=2 e=0 z=0 None .data __vt__15dSmplMdl_draw_c */ +SECTION_DATA void* __vt__15dSmplMdl_draw_c[3 + 1 /* padding */] = { + (void*)NULL /* RTTI */, + (void*)NULL, + (void*)__dt__15dSmplMdl_draw_cFv, + /* padding */ + NULL, }; -/* 80048CB4-80048D60 00AC+00 s=0 e=1 z=0 None .text __ct__15dSmplMdl_draw_cFv */ +/* 80048CB4-80048D60 00AC+00 s=0 e=1 z=0 None .text __ct__15dSmplMdl_draw_cFv */ +// 80048CC4: 803621DC (_savegpr_29) +// 80048CCC: 803A82F8 (__vt__15dSmplMdl_draw_c) +// 80048CD0: 803A82F8 (__vt__15dSmplMdl_draw_c) +// 80048CDC: 80048D60 (__ct__12diff_model_cFv) +// 80048CE0: 80048D60 (__ct__12diff_model_cFv) +// 80048CF0: 80361D60 (__construct_array) +// 80048D04: 80049368 (init__12diff_model_cFv) +// 80048D4C: 80362228 (_restgpr_29) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// False False asm dSmplMdl_draw_c::dSmplMdl_draw_c() { - nofralloc + nofralloc #include "asm/d/d_simple_model/__ct__15dSmplMdl_draw_cFv.s" } #pragma pop -/* 80048D60-80048D80 0020+00 s=1 e=0 z=0 None .text __ct__12diff_model_cFv */ + +/* 80048D60-80048D80 0020+00 s=1 e=0 z=0 None .text __ct__12diff_model_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False asm diff_model_c::diff_model_c() { - nofralloc + nofralloc #include "asm/d/d_simple_model/__ct__12diff_model_cFv.s" } #pragma pop -/* 80048D80-80048E0C 008C+00 s=1 e=0 z=0 None .text __dt__15dSmplMdl_draw_cFv */ + +/* 80048D80-80048E0C 008C+00 s=1 e=0 z=0 None .text __dt__15dSmplMdl_draw_cFv */ +// 80048D90: 803621D8 (_savegpr_28) +// 80048DA0: 803A82F8 (__vt__15dSmplMdl_draw_c) +// 80048DA4: 803A82F8 (__vt__15dSmplMdl_draw_c) +// 80048DCC: 80049210 (remove__12diff_model_cFi) +// 80048DEC: 802CED3C (__dl__FPv) +// 80048DF8: 80362224 (_restgpr_28) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False asm dSmplMdl_draw_c::~dSmplMdl_draw_c() { - nofralloc + nofralloc #include "asm/d/d_simple_model/__dt__15dSmplMdl_draw_cFv.s" } #pragma pop -/* 80048E0C-80048EBC 00B0+00 s=0 e=1 z=0 None .text draw__15dSmplMdl_draw_cFv */ + +/* 80048E0C-80048EBC 00B0+00 s=0 e=1 z=0 None .text draw__15dSmplMdl_draw_cFv */ +// 80048E1C: 803621DC (_savegpr_29) +// 80048E40: 80049270 (draw__12diff_model_cFv) +// 80048E90: 80049408 (insert__12diff_model_cFP11modelList_c) +// 80048EA8: 80362228 (_restgpr_29) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// False False asm void dSmplMdl_draw_c::draw() { - nofralloc + nofralloc #include "asm/d/d_simple_model/draw__15dSmplMdl_draw_cFv.s" } #pragma pop -/* 80048EBC-80048F70 00B4+00 s=0 e=1 z=0 None .text entry__15dSmplMdl_draw_cFP8J3DModeli */ + +/* 80048EBC-80048F70 00B4+00 s=0 e=1 z=0 None .text entry__15dSmplMdl_draw_cFP8J3DModeli */ +// 80048ECC: 803621D0 (_savegpr_26) +// 80048F14: 80049388 (isSame__12diff_model_cFP12J3DModelDatai) +// 80048F34: 80049408 (insert__12diff_model_cFP11modelList_c) +// 80048F5C: 8036221C (_restgpr_26) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// False False +// J3DModel* False +// J3DModel False +// int False asm void dSmplMdl_draw_c::entry(J3DModel* param_0, int param_1) { - nofralloc + nofralloc #include "asm/d/d_simple_model/entry__15dSmplMdl_draw_cFP8J3DModeli.s" } #pragma pop -/* 80048F70-80049058 00E8+00 s=0 e=1 z=0 None .text - * addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc */ + +/* 80048F70-80049058 00E8+00 s=0 e=1 z=0 None .text addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc */ +// 80048F80: 803621CC (_savegpr_25) +// 80048FB0: 80049388 (isSame__12diff_model_cFP12J3DModelDatai) +// 80048FCC: 800490EC (create__12diff_model_cFP12J3DModelDataiUc) +// 80049000: 800491F4 (getModelData__12diff_model_cFv) +// 8004901C: 800490EC (create__12diff_model_cFP12J3DModelDataiUc) +// 80049044: 80362218 (_restgpr_25) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// False False +// J3DModelData* False +// J3DModelData False +// int False +// u8 False asm void dSmplMdl_draw_c::addModel(J3DModelData* param_0, int param_1, u8 param_2) { - nofralloc + nofralloc #include "asm/d/d_simple_model/addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc.s" } #pragma pop -/* 80049058-800490EC 0094+00 s=0 e=1 z=0 None .text - * removeModel__15dSmplMdl_draw_cFP12J3DModelDatai */ + +/* 80049058-800490EC 0094+00 s=0 e=1 z=0 None .text removeModel__15dSmplMdl_draw_cFP12J3DModelDatai */ +// 80049068: 803621D0 (_savegpr_26) +// 800490A0: 80049388 (isSame__12diff_model_cFP12J3DModelDatai) +// 800490B4: 80049210 (remove__12diff_model_cFi) +// 800490D8: 8036221C (_restgpr_26) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// False False +// J3DModelData* False +// J3DModelData False +// int False asm void dSmplMdl_draw_c::removeModel(J3DModelData* param_0, int param_1) { - nofralloc + nofralloc #include "asm/d/d_simple_model/removeModel__15dSmplMdl_draw_cFP12J3DModelDatai.s" } #pragma pop + /* ############################################################################################## */ -/* 80451F38-80451F40 0004+04 s=1 e=0 z=0 None .sdata2 @3763 */ +/* 80451F38-80451F40 0004+04 s=1 e=0 z=0 None .sdata2 @3763 */ SECTION_SDATA2 static f32 lit_3763[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, + 0.0f, + /* padding */ + 0.0f, }; -/* 800490EC-800491F4 0108+00 s=1 e=0 z=0 None .text create__12diff_model_cFP12J3DModelDataiUc - */ +/* 800490EC-800491F4 0108+00 s=1 e=0 z=0 None .text create__12diff_model_cFP12J3DModelDataiUc */ +// 800490FC: 803621D8 (_savegpr_28) +// 80049124: 8000F044 (mDoExt_createSolidHeapFromGameToCurrent__FUlUl) +// 80049148: 80014C54 (mDoExt_J3DModel__create__FP12J3DModelDataUlUl) +// 80049164: 80049210 (remove__12diff_model_cFi) +// 80049168: 8000F1F4 (mDoExt_restoreCurrentHeap__Fv) +// 80049170: 80451F38 (lit_3763) +// 8004918C: 803A2FD8 (g_mDoMtx_identity) +// 80049190: 803A2FD8 (g_mDoMtx_identity) +// 8004919C: 803464B0 (PSMTXCopy) +// 800491B0: 8000F158 (mDoExt_adjustSolidHeapToSystem__FP12JKRSolidHeap) +// 800491E0: 80362224 (_restgpr_28) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False +// J3DModelData* False +// J3DModelData False +// int False +// u8 False asm void diff_model_c::create(J3DModelData* param_0, int param_1, u8 param_2) { - nofralloc + nofralloc #include "asm/d/d_simple_model/create__12diff_model_cFP12J3DModelDataiUc.s" } #pragma pop -/* 800491F4-80049210 001C+00 s=2 e=0 z=0 None .text getModelData__12diff_model_cFv */ + +/* 800491F4-80049210 001C+00 s=2 e=0 z=0 None .text getModelData__12diff_model_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False asm void diff_model_c::getModelData() { - nofralloc + nofralloc #include "asm/d/d_simple_model/getModelData__12diff_model_cFv.s" } #pragma pop -/* 80049210-80049270 0060+00 s=3 e=0 z=0 None .text remove__12diff_model_cFi */ + +/* 80049210-80049270 0060+00 s=3 e=0 z=0 None .text remove__12diff_model_cFi */ +// 80049250: 8000F18C (mDoExt_destroySolidHeap__FP12JKRSolidHeap) +// 80049258: 80049368 (init__12diff_model_cFv) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False +// int False asm void diff_model_c::remove(int param_0) { - nofralloc + nofralloc #include "asm/d/d_simple_model/remove__12diff_model_cFi.s" } #pragma pop -/* 80049270-80049368 00F8+00 s=1 e=0 z=0 None .text draw__12diff_model_cFv */ + +/* 80049270-80049368 00F8+00 s=1 e=0 z=0 None .text draw__12diff_model_cFv */ +// 80049294: 800493FC (getRoomNo__12diff_model_cFv) +// 80049298: 803F6094 (mStatus__20dStage_roomControl_c) +// 8004929C: 803F6094 (mStatus__20dStage_roomControl_c) +// 800492B8: 800493FC (getRoomNo__12diff_model_cFv) +// 800492C0: 803F6094 (mStatus__20dStage_roomControl_c) +// 800492C4: 803F6094 (mStatus__20dStage_roomControl_c) +// 800492D0: 8042CA54 (g_env_light) +// 800492D4: 8042CA54 (g_env_light) +// 800492E0: 801A4DA0 (setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c) +// 800492F0: 804061C0 (g_dComIfG_gameInfo) +// 800492F4: 804061C0 (g_dComIfG_gameInfo) +// 800492FC: 80434AC8 (j3dSys) +// 80049300: 80434AC8 (j3dSys) +// 80049318: 80048C54 (dSmplMdl_modelUpdateDL__FP8J3DModel) +// 8004932C: 8000DCC4 (mDoExt_modelUpdateDL__FP8J3DModel) +// 80049330: 804061C0 (g_dComIfG_gameInfo) +// 80049334: 804061C0 (g_dComIfG_gameInfo) +// 8004933C: 80434AC8 (j3dSys) +// 80049340: 80434AC8 (j3dSys) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False asm void diff_model_c::draw() { - nofralloc + nofralloc #include "asm/d/d_simple_model/draw__12diff_model_cFv.s" } #pragma pop -/* 80049368-80049388 0020+00 s=2 e=0 z=0 None .text init__12diff_model_cFv */ + +/* 80049368-80049388 0020+00 s=2 e=0 z=0 None .text init__12diff_model_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False asm void diff_model_c::init() { - nofralloc + nofralloc #include "asm/d/d_simple_model/init__12diff_model_cFv.s" } #pragma pop -/* 80049388-800493FC 0074+00 s=3 e=0 z=0 None .text isSame__12diff_model_cFP12J3DModelDatai */ + +/* 80049388-800493FC 0074+00 s=3 e=0 z=0 None .text isSame__12diff_model_cFP12J3DModelDatai */ +// 80049398: 803621D8 (_savegpr_28) +// 800493B8: 800491F4 (getModelData__12diff_model_cFv) +// 800493C8: 800493FC (getRoomNo__12diff_model_cFv) +// 800493E8: 80362224 (_restgpr_28) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False +// J3DModelData* False +// J3DModelData False +// int False asm void diff_model_c::isSame(J3DModelData* param_0, int param_1) { - nofralloc + nofralloc #include "asm/d/d_simple_model/isSame__12diff_model_cFP12J3DModelDatai.s" } #pragma pop -/* 800493FC-80049408 000C+00 s=2 e=0 z=0 None .text getRoomNo__12diff_model_cFv */ + +/* 800493FC-80049408 000C+00 s=2 e=0 z=0 None .text getRoomNo__12diff_model_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False asm void diff_model_c::getRoomNo() { - nofralloc + nofralloc #include "asm/d/d_simple_model/getRoomNo__12diff_model_cFv.s" } #pragma pop -/* 80049408-80049420 0018+00 s=2 e=0 z=0 None .text insert__12diff_model_cFP11modelList_c */ + +/* 80049408-80049420 0018+00 s=2 e=0 z=0 None .text insert__12diff_model_cFP11modelList_c */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False +// modelList_c* False +// modelList_c False asm void diff_model_c::insert(modelList_c* param_0) { - nofralloc + nofralloc #include "asm/d/d_simple_model/insert__12diff_model_cFP11modelList_c.s" } #pragma pop + + |
