From c9ee9e43bd5d7f60e5128855e2ceb28f0003d8d8 Mon Sep 17 00:00:00 2001
From: Derek Hensley <hensley.derek58@gmail.com>
Date: Tue, 18 May 2021 12:40:26 -0700
Subject: [PATCH] Changed unk_192 to timer, as well as add missing trailing
 comma for formating (#817)

---
 .../actors/ovl_En_M_Fire1/z_en_m_fire1.c      | 38 ++++++++++---------
 .../actors/ovl_En_M_Fire1/z_en_m_fire1.h      |  2 +-
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c
index 5b419fddef..df283c49e3 100644
--- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c
+++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c
@@ -26,23 +26,25 @@ const ActorInit En_M_Fire1_InitVars = {
     NULL,
 };
 
-static ColliderCylinderInit sCylinderInit = { {
-                                                  COLTYPE_NONE,
-                                                  AT_ON | AT_TYPE_PLAYER,
-                                                  AC_NONE,
-                                                  OC1_NONE,
-                                                  OC2_TYPE_PLAYER,
-                                                  COLSHAPE_CYLINDER,
-                                              },
-                                              {
-                                                  ELEMTYPE_UNK2,
-                                                  { 0x00000001, 0x00, 0x00 },
-                                                  { 0xFFCFFFFF, 0x00, 0x00 },
-                                                  TOUCH_ON | TOUCH_SFX_NONE,
-                                                  BUMP_NONE,
-                                                  OCELEM_NONE,
-                                              },
-                                              { 200, 200, 0, { 0 } } };
+static ColliderCylinderInit sCylinderInit = {
+    {
+        COLTYPE_NONE,
+        AT_ON | AT_TYPE_PLAYER,
+        AC_NONE,
+        OC1_NONE,
+        OC2_TYPE_PLAYER,
+        COLSHAPE_CYLINDER,
+    },
+    {
+        ELEMTYPE_UNK2,
+        { 0x00000001, 0x00, 0x00 },
+        { 0xFFCFFFFF, 0x00, 0x00 },
+        TOUCH_ON | TOUCH_SFX_NONE,
+        BUMP_NONE,
+        OCELEM_NONE,
+    },
+    { 200, 200, 0, { 0 } },
+};
 
 void EnMFire1_Init(Actor* thisx, GlobalContext* globalCtx) {
     EnMFire1* this = THIS;
@@ -66,7 +68,7 @@ void EnMFire1_Update(Actor* thisx, GlobalContext* globalCtx) {
     EnMFire1* this = THIS;
     s32 pad;
 
-    if (Math_StepToF(&this->unk_198, 1.0f, 0.2f)) {
+    if (Math_StepToF(&this->timer, 1.0f, 0.2f)) {
         Actor_Kill(&this->actor);
     } else {
         Collider_UpdateCylinder(&this->actor, &this->collider);
diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
index 985af26cb2..224404a311 100644
--- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
+++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
@@ -9,7 +9,7 @@ struct EnMFire1;
 typedef struct EnMFire1 {
     /* 0x0000 */ Actor actor;
     /* 0x014C */ ColliderCylinder collider;
-    /* 0x0198 */ f32 unk_198;
+    /* 0x0198 */ f32 timer;
 } EnMFire1; // size = 0x019C
 
 extern const ActorInit En_M_Fire1_InitVars;