diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index a71b95786..ffee4ebae 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -18945,7 +18945,7 @@ glabel var7f1a90b4 /* f03fcc0: 46081082 */ mul.s $f2,$f2,$f8 /* f03fcc4: 00000000 */ sll $zero,$zero,0x0 .L0f03fcc8: -/* f03fcc8: 0fc06c45 */ jal func0f01b114 +/* f03fcc8: 0fc06c45 */ jal pdmodeGetAccuracy /* f03fccc: e7a20024 */ swc1 $f2,0x24($sp) /* f03fcd0: 3c013f80 */ lui $at,0x3f80 /* f03fcd4: 44815000 */ mtc1 $at,$f10 @@ -18954,14 +18954,14 @@ glabel var7f1a90b4 /* f03fce0: 00000000 */ sll $zero,$zero,0x0 /* f03fce4: 45000007 */ bc1f .L0f03fd04 /* f03fce8: 00000000 */ sll $zero,$zero,0x0 -/* f03fcec: 0fc06c45 */ jal func0f01b114 +/* f03fcec: 0fc06c45 */ jal pdmodeGetAccuracy /* f03fcf0: e7a20024 */ swc1 $f2,0x24($sp) /* f03fcf4: c7a20024 */ lwc1 $f2,0x24($sp) /* f03fcf8: 46001082 */ mul.s $f2,$f2,$f0 /* f03fcfc: 1000000c */ beqz $zero,.L0f03fd30 /* f03fd00: 00000000 */ sll $zero,$zero,0x0 .L0f03fd04: -/* f03fd04: 0fc06c45 */ jal func0f01b114 +/* f03fd04: 0fc06c45 */ jal pdmodeGetAccuracy /* f03fd08: e7a20024 */ swc1 $f2,0x24($sp) /* f03fd0c: 3c014110 */ lui $at,0x4110 /* f03fd10: 44813000 */ mtc1 $at,$f6 diff --git a/src/game/game_01b0a0.c b/src/game/game_01b0a0.c index ae9bd9ddd..690ee88c5 100644 --- a/src/game/game_01b0a0.c +++ b/src/game/game_01b0a0.c @@ -47,23 +47,14 @@ f32 pdmodeGetDamage(void) return 1.0f; } -GLOBAL_ASM( -glabel func0f01b114 -/* f01b114: 3c02800a */ lui $v0,%hi(g_MissionConfig) -/* f01b118: 2442dfe8 */ addiu $v0,$v0,%lo(g_MissionConfig) -/* f01b11c: 904e0000 */ lbu $t6,0x0($v0) -/* f01b120: 31cf0001 */ andi $t7,$t6,0x1 -/* f01b124: 51e00004 */ beqzl $t7,.L0f01b138 -/* f01b128: 3c013f80 */ lui $at,0x3f80 -/* f01b12c: 03e00008 */ jr $ra -/* f01b130: c4400014 */ lwc1 $f0,0x14($v0) -/* f01b134: 3c013f80 */ lui $at,0x3f80 -.L0f01b138: -/* f01b138: 44810000 */ mtc1 $at,$f0 -/* f01b13c: 00000000 */ sll $zero,$zero,0x0 -/* f01b140: 03e00008 */ jr $ra -/* f01b144: 00000000 */ sll $zero,$zero,0x0 -); +f32 pdmodeGetAccuracy(void) +{ + if (g_MissionConfig.pdmode) { + return g_MissionConfig.pdmodeaccuracyf; + } + + return 1.0f; +} GLOBAL_ASM( glabel func0f01b148 diff --git a/src/include/game/game_01b0a0.h b/src/include/game/game_01b0a0.h index 3ee4ccc8a..ae56bf480 100644 --- a/src/include/game/game_01b0a0.h +++ b/src/include/game/game_01b0a0.h @@ -6,7 +6,7 @@ u32 func0f01b0a0(void); f32 pdmodeGetHealth(void); f32 pdmodeGetDamage(void); -u32 func0f01b114(void); +f32 pdmodeGetAccuracy(void); u32 func0f01b148(void); void func0f01b154(s32 arg0); void activemenuTick(void);