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

Decompile weaponGetName

This commit is contained in:
Ryan Dwyer 2020-03-12 22:36:06 +10:00
parent 08854728d6
commit bbb692bef0
8 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/bondeyespy.c
View File

@ -1607,7 +1607,7 @@ glabel var7f1ada9c
/* f0d07bc: 0fc5b9f1 */ jal langGet
/* f0d07c0: 240458da */ addiu $a0,$zero,0x58da
/* f0d07c4: afa20060 */ sw $v0,0x60($sp)
/* f0d07c8: 0fc28857 */ jal func0f0a215c
/* f0d07c8: 0fc28857 */ jal weaponGetName
/* f0d07cc: 2404002e */ addiu $a0,$zero,0x2e
/* f0d07d0: 3c057f1b */ lui $a1,%hi(var7f1ada78)
/* f0d07d4: 24a5da78 */ addiu $a1,$a1,%lo(var7f1ada78)

2
src/game/game_016100.c
View File

@ -56,7 +56,7 @@ glabel func0f016100
/* f01613c: 10000001 */ beqz $zero,.L0f016144
/* f016140: 8fa40024 */ lw $a0,0x24($sp)
.L0f016144:
/* f016144: 0fc28857 */ jal func0f0a215c
/* f016144: 0fc28857 */ jal weaponGetName
/* f016148: 00000000 */ sll $zero,$zero,0x0
/* f01614c: afa2002c */ sw $v0,0x2c($sp)
/* f016150: 0fc4a24b */ jal setCurrentPlayerNum

34
src/game/game_097ba0.c
View File

@ -116,7 +116,6 @@ const char var7f1ac0b8[] = "Gun : After Cached Setup : Base 0x%08x Free %d\n";
const char var7f1ac0ec[] = "Gun : TotalUsed %d, Free %d\n";
const char var7f1ac10c[] = "BriGun: Set Master State: MASTER_GUN_LOADSTATE_LOADED\n";
const char var7f1ac144[] = "GunLockTimer: %d\n";
const char var7f1ac158[] = "** error\n";
GLOBAL_ASM(
glabel func0f097ba0
@ -12714,29 +12713,16 @@ glabel func0f0a212c
/* f0a2158: 8f020ce4 */ lw $v0,0xce4($t8)
);
GLOBAL_ASM(
glabel func0f0a215c
/* f0a215c: 00047080 */ sll $t6,$a0,0x2
/* f0a2160: 3c028007 */ lui $v0,%hi(g_Weapons)
/* f0a2164: 004e1021 */ addu $v0,$v0,$t6
/* f0a2168: 8c42ff18 */ lw $v0,%lo(g_Weapons)($v0)
/* f0a216c: 27bdffe8 */ addiu $sp,$sp,-24
/* f0a2170: afbf0014 */ sw $ra,0x14($sp)
/* f0a2174: 10400005 */ beqz $v0,.L0f0a218c
/* f0a2178: 00000000 */ sll $zero,$zero,0x0
/* f0a217c: 0fc5b9f1 */ jal langGet
/* f0a2180: 94440046 */ lhu $a0,0x46($v0)
/* f0a2184: 10000004 */ beqz $zero,.L0f0a2198
/* f0a2188: 8fbf0014 */ lw $ra,0x14($sp)
.L0f0a218c:
/* f0a218c: 3c027f1b */ lui $v0,%hi(var7f1ac158)
/* f0a2190: 2442c158 */ addiu $v0,$v0,%lo(var7f1ac158)
/* f0a2194: 8fbf0014 */ lw $ra,0x14($sp)
.L0f0a2198:
/* f0a2198: 27bd0018 */ addiu $sp,$sp,0x18
/* f0a219c: 03e00008 */ jr $ra
/* f0a21a0: 00000000 */ sll $zero,$zero,0x0
);
char *weaponGetName(s32 weaponnum)
{
struct weapon *weapon = g_Weapons[weaponnum];
if (weapon) {
return langGet(weapon->name);
}
return "** error\n";
}
u16 weaponGetNameId(s32 weaponnum)
{

2
src/game/game_102240.c
View File

@ -4035,7 +4035,7 @@ glabel var7f1b2e44
/* f106088: 3c018007 */ lui $at,0x8007
/* f10608c: 0fc6749a */ jal func0f19d268
/* f106090: a0243544 */ sb $a0,0x3544($at)
/* f106094: 0fc28857 */ jal func0f0a215c
/* f106094: 0fc28857 */ jal weaponGetName
/* f106098: 00402025 */ or $a0,$v0,$zero
/* f10609c: 10000033 */ beqz $zero,.L0f10616c
/* f1060a0: 8fbf0014 */ lw $ra,0x14($sp)

8
src/game/game_1a3340.c
View File

@ -307,7 +307,7 @@ glabel var7f1b9940
/* f1a35e0: 0fc54d8a */ jal func0f153628
/* f1a35e4: afb80080 */ sw $t8,0x80($sp)
/* f1a35e8: afa2009c */ sw $v0,0x9c($sp)
/* f1a35ec: 0fc28857 */ jal func0f0a215c
/* f1a35ec: 0fc28857 */ jal weaponGetName
/* f1a35f0: 8fa40090 */ lw $a0,0x90($sp)
/* f1a35f4: 0c002f02 */ jal func0000bc08
/* f1a35f8: afa20044 */ sw $v0,0x44($sp)
@ -1016,7 +1016,7 @@ glabel func0f1a3fc0
/* f1a3fcc: afa40018 */ sw $a0,0x18($sp)
/* f1a3fd0: 0fc6749a */ jal func0f19d268
/* f1a3fd4: 00402025 */ or $a0,$v0,$zero
/* f1a3fd8: 0fc28857 */ jal func0f0a215c
/* f1a3fd8: 0fc28857 */ jal weaponGetName
/* f1a3fdc: 00402025 */ or $a0,$v0,$zero
/* f1a3fe0: 8fbf0014 */ lw $ra,0x14($sp)
/* f1a3fe4: 27bd0018 */ addiu $sp,$sp,0x18
@ -3527,7 +3527,7 @@ glabel var7f1b9994
/* f1a642c: 8cc40000 */ lw $a0,0x0($a2)
/* f1a6430: 0fc68778 */ jal func0f1a1de0
/* f1a6434: 00402025 */ or $a0,$v0,$zero
/* f1a6438: 0fc28857 */ jal func0f0a215c
/* f1a6438: 0fc28857 */ jal weaponGetName
/* f1a643c: 00402025 */ or $a0,$v0,$zero
/* f1a6440: 10000014 */ beqz $zero,.L0f1a6494
/* f1a6444: 8fbf0014 */ lw $ra,0x14($sp)
@ -3568,7 +3568,7 @@ glabel func0f1a64a0
/* f1a64b4: 90848ad8 */ lbu $a0,%lo(var80088ad8)($a0)
/* f1a64b8: 0fc68778 */ jal func0f1a1de0
/* f1a64bc: 00402025 */ or $a0,$v0,$zero
/* f1a64c0: 0fc28857 */ jal func0f0a215c
/* f1a64c0: 0fc28857 */ jal weaponGetName
/* f1a64c4: 00402025 */ or $a0,$v0,$zero
/* f1a64c8: 8fbf0014 */ lw $ra,0x14($sp)
/* f1a64cc: 27bd0018 */ addiu $sp,$sp,0x18

2
src/game/mplayer.c
View File

@ -1668,7 +1668,7 @@ glabel mpGetWeaponLabel
/* f188cd0: 1000000c */ beqz $zero,.L0f188d04
/* f188cd4: 8fbf0024 */ lw $ra,0x24($sp)
.L0f188cd8:
/* f188cd8: 0fc28857 */ jal func0f0a215c
/* f188cd8: 0fc28857 */ jal weaponGetName
/* f188cdc: 00000000 */ sll $zero,$zero,0x0
/* f188ce0: 10000008 */ beqz $zero,.L0f188d04
/* f188ce4: 8fbf0024 */ lw $ra,0x24($sp)

2
src/game/propobj.c
View File

@ -39512,7 +39512,7 @@ glabel func0f08841c
.L0f088664:
/* f088664: 1160000b */ beqz $t3,.L0f088694
/* f088668: 00000000 */ sll $zero,$zero,0x0
/* f08866c: 0fc28857 */ jal func0f0a215c
/* f08866c: 0fc28857 */ jal weaponGetName
/* f088670: 8fa40024 */ lw $a0,0x24($sp)
/* f088674: 8fa40020 */ lw $a0,0x20($sp)
/* f088678: 0c004c89 */ jal strcat

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

@ -100,7 +100,7 @@ u32 func0f0a1df4(void);
void currentPlayerEquipWeapon(u32 arg0, u32 arg1);
u32 func0f0a20fc(void);
u32 func0f0a212c(void);
u32 func0f0a215c(void);
char *weaponGetName(s32 weaponnum);
u16 weaponGetNameId(s32 weaponnum);
char *weaponGetShortName(s32 arg0);
u32 func0f0a2218(void);