mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-14 11:53:44 -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:
@@ -301,7 +301,7 @@ static s16 climb_angle_get(npc_ne_class* i_this) {
|
||||
}
|
||||
|
||||
/* 80A92AC5 0003+00 data_80A92AC5 None */
|
||||
static bool l_hioInit;
|
||||
static bool hio_set;
|
||||
|
||||
static daNpc_Ne_HIO_c l_HIO;
|
||||
|
||||
@@ -3025,7 +3025,7 @@ static int daNpc_Ne_IsDelete(npc_ne_class* i_this) {
|
||||
static int daNpc_Ne_Delete(npc_ne_class* i_this) {
|
||||
dComIfG_resDelete(&i_this->mPhase, i_this->mResName);
|
||||
if (i_this->mHIOInit != 0) {
|
||||
l_hioInit = false;
|
||||
hio_set = false;
|
||||
}
|
||||
if (i_this->heap != NULL) {
|
||||
i_this->mSound.deleteObject();
|
||||
@@ -3163,9 +3163,9 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) {
|
||||
}
|
||||
}
|
||||
|
||||
if (!l_hioInit) {
|
||||
if (!hio_set) {
|
||||
_this->mHIOInit = 1;
|
||||
l_hioInit = true;
|
||||
hio_set = true;
|
||||
l_HIO.field_0x04 = -1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user