diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-21 18:52:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-21 15:52:16 -0800 |
| commit | e2fddadf320e8d35cbb3542645122e086efbfe9f (patch) | |
| tree | f0e11b2955fd092ad3022c192aed36bddd77fb48 /src/d/d_s_menu.cpp | |
| parent | 31621c3daccccc0a582eceafec7e373d872f072a (diff) | |
Misc matches (#2845)
* Misc debug matches
* Fix d_map weak function order
* Remove old nonmatching comments
* d_menu_dmap and JASAudioThread OK, fix weak func order and rodata alignment
* More misc matches
Diffstat (limited to 'src/d/d_s_menu.cpp')
| -rw-r--r-- | src/d/d_s_menu.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 7c5aa27d08..7df243c21a 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -510,7 +510,7 @@ u8 dSm_read_stageset(u8* i_data) { return sp8; } -// NONMATCHING - regalloc / stack +// DEBUG NONMATCHING - regalloc / stack int dScnMenu_Draw(dScnMenu_c* i_this) { static dDlst_2DQuad_c effectQuad; static dDlst_2DQuad_c effectQuad2[40]; @@ -1132,7 +1132,7 @@ void setEnvData(menu_data_class* i_data) { } } -// NONMATCHING - some stack issues +// DEBUG NONMATCHING - some stack issues int dScnMenu_Execute(dScnMenu_c* i_this) { static const u8 l_autoCancel[2][2] = { {99, 99}, @@ -1567,7 +1567,6 @@ u8 search(menu_info_class* i_info) { return rt; } -// NONMATCHING - small regalloc int phase_2(dScnMenu_c* i_this) { if (!i_this->command->sync() || !i_this->fontCommand->sync()) { return cPhs_INIT_e; @@ -1606,7 +1605,7 @@ int phase_2(dScnMenu_c* i_this) { category_offset += menu_info->stage_data[i].field_0x41 * sizeof(menu_data_class); } - i_this->category_info = (menu_category_class*)((uintptr_t)i_this->command->getMemAddress() + category_offset); + i_this->category_info = (menu_category_class*)(&((u8*)i_this->command->getMemAddress())[category_offset]); JUT_ASSERT(3282, i_this->category_info != NULL); category_info = i_this->category_info; |