diff options
| author | Julgodis <> | 2021-04-01 02:07:58 +0200 |
|---|---|---|
| committer | Julgodis <> | 2021-04-01 02:07:58 +0200 |
| commit | f6464a61cecc9b65cf010d2fb7876c23251761f5 (patch) | |
| tree | f8dca6ee66125288bd3be0cc239cf07276469a02 /src/d/msg/d_msg_unit.cpp | |
| parent | b999714187d934636004d3d93e1ed1da792d6f80 (diff) | |
__sinit and progress script update
Diffstat (limited to 'src/d/msg/d_msg_unit.cpp')
| -rw-r--r-- | src/d/msg/d_msg_unit.cpp | 131 |
1 files changed, 41 insertions, 90 deletions
diff --git a/src/d/msg/d_msg_unit.cpp b/src/d/msg/d_msg_unit.cpp index d9f1189fda..bbeb6675eb 100644 --- a/src/d/msg/d_msg_unit.cpp +++ b/src/d/msg/d_msg_unit.cpp @@ -1,135 +1,97 @@ -// +// // Generated By: dol2asm // Translation Unit: d/msg/d_msg_unit -// +// +#include "d/msg/d_msg_unit.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "d/msg/d_msg_unit.h" -// +// // Types: -// +// struct dScnKy_env_light_c { - /* 8019FA08 */ // False False -void getDaytime(); + /* 8019FA08 */ void getDaytime(); }; struct dMsgUnit_c { - /* 80238C94 */ // True False -dMsgUnit_c(); - /* 80238CA4 */ // True False -~dMsgUnit_c(); - /* 80238CEC */ // False False -// int False -// int False -// char* False -// char False -// bool False -void setTag(int, int, char*, bool); + /* 80238C94 */ dMsgUnit_c(); + /* 80238CA4 */ ~dMsgUnit_c(); + /* 80238CEC */ void setTag(int, int, char*, bool); }; -// +// // Forward References: -// +// - -// True False extern "C" void __ct__10dMsgUnit_cFv(); -// True False extern "C" void __dt__10dMsgUnit_cFv(); -// False False -// int False -// int False -// char* False -// char False -// bool False extern "C" void setTag__10dMsgUnit_cFiiPcb(); -// False False extern "C" void __sinit_d_msg_unit_cpp(); extern "C" extern char const* const d_msg_d_msg_unit__stringBase0; extern "C" extern void* __vt__10dMsgUnit_c[3 + 1 /* padding */]; extern "C" extern u8 g_msg_unit[4 + 4 /* padding */]; extern "C" extern u8 data_804510D8[8]; -// +// // External References: -// +// -// False False -// void False -// void* False -// void False void operator delete(void*); -// False False extern "C" void getDaytime__18dScnKy_env_light_cFv(); -// False False -// void False -// void* False -// void False extern "C" void __dl__FPv(); -// False False extern "C" void __register_global_object(); -// False False extern "C" void _savegpr_26(); -// False False extern "C" void _restgpr_26(); -// False False extern "C" void sprintf(); -// False False extern "C" void strcmp(); -// False False extern "C" void strcat(); extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_meter2_info[248]; -// +// // Declarations: -// +// /* ############################################################################################## */ -/* 803C0BF0-803C0C00 000C+04 s=2 e=0 z=0 None .data __vt__10dMsgUnit_c */ +/* 803C0BF0-803C0C00 000C+04 s=2 e=0 z=0 None .data __vt__10dMsgUnit_c */ SECTION_DATA void* __vt__10dMsgUnit_c[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dMsgUnit_cFv, - /* padding */ - NULL, + (void*)NULL /* RTTI */, + (void*)NULL, + (void*)__dt__10dMsgUnit_cFv, + /* padding */ + NULL, }; -/* 80238C94-80238CA4 0010+00 s=1 e=0 z=0 None .text __ct__10dMsgUnit_cFv */ +/* 80238C94-80238CA4 0010+00 s=1 e=0 z=0 None .text __ct__10dMsgUnit_cFv */ // 80238C94: 803C0BF0 (__vt__10dMsgUnit_c) // 80238C98: 803C0BF0 (__vt__10dMsgUnit_c) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// True False asm dMsgUnit_c::dMsgUnit_c() { - nofralloc + nofralloc #include "asm/d/msg/d_msg_unit/__ct__10dMsgUnit_cFv.s" } #pragma pop - -/* 80238CA4-80238CEC 0048+00 s=2 e=0 z=0 None .text __dt__10dMsgUnit_cFv */ +/* 80238CA4-80238CEC 0048+00 s=2 e=0 z=0 None .text __dt__10dMsgUnit_cFv */ // 80238CBC: 803C0BF0 (__vt__10dMsgUnit_c) // 80238CC0: 803C0BF0 (__vt__10dMsgUnit_c) // 80238CD0: 802CED3C (__dl__FPv) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// True False asm dMsgUnit_c::~dMsgUnit_c() { - nofralloc + nofralloc #include "asm/d/msg/d_msg_unit/__dt__10dMsgUnit_cFv.s" } #pragma pop - /* ############################################################################################## */ -/* 803996E8-80399708 001D+03 s=1 e=0 z=0 None .rodata @stringBase0 */ +/* 803996E8-80399708 001D+03 s=1 e=0 z=0 None .rodata @stringBase0 */ #pragma push #pragma force_active on #pragma section ".dead" @@ -143,23 +105,23 @@ SECTION_DEAD char const* const stringBase_803996FF = "%d %s"; SECTION_DEAD static char const* const pad_80399705 = "\0\0"; #pragma pop -/* 80454B40-80454B44 0004+00 s=1 e=0 z=0 None .sdata2 @3702 */ +/* 80454B40-80454B44 0004+00 s=1 e=0 z=0 None .sdata2 @3702 */ SECTION_SDATA2 static f32 lit_3702 = 1000000.0f; -/* 80454B44-80454B48 0004+00 s=1 e=0 z=0 None .sdata2 @3703 */ +/* 80454B44-80454B48 0004+00 s=1 e=0 z=0 None .sdata2 @3703 */ SECTION_SDATA2 static f32 lit_3703 = 60.0f; -/* 80454B48-80454B50 0004+04 s=1 e=0 z=0 None .sdata2 @3704 */ +/* 80454B48-80454B50 0004+04 s=1 e=0 z=0 None .sdata2 @3704 */ SECTION_SDATA2 static f32 lit_3704[1 + 1 /* padding */] = { - 15.0f, - /* padding */ - 0.0f, + 15.0f, + /* padding */ + 0.0f, }; -/* 80454B50-80454B58 0008+00 s=1 e=0 z=0 None .sdata2 @3707 */ +/* 80454B50-80454B58 0008+00 s=1 e=0 z=0 None .sdata2 @3707 */ SECTION_SDATA2 static f64 lit_3707 = 4503601774854144.0 /* cast s32 to float */; -/* 80238CEC-8023907C 0390+00 s=0 e=5 z=0 None .text setTag__10dMsgUnit_cFiiPcb */ +/* 80238CEC-8023907C 0390+00 s=0 e=5 z=0 None .text setTag__10dMsgUnit_cFiiPcb */ // 80238CFC: 803621D0 (_savegpr_26) // 80238D2C: 803996E8 (d_msg_d_msg_unit__stringBase0) // 80238D30: 803996E8 (d_msg_d_msg_unit__stringBase0) @@ -200,27 +162,20 @@ SECTION_SDATA2 static f64 lit_3707 = 4503601774854144.0 /* cast s32 to float */; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// False False -// int False -// int False -// char* False -// char False -// bool False asm void dMsgUnit_c::setTag(int param_0, int param_1, char* param_2, bool param_3) { - nofralloc + nofralloc #include "asm/d/msg/d_msg_unit/setTag__10dMsgUnit_cFiiPcb.s" } #pragma pop - /* ############################################################################################## */ -/* 804306B8-804306C8 000C+04 s=1 e=0 z=0 None .bss @3640 */ +/* 804306B8-804306C8 000C+04 s=1 e=0 z=0 None .bss @3640 */ static u8 lit_3640[12 + 4 /* padding */]; -/* 804510D0-804510D8 0004+04 s=1 e=5 z=0 None .sbss g_msg_unit */ +/* 804510D0-804510D8 0004+04 s=1 e=5 z=0 None .sbss g_msg_unit */ u8 g_msg_unit[4 + 4 /* padding */]; -/* 8023907C-802390B4 0038+00 s=0 e=0 z=0 None .text __sinit_d_msg_unit_cpp */ +/* 8023907C-802390B4 0038+00 s=0 e=0 z=0 None .text __sinit_d_msg_unit_cpp */ // 80239088: 804510D0 (g_msg_unit) // 8023908C: 80238C94 (__ct__10dMsgUnit_cFv) // 80239090: 80238CA4 (__dt__10dMsgUnit_cFv) @@ -231,21 +186,17 @@ u8 g_msg_unit[4 + 4 /* padding */]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// False False extern "C" asm void __sinit_d_msg_unit_cpp() { - nofralloc + nofralloc #include "asm/d/msg/d_msg_unit/__sinit_d_msg_unit_cpp.s" } #pragma pop #pragma push #pragma force_active on -#pragma section ".ctors$15" -__declspec(section ".ctors$15") void* const _ctors_8023907C = (void*)__sinit_d_msg_unit_cpp; +SECTION_CTORS void* const _ctors_8023907C = (void*)__sinit_d_msg_unit_cpp; #pragma pop - /* ############################################################################################## */ -/* 804510D8-804510E0 0008+00 s=0 e=2 z=0 None .sbss None */ +/* 804510D8-804510E0 0008+00 s=0 e=2 z=0 None .sbss None */ u8 data_804510D8[8]; - |
