From 478ab607efd1a2d0eda69cebf48400076a8dcfbd Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 21 Dec 2025 14:47:26 -0500 Subject: [PATCH] Rename hioInit to hio_set --- config/GZ2E01/rels/d_a_e_fs/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_fs/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_fs/symbols.txt | 2 +- src/d/actor/d_a_b_ds.cpp | 8 ++++---- src/d/actor/d_a_b_yo.cpp | 8 ++++---- src/d/actor/d_a_b_yo_ice.cpp | 8 ++++---- src/d/actor/d_a_do.cpp | 8 ++++---- src/d/actor/d_a_e_ba.cpp | 8 ++++---- src/d/actor/d_a_e_bee.cpp | 8 ++++---- src/d/actor/d_a_e_dt.cpp | 8 ++++---- src/d/actor/d_a_e_fs.cpp | 8 ++++---- src/d/actor/d_a_e_ms.cpp | 8 ++++---- src/d/actor/d_a_e_ot.cpp | 8 ++++---- src/d/actor/d_a_e_pm.cpp | 8 ++++---- src/d/actor/d_a_e_rdy.cpp | 8 ++++---- src/d/actor/d_a_e_tk.cpp | 8 ++++---- src/d/actor/d_a_e_tk2.cpp | 8 ++++---- src/d/actor/d_a_e_yc.cpp | 8 ++++---- src/d/actor/d_a_npc_sq.cpp | 8 ++++---- src/d/actor/d_a_obj_ari.cpp | 8 ++++---- src/d/actor/d_a_obj_cho.cpp | 8 ++++---- src/d/actor/d_a_obj_dan.cpp | 8 ++++---- src/d/actor/d_a_obj_food.cpp | 8 ++++---- src/d/actor/d_a_obj_kabuto.cpp | 8 ++++---- src/d/actor/d_a_obj_katatsumuri.cpp | 8 ++++---- src/d/actor/d_a_obj_ki.cpp | 8 ++++---- src/d/actor/d_a_sq.cpp | 8 ++++---- 27 files changed, 99 insertions(+), 99 deletions(-) diff --git a/config/GZ2E01/rels/d_a_e_fs/symbols.txt b/config/GZ2E01/rels/d_a_e_fs/symbols.txt index 9c90c29d5c6..80f5183849e 100644 --- a/config/GZ2E01/rels/d_a_e_fs/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_fs/symbols.txt @@ -129,7 +129,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local s_AtCount__22@unnamed@d_a_e_fs_cpp@ = .bss:0x00000046; // type:object size:0x2 scope:global data:2byte -hioInit = .bss:0x00000048; // type:object size:0x1 data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 data:byte @3933 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x1C scope:global data:byte @4275 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_e_fs/symbols.txt b/config/GZ2J01/rels/d_a_e_fs/symbols.txt index c47f0979a69..62c2e3ce3ed 100644 --- a/config/GZ2J01/rels/d_a_e_fs/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_fs/symbols.txt @@ -128,7 +128,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local s_AtCount__22@unnamed@d_a_e_fs_cpp@ = .bss:0x00000046; // type:object size:0x2 scope:global data:2byte -hioInit = .bss:0x00000048; // type:object size:0x1 data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 data:byte @3933 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x1C scope:global data:byte @4275 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_e_fs/symbols.txt b/config/GZ2P01/rels/d_a_e_fs/symbols.txt index c47f0979a69..62c2e3ce3ed 100644 --- a/config/GZ2P01/rels/d_a_e_fs/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_fs/symbols.txt @@ -128,7 +128,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local s_AtCount__22@unnamed@d_a_e_fs_cpp@ = .bss:0x00000046; // type:object size:0x2 scope:global data:2byte -hioInit = .bss:0x00000048; // type:object size:0x1 data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 data:byte @3933 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x1C scope:global data:byte @4275 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 9312f5ad89a..c559e6d25f0 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -199,7 +199,7 @@ daB_DS_HIO_c::daB_DS_HIO_c() { mP2HealthDebugOn = false; } -static bool hioInit; +static bool hio_set; static daB_DS_HIO_c l_HIO; @@ -5261,7 +5261,7 @@ int daB_DS_c::_delete() { } if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { @@ -5507,8 +5507,8 @@ cPhs__Step daB_DS_c::create() { field_0x560 = health = l_HIO.mP2Health; - if (!hioInit) { - hioInit = 1; + if (!hio_set) { + hio_set = 1; mHIOInit = true; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index c7625f788db..ce7a543f18a 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -123,7 +123,7 @@ enum L5_R50_RES_FIL_ID { }; /* 80639F74 0001+00 data_80639F74 @1009 */ -static bool hioInit; +static bool hio_set; static daB_YO_HIO_c l_HIO; @@ -3074,7 +3074,7 @@ int daB_YO_c::_delete() { dComIfG_resDelete(&mPhase5, "E_FZ"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (mpRoomArenaBgW != NULL) { @@ -3305,8 +3305,8 @@ cPhs__Step daB_YO_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp index c6f4eb6d93e..58a2133e025 100644 --- a/src/d/actor/d_a_b_yo_ice.cpp +++ b/src/d/actor/d_a_b_yo_ice.cpp @@ -27,7 +27,7 @@ public: STATIC_ASSERT(sizeof(daB_YOI_HIO_c) == 0x10); -static bool hioInit; +static bool hio_set; static daB_YOI_HIO_c l_HIO; @@ -968,7 +968,7 @@ int daB_YOI_c::_delete() { dComIfG_resDelete(&mPhase, "B_YO"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { @@ -1013,8 +1013,8 @@ cPhs__Step daB_YOI_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index ed82391076c..2d02b3fe407 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -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; } diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp index 11d77577155..9e91eb28080 100644 --- a/src/d/actor/d_a_e_ba.cpp +++ b/src/d/actor/d_a_e_ba.cpp @@ -29,7 +29,7 @@ public: STATIC_ASSERT(sizeof(daE_BA_HIO_c) == 0x1C); -static bool hioInit; +static bool hio_set; static daE_BA_HIO_c l_HIO; @@ -968,7 +968,7 @@ static int daE_BA_Delete(e_ba_class* i_this) { fopEn_enemy_c* a_this = &i_this->mEnemy; dComIfG_resDelete(&i_this->mPhase, i_this->mArcName); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } if (a_this->heap != NULL) { i_this->mpMorf->stopZelAnime(); @@ -1057,9 +1057,9 @@ static cPhs__Step daE_BA_Create(fopAc_ac_c* i_this) { } } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index 7a3b5e46fdc..e518312df73 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -16,7 +16,7 @@ #include "Z2AudioLib/Z2Instances.h" /* 80685675 0003+00 data_80685675 None */ -static bool hioInit; +static bool hio_set; static daE_Bee_HIO_c l_HIO; @@ -671,7 +671,7 @@ static int daE_Bee_Delete(e_bee_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_bee"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } if (i_this->heap != NULL) { @@ -738,9 +738,9 @@ static cPhs__Step daE_Bee_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index 64a0962fa7f..548b7636333 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -157,7 +157,7 @@ dCcD_SrcSph E_DT_n::cc_dt_tongue_src = { }; /* 806B629D 0003+00 data_806B629D None */ -static bool hioInit; +static bool hio_set; static daE_DT_HIO_c l_HIO; @@ -2401,7 +2401,7 @@ int daE_DT_c::_delete() { dComIfG_resDelete(&mPhase[1], "Dalways"); dComIfG_resDelete(&mPhase[2], "E_OT"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { mSound.deleteObject(); @@ -2485,8 +2485,8 @@ cPhs__Step daE_DT_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index a7787262eb6..4e0188535cf 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -72,7 +72,7 @@ static s16 s_AtCount; } // namespace -static bool hioInit; +static bool hio_set; static daE_Fs_HIO_c l_HIO; @@ -696,7 +696,7 @@ static int daE_Fs_Delete(e_fs_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_FS"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } if (a_this->heap != NULL) { @@ -771,9 +771,9 @@ static cPhs__Step daE_Fs_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index a68682f5893..b8595f2ce55 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -109,7 +109,7 @@ static void ms_disappear(e_ms_class* i_this) { } /* 807297FD 0003+00 data_807297FD None */ -static u8 hioInit; +static u8 hio_set; static daE_MS_HIO_c l_HIO; @@ -949,7 +949,7 @@ static int daE_MS_IsDelete(e_ms_class* i_this) { static int daE_MS_Delete(e_ms_class* i_this) { dComIfG_resDelete(&i_this->mPhaseReq, "E_MS"); if (i_this->mHIOInit) { - hioInit = 0; + hio_set = 0; } if (i_this->heap) { @@ -1017,9 +1017,9 @@ static int daE_MS_Create(fopAc_ac_c* actor) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { i_this->mHIOInit = 1; - hioInit = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_ot.cpp b/src/d/actor/d_a_e_ot.cpp index c715cf7730e..8ef12705d14 100644 --- a/src/d/actor/d_a_e_ot.cpp +++ b/src/d/actor/d_a_e_ot.cpp @@ -87,7 +87,7 @@ static dCcD_SrcSph cc_ot_at_src = { } // namespace /* 8073D2AD 0003+00 data_8073D2AD None */ -static bool hioInit; +static bool hio_set; static daE_OT_HIO_c l_HIO; @@ -697,7 +697,7 @@ int daE_OT_c::_delete() { dComIfG_resDelete(&mPhase, "E_OT"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { @@ -753,8 +753,8 @@ cPhs__Step daE_OT_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index f4eca05de1d..ce1057b26dd 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -129,7 +129,7 @@ enum Mode { }; /* 8074C385 0003+00 data_8074C385 None */ -static bool hioInit; +static bool hio_set; static daE_PM_HIO_c l_HIO; @@ -2623,7 +2623,7 @@ int daE_PM_c::Delete() { dComIfG_resDelete(&mPhase, "E_PM"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { @@ -2800,8 +2800,8 @@ cPhs__Step daE_PM_c::Create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index 1889fd1ce84..e3192621f7a 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -193,7 +193,7 @@ enum Joint { static e_rdy_class* boss; -static bool hioInit; +static bool hio_set; static daE_RDY_HIO_c l_HIO; @@ -4695,7 +4695,7 @@ static int daE_RDY_Delete(e_rdy_class* i_this) { dComIfG_resDelete(&i_this->mPhase, i_this->mpArcName); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } if (a_this->heap != NULL) { @@ -4909,9 +4909,9 @@ static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_tk.cpp b/src/d/actor/d_a_e_tk.cpp index 1723f19804e..06263e632dc 100644 --- a/src/d/actor/d_a_e_tk.cpp +++ b/src/d/actor/d_a_e_tk.cpp @@ -40,7 +40,7 @@ enum Mode { // Not sure if these are correct... /* 0xC */ MODE_TK_WAIT01, }; -static bool hioInit; +static bool hio_set; static daE_TK_HIO_c l_HIO; @@ -650,7 +650,7 @@ static int daE_TK_IsDelete(e_tk_class* i_this) { static int daE_TK_Delete(e_tk_class* i_this) { dComIfG_resDelete(&i_this->mPhaseReq, "E_tk"); if (i_this->mInitHIO) { - hioInit = false; + hio_set = false; } if (i_this->heap != NULL) { i_this->mpMorf->stopZelAnime(); @@ -709,9 +709,9 @@ static int daE_TK_Create(fopAc_ac_c* i_this) { a_this->mPathDirection = 0x1; a_this->mAction = ACT_TK_PATHSWIM; } - if (hioInit == false) { + if (hio_set == false) { a_this->mInitHIO = true; - hioInit = true; + hio_set = true; l_HIO.field_0x04 = -1; } a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e; diff --git a/src/d/actor/d_a_e_tk2.cpp b/src/d/actor/d_a_e_tk2.cpp index d879c92183d..ef82742b36b 100644 --- a/src/d/actor/d_a_e_tk2.cpp +++ b/src/d/actor/d_a_e_tk2.cpp @@ -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; } diff --git a/src/d/actor/d_a_e_yc.cpp b/src/d/actor/d_a_e_yc.cpp index 2c99c9f10f5..8395641bca5 100644 --- a/src/d/actor/d_a_e_yc.cpp +++ b/src/d/actor/d_a_e_yc.cpp @@ -17,7 +17,7 @@ static f32 S_area_dis; -static bool hioInit; +static bool hio_set; static daE_YC_HIO_c l_HIO; @@ -728,7 +728,7 @@ static int daE_YC_Delete(e_yc_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_yc"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } if (i_this->heap != NULL) { @@ -764,9 +764,9 @@ static cPhs__Step daE_YC_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp index d64bf2db591..e51ad61dc1f 100644 --- a/src/d/actor/d_a_npc_sq.cpp +++ b/src/d/actor/d_a_npc_sq.cpp @@ -14,7 +14,7 @@ #include "d/actor/d_a_player.h" #include "d/d_procname.h" -static bool hioInit; +static bool hio_set; static daNpc_Sq_HIO_c l_HIO; @@ -291,7 +291,7 @@ static int daNpc_Sq_IsDelete(npc_sq_class* i_this) { static int daNpc_Sq_Delete(npc_sq_class* i_this) { dComIfG_resDelete(&i_this->mPhaseReq, "Sq"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } return 1; } @@ -337,9 +337,9 @@ static cPhs__Step daNpc_Sq_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index da17324ba97..ee0c02efd41 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -13,7 +13,7 @@ #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" -static bool hioInit; +static bool hio_set; static daObj_AriHIO_c l_HIO; @@ -523,7 +523,7 @@ void daObjARI_c::Z_BufferChk() { int daObjARI_c::Delete() { dComIfG_resDelete(&mPhase, "I_Ari"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { mpMorf->stopZelAnime(); @@ -640,8 +640,8 @@ cPhs__Step daObjARI_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index efe0c02d5ef..51d47ec630f 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -13,7 +13,7 @@ #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" -static bool hioInit; +static bool hio_set; static daObj_ChoHIO_c l_HIO; @@ -448,7 +448,7 @@ void daObjCHO_c::ObjHit() { int daObjCHO_c::Delete() { dComIfG_resDelete(&mPhaseReq, "I_Cho"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { mpMorf->stopZelAnime(); @@ -565,8 +565,8 @@ cPhs__Step daObjCHO_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index 989aa9a45b4..78f200f9e8f 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -13,7 +13,7 @@ #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" -static bool hioInit; +static bool hio_set; static daObj_DanHIO_c l_HIO; @@ -424,7 +424,7 @@ int daObjDAN_c::Execute() { int daObjDAN_c::Delete() { dComIfG_resDelete(&mPhase, "I_Dan"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { mpMorf->stopZelAnime(); @@ -538,8 +538,8 @@ cPhs__Step daObjDAN_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_food.cpp b/src/d/actor/d_a_obj_food.cpp index 19aae2eea0b..31dde10a020 100644 --- a/src/d/actor/d_a_obj_food.cpp +++ b/src/d/actor/d_a_obj_food.cpp @@ -14,7 +14,7 @@ #include "d/actor/d_a_player.h" #include "d/d_procname.h" -static bool hioInit; +static bool hio_set; static daObj_Food_HIO_c l_HIO; @@ -389,7 +389,7 @@ static int daObj_Food_IsDelete(obj_food_class* i_this) { static int daObj_Food_Delete(obj_food_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "Obj_fd"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } if (i_this->heap != NULL) { i_this->mSound.deleteObject(); @@ -433,9 +433,9 @@ static cPhs__Step daObj_Food_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index 7ce815ab13b..e3dbeee34b9 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -13,7 +13,7 @@ #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" -static bool hioInit; +static bool hio_set; static daObj_KabHIO_c l_HIO; @@ -642,7 +642,7 @@ void daObjKABUTO_c::ObjHit() { int daObjKABUTO_c::Delete() { dComIfG_resDelete(&mPhaseReq, "Kab_m"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { mpMorf->stopZelAnime(); @@ -750,8 +750,8 @@ cPhs__Step daObjKABUTO_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index 09b05d6be58..e0a649a6741 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_lib.h" -static u8 hioInit; +static u8 hio_set; static daObj_KatHIO_c l_HIO; @@ -626,7 +626,7 @@ void daObjKAT_c::Z_BufferChk() { int daObjKAT_c::Delete() { dComIfG_resDelete(&mPhase, "Kat"); if (field_0xa70 != 0) { - hioInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.field_0x4); } if (heap != NULL) { @@ -728,8 +728,8 @@ int daObjKAT_c::create() { return cPhs_ERROR_e; } - if (hioInit == 0) { - hioInit = 1; + if (hio_set == 0) { + hio_set = 1; field_0xa70 = 1; // Golden Snail l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("黄金蟲(カタツムリ)", &l_HIO); diff --git a/src/d/actor/d_a_obj_ki.cpp b/src/d/actor/d_a_obj_ki.cpp index 2168f577f41..5922cb1ad09 100644 --- a/src/d/actor/d_a_obj_ki.cpp +++ b/src/d/actor/d_a_obj_ki.cpp @@ -12,7 +12,7 @@ static int ki_bmd[2] = {9, 10}; -static bool hioInit; +static bool hio_set; static daObj_Ki_HIO_c l_HIO; @@ -100,7 +100,7 @@ static int daObj_Ki_IsDelete(obj_ki_class* i_this) { static int daObj_Ki_Delete(obj_ki_class* i_this) { dComIfG_resDelete(&i_this->mPhaseReq, "Obj_Ki"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } dComIfG_Bgsp().Release(i_this->mpBgW); return 1; @@ -160,9 +160,9 @@ static cPhs__Step daObj_Ki_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_sq.cpp b/src/d/actor/d_a_sq.cpp index de4faf2a17c..ba29686f2e8 100644 --- a/src/d/actor/d_a_sq.cpp +++ b/src/d/actor/d_a_sq.cpp @@ -13,7 +13,7 @@ #include "d/d_com_inf_game.h" #include "d/d_procname.h" -static bool hioInit; +static bool hio_set; static daSq_HIO_c l_HIO; @@ -463,7 +463,7 @@ static int daSq_IsDelete(sq_class* i_this) { static int daSq_Delete(sq_class* i_this) { dComIfG_resDelete(&i_this->mPhaseReq, "Sq"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } return 1; } @@ -514,9 +514,9 @@ static cPhs__Step daSq_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; }