From fb937307d33b2eebc7569356ead212ea2ae40c88 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 29 Nov 2020 16:24:13 +1000 Subject: [PATCH] Decompile func0f1526e4 --- src/game/game_150820.c | 21 +++++++-------------- src/include/game/game_150820.h | 4 ++-- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/game/game_150820.c b/src/game/game_150820.c index 28d75f69b..7dc98d029 100644 --- a/src/game/game_150820.c +++ b/src/game/game_150820.c @@ -2102,17 +2102,10 @@ glabel func0f151ed0 /* f1526e0: 27bd0140 */ addiu $sp,$sp,0x140 ); -GLOBAL_ASM( -glabel func0f1526e4 -/* f1526e4: 27bdffe8 */ addiu $sp,$sp,-24 -/* f1526e8: afbf0014 */ sw $ra,0x14($sp) -/* f1526ec: 0fc545e0 */ jal func0f151780 -/* f1526f0: 00000000 */ nop -/* f1526f4: 0fc547b4 */ jal func0f151ed0 -/* f1526f8: 00402025 */ or $a0,$v0,$zero -/* f1526fc: 8fbf0014 */ lw $ra,0x14($sp) -/* f152700: 27bd0018 */ addiu $sp,$sp,0x18 -/* f152704: 03e00008 */ jr $ra -/* f152708: 00000000 */ nop -/* f15270c: 00000000 */ nop -); +Gfx *func0f1526e4(Gfx *gdl) +{ + gdl = func0f151780(gdl); + gdl = func0f151ed0(gdl); + + return gdl; +} diff --git a/src/include/game/game_150820.h b/src/include/game/game_150820.h index 02f2501da..d4c20b576 100644 --- a/src/include/game/game_150820.h +++ b/src/include/game/game_150820.h @@ -5,8 +5,8 @@ u16 func0f150820(struct coord *pos, f32 *rotx, f32 *roty, f32 *rotz, f32 arg4, f32 arg5, f32 arg6, f32 arg7, u32 arg8, struct prop *prop); u32 func0f150d38(void); -u32 func0f151780(void); -u32 func0f151ed0(void); +Gfx *func0f151780(Gfx *gdl); +Gfx *func0f151ed0(Gfx *gdl); Gfx *func0f1526e4(Gfx *gdl); #endif