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

Decompile htMenuTextName

This commit is contained in:
Ryan Dwyer 2020-08-13 19:30:54 +10:00
parent 2c69ae9151
commit a0159e10e8
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -382,7 +382,7 @@ struct menuitem menuitems_2f614[] = {
// 2f68c
struct menudialog g_HoloTrainingDetailsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&func0f1a6a04,
(u32)&htMenuTextName,
menuitems_2f614,
menudialog001a6aa4,
0x00000206,

19
src/game/game_1a3340.c
View File

@ -3433,21 +3433,10 @@ glabel var7f1b99b4
/* f1a6a00: 00000000 */ nop
);
GLOBAL_ASM(
glabel func0f1a6a04
/* f1a6a04: 27bdffe8 */ addiu $sp,$sp,-24
/* f1a6a08: afa40018 */ sw $a0,0x18($sp)
/* f1a6a0c: afbf0014 */ sw $ra,0x14($sp)
/* f1a6a10: 3c048009 */ lui $a0,%hi(var80088bb4)
/* f1a6a14: 0fc68937 */ jal htGetIndexBySlot
/* f1a6a18: 90848bb4 */ lbu $a0,%lo(var80088bb4)($a0)
/* f1a6a1c: 0fc68955 */ jal htGetName
/* f1a6a20: 00402025 */ or $a0,$v0,$zero
/* f1a6a24: 8fbf0014 */ lw $ra,0x14($sp)
/* f1a6a28: 27bd0018 */ addiu $sp,$sp,0x18
/* f1a6a2c: 03e00008 */ jr $ra
/* f1a6a30: 00000000 */ nop
);
char *htMenuTextName(struct menuitem *item)
{
return htGetName(htGetIndexBySlot(var80088bb4));
}
s32 menuhandler001a6a34(u32 operation, struct menuitem *item, s32 *value)
{

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

@ -26,7 +26,7 @@ u32 func0f1a64a0(void);
char *dtMenuTextOkOrResume(struct menuitem *item);
char *dtMenuTextCancelOrAbort(struct menuitem *item);
char *dtMenuTextTimeTakenValue(struct menuitem *item);
u32 func0f1a6a04(void);
char *htMenuTextName(struct menuitem *item);
char *htMenuTextOkOrResume(struct menuitem *item);
char *htMenuTextCancelOrAbort(struct menuitem *item);
char *htMenuTextTimeTakenValue(struct menuitem *item);

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

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