diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index c6db0bb6a..52b5fb452 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -20411,35 +20411,16 @@ glabel var7f1ac8c8 /* f0a456c: 27bd00a0 */ addiu $sp,$sp,0xa0 ); -GLOBAL_ASM( -glabel func0f0a4570 -/* f0a4570: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0a4574: afbf0014 */ sw $ra,0x14($sp) -/* f0a4578: afa5001c */ sw $a1,0x1c($sp) -/* f0a457c: 8c820218 */ lw $v0,0x218($a0) -/* f0a4580: 00803825 */ or $a3,$a0,$zero -/* f0a4584: 1440000a */ bnez $v0,.L0f0a45b0 -/* f0a4588: 00000000 */ nop -/* f0a458c: 8c8e0220 */ lw $t6,0x220($a0) -/* f0a4590: 00a02025 */ or $a0,$a1,$zero -/* f0a4594: 00c02825 */ or $a1,$a2,$zero -/* f0a4598: 19c00005 */ blez $t6,.L0f0a45b0 -/* f0a459c: 00000000 */ nop -/* f0a45a0: 0fc27e5d */ jal func0f09f974 -/* f0a45a4: afa70018 */ sw $a3,0x18($sp) -/* f0a45a8: 8fa70018 */ lw $a3,0x18($sp) -/* f0a45ac: 8ce20218 */ lw $v0,0x218($a3) -.L0f0a45b0: -/* f0a45b0: 50400004 */ beqzl $v0,.L0f0a45c4 -/* f0a45b4: 8fbf0014 */ lw $ra,0x14($sp) -/* f0a45b8: 0fc27e12 */ jal func0f09f848 -/* f0a45bc: 8fa4001c */ lw $a0,0x1c($sp) -/* f0a45c0: 8fbf0014 */ lw $ra,0x14($sp) -.L0f0a45c4: -/* f0a45c4: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0a45c8: 03e00008 */ jr $ra -/* f0a45cc: 00000000 */ nop -); +void func0f0a4570(struct hand *hand, s32 handnum, struct weaponfunc_shootprojectile *func) +{ + if (hand->rocket == NULL && hand->loadedammo[0] > 0) { + func0f09f974(handnum, func); + } + + if (hand->rocket) { + func0f09f848(handnum); + } +} void func0f0a256c(void); diff --git a/src/include/game/game_097ba0.h b/src/include/game/game_097ba0.h index dc07e4861..8a2d959bc 100644 --- a/src/include/game/game_097ba0.h +++ b/src/include/game/game_097ba0.h @@ -73,7 +73,7 @@ void func0f09ebcc(struct defaultobj *obj, struct coord *coord, s16 *rooms, Mtxf u32 func0f09ed2c(void); struct var8009ce58 *func0f09ee18(struct chrdata *chr, struct shorthand *hand, struct coord *pos, s16 *rooms, Mtxf *arg4, struct coord *arg5); void handCreateThrownProjectile(s32 handnum, struct shorthand *hand); -u32 func0f09f848(void); +void func0f09f848(s32 handnum); void func0f09f974(s32 handnum, struct weaponfunc_shootprojectile *func); void func0f09fa20(s32 handnum); void handCreateFiredProjectile(s32 handnum); @@ -126,7 +126,7 @@ u32 func0f0a4094(void); u32 func0f0a419c(void); u32 func0f0a4334(void); u32 func0f0a4438(void); -u32 func0f0a4570(void); +void func0f0a4570(struct hand *hand, s32 handnum, struct weaponfunc_shootprojectile *func); void func0f0a45d0(struct hand *hand, struct modelfiledata *filedata, bool arg2); u32 func0f0a46a4(void); u32 func0f0a4e44(void);