From 58b204cf2902e1c2f0be9bb3f2fd70f3c156b1ad Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 27 Jul 2020 22:36:45 +1000 Subject: [PATCH] Decompile func0f199964 --- src/game/game_197600.c | 15 ++++----------- src/include/game/game_197600.h | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/game/game_197600.c b/src/game/game_197600.c index 2286fe9f1..0afc1091b 100644 --- a/src/game/game_197600.c +++ b/src/game/game_197600.c @@ -2598,17 +2598,10 @@ glabel func0f19978c /* f199960: 27bd0038 */ addiu $sp,$sp,0x38 ); -GLOBAL_ASM( -glabel func0f199964 -/* f199964: 27bdffe8 */ addiu $sp,$sp,-24 -/* f199968: afbf0014 */ sw $ra,0x14($sp) -/* f19996c: 0fc665e3 */ jal func0f19978c -/* f199970: 24060001 */ addiu $a2,$zero,0x1 -/* f199974: 8fbf0014 */ lw $ra,0x14($sp) -/* f199978: 27bd0018 */ addiu $sp,$sp,0x18 -/* f19997c: 03e00008 */ jr $ra -/* f199980: 00000000 */ nop -); +void func0f199964(struct chrdata *chr, u32 weaponnum) +{ + func0f19978c(chr, weaponnum, true); +} GLOBAL_ASM( glabel func0f199984 diff --git a/src/include/game/game_197600.h b/src/include/game/game_197600.h index 97a7f209d..b712acd96 100644 --- a/src/include/game/game_197600.h +++ b/src/include/game/game_197600.h @@ -24,7 +24,7 @@ u32 func0f198e38(void); u32 func0f198e78(void); u32 func0f198eec(void); u32 func0f1994b0(void); -u32 func0f19978c(void); +void func0f19978c(struct chrdata *chr, u32 weaponnum, bool arg2); void func0f199964(struct chrdata *chr, u32 weaponnum); u32 func0f199984(void);