mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-18 14:25:24 -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:
@@ -18,7 +18,7 @@
|
||||
|
||||
/* 8066F2B6 0002+00 data_8066F2B6 None */
|
||||
static bool noFallCheck;
|
||||
static bool hioInit;
|
||||
static bool hio_set;
|
||||
|
||||
static daDo_HIO_c l_HIO;
|
||||
|
||||
@@ -2346,7 +2346,7 @@ static int daDo_Delete(do_class* i_this) {
|
||||
u32 actor_id = fopAcM_GetID(i_this);
|
||||
dComIfG_resDelete(&i_this->mPhase, "Do");
|
||||
if (i_this->mHIOInit) {
|
||||
hioInit = false;
|
||||
hio_set = false;
|
||||
}
|
||||
if (i_this->heap) {
|
||||
i_this->mSound.deleteObject();
|
||||
@@ -2425,9 +2425,9 @@ static cPhs__Step daDo_Create(fopAc_ac_c* i_this) {
|
||||
return cPhs_ERROR_e;
|
||||
}
|
||||
|
||||
if (!hioInit) {
|
||||
if (!hio_set) {
|
||||
_this->mHIOInit = true;
|
||||
hioInit = 1;
|
||||
hio_set = 1;
|
||||
l_HIO.field_0x04 = -1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user