diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index 3b886029e..d2c8361c5 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -13027,7 +13027,7 @@ u32 var80089280 = 0x0300ff00; struct menu_item menuitems_characterprofile[] = { { MENUITEMTYPE_MODEL, 0, 0x00000002, 0x00000046, 0x00000096, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000003, L_MPMENU(432), (u32)&ciMenuTextBioName, NULL }, // "Name:" - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(433), (u32)&func0f1a62e0, NULL }, // "Age:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(433), (u32)&ciMenuTextBioAge, NULL }, // "Age:" { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(434), (u32)&func0f1a6334, NULL }, // "Race:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SCROLLABLE, 3, 0x00000000, 0x000000b4, 0x00000064, NULL }, diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index bc723a5f0..7d2409554 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -3054,30 +3054,13 @@ char *ciMenuTextBioName(struct menu_item *item) return g_StringPointer; } -GLOBAL_ASM( -glabel func0f1a62e0 -/* f1a62e0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f1a62e4: afa40018 */ sw $a0,0x18($sp) -/* f1a62e8: afbf0014 */ sw $ra,0x14($sp) -/* f1a62ec: 3c048009 */ lui $a0,%hi(var800888a0) -/* f1a62f0: 0fc68484 */ jal func0f1a1210 -/* f1a62f4: 908488a0 */ lbu $a0,%lo(var800888a0)($a0) -/* f1a62f8: 0fc68429 */ jal ciGetChrBioByBodynum -/* f1a62fc: 00402025 */ or $a0,$v0,$zero -/* f1a6300: 0fc5b9f1 */ jal langGet -/* f1a6304: 8c440008 */ lw $a0,0x8($v0) -/* f1a6308: 3c048007 */ lui $a0,%hi(g_StringPointer) -/* f1a630c: 3c057f1c */ lui $a1,%hi(var7f1b98a4) -/* f1a6310: 24a598a4 */ addiu $a1,$a1,%lo(var7f1b98a4) -/* f1a6314: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) -/* f1a6318: 0c004dad */ jal sprintf -/* f1a631c: 00403025 */ or $a2,$v0,$zero -/* f1a6320: 8fbf0014 */ lw $ra,0x14($sp) -/* f1a6324: 3c028007 */ lui $v0,%hi(g_StringPointer) -/* f1a6328: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) -/* f1a632c: 03e00008 */ jr $ra -/* f1a6330: 27bd0018 */ addiu $sp,$sp,0x18 -); +char *ciMenuTextBioAge(struct menu_item *item) +{ + struct chrbio *bio = ciGetChrBioByBodynum(func0f1a1210(var800888a0)); + sprintf(g_StringPointer, "%s\n", langGet(bio->age)); + + return g_StringPointer; +} GLOBAL_ASM( glabel func0f1a6334 @@ -4583,7 +4566,6 @@ void *func0f1a7878(u16 fileid, s32 arg1, s32 arg2) return func0f1a7794(fileid, arg1, arg2, 0); } -const char var7f1b98a4[] = "%s\n"; const char var7f1b98a8[] = "%s\n"; const char var7f1b98ac[] = "%s\n"; const char var7f1b98b0[] = "%dm %2ds\n"; diff --git a/src/include/game/game_1a3340.h b/src/include/game/game_1a3340.h index 6c9d16acf..5f2e5d457 100644 --- a/src/include/game/game_1a3340.h +++ b/src/include/game/game_1a3340.h @@ -19,7 +19,7 @@ char *frMenuTextTimeLimitValue(struct menu_item *item); char *frMenuTextAmmoLimitLabel(struct menu_item *item); char *frMenuTextAmmoLimitValue(struct menu_item *item); char *ciMenuTextBioName(struct menu_item *item); -u32 func0f1a62e0(void); +char *ciMenuTextBioAge(struct menu_item *item); u32 func0f1a6334(void); u32 func0f1a6388(void); u32 func0f1a64a0(void);