mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-05 10:47:27 -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:
@@ -140,7 +140,7 @@ static void* shot_b_sub(void* param_1, void* param_2) {
|
||||
|
||||
/* 80D158F4 0001+00 data_80D158F4 @1009 */
|
||||
/* 80D158F5 0003+00 data_80D158F5 None */
|
||||
static u8 l_HIOInit;
|
||||
static u8 hio_set;
|
||||
|
||||
static daObj_Toby_HIO_c l_HIO;
|
||||
|
||||
@@ -416,7 +416,7 @@ static int daObj_Toby_Delete(obj_toby_class* i_this) {
|
||||
}
|
||||
dComIfG_resDelete(&i_this->mPhase, i_this->mArcName);
|
||||
if (i_this->field_0x6370 != 0) {
|
||||
l_HIOInit = 0;
|
||||
hio_set = 0;
|
||||
mDoHIO_DELETE_CHILD(l_HIO.field_0x4);
|
||||
}
|
||||
return 1;
|
||||
@@ -588,9 +588,9 @@ static int daObj_Toby_Create(fopAc_ac_c* a_this) {
|
||||
|
||||
OS_REPORT("//////////////OBJ_TOBY SET 2 !!\n");
|
||||
|
||||
if (!l_HIOInit) {
|
||||
if (!hio_set) {
|
||||
i_this->field_0x6370 = 1;
|
||||
l_HIOInit = 1;
|
||||
hio_set = 1;
|
||||
l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("飛び床", &l_HIO);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user