From 8b7793b3d11e03e01ca00136de7d50b85a75e838 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 28 Sep 2021 22:09:32 +1000 Subject: [PATCH] Decompile func0f14aa94 --- src/game/camdraw.c | 24 +++++++++--------------- src/include/types.h | 2 +- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/game/camdraw.c b/src/game/camdraw.c index 76eecbed1..6c4d62033 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -1092,21 +1092,15 @@ s32 func0f14aa70(void) return thing->unk3b8; } -GLOBAL_ASM( -glabel func0f14aa94 -/* f14aa94: 27bdffe8 */ addiu $sp,$sp,-24 -/* f14aa98: afbf0014 */ sw $ra,0x14($sp) -/* f14aa9c: 0fc5287b */ jal phGetColourName -/* f14aaa0: afa40018 */ sw $a0,0x18($sp) -/* f14aaa4: 0fc5281b */ jal func0f14a06c -/* f14aaa8: 2404ffff */ addiu $a0,$zero,-1 -/* f14aaac: 8fae0018 */ lw $t6,0x18($sp) -/* f14aab0: ac4e039c */ sw $t6,0x39c($v0) -/* f14aab4: 8fbf0014 */ lw $ra,0x14($sp) -/* f14aab8: 27bd0018 */ addiu $sp,$sp,0x18 -/* f14aabc: 03e00008 */ jr $ra -/* f14aac0: 00000000 */ nop -); +void func0f14aa94(s32 colournum) +{ + struct var8007f8e0 *thing; + + phGetColourName(colournum); + + thing = func0f14a06c(-1); + thing->colournum = colournum; +} GLOBAL_ASM( glabel func0f14aac4 diff --git a/src/include/types.h b/src/include/types.h index 0c8571e70..a9c371ebe 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -7649,7 +7649,7 @@ struct var8007f8e0 { // perfect head? /*0x390*/ u32 unk390; /*0x394*/ u32 unk394; /*0x398*/ u32 unk398; - /*0x39c*/ u32 unk39c; + /*0x39c*/ s32 colournum; /*0x3a0*/ u32 unk3a0; /*0x3a4*/ u32 unk3a4; /*0x3a8*/ u32 unk3a8;