From 7461bcf32e3bdd6af40185a67c8ab94bdbe1310a Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 9 May 2021 13:32:48 +1000 Subject: [PATCH] Decompile func0002dc18 --- src/include/lib/lib_24e40.h | 2 +- src/lib/lib_24e40.c | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/include/lib/lib_24e40.h b/src/include/lib/lib_24e40.h index abc8ff60f..8739ebebd 100644 --- a/src/include/lib/lib_24e40.h +++ b/src/include/lib/lib_24e40.h @@ -92,7 +92,7 @@ s32 cdTestAToB3(struct coord *arg0, s16 *arg1, struct coord *arg2, s16 *arg3, f3 u32 func0002da50(void); u32 func0002dac8(void); bool func0002db98(struct coord *viewpos, s16 *rooms, struct coord *targetpos, s32 arg3, u32 arg4); -u32 func0002dc18(struct coord *coord, s16 *room, struct coord *coord2, s32 arg3); +bool func0002dc18(struct coord *coord, s16 *rooms, struct coord *coord2, s32 arg3); bool hasLineOfSight(struct coord *coord, s16 *room, struct coord *coord2, s16 *room2, s32 arg4, s32 arg5); bool func0002dcd0(struct coord *arg0, s16 *rooms1, struct coord *arg2, s16 *rooms2, u32 arg4); bool func0002dcfc(struct coord *pos, s16 *rooms, struct coord *pos2, s16 *rooms2, s16 *rooms3, u32 arg5, u32 arg6); diff --git a/src/lib/lib_24e40.c b/src/lib/lib_24e40.c index b4d170fe5..b7c884c57 100644 --- a/src/lib/lib_24e40.c +++ b/src/lib/lib_24e40.c @@ -9976,18 +9976,10 @@ glabel func0002db98 /* 2dc14: 00000000 */ nop ); -GLOBAL_ASM( -glabel func0002dc18 -/* 2dc18: 27bdffe0 */ addiu $sp,$sp,-32 -/* 2dc1c: afbf001c */ sw $ra,0x1c($sp) -/* 2dc20: 240e001c */ addiu $t6,$zero,0x1c -/* 2dc24: 0c00b6e6 */ jal func0002db98 -/* 2dc28: afae0010 */ sw $t6,0x10($sp) -/* 2dc2c: 8fbf001c */ lw $ra,0x1c($sp) -/* 2dc30: 27bd0020 */ addiu $sp,$sp,0x20 -/* 2dc34: 03e00008 */ jr $ra -/* 2dc38: 00000000 */ nop -); +bool func0002dc18(struct coord *coord, s16 *rooms, struct coord *coord2, s32 arg3) +{ + return func0002db98(coord, rooms, coord2, arg3, 0x1c); +} GLOBAL_ASM( glabel hasLineOfSight