From 86e31d262a5056ebb376bd69e81a73fd6a7c7fc0 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 28 Sep 2021 21:27:20 +1000 Subject: [PATCH] Decompile func0f14a678 --- src/game/camdraw.c | 25 ++++++------------------- src/include/game/camdraw.h | 2 +- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/src/game/camdraw.c b/src/game/camdraw.c index 5a1cc0bb4..849c7eba4 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -916,7 +916,11 @@ s32 func0f14a668(void) return var800a45a0->unk004; } -const char var7f1b6554[] = "camdraw.c"; +void func0f14a678(void) +{ + func0f14c50c(func0f14a06c(-2), func0f14a06c(-1), 1433, "camdraw.c"); +} + const char var7f1b6560[] = "camdraw.c"; const char var7f1b656c[] = "camdraw.c"; const char var7f1b6578[] = "camdraw.c"; @@ -928,24 +932,7 @@ const char var7f1b65cc[] = "camdraw.c"; const char var7f1b65d8[] = "camdraw.c"; GLOBAL_ASM( -glabel func0f14a678 -/* f14a678: 27bdffe0 */ addiu $sp,$sp,-32 -/* f14a67c: afbf0014 */ sw $ra,0x14($sp) -/* f14a680: 0fc5281b */ jal func0f14a06c -/* f14a684: 2404fffe */ addiu $a0,$zero,-2 -/* f14a688: afa20018 */ sw $v0,0x18($sp) -/* f14a68c: 0fc5281b */ jal func0f14a06c -/* f14a690: 2404ffff */ addiu $a0,$zero,-1 -/* f14a694: 3c077f1b */ lui $a3,%hi(var7f1b6554) -/* f14a698: 24e76554 */ addiu $a3,$a3,%lo(var7f1b6554) -/* f14a69c: 8fa40018 */ lw $a0,0x18($sp) -/* f14a6a0: 00402825 */ or $a1,$v0,$zero -/* f14a6a4: 0fc53143 */ jal func0f14c50c -/* f14a6a8: 24060599 */ addiu $a2,$zero,0x599 -/* f14a6ac: 8fbf0014 */ lw $ra,0x14($sp) -/* f14a6b0: 27bd0020 */ addiu $sp,$sp,0x20 -/* f14a6b4: 03e00008 */ jr $ra -/* f14a6b8: 00000000 */ nop +glabel func0f14a6bc /* f14a6bc: 27bdffe0 */ addiu $sp,$sp,-32 /* f14a6c0: afbf001c */ sw $ra,0x1c($sp) /* f14a6c4: afb00018 */ sw $s0,0x18($sp) diff --git a/src/include/game/camdraw.h b/src/include/game/camdraw.h index 24ffd5d6d..8f43638d9 100644 --- a/src/include/game/camdraw.h +++ b/src/include/game/camdraw.h @@ -21,7 +21,7 @@ void func0f14a52c(void); void func0f14a560(void); void func0f14a594(s32 arg0); s32 func0f14a5a4(void); -u32 func0f14a678(void); +void func0f14a678(void); u32 func0f14a8e8(void); u32 func0f14a95c(void); u32 func0f14a984(void);