From 1c812697d7de764622f0bf114f6740c12a3a8200 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 26 Mar 2020 19:08:09 +1000 Subject: [PATCH] Decompile pdmodeGetReaction --- src/game/chr/chraction.c | 6 +++--- src/game/game_01b0a0.c | 16 +++++++--------- src/include/game/game_01b0a0.h | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index ffee4ebae..6dafe6778 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -216,7 +216,7 @@ glabel var7f1a8cf0 /* f02e170: 448e2000 */ mtc1 $t6,$f4 /* f02e174: 00000000 */ sll $zero,$zero,0x0 /* f02e178: 468020a0 */ cvt.s.w $f2,$f4 -/* f02e17c: 0fc06c28 */ jal func0f01b0a0 +/* f02e17c: 0fc06c28 */ jal pdmodeGetReaction /* f02e180: e7a2001c */ swc1 $f2,0x1c($sp) /* f02e184: 3c0142c8 */ lui $at,0x42c8 /* f02e188: 44813000 */ mtc1 $at,$f6 @@ -244,7 +244,7 @@ glabel func0f02e1cc /* f02e1d0: afbf0014 */ sw $ra,0x14($sp) /* f02e1d4: afa50024 */ sw $a1,0x24($sp) /* f02e1d8: 80830003 */ lb $v1,0x3($a0) -/* f02e1dc: 0fc06c28 */ jal func0f01b0a0 +/* f02e1dc: 0fc06c28 */ jal pdmodeGetReaction /* f02e1e0: afa3001c */ sw $v1,0x1c($sp) /* f02e1e4: 8fa3001c */ lw $v1,0x1c($sp) /* f02e1e8: 24040064 */ addiu $a0,$zero,0x64 @@ -295,7 +295,7 @@ glabel var7f1a8cf4 /* f02e274: 448e2000 */ mtc1 $t6,$f4 /* f02e278: 00000000 */ sll $zero,$zero,0x0 /* f02e27c: 468020a0 */ cvt.s.w $f2,$f4 -/* f02e280: 0fc06c28 */ jal func0f01b0a0 +/* f02e280: 0fc06c28 */ jal pdmodeGetReaction /* f02e284: e7a2001c */ swc1 $f2,0x1c($sp) /* f02e288: 3c0142c8 */ lui $at,0x42c8 /* f02e28c: 44813000 */ mtc1 $at,$f6 diff --git a/src/game/game_01b0a0.c b/src/game/game_01b0a0.c index 690ee88c5..3a1968201 100644 --- a/src/game/game_01b0a0.c +++ b/src/game/game_01b0a0.c @@ -22,12 +22,10 @@ const u32 var7f1a85a4[] = {0x3e89374c}; const u32 var7f1a85a8[] = {0x4196cbe4}; const u32 var7f1a85ac[] = {0x4196cbe4}; -GLOBAL_ASM( -glabel func0f01b0a0 -/* f01b0a0: 44800000 */ mtc1 $zero,$f0 -/* f01b0a4: 03e00008 */ jr $ra -/* f01b0a8: 00000000 */ sll $zero,$zero,0x0 -); +f32 pdmodeGetReaction(void) +{ + return 0; +} f32 pdmodeGetHealth(void) { @@ -35,7 +33,7 @@ f32 pdmodeGetHealth(void) return g_MissionConfig.pdmodehealthf; } - return 1.0f; + return 1; } f32 pdmodeGetDamage(void) @@ -44,7 +42,7 @@ f32 pdmodeGetDamage(void) return g_MissionConfig.pdmodedamagef; } - return 1.0f; + return 1; } f32 pdmodeGetAccuracy(void) @@ -53,7 +51,7 @@ f32 pdmodeGetAccuracy(void) return g_MissionConfig.pdmodeaccuracyf; } - return 1.0f; + return 1; } GLOBAL_ASM( diff --git a/src/include/game/game_01b0a0.h b/src/include/game/game_01b0a0.h index ae56bf480..6ed1bd788 100644 --- a/src/include/game/game_01b0a0.h +++ b/src/include/game/game_01b0a0.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func0f01b0a0(void); +f32 pdmodeGetReaction(void); f32 pdmodeGetHealth(void); f32 pdmodeGetDamage(void); f32 pdmodeGetAccuracy(void);