From fde51c16370cc5ffc18750eb8fbbb2baa1f3ba2e Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 28 Sep 2021 22:07:42 +1000 Subject: [PATCH] Decompile func0f14aa70 --- src/game/camdraw.c | 18 ++++++++---------- src/include/game/camdraw.h | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/game/camdraw.c b/src/game/camdraw.c index 243d722d7..76eecbed1 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -1085,17 +1085,15 @@ void func0f14aa48(void) thing->unk3b8 = 6; } +s32 func0f14aa70(void) +{ + struct var8007f8e0 *thing = func0f14a06c(-1); + + return thing->unk3b8; +} + GLOBAL_ASM( -glabel func0f14aa70 -/* f14aa70: 27bdffe8 */ addiu $sp,$sp,-24 -/* f14aa74: afbf0014 */ sw $ra,0x14($sp) -/* f14aa78: 0fc5281b */ jal func0f14a06c -/* f14aa7c: 2404ffff */ addiu $a0,$zero,-1 -/* f14aa80: 8fbf0014 */ lw $ra,0x14($sp) -/* f14aa84: 8c4203b8 */ lw $v0,0x3b8($v0) -/* f14aa88: 27bd0018 */ addiu $sp,$sp,0x18 -/* f14aa8c: 03e00008 */ jr $ra -/* f14aa90: 00000000 */ nop +glabel func0f14aa94 /* f14aa94: 27bdffe8 */ addiu $sp,$sp,-24 /* f14aa98: afbf0014 */ sw $ra,0x14($sp) /* f14aa9c: 0fc5287b */ jal phGetColourName diff --git a/src/include/game/camdraw.h b/src/include/game/camdraw.h index 162e938d3..89c7cb73e 100644 --- a/src/include/game/camdraw.h +++ b/src/include/game/camdraw.h @@ -27,7 +27,7 @@ void func0f14a95c(void); s32 func0f14a984(void); s32 func0f14a9f8(s32 index); void func0f14aa48(void); -u32 func0f14aa70(void); +s32 func0f14aa70(void); u32 func0f14aac4(void); u32 func0f14ab3c(void); u16 func0f14ad14(s32 device);