From 1a9a18ace58be6024073e1feb6bc0b5baf319a5e Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 8 Nov 2019 21:31:29 +1000 Subject: [PATCH] Decompile func0f04a76c --- src/game/chr/chraicommands.c | 2 -- src/game/game_000000.c | 19 ++++--------------- src/include/game/game_000000.h | 1 + 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index cf663a30b..709d6c3d1 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -9610,8 +9610,6 @@ glabel ai0108 /* f058f34: 00001025 */ or $v0,$zero,$zero ); -bool func0f04a79c(u8 chrnum, struct chrdata *chr, float distance); - /** * @cmd 0109 */ diff --git a/src/game/game_000000.c b/src/game/game_000000.c index 4f667724a..edd982a87 100644 --- a/src/game/game_000000.c +++ b/src/game/game_000000.c @@ -85058,21 +85058,10 @@ glabel func0f04a674 /* f04a768: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f04a76c -/* f04a76c: 44856000 */ mtc1 $a1,$f12 -/* f04a770: 27bdffe8 */ addiu $sp,$sp,-24 -/* f04a774: afbf0014 */ sw $ra,0x14($sp) -/* f04a778: afa40018 */ sw $a0,0x18($sp) -/* f04a77c: 00802825 */ or $a1,$a0,$zero -/* f04a780: 44066000 */ mfc1 $a2,$f12 -/* f04a784: 0fc129e7 */ jal func0f04a79c -/* f04a788: 00002025 */ or $a0,$zero,$zero -/* f04a78c: 8fbf0014 */ lw $ra,0x14($sp) -/* f04a790: 27bd0018 */ addiu $sp,$sp,0x18 -/* f04a794: 03e00008 */ jr $ra -/* f04a798: 00000000 */ sll $zero,$zero,0x0 -); +bool func0f04a76c(struct chrdata *chr, float distance) +{ + return func0f04a79c(0, chr, distance); +} GLOBAL_ASM( glabel func0f04a79c diff --git a/src/include/game/game_000000.h b/src/include/game/game_000000.h index ef2b99a0c..a021239bd 100644 --- a/src/include/game/game_000000.h +++ b/src/include/game/game_000000.h @@ -16,6 +16,7 @@ u32 func0f000090(void); u32 func0f000100(void); u32 func0f000130(void); bool func0f04a76c(struct chrdata *chr, float distance); +bool func0f04a79c(u8 chrnum, struct chrdata *chr, float distance); u32 func0f000840(void); u32 func0f000850(void); u32 func0f000860(void);