From b4f931f75f5d87fc7844e00eab7d7b99eceb3622 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Sun, 21 Dec 2025 19:43:06 -0500
Subject: Miscellaneous data fixes (#2983)

* Replace bss lbl_ with init$0000

* Rename l_HIOInit to hio_set

The name is excluded from TP's weird maps, but hio_set is the name they used in TWW's maps.

* Fix a couple more init$ names

* Fix nbomb missing some bss

* Fix camera localstatics having wrong name

* Rename l_initHIO to hio_set

* A couple manual fixes

* Rename hioInit to hio_set

* Couple more manual fixes

* Fix d_a_npc_cd2 data and function order

* More data fixes

* Fix inconsistent hex vs decimal
---
 src/d/actor/d_a_obj_tombo.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/d/actor/d_a_obj_tombo.cpp')

diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp
index 617ae6ee6d..1252922559 100644
--- a/src/d/actor/d_a_obj_tombo.cpp
+++ b/src/d/actor/d_a_obj_tombo.cpp
@@ -433,7 +433,7 @@ void daObjTOMBO_c::BoomChk() {
     }
 }
 
-static bool l_HIOInit;
+static bool hio_set;
 
 static daObj_TomHIO_c l_HIO;
 
@@ -533,7 +533,7 @@ void daObjTOMBO_c::Z_BufferChk() {
 int daObjTOMBO_c::Delete() {
     dComIfG_resDelete(&mPhase, "Tombo");
     if (mIsHIOOwner) {
-        l_HIOInit = false;
+        hio_set = false;
         mDoHIO_DELETE_CHILD(l_HIO.mId);
     }
     if (heap != NULL) {
@@ -638,8 +638,8 @@ int daObjTOMBO_c::create() {
         if (!fopAcM_entrySolidHeap(this, useHeapInit, 0xaa0)) {
             return cPhs_ERROR_e;
         }
-        if (!l_HIOInit) {
-            l_HIOInit = true;
+        if (!hio_set) {
+            hio_set = true;
             mIsHIOOwner = true;
             // Golden Dragonfly
             l_HIO.mId = mDoHIO_CREATE_CHILD("黄金蟲(トンボ)", &l_HIO);
-- 
cgit v1.2.3