From 57cd5b2722209f14e8cbe6d9f32e85d9d31e46b9 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 25 Dec 2019 22:41:14 +1000 Subject: [PATCH] Decompile func0f01e760 --- src/game/chr/chr.c | 18 ++++++------------ src/include/game/chr/chr.h | 2 +- src/include/game/game_1668e0.h | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 56f3b9157..b9075cce3 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -1411,19 +1411,13 @@ glabel func0f01e6a4 /* f01e75c: 00000000 */ sll $zero,$zero,0x0 ); +void func0f01e760(s32 arg0) +{ + func0f1679f4(arg0 * 12); +} + GLOBAL_ASM( -glabel func0f01e760 -/* f01e760: 00802825 */ or $a1,$a0,$zero -/* f01e764: 27bdffe8 */ addiu $sp,$sp,-24 -/* f01e768: 00042080 */ sll $a0,$a0,0x2 -/* f01e76c: afbf0014 */ sw $ra,0x14($sp) -/* f01e770: 00852023 */ subu $a0,$a0,$a1 -/* f01e774: 0fc59e7d */ jal func0f1679f4 -/* f01e778: 00042080 */ sll $a0,$a0,0x2 -/* f01e77c: 8fbf0014 */ lw $ra,0x14($sp) -/* f01e780: 27bd0018 */ addiu $sp,$sp,0x18 -/* f01e784: 03e00008 */ jr $ra -/* f01e788: 00000000 */ sll $zero,$zero,0x0 +glabel func0f01e790 /* f01e78c: 3c018006 */ lui $at,0x8006 /* f01e790: 03e00008 */ jr $ra /* f01e794: ac24297c */ sw $a0,0x297c($at) diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index f351c2854..269c96c74 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -419,6 +419,6 @@ s32 chrResolvePadId(struct chrdata *chr, s32 pad_id); f32 propGetDistanceToProp(struct prop *a, struct prop *b); s32 propGetIndexByChrId(struct chrdata *chr, s32 chrnum); f32 propGetLateralDistanceToProp(struct prop *a, struct prop *b); -void func0f01e760(void); +void func0f01e760(s32 arg0); #endif diff --git a/src/include/game/game_1668e0.h b/src/include/game/game_1668e0.h index 3be2f2148..c47f8856e 100644 --- a/src/include/game/game_1668e0.h +++ b/src/include/game/game_1668e0.h @@ -35,7 +35,7 @@ u32 func0f167964(void); u32 func0f167998(void); u32 func0f1679b0(void); u32 func0f1679cc(void); -u32 func0f1679f4(void); +void func0f1679f4(s32 arg0); u32 func0f167a18(void); u32 func0f167ae0(void); u32 func0f167af8(void);