From b4f931f75f5d87fc7844e00eab7d7b99eceb3622 Mon Sep 17 00:00:00 2001 From: LagoLunatic 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_msima.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/d/actor/d_a_obj_msima.cpp') diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index 0163bbe96d..d98ee17945 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -88,7 +88,7 @@ static void msima_start(obj_msima_class* i_this) { /* 80C9CEA4 0001+00 data_80C9CEA4 @1009 */ /* 80C9CEA5 0003+00 data_80C9CEA5 None */ -static bool l_HIOInit; +static bool hio_set; static daObj_Msima_HIO_c l_HIO; @@ -366,7 +366,7 @@ static int daObj_Msima_Delete(obj_msima_class* i_this) { fopAcM_GetID(a_this); dComIfG_resDelete(&i_this->mPhase, "MAGNESIMA"); if (i_this->mIsHIOOwner) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } dComIfG_Bgsp().Release(i_this->mpBgW); @@ -458,9 +458,9 @@ static int daObj_Msima_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { i_this->mIsHIOOwner = true; - l_HIOInit = 1; + hio_set = 1; // Magma Island l_HIO.mId = mDoHIO_CREATE_CHILD("マグネ島", &l_HIO); } -- cgit v1.2.3