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

Decompile mpSetWeaponSet

This commit is contained in:
Ryan Dwyer 2020-07-27 22:57:05 +10:00
parent d956b5be94
commit 15ef055bb6
4 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/game_0f09f0.c
View File

@ -10948,7 +10948,7 @@ glabel var7f1b2a64
/* f0f9f68: 0018cb00 */ sll $t9,$t8,0xc
/* f0f9f6c: 07210009 */ bgez $t9,.L0f0f9f94
/* f0f9f70: 00000000 */ nop
/* f0f9f74: 0fc62587 */ jal func0f18961c
/* f0f9f74: 0fc62587 */ jal mpGetWeaponSet
/* f0f9f78: 00000000 */ nop
/* f0f9f7c: 0fc62422 */ jal func0f189088
/* f0f9f80: 00408025 */ or $s0,$v0,$zero

10
src/game/game_179060.c
View File

@ -464,10 +464,10 @@ char *menuhandlerMpWeaponSetDropdown(u32 operation, struct menuitem *item, s32 *
case MENUOP_GETOPTIONTEXT:
return mpGetWeaponSetName(*value);
case MENUOP_SET:
func0f1895bc(*value);
mpSetWeaponSet(*value);
break;
case MENUOP_GETOPTIONVALUE:
*value = func0f18961c();
*value = mpGetWeaponSet();
break;
}
@ -5916,7 +5916,7 @@ char *mpMenuTextArenaName(struct menuitem *item)
char *mpMenuTextWeaponSetName(struct menuitem *item)
{
return mpGetWeaponSetName(func0f18961c());
return mpGetWeaponSetName(mpGetWeaponSet());
}
bool menudialogMpGameSetup(u32 operation, struct menudialog *dialog, struct menu *menu)
@ -6571,8 +6571,8 @@ s32 menuhandlerMpQuickTeamOption(u32 operation, struct menuitem *item, s32 *valu
if (operation == MENUOP_SET) {
g_Vars.mpquickteam = item->param;
if (func0f18961c() >= func0f189058(0)) {
func0f1895bc(0);
if (mpGetWeaponSet() >= func0f189058(0)) {
mpSetWeaponSet(0);
}
if (g_Vars.mpquickteam == MPQUICKTEAM_PLAYERSONLY ||

25
src/game/mplayer.c
View File

@ -830,12 +830,12 @@ glabel func0f188210
/* f1882c0: 0c004c04 */ jal func00013010
/* f1882c4: 24a58a44 */ addiu $a1,$a1,%lo(var7f1b8a44)
/* f1882c8: 90440000 */ lbu $a0,0x0($v0)
/* f1882cc: 0fc6256f */ jal func0f1895bc
/* f1882cc: 0fc6256f */ jal mpSetWeaponSet
/* f1882d0: 2484ffd0 */ addiu $a0,$a0,-48
/* f1882d4: 10000003 */ b .L0f1882e4
/* f1882d8: 00000000 */ nop
.L0f1882dc:
/* f1882dc: 0fc6256f */ jal func0f1895bc
/* f1882dc: 0fc6256f */ jal mpSetWeaponSet
/* f1882e0: 00002025 */ or $a0,$zero,$zero
.L0f1882e4:
/* f1882e4: 3c02800b */ lui $v0,%hi(g_MpLockPlayerNum)
@ -2216,20 +2216,11 @@ glabel func0f1892dc
/* f1895b8: 00000000 */ nop
);
GLOBAL_ASM(
glabel func0f1895bc
/* f1895bc: 27bdffe8 */ addiu $sp,$sp,-24
/* f1895c0: afbf0014 */ sw $ra,0x14($sp)
/* f1895c4: 0fc623e7 */ jal func0f188f9c
/* f1895c8: 00000000 */ nop
/* f1895cc: 3c018008 */ lui $at,%hi(var800874c8)
/* f1895d0: 0fc624b7 */ jal func0f1892dc
/* f1895d4: ac2274c8 */ sw $v0,%lo(var800874c8)($at)
/* f1895d8: 8fbf0014 */ lw $ra,0x14($sp)
/* f1895dc: 27bd0018 */ addiu $sp,$sp,0x18
/* f1895e0: 03e00008 */ jr $ra
/* f1895e4: 00000000 */ nop
);
void mpSetWeaponSet(s32 weaponsetnum)
{
var800874c8 = func0f188f9c(weaponsetnum);
func0f1892dc();
}
GLOBAL_ASM(
glabel func0f1895e8
@ -2250,7 +2241,7 @@ glabel func0f1895e8
);
GLOBAL_ASM(
glabel func0f18961c
glabel mpGetWeaponSet
/* f18961c: 27bdffe8 */ addiu $sp,$sp,-24
/* f189620: afbf0014 */ sw $ra,0x14($sp)
/* f189624: 3c048008 */ lui $a0,%hi(var800874c8)

4
src/include/game/mplayer.h
View File

@ -32,9 +32,9 @@ u32 func0f189088(void);
char *mpGetWeaponSetName(s32 arg0);
u32 func0f18913c(void);
u32 func0f1892dc(void);
void func0f1895bc(s32 arg0);
void mpSetWeaponSet(s32 weaponsetnum);
u32 func0f1895e8(void);
s32 func0f18961c(void);
s32 mpGetWeaponSet(void);
u32 mpIsPaused(void);
void mpSetPaused(u8 pause);
u32 func0f18973c(void);