diff --git a/src/game/bondmove.c b/src/game/bondmove.c index 840d8eb5d..600f3d91e 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -50,12 +50,13 @@ void currentPlayerSetControlDef(u32 controldef) g_Vars.currentplayer->controldef = controldef; } +void currentPlayerSetAutoMoveCentreEnabled(bool enabled) +{ + g_Vars.currentplayer->automovecentreenabled = enabled; +} + GLOBAL_ASM( -glabel func0f0c7a00 -/* f0c7a00: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f0c7a04: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f0c7a08: 03e00008 */ jr $ra -/* f0c7a0c: adc40114 */ sw $a0,0x114($t6) +glabel func0f0c7a10 /* f0c7a10: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f0c7a14: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0c7a18: 03e00008 */ jr $ra diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index a8d186a4a..339b1ac3b 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -8731,7 +8731,7 @@ glabel var7f1ad6ac /* f0bdc60: 8e6d0288 */ lw $t5,0x288($s3) /* f0bdc64: 0fc549f2 */ jal optionsGetLookAhead /* f0bdc68: 8da40070 */ lw $a0,0x70($t5) -/* f0bdc6c: 0fc31e80 */ jal func0f0c7a00 +/* f0bdc6c: 0fc31e80 */ jal currentPlayerSetAutoMoveCentreEnabled /* f0bdc70: 00402025 */ or $a0,$v0,$zero /* f0bdc74: 8e6e0288 */ lw $t6,0x288($s3) /* f0bdc78: 0fc54a0d */ jal optionsGetAmmoOnScreen diff --git a/src/include/game/bondmove.h b/src/include/game/bondmove.h index 9faeed791..6ef3566a4 100644 --- a/src/include/game/bondmove.h +++ b/src/include/game/bondmove.h @@ -4,7 +4,7 @@ #include "types.h" void currentPlayerSetControlDef(u32 controldef); -u32 func0f0c7a00(void); +void currentPlayerSetAutoMoveCentreEnabled(bool enabled); void currentPlayerSetAutoAimY(bool enabled); bool currentPlayerIsAutoAimYEnabled(void); u32 func0f0c7a8c(void); diff --git a/src/include/types.h b/src/include/types.h index c7d313c36..a0817c42f 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -1710,7 +1710,7 @@ struct player { /*0x0108*/ u32 unk0108; /*0x010c*/ u32 unk010c; /*0x0110*/ u32 unk0110; - /*0x0114*/ u32 unk0114; + /*0x0114*/ bool automovecentreenabled; /*0x0118*/ u32 unk0118; /*0x011c*/ u32 unk011c; /*0x0120*/ bool insightaimmode;