From d45e342fc947572574a28910af76a1ace5fd4bd3 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 29 Feb 2020 23:01:35 +1000 Subject: [PATCH] Decompile currentPlayerSetAutoAimY --- src/game/game_0b63b0.c | 2 +- src/game/game_0c79f0.c | 11 ++++------- src/include/game/game_0c79f0.h | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 9468806f9..cbac700bb 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -8230,7 +8230,7 @@ glabel func0f0bd904 /* f0bdc38: 8e6b0288 */ lw $t3,0x288($s3) /* f0bdc3c: 0fc549e9 */ jal optionsGetAutoAim /* f0bdc40: 8d640070 */ lw $a0,0x70($t3) -/* f0bdc44: 0fc31e88 */ jal func0f0c7a20 +/* f0bdc44: 0fc31e88 */ jal currentPlaySetAutoAimY /* f0bdc48: 00402025 */ or $a0,$v0,$zero /* f0bdc4c: 8e6c0288 */ lw $t4,0x288($s3) /* f0bdc50: 0fc549e9 */ jal optionsGetAutoAim diff --git a/src/game/game_0c79f0.c b/src/game/game_0c79f0.c index 3c948bd96..3285f4ef8 100644 --- a/src/game/game_0c79f0.c +++ b/src/game/game_0c79f0.c @@ -183,13 +183,10 @@ glabel func0f0c7a00 /* f0c7a1c: 8dc20114 */ lw $v0,0x114($t6) ); -GLOBAL_ASM( -glabel func0f0c7a20 -/* f0c7a20: 3c0e800a */ lui $t6,0x800a -/* f0c7a24: 8dcea244 */ lw $t6,-0x5dbc($t6) -/* f0c7a28: 03e00008 */ jr $ra -/* f0c7a2c: adc40124 */ sw $a0,0x124($t6) -); +void currentPlaySetAutoAimY(bool enabled) +{ + g_Vars.currentplayer->autoyaimenabled = enabled; +} bool currentPlayerIsAutoAimYEnabled(void) { diff --git a/src/include/game/game_0c79f0.h b/src/include/game/game_0c79f0.h index f8e8067f1..cd5c3f829 100644 --- a/src/include/game/game_0c79f0.h +++ b/src/include/game/game_0c79f0.h @@ -5,7 +5,7 @@ u32 func0f0c79f0(void); u32 func0f0c7a00(void); -u32 func0f0c7a20(void); +void currentPlaySetAutoAimY(bool enabled); bool currentPlayerIsAutoAimYEnabled(void); u32 func0f0c7a8c(void); u32 func0f0c7af0(void);