diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 7562f6912..a13b1c202 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -638,12 +638,10 @@ glabel func0f19d250 /* f19d258: 9442d176 */ lhu $v0,%lo(g_FiringRangeData+0x456)($v0) ); -GLOBAL_ASM( -glabel func0f19d25c -/* f19d25c: 3c01800b */ lui $at,%hi(g_FiringRangeData+0x456) -/* f19d260: 03e00008 */ jr $ra -/* f19d264: a424d176 */ sh $a0,%lo(g_FiringRangeData+0x456)($at) -); +void frSetSlot(s32 slot) +{ + g_FiringRangeData.slot = slot; +} u32 frGetWeaponBySlot(s32 slot) { diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 11f0486a9..4393c4bf6 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -207,7 +207,7 @@ glabel var7f1b9940 /* f1a351c: 0fc679ea */ jal func0f19e7a8 /* f1a3520: afa200a0 */ sw $v0,0xa0($sp) /* f1a3524: 8fa600b0 */ lw $a2,0xb0($sp) -/* f1a3528: 0fc67497 */ jal func0f19d25c +/* f1a3528: 0fc67497 */ jal frSetSlot /* f1a352c: 8cc40000 */ lw $a0,0x0($a2) /* f1a3530: 8fb800a0 */ lw $t8,0xa0($sp) /* f1a3534: 1300000c */ beqz $t8,.L0f1a3568 diff --git a/src/include/game/game_19c990.h b/src/include/game/game_19c990.h index dd4c378ec..d312693e9 100644 --- a/src/include/game/game_19c990.h +++ b/src/include/game/game_19c990.h @@ -18,7 +18,7 @@ u32 func0f19ccc0(u32 weaponnum); u32 func0f19cdf0(u32 weaponnum); u32 func0f19cf20(s32 stage_index); // firing range related u32 func0f19d250(void); -u32 func0f19d25c(void); +void frSetSlot(s32 slot); u32 frGetWeaponBySlot(s32 slot); u32 func0f19d2e0(void); u32 func0f19d338(void);