This commit is contained in:
Niko 2024-02-23 14:57:02 -05:00
parent aee3f513cc
commit 4a06af1ebf
2 changed files with 29 additions and 8 deletions

View File

@ -5794,8 +5794,12 @@ LAB_800b1d7c:
FUN_80045db0(&DAT_800b56c8,(int)(((uint)DAT_800b5646 + 0x9c) * 0x10000) >> 0x10,
(int)(((uint)DAT_800b5648 + 0x24) * 0x10000) >> 0x10,0x134);
local_38 = 0xd;
// MENUBOX_GetHeight
FUN_80045b1c(&DAT_800b56c8,&local_38,0);
sVar6 = local_38 + 0x20;
// _DAT_8008d878 + 0x254
@ -5831,10 +5835,17 @@ LAB_800b1d7c:
FUN_80045db0(&DAT_800b57d8,
(int)(((uint)DAT_800b565a + 0x142) * 0x10000) >> 0x10,
(int)(short)(DAT_800b565c + sVar6 + 4),0x8e);
local_38 = 0xd;
FUN_80045b1c(&DAT_800b570c,&local_38,0);
local_36[0] = 0xd;
local_38 = 0xd;
// MENUBOX_GetHeight
FUN_80045b1c(&DAT_800b570c,&local_38,0);
local_36[0] = 0xd;
// MENUBOX_GetHeight
FUN_80045b1c(&DAT_800b57d8,local_36,0);
sVar20 = local_36[0] + sVar6;
if (local_36[0] < local_38) {
sVar20 = local_38 + sVar6;
@ -5857,7 +5868,10 @@ LAB_800b1d7c:
FUN_80045db0(puVar19,(int)(((uint)DAT_800b565a + 0x9c) * 0x10000) >> 0x10,
(int)(short)(DAT_800b565c + sVar6 + 4),0x134);
local_38 = 0xd;
// MENUBOX_GetHeight
FUN_80045b1c(puVar19,&local_38,0);
sVar20 = local_38 + sVar6;
LAB_800b25f0:
iVar8 = 0x9f;
@ -6088,6 +6102,8 @@ LAB_800b25f0:
FUN_80045db0(&DAT_800b5810,(int)(((uint)DAT_800b5696 + 0x9c) * 0x10000) >> 0x10,
(int)(short)(DAT_800b5698 + sVar20 + 0x78),0x134);
local_38 = 0xd;
// MENUBOX_GetHeight
FUN_80045b1c(&DAT_800b5810,&local_38,0);
}

View File

@ -3278,13 +3278,14 @@ LAB_80045bd0:
((*(uint *)(param_1 + 4) & 0x10) != 0)
)
{
// MENUBOX_GetHeight
// recursively check height from submenus
FUN_80045b1c(*(undefined4 *)(param_1 + 0x12),param_2,1);
}
return;
}
// get width of menubox
// MENUBOX_GetWidth
// param_1 MenuBox
// param_2 return value
// param_3 bool check submenus
@ -3363,6 +3364,7 @@ void FUN_80045c50(short *param_1,short *param_2,short param_3)
// if submenu will be drawn
((*(uint *)(param_1 + 4) & 0x10) != 0))
{
// MENUBOX_GetWidth
// recursively check submenus for width
FUN_80045c50(*(undefined4 *)(param_1 + 0x12),param_2,1);
}
@ -3474,7 +3476,7 @@ LAB_80045e94:
param_1[0xb] = param_1[1];
param_1[0xc] = param_1[2];
// get height of menubox
// MENUBOX_GetHeight
FUN_80045b1c(param_1,&local_60,0);
uVar2 = *(uint *)(param_1 + 4);
@ -3489,7 +3491,10 @@ LAB_80045e94:
if ((uVar2 & 2) != 0) {
local_5e[0] = 0;
// MENUBOX_GetHeight
FUN_80045b1c(param_1,local_5e,1);
local_38 = (short)((uint)(-(int)local_5e[0] - (-(int)local_5e[0] >> 0x1f)) >> 1);
}
uVar2 = *(uint *)(param_1 + 4);
@ -4105,7 +4110,7 @@ void FUN_8004680c(void)
// set width to zero
local_10[0] = 0;
// get width of menubox
// MENUBOX_GetWidth
FUN_80045c50(DAT_8008d908,local_10,1);
// draw menubox
@ -7203,7 +7208,7 @@ LAB_800499e4:
// set menubox width to zero
local_56[0] = 0;
// get width of menubox
// MENUBOX_GetWidth
FUN_80045c50(&DAT_80085d5c,local_56,1);
// draw menubox
@ -7274,7 +7279,7 @@ LAB_800499e4:
// Open "Overwrite" menuBox
// get width of menuBox
// MENUBOX_GetWidth
FUN_80045c50(&DAT_80085d30,&local_58,1);
// draw menuBox