falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile bioMenuTextName

This commit is contained in:
Ryan Dwyer 2020-08-13 19:34:25 +10:00
parent a0159e10e8
commit e561533bfe
4 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/data/data_02e820.c
View File

@ -486,7 +486,7 @@ struct menudialog menudialog_holograph = {
// 2f938
struct menudialog menudialog_2f938 = {
MENUDIALOGTYPE_DEFAULT,
(u32)&func0f1a6c8c,
(u32)&bioMenuTextName,
menuitems_2f858,
NULL,
0x00000202,
@ -496,7 +496,7 @@ struct menudialog menudialog_2f938 = {
// 2f950
struct menudialog menudialog_2f950 = {
MENUDIALOGTYPE_DEFAULT,
(u32)&func0f1a6c8c,
(u32)&bioMenuTextName,
menuitems_2f858,
NULL,
0x00000202,

25
src/game/game_1a3340.c
View File

@ -3523,23 +3523,12 @@ bool menudialogFiringRangeResults(u32 operation, struct menudialog *dialog, stru
return false;
}
GLOBAL_ASM(
glabel func0f1a6c8c
/* f1a6c8c: 27bdffe8 */ addiu $sp,$sp,-24
/* f1a6c90: afa40018 */ sw $a0,0x18($sp)
/* f1a6c94: afbf0014 */ sw $ra,0x14($sp)
/* f1a6c98: 3c048009 */ lui $a0,%hi(g_HangarBioSlot)
/* f1a6c9c: 0fc685db */ jal ciGetHangarBioIndexBySlot
/* f1a6ca0: 90848964 */ lbu $a0,%lo(g_HangarBioSlot)($a0)
/* f1a6ca4: 0fc6852d */ jal ciGetHangarBio
/* f1a6ca8: 00402025 */ or $a0,$v0,$zero
/* f1a6cac: 0fc5b9f1 */ jal langGet
/* f1a6cb0: 8c440000 */ lw $a0,0x0($v0)
/* f1a6cb4: 8fbf0014 */ lw $ra,0x14($sp)
/* f1a6cb8: 27bd0018 */ addiu $sp,$sp,0x18
/* f1a6cbc: 03e00008 */ jr $ra
/* f1a6cc0: 00000000 */ nop
);
char *bioMenuTextName(struct menuitem *item)
{
struct hangarbio *bio = ciGetHangarBio(ciGetHangarBioIndexBySlot(g_HangarBioSlot));
return langGet(bio->name);
}
GLOBAL_ASM(
glabel func0f1a6cc4
@ -3894,7 +3883,7 @@ glabel menuhandler001a6ea4
/* f1a71a8: 0fc54d8a */ jal func0f153628
/* f1a71ac: 8fa400a4 */ lw $a0,0xa4($sp)
/* f1a71b0: afa200a4 */ sw $v0,0xa4($sp)
/* f1a71b4: 0fc69b23 */ jal func0f1a6c8c
/* f1a71b4: 0fc69b23 */ jal bioMenuTextName
/* f1a71b8: 00002025 */ or $a0,$zero,$zero
/* f1a71bc: 3c0a8008 */ lui $t2,%hi(var8007fb14)
/* f1a71c0: 8d4afb14 */ lw $t2,%lo(var8007fb14)($t2)

2
src/include/game/game_1a3340.h
View File

@ -30,7 +30,7 @@ char *htMenuTextName(struct menuitem *item);
char *htMenuTextOkOrResume(struct menuitem *item);
char *htMenuTextCancelOrAbort(struct menuitem *item);
char *htMenuTextTimeTakenValue(struct menuitem *item);
u32 func0f1a6c8c(void);
char *bioMenuTextName(struct menuitem *item);
u32 func0f1a6cc4(void);
struct menudialog *ciGetFrWeaponListMenuDialog(void);
void func0f1a7560(void *ptr, u16 fileid, u32 arg2, void *arg3, s32 arg4, bool arg5);

1
src/include/game/training.h
View File

@ -7,6 +7,7 @@ extern u8 g_FrIsValidWeapon;
extern s32 g_FrWeaponNum;
extern u8 var800888a0;
extern u8 var80088bb4;
extern u8 g_HangarBioSlot;
bool ciIsTourDone(void);
u8 ciGetFiringRangeScore(s32 weaponindex);