diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 946e885d7..a71b95786 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -7321,7 +7321,7 @@ glabel var7f1a8d98 /* f034960: 24010006 */ addiu $at,$zero,0x6 /* f034964: 5461000b */ bnel $v1,$at,.L0f034994 /* f034968: 24010006 */ addiu $at,$zero,0x6 -/* f03496c: 0fc06c38 */ jal func0f01b0e0 +/* f03496c: 0fc06c38 */ jal pdmodeGetDamage /* f034970: 00000000 */ sll $zero,$zero,0x0 /* f034974: 3c018006 */ lui $at,0x8006 /* f034978: c42a2ca4 */ lwc1 $f10,0x2ca4($at) @@ -7403,7 +7403,7 @@ glabel var7f1a8d98 /* f034a90: 24010006 */ addiu $at,$zero,0x6 /* f034a94: 5461000b */ bnel $v1,$at,.L0f034ac4 /* f034a98: 24010006 */ addiu $at,$zero,0x6 -/* f034a9c: 0fc06c38 */ jal func0f01b0e0 +/* f034a9c: 0fc06c38 */ jal pdmodeGetDamage /* f034aa0: 00000000 */ sll $zero,$zero,0x0 /* f034aa4: 3c018006 */ lui $at,0x8006 /* f034aa8: c4302ca4 */ lwc1 $f16,0x2ca4($at) @@ -7484,7 +7484,7 @@ glabel var7f1a8d98 /* f034bbc: 00000000 */ sll $zero,$zero,0x0 /* f034bc0: 14a2000c */ bne $a1,$v0,.L0f034bf4 /* f034bc4: 00000000 */ sll $zero,$zero,0x0 -/* f034bc8: 0fc06c38 */ jal func0f01b0e0 +/* f034bc8: 0fc06c38 */ jal pdmodeGetDamage /* f034bcc: 00000000 */ sll $zero,$zero,0x0 /* f034bd0: 3c018006 */ lui $at,0x8006 /* f034bd4: c4322ca4 */ lwc1 $f18,0x2ca4($at) diff --git a/src/game/game_01b0a0.c b/src/game/game_01b0a0.c index 25c1d9fa9..ae9bd9ddd 100644 --- a/src/game/game_01b0a0.c +++ b/src/game/game_01b0a0.c @@ -38,23 +38,14 @@ f32 pdmodeGetHealth(void) return 1.0f; } -GLOBAL_ASM( -glabel func0f01b0e0 -/* f01b0e0: 3c02800a */ lui $v0,%hi(g_MissionConfig) -/* f01b0e4: 2442dfe8 */ addiu $v0,$v0,%lo(g_MissionConfig) -/* f01b0e8: 904e0000 */ lbu $t6,0x0($v0) -/* f01b0ec: 31cf0001 */ andi $t7,$t6,0x1 -/* f01b0f0: 51e00004 */ beqzl $t7,.L0f01b104 -/* f01b0f4: 3c013f80 */ lui $at,0x3f80 -/* f01b0f8: 03e00008 */ jr $ra -/* f01b0fc: c4400010 */ lwc1 $f0,0x10($v0) -/* f01b100: 3c013f80 */ lui $at,0x3f80 -.L0f01b104: -/* f01b104: 44810000 */ mtc1 $at,$f0 -/* f01b108: 00000000 */ sll $zero,$zero,0x0 -/* f01b10c: 03e00008 */ jr $ra -/* f01b110: 00000000 */ sll $zero,$zero,0x0 -); +f32 pdmodeGetDamage(void) +{ + if (g_MissionConfig.pdmode) { + return g_MissionConfig.pdmodedamagef; + } + + return 1.0f; +} GLOBAL_ASM( glabel func0f01b114 diff --git a/src/include/game/game_01b0a0.h b/src/include/game/game_01b0a0.h index be9e35a8f..3ee4ccc8a 100644 --- a/src/include/game/game_01b0a0.h +++ b/src/include/game/game_01b0a0.h @@ -5,7 +5,7 @@ u32 func0f01b0a0(void); f32 pdmodeGetHealth(void); -u32 func0f01b0e0(void); +f32 pdmodeGetDamage(void); u32 func0f01b114(void); u32 func0f01b148(void); void func0f01b154(s32 arg0);