mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-15 13:41:31 -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:
@@ -254,7 +254,7 @@ static void chain_control3(obj_keyhole_class* i_this, kh_chain_s* i_chain_s, int
|
||||
}
|
||||
|
||||
/* 80C43CE5 0003+00 data_80C43CE5 None */
|
||||
static u8 l_HIOInit;
|
||||
static u8 hio_set;
|
||||
|
||||
static daObj_Keyhole_HIO_c l_HIO;
|
||||
|
||||
@@ -634,7 +634,7 @@ static int daObj_Keyhole_Delete(obj_keyhole_class* i_this) {
|
||||
dComIfG_resDelete(&i_this->phase, i_this->arcname);
|
||||
|
||||
if (i_this->HIOInit) {
|
||||
l_HIOInit = FALSE;
|
||||
hio_set = FALSE;
|
||||
mDoHIO_DELETE_CHILD(l_HIO.id);
|
||||
}
|
||||
|
||||
@@ -757,9 +757,9 @@ static int daObj_Keyhole_Create(fopAc_ac_c* a_this) {
|
||||
i_this->arg0 = 0;
|
||||
}
|
||||
|
||||
if (!l_HIOInit) {
|
||||
if (!hio_set) {
|
||||
i_this->HIOInit = TRUE;
|
||||
l_HIOInit = TRUE;
|
||||
hio_set = TRUE;
|
||||
l_HIO.id = mDoHIO_CREATE_CHILD("リアル施錠", &l_HIO);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user