From f2046a1fa60434fd9a434797993e5df6872d0569 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 28 Sep 2021 21:09:33 +1000 Subject: [PATCH] Decompile phGetColourName --- src/game/camdraw.c | 37 +++++++++++-------------------------- src/include/game/camdraw.h | 2 +- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/src/game/camdraw.c b/src/game/camdraw.c index d49018fd2..dcfdcd6a6 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -699,31 +699,16 @@ char *phGetStyleName(s32 stylenum) return langGet(L_MISC_429 + stylenum); } -#if VERSION >= VERSION_PAL_FINAL -GLOBAL_ASM( -glabel func0f14a1ec -/* f14a1ec: 27bdffe8 */ addiu $sp,$sp,-24 -/* f14a1f0: afbf0014 */ sw $ra,0x14($sp) -/* f14a1f4: 0fc5b9f1 */ jal langGet -/* f14a1f8: 248459b1 */ addiu $a0,$a0,0x58ae -/* f14a1fc: 8fbf0014 */ lw $ra,0x14($sp) -/* f14a200: 27bd0018 */ addiu $sp,$sp,0x18 -/* f14a204: 03e00008 */ jr $ra -/* f14a208: 00000000 */ nop -); -#else -GLOBAL_ASM( -glabel func0f14a1ec -/* f14a1ec: 27bdffe8 */ addiu $sp,$sp,-24 -/* f14a1f0: afbf0014 */ sw $ra,0x14($sp) -/* f14a1f4: 0fc5b9f1 */ jal langGet -/* f14a1f8: 248459b1 */ addiu $a0,$a0,0x59b1 -/* f14a1fc: 8fbf0014 */ lw $ra,0x14($sp) -/* f14a200: 27bd0018 */ addiu $sp,$sp,0x18 -/* f14a204: 03e00008 */ jr $ra -/* f14a208: 00000000 */ nop -); -#endif +/** + * 0 returns "Blonde" + * 1 returns "Black" + * 2 returns "Auburn" + * 3 returns "Blue Rinse" + */ +char *phGetColourName(s32 colournum) +{ + return langGet(L_MISC_433 + colournum); +} GLOBAL_ASM( glabel func0f14a20c @@ -1285,7 +1270,7 @@ glabel func0f14aa70 /* f14aa90: 00000000 */ nop /* f14aa94: 27bdffe8 */ addiu $sp,$sp,-24 /* f14aa98: afbf0014 */ sw $ra,0x14($sp) -/* f14aa9c: 0fc5287b */ jal func0f14a1ec +/* f14aa9c: 0fc5287b */ jal phGetColourName /* f14aaa0: afa40018 */ sw $a0,0x18($sp) /* f14aaa4: 0fc5281b */ jal func0f14a06c /* f14aaa8: 2404ffff */ addiu $a0,$zero,-1 diff --git a/src/include/game/camdraw.h b/src/include/game/camdraw.h index 953722f0a..cc853c118 100644 --- a/src/include/game/camdraw.h +++ b/src/include/game/camdraw.h @@ -11,7 +11,7 @@ u32 func0f14a00c(void); struct var8007f8e0 *func0f14a06c(s32 index); u32 func0f14a16c(void); char *phGetStyleName(s32 stylenum); -u32 func0f14a1ec(void); +char *phGetColourName(s32 colournum); u32 func0f14a20c(void); void func0f14a240(void); void func0f14a2fc(s32 arg0, u32 line, char *file);