mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-13 11:38:49 -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:
@@ -175,19 +175,10 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 807E35B4 0001+00 data_807E35B4 @1009 */
|
||||
/* 807E35B5 0001+00 data_807E35B5 None */
|
||||
/* 807E35B6 0001+00 data_807E35B6 None */
|
||||
/* 807E35B7 0001+00 data_807E35B7 None */
|
||||
static s8 lbl_244_bss_45;
|
||||
static s8 lbl_244_bss_46;
|
||||
static s8 lbl_244_bss_47;
|
||||
static bool l_HIOInit;
|
||||
|
||||
// static u8 lbl_244_bss_48;
|
||||
// static u8 lbl_244_bss_49;
|
||||
// static u8 lbl_244_bss_4a;
|
||||
// static u8 lbl_244_bss_4b;
|
||||
static bool hio_set;
|
||||
|
||||
static daE_WB_HIO_c l_HIO;
|
||||
|
||||
@@ -5473,7 +5464,7 @@ static int daE_WB_Delete(e_wb_class* i_this) {
|
||||
fopAcM_GetID(i_this);
|
||||
dComIfG_resDelete(&i_this->mPhase, i_this->mResName);
|
||||
if (i_this->field_0x17e0 != 0) {
|
||||
l_HIOInit = false;
|
||||
hio_set = false;
|
||||
mDoHIO_DELETE_CHILD(l_HIO.mId);
|
||||
}
|
||||
|
||||
@@ -5692,9 +5683,9 @@ static int daE_WB_Create(fopAc_ac_c* a_this) {
|
||||
OS_REPORT("//////////////E_WB SET NON !!\n");
|
||||
return cPhs_ERROR_e;
|
||||
} else {
|
||||
if (!l_HIOInit) {
|
||||
if (!hio_set) {
|
||||
i_this->field_0x17e0 = 1;
|
||||
l_HIOInit = true;
|
||||
hio_set = true;
|
||||
l_HIO.mId = mDoHIO_CREATE_CHILD("イノシシ", &l_HIO);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user