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

Decompile weaponGetActivatedText

This commit is contained in:
Ryan Dwyer 2020-02-08 13:05:49 +10:00
parent 7953faf106
commit b4b983cc4f
3 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/game_066310.c
View File

@ -40073,7 +40073,7 @@ glabel func0f088840
/* f088bf0: afae0094 */ sw $t6,0x94($sp)
/* f088bf4: 11e00014 */ beqz $t7,.L0f088c48
/* f088bf8: 8fb80074 */ lw $t8,0x74($sp)
/* f088bfc: 0fc44c0d */ jal func0f113034
/* f088bfc: 0fc44c0d */ jal weaponGetActivatedText
/* f088c00: 9304005c */ lbu $a0,0x5c($t8)
/* f088c04: 10400008 */ beqz $v0,.L0f088c28
/* f088c08: 00402025 */ or $a0,$v0,$zero

33
src/game/game_111600.c
View File

@ -1514,29 +1514,16 @@ char *objGetActivatedText(struct defaultobj *obj)
return NULL;
}
GLOBAL_ASM(
glabel func0f113034
/* f113034: 27bdffe8 */ addiu $sp,$sp,-24
/* f113038: afbf0014 */ sw $ra,0x14($sp)
/* f11303c: 0fc44aff */ jal weaponGetTextOverride
/* f113040: 00000000 */ sll $zero,$zero,0x0
/* f113044: 50400009 */ beqzl $v0,.L0f11306c
/* f113048: 00001025 */ or $v0,$zero,$zero
/* f11304c: 8c4e001c */ lw $t6,0x1c($v0)
/* f113050: 51c00006 */ beqzl $t6,.L0f11306c
/* f113054: 00001025 */ or $v0,$zero,$zero
/* f113058: 0fc5b9f1 */ jal langGet
/* f11305c: 8c44001c */ lw $a0,0x1c($v0)
/* f113060: 10000003 */ beqz $zero,.L0f113070
/* f113064: 8fbf0014 */ lw $ra,0x14($sp)
/* f113068: 00001025 */ or $v0,$zero,$zero
.L0f11306c:
/* f11306c: 8fbf0014 */ lw $ra,0x14($sp)
.L0f113070:
/* f113070: 27bd0018 */ addiu $sp,$sp,0x18
/* f113074: 03e00008 */ jr $ra
/* f113078: 00000000 */ sll $zero,$zero,0x0
);
char *weaponGetActivatedText(s32 weaponnum)
{
struct textoverride *override = weaponGetTextOverride(weaponnum);
if (override && override->activatetextid) {
return langGet(override->activatetextid);
}
return NULL;
}
GLOBAL_ASM(
glabel func0f11307c

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

@ -44,7 +44,7 @@ u32 currentPlayerGetEquipCurItem(void);
void currentPlayerSetEquipCurItem(u32 item);
void currentPlayerCalculateEquipCurItem(void);
char *objGetActivatedText(struct defaultobj *obj);
u32 func0f113034(void);
char *weaponGetActivatedText(s32 weaponnum);
u32 func0f11307c(void);
u32 func0f1131ac(void);