diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index c2af93b0d..df623491f 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -1912,22 +1912,10 @@ void currentPlayerUpdatePrevPosGrab(void) g_Vars.currentplayer->grabbedprevpos.z = g_Vars.currentplayer->grabbedprop->pos.z; } -GLOBAL_ASM( -glabel func0f0ce178 -/* f0ce178: 3c0e800a */ lui $t6,0x800a -/* f0ce17c: 8dcea244 */ lw $t6,-0x5dbc($t6) -/* f0ce180: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0ce184: afbf0014 */ sw $ra,0x14($sp) -/* f0ce188: 8dcf1b5c */ lw $t7,0x1b5c($t6) -/* f0ce18c: 00002825 */ or $a1,$zero,$zero -/* f0ce190: 24060001 */ addiu $a2,$zero,0x1 -/* f0ce194: 0fc1a71c */ jal func0f069c70 -/* f0ce198: 8de40004 */ lw $a0,0x4($t7) -/* f0ce19c: 8fbf0014 */ lw $ra,0x14($sp) -/* f0ce1a0: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0ce1a4: 03e00008 */ jr $ra -/* f0ce1a8: 00000000 */ sll $zero,$zero,0x0 -); +void func0f0ce178(void) +{ + func0f069c70(g_Vars.currentplayer->grabbedprop->obj, 0, 1); +} GLOBAL_ASM( glabel func0f0ce1ac diff --git a/src/include/game/bondgrab.h b/src/include/game/bondgrab.h index 214e4803b..e95b867d3 100644 --- a/src/include/game/bondgrab.h +++ b/src/include/game/bondgrab.h @@ -16,7 +16,7 @@ u32 func0f0cdf64(void); u32 func0f0cdfbc(void); u32 func0f0ce0bc(void); void currentPlayerUpdatePrevPosGrab(void); -u32 func0f0ce178(void); +void func0f0ce178(void); u32 func0f0ce1ac(void); u32 func0f0ce450(void); u32 func0f0ce4a0(void); diff --git a/src/include/game/game_066310.h b/src/include/game/game_066310.h index 4406abccd..a82cbbb8d 100644 --- a/src/include/game/game_066310.h +++ b/src/include/game/game_066310.h @@ -80,7 +80,7 @@ u32 func0f069750(void); u32 func0f069850(void); u32 func0f069b4c(void); u32 func0f069c1c(void); -u32 func0f069c70(void); +void func0f069c70(struct defaultobj *obj, bool arg1, bool arg2); u32 func0f069cd8(void); u32 func0f069d38(void); u32 func0f06a170(void);