z_lifemeter (#247)

* z_lifemeter done.

* fix new warning I didn't saw. add variables.txt

* suggested changes

* add new texture ptrs to undefined_sym, changed heartTex & temp to TexturePtr in LifeMeter_Draw

* change hex literal to decimal and other small suggestions

* change bool to u32; change hexa literal to decimal in LifeMeter_IsCritical; renamed undefined sym to their D_02 addresses

* re-applied format.sh on z_lifemeter

* coding style fixes

* fix typo in undefined_sym

* named func and vars.

* changed modulo check

* add extra line after var declaration in LifeMeter_Draw

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* changed unkTimer to camelCase; timer constant as decimal; flip some comparison in LifeMeter_Draw

* uncomment & rename func_ in functions.h

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

Co-authored-by: Andzura <andzura@andzura.fr>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

3 files changed, 29 insertions, 28 deletions

diff --git a/include/functions.h b/include/functions.h
index dd2ecd2a8..6504cdbeb 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -2000,12 +2000,12 @@ void* Lib_PhysicalToVirtual(void* ptr);
 void* Lib_PhysicalToVirtualNull(void* ptr);
 void LifeMeter_Init(GlobalContext* globalCtx);
 void LifeMeter_UpdateColors(GlobalContext* globalCtx);
-// UNK_TYPE4 func_80100A80(GlobalContext* globalCtx);
-// UNK_TYPE4 func_80100AA0(GlobalContext* globalCtx);
-// UNK_TYPE4 func_80100AF0(GlobalContext* globalCtx);
+s32 LifeMeter_SaveInterfaceHealth(GlobalContext* globalCtx);
+s32 LifeMeter_IncreaseInterfaceHealth(GlobalContext* globalCtx);
+s32 LifeMeter_DecreaseInterfaceHealth(GlobalContext* globalCtx);
 void LifeMeter_Draw(GlobalContext* globalCtx);
 void LifeMeter_UpdateSizeAndBeep(GlobalContext* globalCtx);
-// s32 LifeMeter_IsCritical(void);
+bool LifeMeter_IsCritical(void);
 void Lights_PointSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius, s32 type);
 void Lights_PointNoGlowSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius);
 void Lights_PointGlowSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius);
@@ -3389,15 +3389,16 @@ void Sched_Init(SchedContext* sched, void* stack, OSPri pri, UNK_TYPE arg3, UNK_
 void func_801773A0(void* arg0);
 void func_801773C4(void* arg0);
 void SpeedMeter_DrawTimeEntries(void* displayList, GraphicsContext* gCtx);
-// void func_80177A84(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5,
-// UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9); void func_80177AC8(void);
-void SpeedMeter_DrawAllocEntries(void* displayList, GraphicsContext* gCtx, GameState* ctx);
-// void func_801780F0(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5,
-// UNK_TYPE4 param_6, UNK_TYPE4 param_7); void func_801781EC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3,
-// UNK_TYPE1 param_4, UNK_TYPE4 param_5); void func_8017842C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3,
-// UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9,
-// UNK_TYPE4 param_10, UNK_TYPE4 param_11); void func_80178750(void); void func_80178818(void); void
-// func_80178978(void); void func_801789D4(void);
+// void func_80177A84(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9);
+// void func_80177AC8(void);
+void SpeedMeter_DrawAllocEntries(void* displayList, GraphicsContext* gfxCtx, GameState* gameState);
+void func_801780F0(Mtx* param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5, f32 param_6, f32 param_7);
+// void func_801781EC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
+// void func_8017842C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9, UNK_TYPE4 param_10, UNK_TYPE4 param_11);
+// void func_80178750(void);
+// void func_80178818(void);
+// void func_80178978(void);
+// void func_801789D4(void);
 u32* get_framebuffer(s32 index);
 // u16* get_zbuffer(void);
 // UNK_TYPE4 func_80178A24(void);
diff --git a/include/variables.h b/include/variables.h
index 31443e6a8..6c79074ad 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -1001,28 +1001,28 @@ extern u8 kanfontOrdering[92];
 // extern UNK_TYPE1 D_801BE92C;
 // extern UNK_TYPE1 D_801BE944;
 // extern actor_init_var_func sInitChainHandlers[11];
-// extern UNK_TYPE2 D_801BE990;
+// extern UNK_TYPE2 sHeartsPrimColors;
 // extern UNK_TYPE2 D_801BE992;
 // extern UNK_TYPE2 D_801BE994;
-// extern UNK_TYPE2 D_801BE9A4;
+// extern UNK_TYPE2 sHeartsEnvColors;
 // extern UNK_TYPE2 D_801BE9A6;
 // extern UNK_TYPE2 D_801BE9A8;
-// extern UNK_TYPE2 D_801BE9B8;
-// extern UNK_TYPE2 D_801BE9CC;
-// extern UNK_TYPE2 D_801BE9E0;
+// extern UNK_TYPE2 sHeartsPrimFactors;
+// extern UNK_TYPE2 sHeartsEnvFactors;
+// extern UNK_TYPE2 sHeartsDDPrimColors;
 // extern UNK_TYPE2 D_801BE9E2;
 // extern UNK_TYPE2 D_801BE9E4;
-// extern UNK_TYPE2 D_801BE9F4;
+// extern UNK_TYPE2 sHeartsDDEnvColors;
 // extern UNK_TYPE2 D_801BE9F6;
 // extern UNK_TYPE2 D_801BE9F8;
-// extern UNK_TYPE2 D_801BEA08;
+// extern UNK_TYPE2 sHeartsDDPrimFactors;
 // extern UNK_TYPE2 D_801BEA0A;
 // extern UNK_TYPE2 D_801BEA0C;
-// extern UNK_TYPE2 D_801BEA1C;
+// extern UNK_TYPE2 sHeartsDDEnvFactors;
 // extern UNK_TYPE2 D_801BEA1E;
 // extern UNK_TYPE2 D_801BEA20;
-// extern UNK_TYPE1 D_801BEA30;
-// extern UNK_TYPE1 D_801BEA70;
+// extern UNK_TYPE1 HeartTextures;
+// extern UNK_TYPE1 HeartDDTextures;
 //extern LightsPosBindFunc posBindFuncs[3];
 //extern LightsBindFunc dirBindFuncs[3];
 // extern UNK_TYPE4 D_801BEAD4;
@@ -3333,9 +3333,9 @@ extern f32 D_801F4E70;
 // extern UNK_TYPE1 D_801F4F33;
 // extern UNK_TYPE1 D_801F4F34;
 // extern UNK_TYPE1 D_801F4F38;
-// extern UNK_TYPE1 D_801F4F40;
-// extern UNK_TYPE1 D_801F4F48;
-// extern UNK_TYPE1 D_801F4F50;
+// extern UNK_TYPE1 sBeatingHeartsDDPrim;
+// extern UNK_TYPE1 sBeatingHeartsDDEnv;
+// extern UNK_TYPE1 sHeartsDDPrim;
 // extern UNK_TYPE1 D_801F4F56;
 // extern UNK_TYPE1 D_801F4F58;
 // extern UNK_TYPE1 D_801F4F5A;
diff --git a/include/z64.h b/include/z64.h
index 107435011..9f186285f 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -737,8 +737,8 @@ typedef struct {
     /* 0x242 */ s16 heartsEnvR[2];
     /* 0x246 */ s16 heartsEnvG[2];
     /* 0x24A */ s16 heartsEnvB[2];
-    /* 0x24E */ s16 unk_24E;
-    /* 0x250 */ s16 unk_250;
+    /* 0x24E */ s16 health;
+    /* 0x250 */ s16 unkTimer;
     /* 0x252 */ s16 lifeSizeChange;
     /* 0x254 */ s16 lifeSizeChangeDirection; // 1 means shrinking, 0 growing
     /* 0x256 */ s16 unk_256;