diff --git a/src/game/bondmove.c b/src/game/bondmove.c index 072ed1f3b..6062258f5 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -3806,7 +3806,7 @@ glabel var7f1ad8e4 .L0f0cb528: /* f0cb528: 1120007d */ beqz $t1,.L0f0cb720 /* f0cb52c: 8fb901b8 */ lw $t9,0x1b8($sp) -/* f0cb530: 0fc2a4f4 */ jal func0f0a93d0 +/* f0cb530: 0fc2a4f4 */ jal currentPlayerSetAimType /* f0cb534: 00002025 */ or $a0,$zero,$zero /* f0cb538: 8faa022c */ lw $t2,0x22c($sp) /* f0cb53c: 11400015 */ beqz $t2,.L0f0cb594 @@ -3944,7 +3944,7 @@ glabel var7f1ad8e4 .L0f0cb720: /* f0cb720: 53200014 */ beqzl $t9,.L0f0cb774 /* f0cb724: 8fbf0034 */ lw $ra,0x34($sp) -/* f0cb728: 0fc2a4f4 */ jal func0f0a93d0 +/* f0cb728: 0fc2a4f4 */ jal currentPlayerSetAimType /* f0cb72c: 00002025 */ or $a0,$zero,$zero /* f0cb730: 8fa30248 */ lw $v1,0x248($sp) /* f0cb734: 8fa4024c */ lw $a0,0x24c($sp) diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 551972c8f..49e2ba442 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -21266,13 +21266,10 @@ glabel func0f0a92ac /* f0a93cc: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f0a93d0 -/* f0a93d0: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f0a93d4: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f0a93d8: 03e00008 */ jr $ra -/* f0a93dc: adc41620 */ sw $a0,0x1620($t6) -); +void currentPlayerSetAimType(u32 aimtype) +{ + g_Vars.currentplayer->aimtype = aimtype; +} GLOBAL_ASM( glabel func0f0a93e0 diff --git a/src/include/game/game_097ba0.h b/src/include/game/game_097ba0.h index d0a0f7a4c..c3b6550cf 100644 --- a/src/include/game/game_097ba0.h +++ b/src/include/game/game_097ba0.h @@ -145,7 +145,7 @@ u32 func0f0a8c50(void); u32 func0f0a8c7c(void); u32 func0f0a8d34(void); void func0f0a92ac(u32 arg0); -u32 func0f0a93d0(void); +void currentPlayerSetAimType(u32 aimtype); u32 func0f0a93e0(void); u32 func0f0a9464(void); u32 func0f0a9494(void); diff --git a/src/include/types.h b/src/include/types.h index e26d4b33d..db461507f 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -2509,7 +2509,7 @@ struct player { /*0x161a*/ u16 floorcol; /*0x161c*/ u16 floorflags; /*0x161e*/ u8 floortype; - /*0x1620*/ u32 unk1620; + /*0x1620*/ u32 aimtype; /*0x1624*/ struct prop *lookingatprop; /*0x1628*/ u32 unk1628; /*0x162c*/ u32 unk162c;