From 81f2f9a5c60b3a086bac08f1fa1e8bcbcf4c1743 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 10 May 2021 19:43:49 +1000 Subject: [PATCH] Decompile func00024ee8 --- src/include/lib/lib_24e40.h | 2 +- src/lib/lib_24e40.c | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/include/lib/lib_24e40.h b/src/include/lib/lib_24e40.h index 891edab9a..25b0ce1d5 100644 --- a/src/include/lib/lib_24e40.h +++ b/src/include/lib/lib_24e40.h @@ -10,7 +10,7 @@ f32 func00024e98(void); s32 func00024ea4(void); struct prop *cdGetObstacle(void); void cdGetPos(struct coord *pos, u32 line, char *file); -u32 func00024ee8(void); +void func00024ee8(struct coord *arg0); u32 func00024f10(void); void func00024f6c(void); u32 func00024fb0(void); diff --git a/src/lib/lib_24e40.c b/src/lib/lib_24e40.c index 08790ca46..002eca75c 100644 --- a/src/lib/lib_24e40.c +++ b/src/lib/lib_24e40.c @@ -62,7 +62,7 @@ u32 var8009a958; u32 var8009a95c; u32 var8009a960; -u32 var8009a964; +struct tile *var8009a964; u32 var8009a968; u32 var8009a96c; @@ -108,19 +108,10 @@ void cdGetPos(struct coord *pos, u32 line, char *file) pos->z = g_CdPos.z; } -GLOBAL_ASM( -glabel func00024ee8 -/* 24ee8: 27bdffe8 */ addiu $sp,$sp,-24 -/* 24eec: 00802825 */ or $a1,$a0,$zero -/* 24ef0: afbf0014 */ sw $ra,0x14($sp) -/* 24ef4: 3c04800a */ lui $a0,%hi(var8009a964) -/* 24ef8: 0c00964a */ jal func00025928 -/* 24efc: 8c84a964 */ lw $a0,%lo(var8009a964)($a0) -/* 24f00: 8fbf0014 */ lw $ra,0x14($sp) -/* 24f04: 27bd0018 */ addiu $sp,$sp,0x18 -/* 24f08: 03e00008 */ jr $ra -/* 24f0c: 00000000 */ nop -); +void func00024ee8(struct coord *arg0) +{ + func00025928(var8009a964, arg0); +} GLOBAL_ASM( glabel func00024f10