From 4a78a547de97a3051bac64d35ea0956bc149af22 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 27 Jul 2020 22:39:26 +1000 Subject: [PATCH] Decompile func0f065e74 --- src/game/game_0601b0.c | 16 ++++------------ src/include/game/game_0601b0.h | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index acd826830..b180ddeb2 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -6733,18 +6733,10 @@ glabel func0f065dfc /* f065e70: 00000000 */ nop ); -GLOBAL_ASM( -glabel func0f065e74 -/* f065e74: 27bdffe0 */ addiu $sp,$sp,-32 -/* f065e78: afbf001c */ sw $ra,0x1c($sp) -/* f065e7c: afa00010 */ sw $zero,0x10($sp) -/* f065e80: 0fc1977f */ jal func0f065dfc -/* f065e84: afa00014 */ sw $zero,0x14($sp) -/* f065e88: 8fbf001c */ lw $ra,0x1c($sp) -/* f065e8c: 27bd0020 */ addiu $sp,$sp,0x20 -/* f065e90: 03e00008 */ jr $ra -/* f065e94: 00000000 */ nop -); +void func0f065e74(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms) +{ + func0f065dfc(pos, rooms, newpos, newrooms, 0, 0); +} GLOBAL_ASM( glabel func0f065e98 diff --git a/src/include/game/game_0601b0.h b/src/include/game/game_0601b0.h index 8e6968a94..adad45c44 100644 --- a/src/include/game/game_0601b0.h +++ b/src/include/game/game_0601b0.h @@ -50,7 +50,7 @@ void func0f065c44(struct prop *prop); void func0f065cb0(struct prop *prop); u32 func0f065d1c(void); u32 func0f065dd8(void); -u32 func0f065dfc(void); +void func0f065dfc(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms, u32 arg4, u32 arg5); void func0f065e74(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms); void func0f065e98(struct coord *pos, s16 *rooms, struct coord *pos2, s16 *rooms2); void roomGetProps(s16 *room, s16 *propnums, u32 size);