HealthMeter_ -> Health_ (#1202)

* HealthMeter_ -> Health_

* PR Suggestion

3 files changed, 10 insertions, 10 deletions

diff --git a/src/code/z_construct.c b/src/code/z_construct.c
index 7c3947f74..fbfc9dcb0 100644
--- a/src/code/z_construct.c
+++ b/src/code/z_construct.c
@@ -146,7 +146,7 @@ void func_801109B0(GlobalContext* globalCtx) {
 
     osSyncPrintf("ＰＡＲＡＭＥＴＥＲ領域＝%x\n", parameterSize + 0x5300); // "Parameter Area = %x"
 
-    HealthMeter_Init(globalCtx);
+    Health_InitMeter(globalCtx);
     Map_Init(globalCtx);
 
     interfaceCtx->unk_23C = interfaceCtx->unk_242 = 0;
diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c
index 115baadce..977a3c62d 100644
--- a/src/code/z_lifemeter.c
+++ b/src/code/z_lifemeter.c
@@ -111,7 +111,7 @@ s16 sBeatingHeartsDDEnv[3];
 s16 sHeartsDDPrim[2][3];
 s16 sHeartsDDEnv[2][3];
 
-void HealthMeter_Init(GlobalContext* globalCtx) {
+void Health_InitMeter(GlobalContext* globalCtx) {
     InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
 
     interfaceCtx->unk_228 = 0x140;
@@ -144,7 +144,7 @@ void HealthMeter_Init(GlobalContext* globalCtx) {
     sHeartsDDEnv[0][2] = sHeartsDDEnv[1][2] = HEARTS_DD_ENV_B;
 }
 
-void HealthMeter_Update(GlobalContext* globalCtx) {
+void Health_UpdateMeter(GlobalContext* globalCtx) {
     InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
     f32 factor = interfaceCtx->heartColorOscillator * 0.1f;
     f32 ddFactor;
@@ -295,7 +295,7 @@ static void* sHeartDDTextures[] = {
     gDefenseHeartThreeQuarterTex,
 };
 
-void HealthMeter_Draw(GlobalContext* globalCtx) {
+void Health_DrawMeter(GlobalContext* globalCtx) {
     s32 pad[5];
     void* heartBgImg;
     u32 curColorSet;
@@ -498,7 +498,7 @@ void HealthMeter_Draw(GlobalContext* globalCtx) {
     CLOSE_DISPS(gfxCtx, "../z_lifemeter.c", 606);
 }
 
-void HealthMeter_UpdateBeatingHeart(GlobalContext* globalCtx) {
+void Health_UpdateBeatingHeart(GlobalContext* globalCtx) {
     InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
 
     if (interfaceCtx->beatingHeartOscillatorDirection != 0) {
@@ -507,7 +507,7 @@ void HealthMeter_UpdateBeatingHeart(GlobalContext* globalCtx) {
             interfaceCtx->beatingHeartOscillator = 0;
             interfaceCtx->beatingHeartOscillatorDirection = 0;
             if (!Player_InCsMode(globalCtx) && (globalCtx->pauseCtx.state == 0) &&
-                (globalCtx->pauseCtx.debugState == 0) && HealthMeter_IsCritical() && !Gameplay_InCsMode(globalCtx)) {
+                (globalCtx->pauseCtx.debugState == 0) && Health_IsCritical() && !Gameplay_InCsMode(globalCtx)) {
                 func_80078884(NA_SE_SY_HITPOINT_ALARM);
             }
         }
@@ -520,7 +520,7 @@ void HealthMeter_UpdateBeatingHeart(GlobalContext* globalCtx) {
     }
 }
 
-u32 HealthMeter_IsCritical(void) {
+u32 Health_IsCritical(void) {
     s32 criticalHealth;
 
     if (gSaveContext.healthCapacity <= 0x50) {
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 87f798885..cb7975ec6 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -3060,7 +3060,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
     if (pauseCtx->debugState == 0) {
         Interface_InitVertices(globalCtx);
         func_8008A994(interfaceCtx);
-        HealthMeter_Draw(globalCtx);
+        Health_DrawMeter(globalCtx);
 
         func_80094520(globalCtx->state.gfxCtx);
 
@@ -3980,7 +3980,7 @@ void Interface_Update(GlobalContext* globalCtx) {
         }
     }
 
-    HealthMeter_UpdateBeatingHeart(globalCtx);
+    Health_UpdateBeatingHeart(globalCtx);
     D_80125A58 = func_8008F2F8(globalCtx);
 
     if (D_80125A58 == 1) {
@@ -3993,7 +3993,7 @@ void Interface_Update(GlobalContext* globalCtx) {
         }
     }
 
-    HealthMeter_Update(globalCtx);
+    Health_UpdateMeter(globalCtx);
 
     if ((gSaveContext.timer1State >= 3) && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.debugState == 0) &&
         (msgCtx->msgMode == MSGMODE_NONE) && !(player->stateFlags2 & PLAYER_STATE2_24) &&