diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index c2b8493d9..ab796ee4d 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -3186,7 +3186,7 @@ glabel var7f1ac31c /* f09a250: 29c10017 */ slti $at,$t6,0x17 /* f09a254: 50200010 */ beqzl $at,.L0f09a298 /* f09a258: ae000020 */ sw $zero,0x20($s0) -/* f09a25c: 0fc2c6b4 */ jal func0f0b1ad0 +/* f09a25c: 0fc2c6b4 */ jal weaponGetModelNum2 /* f09a260: 8d640000 */ lw $a0,0x0($t3) /* f09a264: 1040000b */ beqz $v0,.L0f09a294 /* f09a268: 8fac0038 */ lw $t4,0x38($sp) @@ -6392,7 +6392,7 @@ glabel var7f1ac5ec /* f09c9f8: 01cf082a */ slt $at,$t6,$t7 /* f09c9fc: 50200010 */ beqzl $at,.L0f09ca40 /* f09ca00: 8e090608 */ lw $t1,0x608($s0) -/* f09ca04: 0fc2c6b4 */ jal func0f0b1ad0 +/* f09ca04: 0fc2c6b4 */ jal weaponGetModelNum2 /* f09ca08: 8f040000 */ lw $a0,0x0($t8) /* f09ca0c: 1040000b */ beqz $v0,.L0f09ca3c /* f09ca10: 8fb90070 */ lw $t9,0x70($sp) diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c index 72fabbb12..2d9ba8c34 100644 --- a/src/game/game_0b0420.c +++ b/src/game/game_0b0420.c @@ -1217,17 +1217,10 @@ u16 weaponGetModelNum(s32 weaponnum) return 0; } -GLOBAL_ASM( -glabel func0f0b1ad0 -/* f0b1ad0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0b1ad4: afbf0014 */ sw $ra,0x14($sp) -/* f0b1ad8: 0fc2c686 */ jal weaponGetModelNum -/* f0b1adc: 00000000 */ nop -/* f0b1ae0: 8fbf0014 */ lw $ra,0x14($sp) -/* f0b1ae4: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0b1ae8: 03e00008 */ jr $ra -/* f0b1aec: 00000000 */ nop -); +u16 weaponGetModelNum2(s32 weaponnum) +{ + return weaponGetModelNum(weaponnum); +} GLOBAL_ASM( glabel func0f0b1af0 diff --git a/src/include/game/game_0b0420.h b/src/include/game/game_0b0420.h index c870ea26e..6231bf37e 100644 --- a/src/include/game/game_0b0420.h +++ b/src/include/game/game_0b0420.h @@ -36,7 +36,7 @@ u32 func0f0b184c(void); s32 currentPlayerGetDeviceState(s32 weaponnum); void currentPlayerSetDeviceActive(s32 weaponum, bool active); u16 weaponGetModelNum(s32 weaponnum); -u32 func0f0b1ad0(void); +u16 weaponGetModelNum2(s32 weaponnum); u32 func0f0b1af0(void); struct inventory_ammo *handGetAmmoDefinition(struct hand *hand); u8 handGetSingleUnk3c(struct hand *hand);