diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c index a1a7ce5e9..f608ee908 100644 --- a/src/game/game_0b0420.c +++ b/src/game/game_0b0420.c @@ -115,15 +115,10 @@ glabel func0f0b0520 /* f0b0528: ac200590 */ sw $zero,0x590($at) ); -GLOBAL_ASM( -glabel currentPlayerGetShotCount -/* f0b052c: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) -/* f0b0530: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) -/* f0b0534: 00047880 */ sll $t7,$a0,0x2 -/* f0b0538: 01cfc021 */ addu $t8,$t6,$t7 -/* f0b053c: 03e00008 */ jr $ra -/* f0b0540: 8f020000 */ lw $v0,0x0($t8) -); +s32 currentPlayerGetShotCount(u32 type) +{ + return g_Vars.currentplayerstats->shotcount[type]; +} void incrementKillCount(void) { diff --git a/src/include/types.h b/src/include/types.h index dbefb3297..b635cbc5c 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -3261,13 +3261,7 @@ struct bootbufferthing { }; struct playerstats { - /*0x00*/ u32 shotcount; - /*0x04*/ u32 unk04; - /*0x08*/ u32 unk08; - /*0x0c*/ u32 unk0c; - /*0x10*/ u32 unk10; - /*0x14*/ u32 unk14; - /*0x18*/ u32 unk18; + /*0x00*/ u32 shotcount[7]; /*0x1c*/ u32 killcount; /*0x20*/ u32 ggkillcount; /*0x24*/ u32 kills[4];