diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index 2b9f59c71..98b05cbdb 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -379,17 +379,10 @@ bool aibotDoFarsightThing(struct chrdata *chr, u32 arg1, struct coord *arg2, str return true; } -GLOBAL_ASM( -glabel func0f19a27c -/* f19a27c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f19a280: afbf0014 */ sw $ra,0x14($sp) -/* f19a284: 0fc4a2bd */ jal weaponGetModel -/* f19a288: 00000000 */ sll $zero,$zero,0x0 -/* f19a28c: 8fbf0014 */ lw $ra,0x14($sp) -/* f19a290: 27bd0018 */ addiu $sp,$sp,0x18 -/* f19a294: 03e00008 */ jr $ra -/* f19a298: 00000000 */ sll $zero,$zero,0x0 -); +s32 func0f19a27c(s32 weapon) +{ + return weaponGetModel(weapon); +} bool func0f19a29c(u32 weaponnum, bool is_secondary) { diff --git a/src/include/game/game_127910.h b/src/include/game/game_127910.h index 07951d4da..c4d71344e 100644 --- a/src/include/game/game_127910.h +++ b/src/include/game/game_127910.h @@ -13,7 +13,7 @@ void currentPlayerSetViewSize(s32 viewx, s32 viewy); void currentPlayerSetViewPosition(s32 viewleft, s32 viewtop); void currentPlayerSetFovY(f32 fovy); void currentPlayerSetAspectRatio(f32 aspect); -s32 weaponGetModel(s32 arg0); +s32 weaponGetModel(s32 weapon); void currentPlayerSetWeaponFlag4(s32 weaponslot); void func0f128d20(s32 slot); void randomisePlayerOrder(void);