From 7af17854599895def96d156590680556b3d368db Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 25 Dec 2019 22:28:36 +1000 Subject: [PATCH] Decompile chrGetArmor --- src/game/chr/chr.c | 23 ++++++++--------------- src/include/game/chr/chr.h | 1 + 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 206d52840..9d9ee4ab0 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -3495,21 +3495,14 @@ void chrAddHealth(struct chrdata *chr, f32 health) chr->damage -= health; } -GLOBAL_ASM( -glabel func0f0205c0 -/* f0205c0: 44806000 */ mtc1 $zero,$f12 -/* f0205c4: c4820100 */ lwc1 $f2,0x100($a0) -/* f0205c8: 460c103c */ c.lt.s $f2,$f12 -/* f0205cc: 00000000 */ sll $zero,$zero,0x0 -/* f0205d0: 45020004 */ bc1fl .L0f0205e4 -/* f0205d4: 46006006 */ mov.s $f0,$f12 -/* f0205d8: 03e00008 */ jr $ra -/* f0205dc: 46001007 */ neg.s $f0,$f2 -/* f0205e0: 46006006 */ mov.s $f0,$f12 -.L0f0205e4: -/* f0205e4: 03e00008 */ jr $ra -/* f0205e8: 00000000 */ sll $zero,$zero,0x0 -); +f32 chrGetArmor(struct chrdata *chr) +{ + if (chr->damage < 0) { + return -chr->damage; + } + + return 0; +} GLOBAL_ASM( glabel func0f0205ec diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index 3ed1c4b38..dcb67f554 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -47,6 +47,7 @@ u32 func0f020538(void); void chrSetMaxDamage(struct chrdata *chr, f32 maxdamage); f32 chrGetMaxDamage(struct chrdata *chr); void chrAddHealth(struct chrdata *chr, f32 health); +f32 chrGetArmor(struct chrdata *chr); u32 func0f0205ec(void); u32 func0f020668(void); u32 func0f020b14(void);