Decompile currentPlayerTickDamageAndHealth

src/include/constants.h

@@ -966,9 +966,10 @@
 #define GUNMEMOWNER_10 10
 #define GUNMEMOWNER_11 11
 
-#define GUNSIGHTREASON_1         1
-#define GUNSIGHTREASON_AIMING    2
-#define GUNSIGHTREASON_NOCONTROL 4
+#define GUNSIGHTREASON_1         0x01
+#define GUNSIGHTREASON_AIMING    0x02
+#define GUNSIGHTREASON_NOCONTROL 0x04
+#define GUNSIGHTREASON_DAMAGE    0x10
 
 #define HAND_RIGHT 0
 #define HAND_LEFT  1

src/include/game/game_0b69d0.h

@@ -35,9 +35,9 @@ Gfx *fadeDraw(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac);
 Gfx *currentPlayerDrawFade(Gfx *gdl);
 void currentPlayerUpdateColourScreenProperties(void);
 void currentPlayerTickChrFade(void);
-void currentPlayerShowHealthBar(void);
-void func0f0bb814(void);
-void currentPlayerUpdateHealthShow(void);
+void currentPlayerDisplayHealth(void);
+void currentPlayerTickDamageAndHealth(void);
+void currentPlayerDisplayDamage(void);
 Gfx *hudRenderHealthBar(Gfx *gdl);
 void currentPlayerSurroundWithExplosions(s32 arg0);
 void currentPlayerTickExplode(void);
@@ -56,7 +56,7 @@ void currentPlayerConfigureVi(void);
 void func0f0bd904(bool arg0);
 void func0f0bfc7c(struct coord *cam_pos, struct coord *cam_look, struct coord *cam_up);
 Gfx *currentPlayerUpdateShootRot(Gfx *gdl);
-void currentPlayerUpdateShieldShow(void);
+void currentPlayerDisplayShield(void);
 Gfx *currentPlayerRenderShield(Gfx *gdl);
 Gfx *func0f0c07c8(Gfx *gdl);
 void currentPlayerDie(bool force);

src/include/types.h

@@ -2835,13 +2835,13 @@ struct player {
 	/*0x1920*/ u8 buthistindex;
 	/*0x1921*/ u8 buthistlen;
 	/*0x1922*/ u8 invincible;
-	/*0x1924*/ u32 healthdamagetype; // 0-7, decreases based on amount of damage taken
+	/*0x1924*/ s32 healthdamagetype; // 0-7, decreases based on amount of damage taken
 	/*0x1928*/ f32 bondleandown;
 	/*0x192c*/ bool mpmenuon;
 	/*0x1930*/ u32 mpmenumode;
 	/*0x1934*/ u32 mpquitconfirm;
 	/*0x1938*/ u32 mpjoywascentre;
-	/*0x193c*/ u32 damagetype;
+	/*0x193c*/ s32 damagetype;
 	/*0x1940*/ u32 deathcount;
 	/*0x1948*/ u32 oldcrosspos[2];
 	/*0x194c*/ s32 lastkilltime60;
@@ -6113,22 +6113,22 @@ struct bgroom {
 	u8 unk11;
 };
 
-struct healthdamagetype2 {
-	s32 unk00;
-	f32 showtime;
-	f32 unk08;
-	f32 unk0c;
-	s32 unk10;
-	s32 unk14;
-	s32 unk18;
+struct damagetype {
+	f32 flashstartframe;
+	f32 flashfullframe;
+	f32 flashendframe;
+	f32 maxalpha;
+	s32 red;
+	s32 green;
+	s32 blue;
 };
 
 struct healthdamagetype {
-	s32 openduration;
-	s32 unk04;
-	s32 unk08;
-	s32 unk0c;
-	s32 unk10;
+	s32 openendframe;
+	s32 updatestartframe;
+	s32 updateendframe;
+	s32 closestartframe;
+	s32 closeendframe;
 };
 
 struct model08thing {