diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-08-30 14:22:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 15:22:17 -0600 |
| commit | f8979749e3ef8e8cacf2ea8f474c7f23fc5cb6b3 (patch) | |
| tree | 69659df2105266e9b26a4d50b9a2d610b3e437a2 /src/d/d_attention.cpp | |
| parent | bc30d007e11458a198c5725626a10bb06a5da536 (diff) | |
j2d / map_path work, d_drawlist / d_attention cleanup (#208)
* work on fop actor / actor mng, daalink, d_a_obj_item
* d_a_title mostly decompiled
* daalink / d_event / JMessage / dmsg_out_font work
* msg_scrn_base / msg_scrn_boss
* some work on mDo machine, d_menu_save, d_tresure, and various
* remove asm
* progress
* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data
* rename more data
* remove asm / progress
* match all of d_pane_class
* fixes / some dKankyo doc
* bunch of j2d work. d_drawlist / d_attention cleanup
* progress / asm
* cleanup wip
* decompile JStage
* setup some more JStudio structs
* set up d_demo classes
* some d_demo work
* cleanup dolphin os stuff
* some initial dEvent documentation
* some At collision documentation
* match JUTConsole::doDraw
* dbgs work / split up some of d_a_alink into .inc files
* d_a_alink_spinner work
Diffstat (limited to 'src/d/d_attention.cpp')
| -rw-r--r-- | src/d/d_attention.cpp | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index c158f9dfa5..06b1721b41 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -16,9 +16,14 @@ struct mDoCPd_c { static u8 m_cpadInfo[256]; }; -struct dAttDrawParam_c { +class dAttDrawParam_c { +public: /* 80070158 */ dAttDrawParam_c(); - /* 80073FC4 */ ~dAttDrawParam_c(); + /* 80073FC4 */ virtual ~dAttDrawParam_c(); + + /* 0x4 */ s8 field_0x4; + /* 0x8 */ f32 mCursorDistance; + /* 0xC */ f32 field_0xc; }; // @@ -347,11 +352,8 @@ SECTION_DEAD static char const* const stringBase_8037A778 = "Always"; SECTION_DEAD static char const* const pad_8037A77F = ""; #pragma pop -/* 80424B00-80424B0C 051820 000C+00 1/1 0/0 0/0 .bss @4093 */ -static u8 lit_4093[12]; - /* 80424B0C-80424B20 05182C 0010+04 3/3 0/0 0/0 .bss g_AttDwHIO */ -static u8 g_AttDwHIO[16 + 4 /* padding */]; +static dAttDrawParam_c g_AttDwHIO; /* 80070198-80070774 06AAD8 05DC+00 0/0 1/1 0/0 .text __ct__12dAttention_cFP10fopAc_ac_cUl */ #pragma push @@ -1093,27 +1095,13 @@ asm void dAttLook_c::request(fopAc_ac_c* param_0, f32 param_1, f32 param_2, f32 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dAttDrawParam_c::~dAttDrawParam_c() { +// asm dAttDrawParam_c::~dAttDrawParam_c() { +extern "C" asm void __dt__15dAttDrawParam_cFv() { nofralloc #include "asm/d/d_attention/__dt__15dAttDrawParam_cFv.s" } #pragma pop -/* 8007400C-80074048 06E94C 003C+00 0/0 1/0 0/0 .text __sinit_d_attention_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_attention_cpp() { - nofralloc -#include "asm/d/d_attention/__sinit_d_attention_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8007400C, __sinit_d_attention_cpp); -#pragma pop - /* ############################################################################################## */ /* 8045067A-8045067E -00001 0004+00 0/0 0/0 0/0 .sdata None */ #pragma push |