From b67620478bad534cf130c63915564dc9e320caee Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 28 Sep 2021 21:07:12 +1000 Subject: [PATCH] Decompile phGetStyleName --- 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 79c2451dd..d49018fd2 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -688,31 +688,16 @@ glabel func0f14a16c /* f14a1c8: 314200ff */ andi $v0,$t2,0xff ); -#if VERSION >= VERSION_PAL_FINAL -GLOBAL_ASM( -glabel func0f14a1cc -/* f14a1cc: 27bdffe8 */ addiu $sp,$sp,-24 -/* f14a1d0: afbf0014 */ sw $ra,0x14($sp) -/* f14a1d4: 0fc5b9f1 */ jal langGet -/* f14a1d8: 248459ad */ addiu $a0,$a0,0x58aa -/* f14a1dc: 8fbf0014 */ lw $ra,0x14($sp) -/* f14a1e0: 27bd0018 */ addiu $sp,$sp,0x18 -/* f14a1e4: 03e00008 */ jr $ra -/* f14a1e8: 00000000 */ nop -); -#else -GLOBAL_ASM( -glabel func0f14a1cc -/* f14a1cc: 27bdffe8 */ addiu $sp,$sp,-24 -/* f14a1d0: afbf0014 */ sw $ra,0x14($sp) -/* f14a1d4: 0fc5b9f1 */ jal langGet -/* f14a1d8: 248459ad */ addiu $a0,$a0,0x59ad -/* f14a1dc: 8fbf0014 */ lw $ra,0x14($sp) -/* f14a1e0: 27bd0018 */ addiu $sp,$sp,0x18 -/* f14a1e4: 03e00008 */ jr $ra -/* f14a1e8: 00000000 */ nop -); -#endif +/** + * 0 returns "Style 1" + * 1 returns "Style 2" + * 2 returns "Style 3" + * 3 returns "Style 4" + */ +char *phGetStyleName(s32 stylenum) +{ + return langGet(L_MISC_429 + stylenum); +} #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( @@ -1334,7 +1319,7 @@ glabel func0f14aac4 /* f14ab08: 00000000 */ nop /* f14ab0c: 27bdffe8 */ addiu $sp,$sp,-24 /* f14ab10: afbf0014 */ sw $ra,0x14($sp) -/* f14ab14: 0fc52873 */ jal func0f14a1cc +/* f14ab14: 0fc52873 */ jal phGetStyleName /* f14ab18: afa40018 */ sw $a0,0x18($sp) /* f14ab1c: 0fc5281b */ jal func0f14a06c /* f14ab20: 2404ffff */ addiu $a0,$zero,-1 diff --git a/src/include/game/camdraw.h b/src/include/game/camdraw.h index 56f9f50b9..953722f0a 100644 --- a/src/include/game/camdraw.h +++ b/src/include/game/camdraw.h @@ -10,7 +10,7 @@ void func0f149e58(u32 arg0, u32 arg1); u32 func0f14a00c(void); struct var8007f8e0 *func0f14a06c(s32 index); u32 func0f14a16c(void); -u32 func0f14a1cc(void); +char *phGetStyleName(s32 stylenum); u32 func0f14a1ec(void); u32 func0f14a20c(void); void func0f14a240(void);