mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-12 13:04:38 -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:
@@ -38,7 +38,7 @@ enum Mode { // Not sure if these are correct...
|
||||
/* 0xC */ MODE_TK2_WAIT01,
|
||||
};
|
||||
|
||||
static bool hioInit;
|
||||
static bool hio_set;
|
||||
|
||||
static daE_TK2_HIO_c l_HIO;
|
||||
|
||||
@@ -463,7 +463,7 @@ static int daE_TK2_IsDelete(e_tk2_class* i_this) {
|
||||
static int daE_TK2_Delete(e_tk2_class* i_this) {
|
||||
dComIfG_resDelete(&i_this->mPhaseReq, "E_tk2");
|
||||
if (i_this->mInitHIO) {
|
||||
hioInit = false;
|
||||
hio_set = false;
|
||||
}
|
||||
if (i_this->heap != NULL) {
|
||||
i_this->mpMorf->stopZelAnime();
|
||||
@@ -512,9 +512,9 @@ static int daE_TK2_Create(fopAc_ac_c* i_this) {
|
||||
return cPhs_ERROR_e;
|
||||
}
|
||||
|
||||
if (hioInit == false) {
|
||||
if (hio_set == false) {
|
||||
a_this->mInitHIO = true;
|
||||
hioInit = true;
|
||||
hio_set = true;
|
||||
l_HIO.field_0x04 = -1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user