mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-03 18:06:02 -04:00
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
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user