From c5086528e5cec7e95ae80eeea0987b2aeff587bd Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 8 Oct 2021 17:49:34 +1000 Subject: [PATCH] Decompile vi0000b1a8 --- src/include/lib/lib_09a80.h | 2 +- src/lib/lib_09a80.c | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/include/lib/lib_09a80.h b/src/include/lib/lib_09a80.h index 968f49e7f..01b1f21ea 100644 --- a/src/include/lib/lib_09a80.h +++ b/src/include/lib/lib_09a80.h @@ -25,7 +25,7 @@ Vp *viGetCurrentPlayerViewport(void); u16 vi0000ab6c(void); u32 vi0000ab78(void); u32 vi0000aca4(void); -u32 vi0000ad5c(void); +Gfx *vi0000ad5c(Gfx *gdl, Vp *vp); u32 vi0000af00(void); u32 vi0000b0e8(void); Gfx *vi0000b1a8(Gfx *gdl); diff --git a/src/lib/lib_09a80.c b/src/lib/lib_09a80.c index 4a6febee0..0f5a9eb06 100644 --- a/src/lib/lib_09a80.c +++ b/src/lib/lib_09a80.c @@ -2398,19 +2398,10 @@ glabel vi0000b0e8 /* b1a4: 00000000 */ nop ); -GLOBAL_ASM( -glabel vi0000b1a8 -/* b1a8: 3c05800a */ lui $a1,%hi(g_Vars+0x284) -/* b1ac: 8ca5a244 */ lw $a1,%lo(g_Vars+0x284)($a1) -/* b1b0: 27bdffe8 */ addiu $sp,$sp,-24 -/* b1b4: afbf0014 */ sw $ra,0x14($sp) -/* b1b8: 0c002b57 */ jal vi0000ad5c -/* b1bc: 24a50610 */ addiu $a1,$a1,1552 -/* b1c0: 8fbf0014 */ lw $ra,0x14($sp) -/* b1c4: 27bd0018 */ addiu $sp,$sp,0x18 -/* b1c8: 03e00008 */ jr $ra -/* b1cc: 00000000 */ nop -); +Gfx *vi0000b1a8(Gfx *gdl) +{ + return vi0000ad5c(gdl, &g_Vars.currentplayer->viewport[0]); +} GLOBAL_ASM( glabel vi0000b1d0