From 95cdbd498e7a4226e0b46a803d9965f3e4858d22 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 7 Jan 2021 13:18:49 +1000 Subject: [PATCH] Decompile func0f065dd8 --- 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 587be3b4d..63393bc7c 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -6456,18 +6456,10 @@ glabel func0f065d1c /* f065dd4: 27bd0058 */ addiu $sp,$sp,0x58 ); -GLOBAL_ASM( -glabel func0f065dd8 -/* f065dd8: 27bdffe0 */ addiu $sp,$sp,-32 -/* f065ddc: afbf001c */ sw $ra,0x1c($sp) -/* f065de0: afa00010 */ sw $zero,0x10($sp) -/* f065de4: 0fc19747 */ jal func0f065d1c -/* f065de8: afa00014 */ sw $zero,0x14($sp) -/* f065dec: 8fbf001c */ lw $ra,0x1c($sp) -/* f065df0: 27bd0020 */ addiu $sp,$sp,0x20 -/* f065df4: 03e00008 */ jr $ra -/* f065df8: 00000000 */ nop -); +void func0f065dd8(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms) +{ + func0f065d1c(pos, rooms, newpos, newrooms, NULL, 0); +} void func0f065dfc(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms, s16 *morerooms, u32 arg5) { diff --git a/src/include/game/game_0601b0.h b/src/include/game/game_0601b0.h index 3b4649307..fe5192d56 100644 --- a/src/include/game/game_0601b0.h +++ b/src/include/game/game_0601b0.h @@ -51,7 +51,7 @@ void func0f065ae0(struct prop *prop, s16 room); void func0f065c44(struct prop *prop); void func0f065cb0(struct prop *prop); void func0f065d1c(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms, s16 *morerooms, u32 arg5); -u32 func0f065dd8(void); +void func0f065dd8(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms); void func0f065dfc(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms, s16 *morerooms, 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);