Decompile mpMenuTextBodyName

This commit is contained in:
Ryan Dwyer 2020-03-18 23:00:12 +10:00
parent 9f9075d2f3
commit a342c3dba1
3 changed files with 6 additions and 21 deletions

View File

@ -10618,7 +10618,7 @@ u32 var8008544c = 0x0400ff00;
// 2b470
struct menu_item menuitems_mpcharacter[] = {
{ MENUITEMTYPE_LABEL, 0, 0x00004230, (u32)&func0f17b8b0, 0x00000000, NULL },
{ MENUITEMTYPE_LABEL, 0, 0x00004230, (u32)&mpMenuTextBodyName, 0x00000000, NULL },
{ MENUITEMTYPE_CAROUSEL, 0, 0x00000000, 0x00000000, 0x00000022, menuhandlerMpCharacterHead },
{ MENUITEMTYPE_CAROUSEL, 0, 0x00000000, 0x00000000, 0x0000001b, menuhandlerMpCharacterBody },
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },

View File

@ -2725,25 +2725,10 @@ s32 menuhandlerMpCharacterHead(u32 operation, struct menu_item *item, s32 *value
return func0f17b4f8(operation, item, value, g_MpPlayers[g_MpPlayerNum].base.headnum, 1);
}
GLOBAL_ASM(
glabel func0f17b8b0
/* f17b8b0: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum)
/* f17b8b4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6)
/* f17b8b8: 27bdffe8 */ addiu $sp,$sp,-24
/* f17b8bc: afa40018 */ sw $a0,0x18($sp)
/* f17b8c0: 000e7880 */ sll $t7,$t6,0x2
/* f17b8c4: 01ee7821 */ addu $t7,$t7,$t6
/* f17b8c8: 000f7940 */ sll $t7,$t7,0x5
/* f17b8cc: 3c04800b */ lui $a0,%hi(g_MpPlayers+0x10)
/* f17b8d0: afbf0014 */ sw $ra,0x14($sp)
/* f17b8d4: 008f2021 */ addu $a0,$a0,$t7
/* f17b8d8: 0fc62f0c */ jal mpGetBodyName
/* f17b8dc: 9084c7c8 */ lbu $a0,%lo(g_MpPlayers+0x10)($a0)
/* f17b8e0: 8fbf0014 */ lw $ra,0x14($sp)
/* f17b8e4: 27bd0018 */ addiu $sp,$sp,0x18
/* f17b8e8: 03e00008 */ jr $ra
/* f17b8ec: 00000000 */ sll $zero,$zero,0x0
);
char *mpMenuTextBodyName(struct menu_item *item)
{
return mpGetBodyName(g_MpPlayers[g_MpPlayerNum].base.bodynum);
}
GLOBAL_ASM(
glabel func0f17b8f0

View File

@ -32,7 +32,7 @@ s32 menuhandlerMpMedal(u32, u32, u32 *);
u32 func0f17b360(void);
u32 mpMenuTextUsernamePassword(void);
s32 func0f17b4f8(u32 operation, struct menu_item *item, s32 *value, s32 arg3, s32 arg4);
u32 func0f17b8b0(void);
char *mpMenuTextBodyName(struct menu_item *item);
u32 func0f17b8f0(void);
s32 menuhandler0017b91c(u32, u32, u32 *);
s32 menuhandler0017bab4(u32, u32, u32 *);