diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index cbac700bb..14d1b4910 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -8230,12 +8230,12 @@ glabel func0f0bd904 /* f0bdc38: 8e6b0288 */ lw $t3,0x288($s3) /* f0bdc3c: 0fc549e9 */ jal optionsGetAutoAim /* f0bdc40: 8d640070 */ lw $a0,0x70($t3) -/* f0bdc44: 0fc31e88 */ jal currentPlaySetAutoAimY +/* f0bdc44: 0fc31e88 */ jal currentPlayerSetAutoAimY /* f0bdc48: 00402025 */ or $a0,$v0,$zero /* f0bdc4c: 8e6c0288 */ lw $t4,0x288($s3) /* f0bdc50: 0fc549e9 */ jal optionsGetAutoAim /* f0bdc54: 8d840070 */ lw $a0,0x70($t4) -/* f0bdc58: 0fc31ed9 */ jal func0f0c7b64 +/* f0bdc58: 0fc31ed9 */ jal currentPlayerSetAutoAimX /* f0bdc5c: 00402025 */ or $a0,$v0,$zero /* f0bdc60: 8e6d0288 */ lw $t5,0x288($s3) /* f0bdc64: 0fc549f2 */ jal optionsGetLookAhead diff --git a/src/game/game_0c79f0.c b/src/game/game_0c79f0.c index 3285f4ef8..60a039c95 100644 --- a/src/game/game_0c79f0.c +++ b/src/game/game_0c79f0.c @@ -183,7 +183,7 @@ glabel func0f0c7a00 /* f0c7a1c: 8dc20114 */ lw $v0,0x114($t6) ); -void currentPlaySetAutoAimY(bool enabled) +void currentPlayerSetAutoAimY(bool enabled) { g_Vars.currentplayer->autoyaimenabled = enabled; } @@ -272,13 +272,10 @@ glabel func0f0c7b00 /* f0c7b60: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f0c7b64 -/* f0c7b64: 3c0e800a */ lui $t6,0x800a -/* f0c7b68: 8dcea244 */ lw $t6,-0x5dbc($t6) -/* f0c7b6c: 03e00008 */ jr $ra -/* f0c7b70: adc40134 */ sw $a0,0x134($t6) -); +void currentPlayerSetAutoAimX(bool enabled) +{ + g_Vars.currentplayer->autoxaimenabled = enabled; +} bool currentPlayerIsAutoAimXEnabled(void) { diff --git a/src/include/game/game_0c79f0.h b/src/include/game/game_0c79f0.h index cd5c3f829..d87616486 100644 --- a/src/include/game/game_0c79f0.h +++ b/src/include/game/game_0c79f0.h @@ -5,12 +5,12 @@ u32 func0f0c79f0(void); u32 func0f0c7a00(void); -void currentPlaySetAutoAimY(bool enabled); +void currentPlayerSetAutoAimY(bool enabled); bool currentPlayerIsAutoAimYEnabled(void); u32 func0f0c7a8c(void); u32 func0f0c7af0(void); u32 func0f0c7b00(void); -u32 func0f0c7b64(void); +void currentPlayerSetAutoAimX(bool enabled); bool currentPlayerIsAutoAimXEnabled(void); u32 func0f0c7bd0(void); u32 func0f0c7c34(void);