diff --git a/config/GZ2E01/rels/d_a_bd/symbols.txt b/config/GZ2E01/rels/d_a_bd/symbols.txt index 3aaec7bce54..5731497f879 100644 --- a/config/GZ2E01/rels/d_a_bd/symbols.txt +++ b/config/GZ2E01/rels/d_a_bd/symbols.txt @@ -131,7 +131,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3937 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte @3946 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_fb/symbols.txt b/config/GZ2E01/rels/d_a_e_fb/symbols.txt index b74d5621486..6ae5f04ebcc 100644 --- a/config/GZ2E01/rels/d_a_e_fb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_fb/symbols.txt @@ -114,7 +114,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3657 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte mFireTimer = .bss:0x00000078; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_e_hm/symbols.txt b/config/GZ2E01/rels/d_a_e_hm/symbols.txt index 3a977acca7a..ab9bc3414e4 100644 --- a/config/GZ2E01/rels/d_a_e_hm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_hm/symbols.txt @@ -181,7 +181,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3807 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte s_dis__22@unnamed@d_a_e_hm_cpp@ = .bss:0x00000074; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_e_hp/symbols.txt b/config/GZ2E01/rels/d_a_e_hp/symbols.txt index dd58f774a9e..d4918268e6e 100644 --- a/config/GZ2E01/rels/d_a_e_hp/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_hp/symbols.txt @@ -122,6 +122,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001DC; // type:object size:0xC scope:global __vt__12daE_HP_HIO_c = .data:0x000001E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3921 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_nz/symbols.txt b/config/GZ2E01/rels/d_a_e_nz/symbols.txt index 59e3bf5bee8..6c50f55d1d8 100644 --- a/config/GZ2E01/rels/d_a_e_nz/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_nz/symbols.txt @@ -116,7 +116,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_215_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3805 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte lbl_215_bss_74 = .bss:0x00000074; // type:object size:0x1 data:byte diff --git a/config/GZ2E01/rels/d_a_e_po/symbols.txt b/config/GZ2E01/rels/d_a_e_po/symbols.txt index b57e7b837e8..868aa468500 100644 --- a/config/GZ2E01/rels/d_a_e_po/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_po/symbols.txt @@ -363,7 +363,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3933 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global align:4 data:float mRollCount = .bss:0x00000090; // type:object size:0x2 scope:global diff --git a/config/GZ2E01/rels/d_a_e_sb/symbols.txt b/config/GZ2E01/rels/d_a_e_sb/symbols.txt index 94ea694cdb5..dd060af4759 100644 --- a/config/GZ2E01/rels/d_a_e_sb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sb/symbols.txt @@ -136,7 +136,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3653 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x40 scope:local data:byte s_Bomb__22@unnamed@d_a_e_sb_cpp@ = .bss:0x00000094; // type:object size:0x4 scope:local data:4byte diff --git a/config/GZ2E01/rels/d_a_e_sh/symbols.txt b/config/GZ2E01/rels/d_a_e_sh/symbols.txt index 55d03fff5b1..0fd6daf0fb7 100644 --- a/config/GZ2E01/rels/d_a_e_sh/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sh/symbols.txt @@ -144,6 +144,6 @@ __vt__8cM3dGAab = .data:0x000001E8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001F4; // type:object size:0x24 scope:global __vt__12daE_SH_HIO_c = .data:0x00000218; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_wb/symbols.txt b/config/GZ2E01/rels/d_a_e_wb/symbols.txt index 8c9c8c94fa3..0a2fa43ab74 100644 --- a/config/GZ2E01/rels/d_a_e_wb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_wb/symbols.txt @@ -542,7 +542,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa lbl_244_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte lbl_244_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte lbl_244_bss_47 = .bss:0x00000047; // type:object size:0x1 data:byte -l_HIOInit = .bss:0x00000048; // type:object size:0x1 data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 data:byte @4435 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x5C scope:global data:byte @4746 = .bss:0x000000B4; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_yh/symbols.txt b/config/GZ2E01/rels/d_a_e_yh/symbols.txt index 32982191cad..d2316c664e0 100644 --- a/config/GZ2E01/rels/d_a_e_yh/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_yh/symbols.txt @@ -167,6 +167,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:gl __vt__12J3DFrameCtrl = .data:0x00000310; // type:object size:0xC scope:global __vt__12daE_YH_HIO_c = .data:0x0000031C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_kago/symbols.txt b/config/GZ2E01/rels/d_a_kago/symbols.txt index 1d6519d20d7..97454c22bf0 100644 --- a/config/GZ2E01/rels/d_a_kago/symbols.txt +++ b/config/GZ2E01/rels/d_a_kago/symbols.txt @@ -246,6 +246,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001D8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001FC; // type:object size:0xC scope:global __vt__12daKago_HIO_c = .data:0x00000208; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3924 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x5C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_mg_rod/symbols.txt b/config/GZ2E01/rels/d_a_mg_rod/symbols.txt index 98c77154084..c2ade85265c 100644 --- a/config/GZ2E01/rels/d_a_mg_rod/symbols.txt +++ b/config/GZ2E01/rels/d_a_mg_rod/symbols.txt @@ -363,7 +363,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local henna = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte data_804BBBD4 = .bss:0x0000004C; // type:object size:0x1 data:byte -l_HIOInit = .bss:0x0000004D; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004D; // type:object size:0x1 data:byte @4280 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x28 scope:global data:byte @4921 = .bss:0x00000084; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_npc_henna/symbols.txt b/config/GZ2E01/rels/d_a_npc_henna/symbols.txt index 9c4bfcd943e..77a7e3144a0 100644 --- a/config/GZ2E01/rels/d_a_npc_henna/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_henna/symbols.txt @@ -304,7 +304,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3900 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x38 scope:global data:byte lrl = .bss:0x0000008C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_ks/symbols.txt b/config/GZ2E01/rels/d_a_npc_ks/symbols.txt index 2d3703eaca4..d4fded63817 100644 --- a/config/GZ2E01/rels/d_a_npc_ks/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_ks/symbols.txt @@ -522,7 +522,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa obj_pos = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float leader = .bss:0x00000060; // type:object size:0x4 scope:global data:4byte call_pt = .bss:0x00000064; // type:object size:0x4 scope:global data:4byte -l_HIOInit = .bss:0x00000068; // type:object size:0x1 data:byte +hio_set = .bss:0x00000068; // type:object size:0x1 data:byte @4025 = .bss:0x0000006C; // type:object size:0xC scope:local l_HIO = .bss:0x00000078; // type:object size:0x38 scope:global data:byte target_info = .bss:0x000000B0; // type:object size:0x28 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_batta/symbols.txt b/config/GZ2E01/rels/d_a_obj_batta/symbols.txt index 3ebe277f25b..e550aefccb9 100644 --- a/config/GZ2E01/rels/d_a_obj_batta/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_batta/symbols.txt @@ -130,6 +130,6 @@ __vt__12daObjBATTA_c = .data:0x000001E8; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global __vt__16daObj_BattaHIO_c = .data:0x00000200; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt b/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt index c63329fe7af..99f0c23f4dc 100644 --- a/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt @@ -91,6 +91,6 @@ __vt__8cM3dGSph = .data:0x00000090; // type:object size:0xC scope:global __vt__15daObjGOMIKABE_c = .data:0x0000009C; // type:object size:0x28 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x000000C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3761 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt b/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt index cfb339d7b34..23c57b9e6f7 100644 --- a/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt @@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global __vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global __vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3639 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_kita/symbols.txt b/config/GZ2E01/rels/d_a_obj_kita/symbols.txt index b71b6895a0f..bac9b5db571 100644 --- a/config/GZ2E01/rels/d_a_obj_kita/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kita/symbols.txt @@ -50,6 +50,6 @@ l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:local g_profile_OBJ_KITA = .data:0x00000020; // type:object size:0x30 scope:global __vt__16daObj_Kita_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_obj_kuwagata/symbols.txt b/config/GZ2E01/rels/d_a_obj_kuwagata/symbols.txt index 0d42e114437..6b58a43d166 100644 --- a/config/GZ2E01/rels/d_a_obj_kuwagata/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kuwagata/symbols.txt @@ -99,6 +99,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KuwHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt index a253b2a87a7..d35995e8c03 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt @@ -54,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3632 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte -l_HIOInit = .bss:0x0000001C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000001C; // type:object size:0x1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_msima/symbols.txt b/config/GZ2E01/rels/d_a_obj_msima/symbols.txt index d9491231891..38370071a82 100644 --- a/config/GZ2E01/rels/d_a_obj_msima/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_msima/symbols.txt @@ -88,7 +88,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3858 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:local data:byte @3958 = .bss:0x00000068; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_toby/symbols.txt b/config/GZ2E01/rels/d_a_obj_toby/symbols.txt index 144a68b6e30..8a40ef99ad9 100644 --- a/config/GZ2E01/rels/d_a_obj_toby/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_toby/symbols.txt @@ -98,7 +98,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3801 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_tombo/symbols.txt b/config/GZ2E01/rels/d_a_obj_tombo/symbols.txt index 0447e763ccd..f90429ab442 100644 --- a/config/GZ2E01/rels/d_a_obj_tombo/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_tombo/symbols.txt @@ -109,6 +109,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000A4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global __vt__14daObj_TomHIO_c = .data:0x000000E0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_e_fb/symbols.txt b/config/GZ2J01/rels/d_a_e_fb/symbols.txt index e715ea9ef69..b13581c4989 100644 --- a/config/GZ2J01/rels/d_a_e_fb/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_fb/symbols.txt @@ -114,7 +114,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3657 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte mFireTimer = .bss:0x00000078; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_e_hm/symbols.txt b/config/GZ2J01/rels/d_a_e_hm/symbols.txt index a6f6360f006..fe75134251d 100644 --- a/config/GZ2J01/rels/d_a_e_hm/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_hm/symbols.txt @@ -180,7 +180,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3807 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte s_dis__22@unnamed@d_a_e_hm_cpp@ = .bss:0x00000074; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_e_hp/symbols.txt b/config/GZ2J01/rels/d_a_e_hp/symbols.txt index 2259904b4fb..c6012fdf7d4 100644 --- a/config/GZ2J01/rels/d_a_e_hp/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_hp/symbols.txt @@ -121,6 +121,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001DC; // type:object size:0xC scope:global __vt__12daE_HP_HIO_c = .data:0x000001E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3921 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_nz/symbols.txt b/config/GZ2J01/rels/d_a_e_nz/symbols.txt index ced74ba0af4..077d1abc5ab 100644 --- a/config/GZ2J01/rels/d_a_e_nz/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_nz/symbols.txt @@ -115,7 +115,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_215_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3805 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte lbl_215_bss_74 = .bss:0x00000074; // type:object size:0x1 data:byte diff --git a/config/GZ2J01/rels/d_a_e_po/symbols.txt b/config/GZ2J01/rels/d_a_e_po/symbols.txt index 55e31bd0e1f..a515c05f4d9 100644 --- a/config/GZ2J01/rels/d_a_e_po/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_po/symbols.txt @@ -362,7 +362,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3933 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global align:4 data:float mRollCount = .bss:0x00000090; // type:object size:0x2 scope:global diff --git a/config/GZ2J01/rels/d_a_e_sh/symbols.txt b/config/GZ2J01/rels/d_a_e_sh/symbols.txt index 3c574d67a6b..d0fbea44b76 100644 --- a/config/GZ2J01/rels/d_a_e_sh/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_sh/symbols.txt @@ -143,6 +143,6 @@ __vt__8cM3dGAab = .data:0x000001E8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001F4; // type:object size:0x24 scope:global __vt__12daE_SH_HIO_c = .data:0x00000218; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_yh/symbols.txt b/config/GZ2J01/rels/d_a_e_yh/symbols.txt index 04a49a35fd6..b5a33970db7 100644 --- a/config/GZ2J01/rels/d_a_e_yh/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_yh/symbols.txt @@ -166,6 +166,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:gl __vt__12J3DFrameCtrl = .data:0x00000310; // type:object size:0xC scope:global __vt__12daE_YH_HIO_c = .data:0x0000031C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_mg_rod/symbols.txt b/config/GZ2J01/rels/d_a_mg_rod/symbols.txt index 98c77154084..c2ade85265c 100644 --- a/config/GZ2J01/rels/d_a_mg_rod/symbols.txt +++ b/config/GZ2J01/rels/d_a_mg_rod/symbols.txt @@ -363,7 +363,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local henna = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte data_804BBBD4 = .bss:0x0000004C; // type:object size:0x1 data:byte -l_HIOInit = .bss:0x0000004D; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004D; // type:object size:0x1 data:byte @4280 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x28 scope:global data:byte @4921 = .bss:0x00000084; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_npc_henna/symbols.txt b/config/GZ2J01/rels/d_a_npc_henna/symbols.txt index ee1055849f6..247cd657897 100644 --- a/config/GZ2J01/rels/d_a_npc_henna/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_henna/symbols.txt @@ -303,7 +303,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3900 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x38 scope:global data:byte lrl = .bss:0x0000008C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_obj_batta/symbols.txt b/config/GZ2J01/rels/d_a_obj_batta/symbols.txt index 78b1c7e393a..a3acf1ce9a8 100644 --- a/config/GZ2J01/rels/d_a_obj_batta/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_batta/symbols.txt @@ -129,6 +129,6 @@ __vt__12daObjBATTA_c = .data:0x000001E8; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global __vt__16daObj_BattaHIO_c = .data:0x00000200; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt b/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt index 81e36fcb567..c20eccffcac 100644 --- a/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt @@ -91,6 +91,6 @@ __vt__8cM3dGSph = .data:0x00000090; // type:object size:0xC scope:global __vt__15daObjGOMIKABE_c = .data:0x0000009C; // type:object size:0x28 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x000000C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3761 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt b/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt index cfb339d7b34..23c57b9e6f7 100644 --- a/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt @@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global __vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global __vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3639 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_kita/symbols.txt b/config/GZ2J01/rels/d_a_obj_kita/symbols.txt index b71b6895a0f..bac9b5db571 100644 --- a/config/GZ2J01/rels/d_a_obj_kita/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kita/symbols.txt @@ -50,6 +50,6 @@ l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:local g_profile_OBJ_KITA = .data:0x00000020; // type:object size:0x30 scope:global __vt__16daObj_Kita_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_obj_kuwagata/symbols.txt b/config/GZ2J01/rels/d_a_obj_kuwagata/symbols.txt index 0d42e114437..6b58a43d166 100644 --- a/config/GZ2J01/rels/d_a_obj_kuwagata/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kuwagata/symbols.txt @@ -99,6 +99,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KuwHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt index 1df1fe2b88f..85a76a81962 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt @@ -53,4 +53,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3632 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte -l_HIOInit = .bss:0x0000001C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000001C; // type:object size:0x1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_msima/symbols.txt b/config/GZ2J01/rels/d_a_obj_msima/symbols.txt index d9491231891..38370071a82 100644 --- a/config/GZ2J01/rels/d_a_obj_msima/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_msima/symbols.txt @@ -88,7 +88,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3858 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:local data:byte @3958 = .bss:0x00000068; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_obj_toby/symbols.txt b/config/GZ2J01/rels/d_a_obj_toby/symbols.txt index b59a2ac86a3..b0a0be5011f 100644 --- a/config/GZ2J01/rels/d_a_obj_toby/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_toby/symbols.txt @@ -98,7 +98,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3801 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_tombo/symbols.txt b/config/GZ2J01/rels/d_a_obj_tombo/symbols.txt index 0447e763ccd..f90429ab442 100644 --- a/config/GZ2J01/rels/d_a_obj_tombo/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_tombo/symbols.txt @@ -109,6 +109,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000A4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global __vt__14daObj_TomHIO_c = .data:0x000000E0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_bd/symbols.txt b/config/GZ2P01/rels/d_a_bd/symbols.txt index 3aaec7bce54..5731497f879 100644 --- a/config/GZ2P01/rels/d_a_bd/symbols.txt +++ b/config/GZ2P01/rels/d_a_bd/symbols.txt @@ -131,7 +131,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3937 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte @3946 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_e_fb/symbols.txt b/config/GZ2P01/rels/d_a_e_fb/symbols.txt index 176e6ce64d6..bc2bab1a2a8 100644 --- a/config/GZ2P01/rels/d_a_e_fb/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_fb/symbols.txt @@ -114,7 +114,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3657 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte mFireTimer = .bss:0x00000078; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_e_hm/symbols.txt b/config/GZ2P01/rels/d_a_e_hm/symbols.txt index a6f6360f006..fe75134251d 100644 --- a/config/GZ2P01/rels/d_a_e_hm/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_hm/symbols.txt @@ -180,7 +180,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3807 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte s_dis__22@unnamed@d_a_e_hm_cpp@ = .bss:0x00000074; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_e_hp/symbols.txt b/config/GZ2P01/rels/d_a_e_hp/symbols.txt index 2259904b4fb..c6012fdf7d4 100644 --- a/config/GZ2P01/rels/d_a_e_hp/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_hp/symbols.txt @@ -121,6 +121,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001DC; // type:object size:0xC scope:global __vt__12daE_HP_HIO_c = .data:0x000001E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3921 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_nz/symbols.txt b/config/GZ2P01/rels/d_a_e_nz/symbols.txt index ced74ba0af4..077d1abc5ab 100644 --- a/config/GZ2P01/rels/d_a_e_nz/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_nz/symbols.txt @@ -115,7 +115,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_215_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3805 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte lbl_215_bss_74 = .bss:0x00000074; // type:object size:0x1 data:byte diff --git a/config/GZ2P01/rels/d_a_e_po/symbols.txt b/config/GZ2P01/rels/d_a_e_po/symbols.txt index 55e31bd0e1f..a515c05f4d9 100644 --- a/config/GZ2P01/rels/d_a_e_po/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_po/symbols.txt @@ -362,7 +362,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3933 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global align:4 data:float mRollCount = .bss:0x00000090; // type:object size:0x2 scope:global diff --git a/config/GZ2P01/rels/d_a_e_sh/symbols.txt b/config/GZ2P01/rels/d_a_e_sh/symbols.txt index 3c574d67a6b..d0fbea44b76 100644 --- a/config/GZ2P01/rels/d_a_e_sh/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_sh/symbols.txt @@ -143,6 +143,6 @@ __vt__8cM3dGAab = .data:0x000001E8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001F4; // type:object size:0x24 scope:global __vt__12daE_SH_HIO_c = .data:0x00000218; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_yh/symbols.txt b/config/GZ2P01/rels/d_a_e_yh/symbols.txt index 04a49a35fd6..b5a33970db7 100644 --- a/config/GZ2P01/rels/d_a_e_yh/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_yh/symbols.txt @@ -166,6 +166,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:gl __vt__12J3DFrameCtrl = .data:0x00000310; // type:object size:0xC scope:global __vt__12daE_YH_HIO_c = .data:0x0000031C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_mg_rod/symbols.txt b/config/GZ2P01/rels/d_a_mg_rod/symbols.txt index 6918801b443..2ce0f102342 100644 --- a/config/GZ2P01/rels/d_a_mg_rod/symbols.txt +++ b/config/GZ2P01/rels/d_a_mg_rod/symbols.txt @@ -363,7 +363,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local henna = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte data_804BBBD4 = .bss:0x0000004C; // type:object size:0x1 data:byte -l_HIOInit = .bss:0x0000004D; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004D; // type:object size:0x1 data:byte @4280 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x28 scope:global data:byte @4921 = .bss:0x00000084; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_npc_henna/symbols.txt b/config/GZ2P01/rels/d_a_npc_henna/symbols.txt index ee1055849f6..247cd657897 100644 --- a/config/GZ2P01/rels/d_a_npc_henna/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_henna/symbols.txt @@ -303,7 +303,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3900 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x38 scope:global data:byte lrl = .bss:0x0000008C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_obj_batta/symbols.txt b/config/GZ2P01/rels/d_a_obj_batta/symbols.txt index 78b1c7e393a..a3acf1ce9a8 100644 --- a/config/GZ2P01/rels/d_a_obj_batta/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_batta/symbols.txt @@ -129,6 +129,6 @@ __vt__12daObjBATTA_c = .data:0x000001E8; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global __vt__16daObj_BattaHIO_c = .data:0x00000200; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt b/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt index c63329fe7af..99f0c23f4dc 100644 --- a/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt @@ -91,6 +91,6 @@ __vt__8cM3dGSph = .data:0x00000090; // type:object size:0xC scope:global __vt__15daObjGOMIKABE_c = .data:0x0000009C; // type:object size:0x28 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x000000C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3761 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt b/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt index cfb339d7b34..23c57b9e6f7 100644 --- a/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt @@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global __vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global __vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3639 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_kita/symbols.txt b/config/GZ2P01/rels/d_a_obj_kita/symbols.txt index b71b6895a0f..bac9b5db571 100644 --- a/config/GZ2P01/rels/d_a_obj_kita/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kita/symbols.txt @@ -50,6 +50,6 @@ l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:local g_profile_OBJ_KITA = .data:0x00000020; // type:object size:0x30 scope:global __vt__16daObj_Kita_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_obj_kuwagata/symbols.txt b/config/GZ2P01/rels/d_a_obj_kuwagata/symbols.txt index 0d42e114437..6b58a43d166 100644 --- a/config/GZ2P01/rels/d_a_obj_kuwagata/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kuwagata/symbols.txt @@ -99,6 +99,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KuwHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt index 1df1fe2b88f..85a76a81962 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt @@ -53,4 +53,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3632 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte -l_HIOInit = .bss:0x0000001C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000001C; // type:object size:0x1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_msima/symbols.txt b/config/GZ2P01/rels/d_a_obj_msima/symbols.txt index 944f6e08b32..aea56fe4d50 100644 --- a/config/GZ2P01/rels/d_a_obj_msima/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_msima/symbols.txt @@ -88,7 +88,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3858 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:local data:byte @3958 = .bss:0x00000068; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_obj_toby/symbols.txt b/config/GZ2P01/rels/d_a_obj_toby/symbols.txt index 9583ab8c84d..369ed50225b 100644 --- a/config/GZ2P01/rels/d_a_obj_toby/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_toby/symbols.txt @@ -98,7 +98,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3801 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_tombo/symbols.txt b/config/GZ2P01/rels/d_a_obj_tombo/symbols.txt index 0447e763ccd..f90429ab442 100644 --- a/config/GZ2P01/rels/d_a_obj_tombo/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_tombo/symbols.txt @@ -109,6 +109,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000A4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global __vt__14daObj_TomHIO_c = .data:0x000000E0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global align:4 data:float diff --git a/config/RZDE01_00/rels/d_a_e_yh/symbols.txt b/config/RZDE01_00/rels/d_a_e_yh/symbols.txt index 6ae565d0928..1a06ebd73ae 100644 --- a/config/RZDE01_00/rels/d_a_e_yh/symbols.txt +++ b/config/RZDE01_00/rels/d_a_e_yh/symbols.txt @@ -148,6 +148,6 @@ lbl_251_data_3FC = .data:0x000003FC; // type:object size:0x1C @95827 = .data:0x00000418; // type:object size:0xC scope:local lbl_251_data_424 = .data:0x00000424; // type:object size:0xCC __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @94134 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/RZDE01_00/rels/d_a_obj_batta/symbols.txt b/config/RZDE01_00/rels/d_a_obj_batta/symbols.txt index 359b1b2018d..04f5fbb7fc5 100644 --- a/config/RZDE01_00/rels/d_a_obj_batta/symbols.txt +++ b/config/RZDE01_00/rels/d_a_obj_batta/symbols.txt @@ -133,6 +133,6 @@ lbl_403_data_424 = .data:0x00000424; // type:object size:0x4 data:string lbl_403_data_428 = .data:0x00000428; // type:object size:0x4 data:string lbl_403_data_42C = .data:0x0000042C; // type:object size:0x4 data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @93433 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/RZDE01_00/rels/d_a_obj_gomikabe/symbols.txt b/config/RZDE01_00/rels/d_a_obj_gomikabe/symbols.txt index dc57641ca42..f0d0e59cc35 100644 --- a/config/RZDE01_00/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/RZDE01_00/rels/d_a_obj_gomikabe/symbols.txt @@ -79,6 +79,6 @@ lbl_462_data_E8 = .data:0x000000E8; // type:object size:0xF data:string lbl_462_data_F7 = .data:0x000000F7; // type:object size:0x15 data:string lbl_462_data_10C = .data:0x0000010C; // type:object size:0xF data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @93404 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/RZDE01_00/rels/d_a_obj_ice_s/symbols.txt b/config/RZDE01_00/rels/d_a_obj_ice_s/symbols.txt index bdf287b0e83..a522f8d2dbe 100644 --- a/config/RZDE01_00/rels/d_a_obj_ice_s/symbols.txt +++ b/config/RZDE01_00/rels/d_a_obj_ice_s/symbols.txt @@ -69,6 +69,6 @@ __RTTI__12daObjIce_s_c = .data:0x000000DC; // type:object size:0x8 scope:global lbl_480_data_E4 = .data:0x000000E4; // type:object size:0xA data:string lbl_480_data_EE = .data:0x000000EE; // type:object size:0xA data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @91760 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/RZDE01_02/rels/d_a_e_yh/symbols.txt b/config/RZDE01_02/rels/d_a_e_yh/symbols.txt index e75164b41dd..accd1e14cec 100644 --- a/config/RZDE01_02/rels/d_a_e_yh/symbols.txt +++ b/config/RZDE01_02/rels/d_a_e_yh/symbols.txt @@ -151,6 +151,6 @@ lbl_251_data_3FC = .data:0x000003FC; // type:object size:0x1C @95827 = .data:0x00000418; // type:object size:0xC scope:local align:4 lbl_251_data_424 = .data:0x00000424; // type:object size:0xCC __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global align:4 -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @94134 = .bss:0x0000000C; // type:object size:0xC scope:local align:4 l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global align:4 data:byte diff --git a/config/ShieldD/rels/d_a_bdD/symbols.txt b/config/ShieldD/rels/d_a_bdD/symbols.txt index 964778448b2..c0a76ede04e 100644 --- a/config/ShieldD/rels/d_a_bdD/symbols.txt +++ b/config/ShieldD/rels/d_a_bdD/symbols.txt @@ -147,7 +147,7 @@ lbl_58_data_4B0 = .data:0x000004B0; // type:object size:0x24 @122173 = .data:0x00000698; // type:object size:0xC scope:local @122174 = .data:0x000006BC; // type:object size:0x11 scope:local data:string @122175 = .data:0x000006E4; // type:object size:0xD scope:local data:string -l_HIOInit = .bss:0x00000000; // type:object size:0x1 data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000008; // type:object size:0x20 scope:global data:byte land_sp_pos = .bss:0x00000028; // type:object size:0x30 scope:global rope_pt = .bss:0x00000058; // type:object size:0x4 scope:global data:4byte diff --git a/config/ShieldD/rels/d_a_e_fbD/symbols.txt b/config/ShieldD/rels/d_a_e_fbD/symbols.txt index 7564bedf296..64f5efc8aa3 100644 --- a/config/ShieldD/rels/d_a_e_fbD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_fbD/symbols.txt @@ -143,7 +143,7 @@ lbl_179_data_320 = .data:0x00000320; // type:object size:0x24 @118010 = .data:0x0000052C; // type:object size:0x11 scope:local data:string @118011 = .data:0x00000554; // type:object size:0xD scope:local data:string lbl_179_data_561 = .data:0x00000561; // type:object size:0x93 -l_HIOInit = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 scope:local data:byte l_HIO = .bss:0x00000004; // type:object size:0x24 scope:global data:byte mFireTimer = .bss:0x00000028; // type:object size:0x4 scope:global data:4byte lbl_179_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte diff --git a/config/ShieldD/rels/d_a_e_hpD/symbols.txt b/config/ShieldD/rels/d_a_e_hpD/symbols.txt index 25a3aaaed0e..8a8f39a6db7 100644 --- a/config/ShieldD/rels/d_a_e_hpD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_hpD/symbols.txt @@ -162,5 +162,5 @@ lbl_191_data_310 = .data:0x00000310; // type:object size:0x24 @120215 = .data:0x00000538; // type:object size:0xC scope:local @120216 = .data:0x0000055C; // type:object size:0x11 scope:local data:string lbl_191_data_56D = .data:0x0000056D; // type:object size:0x8F -l_HIOInit = .bss:0x00000000; // type:object size:0x1 data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000004; // type:object size:0x14 scope:global data:byte diff --git a/config/ShieldD/rels/d_a_e_shD/symbols.txt b/config/ShieldD/rels/d_a_e_shD/symbols.txt index c69911dc43e..c65c7b006b5 100644 --- a/config/ShieldD/rels/d_a_e_shD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_shD/symbols.txt @@ -173,5 +173,5 @@ lbl_221_data_340 = .data:0x00000340; // type:object size:0x24 @120143 = .data:0x00000528; // type:object size:0xC scope:local @120144 = .data:0x0000054C; // type:object size:0x11 scope:local data:string lbl_221_data_55D = .data:0x0000055D; // type:object size:0x8F -l_HIOInit = .bss:0x00000000; // type:object size:0x1 data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000004; // type:object size:0x2C scope:global data:byte diff --git a/config/ShieldD/rels/d_a_kagoD/symbols.txt b/config/ShieldD/rels/d_a_kagoD/symbols.txt index 5ca8576a451..e13fe989470 100644 --- a/config/ShieldD/rels/d_a_kagoD/symbols.txt +++ b/config/ShieldD/rels/d_a_kagoD/symbols.txt @@ -313,5 +313,5 @@ lbl_256_data_530 = .data:0x00000530; // type:object size:0x24 @125862 = .data:0x00000738; // type:object size:0xC scope:local @125863 = .data:0x0000075C; // type:object size:0x11 scope:local data:string lbl_256_data_76D = .data:0x0000076D; // type:object size:0xB7 -l_HIOInit = .bss:0x00000000; // type:object size:0x1 data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000004; // type:object size:0x5C scope:global data:byte diff --git a/config/ShieldD/rels/d_a_obj_ice_sD/symbols.txt b/config/ShieldD/rels/d_a_obj_ice_sD/symbols.txt index 6579a71a393..b787c747864 100644 --- a/config/ShieldD/rels/d_a_obj_ice_sD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_ice_sD/symbols.txt @@ -94,5 +94,5 @@ __RTTI__12daObjIce_s_c = .data:0x00000160; // type:object size:0x8 scope:global @STRING@CreateHeap__12daObjIce_s_cFv@0 = .data:0x0000028C; // type:object size:0x12 scope:local data:string @STRING@CreateHeap__12daObjIce_s_cFv = .data:0x000002A0; // type:object size:0xA scope:local data:string lbl_468_data_2AA = .data:0x000002AA; // type:object size:0x72 -l_HIOInit = .bss:0x00000000; // type:object size:0x1 data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000008; // type:object size:0x10 scope:global data:byte diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index d75a2f8cf2d..d8699bcd215 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -269,8 +269,7 @@ void daB_GG_c::initCc() { } } -/* 805ED6FD 0003+00 l_HIOInit None */ -static u8 l_HIOInit; +static u8 hio_set; static daB_GG_HIO_c l_HIO; @@ -4194,7 +4193,7 @@ int daB_GG_c::Delete() { dComIfG_resDelete(&mPhase, "B_gg"); if (mHIOInit) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -4288,8 +4287,8 @@ int daB_GG_c::Create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = TRUE; + if (!hio_set) { + hio_set = TRUE; mHIOInit = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("ガーゴイル", &l_HIO); } diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index 92ad841bb39..9c71ef85646 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -45,7 +45,7 @@ static land_pos land_pos127[20] = { static int wait_bck[3] = {ANM_PITA_LEFTUP, ANM_PITA_RIGHT, ANM_PITA_DOWN}; -static u8 l_HIOInit; +static u8 hio_set; static daBd_HIO_c l_HIO; static cXyz land_sp_pos[4] = { @@ -933,7 +933,7 @@ static int daBd_Delete(bd_class* i_this) { fopAcM_RegisterDeleteID(i_this, "Bd"); dComIfG_resDelete(&i_this->mPhase, "Bd"); if (i_this->field_0x9E8 != 0) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.id); } if (a_this->heap != 0) { @@ -989,9 +989,9 @@ static int daBd_Create(fopAc_ac_c* i_act_this) { return cPhs_ERROR_e; } OS_REPORT("//////////////BD SET 2 !!\n"); - if (l_HIOInit == 0) { + if (hio_set == 0) { i_this->field_0x9E8 = 1; - l_HIOInit = 1; + hio_set = 1; l_HIO.id = mDoHIO_CREATE_CHILD("小鳥", (JORReflexible*)&l_HIO); } fopAcM_SetMtx(i_act_this, i_this->mpMorf->getModel()->getBaseTRMtx()); diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp index 87f07648737..5852c7858e7 100644 --- a/src/d/actor/d_a_e_ai.cpp +++ b/src/d/actor/d_a_e_ai.cpp @@ -338,7 +338,7 @@ void e_ai_class::damage_check() { } } -static u8 l_HIOInit; +static u8 hio_set; static daE_AI_HIO_c l_HIO; @@ -828,7 +828,7 @@ int e_ai_class::Delete() { dComIfG_resDelete(&m_phase, "E_AI"); if (m_HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -902,8 +902,8 @@ int e_ai_class::Create() { } OS_REPORT("//////////////E_AI SET 2 !!\n"); - if (!l_HIOInit) { - l_HIOInit = TRUE; + if (!hio_set) { + hio_set = TRUE; m_HIOInit = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("アモス", &l_HIO); } diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp index 1abedf4744b..3f40108d5c7 100644 --- a/src/d/actor/d_a_e_bs.cpp +++ b/src/d/actor/d_a_e_bs.cpp @@ -198,7 +198,7 @@ static void e_bs_appear(e_bs_class* i_this) { } } -static u8 l_HIOInit; +static u8 hio_set; static daE_BS_HIO_c l_HIO; @@ -783,7 +783,7 @@ static int daE_BS_Delete(e_bs_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_BS"); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -848,9 +848,9 @@ static int daE_BS_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("ベビースタル", &l_HIO); } diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp index d820bc4123b..3bcab8c744e 100644 --- a/src/d/actor/d_a_e_bu.cpp +++ b/src/d/actor/d_a_e_bu.cpp @@ -92,7 +92,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { return 1; } -static u8 l_HIOInit; +static u8 hio_set; static daE_BU_HIO_c l_HIO; @@ -994,7 +994,7 @@ static int daE_BU_Delete(e_bu_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_BU"); if (i_this->HIOInit != 0) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -1076,9 +1076,9 @@ static int daE_BU_Create(fopAc_ac_c* i_this) { a_this->action = ACTION_FLY; } - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("バブル", &l_HIO); } diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp index 4ee02f56263..509b2b691dd 100644 --- a/src/d/actor/d_a_e_cr.cpp +++ b/src/d/actor/d_a_e_cr.cpp @@ -162,7 +162,7 @@ static BOOL way_bg_check(e_cr_class* a_this, f32 param_1) { return FALSE; } -static u8 l_HIOInit; +static u8 hio_set; static daE_CR_HIO_c l_HIO; @@ -447,7 +447,7 @@ static int daE_CR_Delete(e_cr_class* a_this) { dComIfG_resDelete(&a_this->phase, "E_CR"); if (a_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -495,9 +495,9 @@ static int daE_CR_Create(fopAc_ac_c* i_this) { } OS_REPORT("//////////////E_CR SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("クレイジーランナー", &l_HIO); } diff --git a/src/d/actor/d_a_e_db.cpp b/src/d/actor/d_a_e_db.cpp index f29b02251b1..16986128375 100644 --- a/src/d/actor/d_a_e_db.cpp +++ b/src/d/actor/d_a_e_db.cpp @@ -265,7 +265,7 @@ static void damage_check(e_db_class* i_this) { } } -static u8 l_HIOInit; +static u8 hio_set; static daE_DB_HIO_c l_HIO; @@ -2019,7 +2019,7 @@ static int daE_DB_Delete(e_db_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_db"); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -2102,9 +2102,9 @@ static int daE_DB_Create(fopAc_ac_c* i_this) { OS_REPORT("//////////////E_DB SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("デグババ", &l_HIO); } diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp index ec5b2e38bb9..4e0888721eb 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -127,7 +127,7 @@ static f32 dummy_117095() { } #endif -bool l_HIOInit; +bool hio_set; static daE_FB_HIO_c l_HIO; @@ -857,7 +857,7 @@ int daE_FB_c::_delete() { } if (mHIOInit) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -942,8 +942,8 @@ cPhs__Step daE_FB_c::create() { return cPhs_ERROR_e; } - if (l_HIOInit == false) { - l_HIOInit = true; + if (hio_set == false) { + hio_set = true; mHIOInit = 1; l_HIO.mId = mDoHIO_CREATE_CHILD("フリザド(大)", &l_HIO); } diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp index a8cd7c4061c..0ceb54aca44 100644 --- a/src/d/actor/d_a_e_fk.cpp +++ b/src/d/actor/d_a_e_fk.cpp @@ -106,7 +106,7 @@ void daE_FK_c::initSwordSph() { OnAt(); } -static u8 l_HIOInit; +static u8 hio_set; static daE_FK_HIO_c l_HIO; @@ -671,7 +671,7 @@ int daE_FK_c::Delete() { dComIfG_resDelete(&mPhase, "E_fk"); if (mHIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -743,8 +743,8 @@ int daE_FK_c::Create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = TRUE; + if (!hio_set) { + hio_set = TRUE; mHIOInit = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("ファントム騎馬兵", &l_HIO); } diff --git a/src/d/actor/d_a_e_ga.cpp b/src/d/actor/d_a_e_ga.cpp index ffa924646e5..0878eb96885 100644 --- a/src/d/actor/d_a_e_ga.cpp +++ b/src/d/actor/d_a_e_ga.cpp @@ -151,7 +151,7 @@ static int daE_Ga_IsDelete(e_ga_class* a_this) { return 1; } -static u8 l_HIOInit; +static u8 hio_set; static int daE_Ga_Delete(e_ga_class* a_this) { fopAc_ac_c* actor = &a_this->actor; @@ -165,7 +165,7 @@ static int daE_Ga_Delete(e_ga_class* a_this) { dComIfG_resDelete(&a_this->phase, "E_ga"); if (a_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; } return 1; @@ -222,9 +222,9 @@ static int daE_Ga_Create(fopAc_ac_c* i_this) { } OS_REPORT("//////////////E_GA SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = -1; } diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index 745e3dbedbc..2cdce165c64 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -46,7 +46,7 @@ enum daE_GE_Action { /* 9 */ ACTION_MAX }; -static u8 l_HIOInit; +static u8 hio_set; static daE_GE_HIO_c l_HIO; @@ -1241,7 +1241,7 @@ int daE_GE_c::_delete() { dComIfG_resDelete(&mPhaseReq, "E_GE"); if (mHIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -1309,9 +1309,9 @@ int daE_GE_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { mHIOInit = true; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("グェー", &l_HIO); } diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index b39de4e9b47..1bf8685e98a 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -156,7 +156,7 @@ void daE_GI_c::setActionMode(int i_actionMode, int i_moveMode) { offHeadLockFlg(); } -static u8 l_HIOInit; +static u8 hio_set; static daE_GI_HIO_c l_HIO; @@ -970,7 +970,7 @@ int daE_GI_c::_delete() { dComIfG_resDelete(&mPhase, "E_GI"); if (mHIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -1042,8 +1042,8 @@ int daE_GI_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = TRUE; + if (!hio_set) { + hio_set = TRUE; mHIOInit = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("ギブド", &l_HIO); } diff --git a/src/d/actor/d_a_e_gs.cpp b/src/d/actor/d_a_e_gs.cpp index 2a8e5c283e3..a678880082c 100644 --- a/src/d/actor/d_a_e_gs.cpp +++ b/src/d/actor/d_a_e_gs.cpp @@ -47,7 +47,7 @@ static int daE_GS_Draw(e_gs_class* a_this) { return 1; } -static u8 l_HIOInit; +static u8 hio_set; static daE_GS_HIO_c l_HIO; @@ -158,7 +158,7 @@ static int daE_GS_Delete(e_gs_class* a_this) { dComIfG_resDelete(&a_this->phase, "E_gs"); if (a_this->hio_init) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -202,9 +202,9 @@ static int daE_GS_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { a_this->hio_init = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("幽霊兵士", &l_HIO); } diff --git a/src/d/actor/d_a_e_hb.cpp b/src/d/actor/d_a_e_hb.cpp index a28b43e3347..ac087a09cab 100644 --- a/src/d/actor/d_a_e_hb.cpp +++ b/src/d/actor/d_a_e_hb.cpp @@ -213,7 +213,7 @@ static void damage_check(e_hb_class* i_this) { } } -static u8 l_HIOInit; +static u8 hio_set; static daE_HB_HIO_c l_HIO; @@ -1327,7 +1327,7 @@ static int daE_HB_Delete(e_hb_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_hb"); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -1410,9 +1410,9 @@ static int daE_HB_Create(fopAc_ac_c* i_this) { OS_REPORT("//////////////E_HB SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("デグババ(ボックリ)", &l_HIO); } diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp index 4a993f23e66..781ee1ad775 100644 --- a/src/d/actor/d_a_e_hm.cpp +++ b/src/d/actor/d_a_e_hm.cpp @@ -578,7 +578,7 @@ void daE_HM_c::UpDeathAction() { } } -static bool l_HIOInit; +static bool hio_set; static daE_HM_HIO_c l_HIO; @@ -1361,7 +1361,7 @@ int daE_HM_c::Delete() { dComIfG_resDelete(&mPhase,"E_HM"); if (field_0xa84 != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.field_0x04); } @@ -1531,8 +1531,8 @@ int daE_HM_c::Create() { return cPhs_ERROR_e; } - if (l_HIOInit == 0) { - l_HIOInit = true; + if (hio_set == 0) { + hio_set = true; field_0xa84 = 1; l_HIO.field_0x04 = mDoHIO_CREATE_CHILD("E_HM", &l_HIO); } diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index 1b052ddb2a4..e37042a121c 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -164,7 +164,7 @@ int daE_HP_c::LampJointCallBack(J3DJoint* i_joint, int param_1) { return 1; } -static bool l_HIOInit; +static bool hio_set; static daE_HP_HIO_c l_HIO; @@ -1128,7 +1128,7 @@ int daE_HP_c::_delete() { dComIfG_resDelete(&mPhaseReq, "E_HP"); if (field_0xdf9 != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mChild); } @@ -1236,8 +1236,8 @@ int daE_HP_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; field_0xdf9 = 1; // "General-purpose Poe" l_HIO.mChild = mDoHIO_CREATE_CHILD("汎用ポゥ", &l_HIO); diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index c7b54ecabaf..d9be18d622a 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -99,7 +99,7 @@ bool daE_HZ_c::checkBck(int i_index) { return false; } -static u8 l_HIOInit; +static u8 hio_set; static daE_HZ_HIO_c l_HIO; @@ -1854,7 +1854,7 @@ int daE_HZ_c::_delete() { dComIfG_resDelete(&mPhaseReq2, mpName); if (mHIOInit) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.enemy_sample); } @@ -2043,9 +2043,9 @@ int daE_HZ_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { mHIOInit = true; - l_HIOInit = true; + hio_set = true; l_HIO.enemy_sample = mDoHIO_CREATE_CHILD("Hajiki-san", &l_HIO); } diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp index b8c55ae6e66..82ba88099cf 100644 --- a/src/d/actor/d_a_e_is.cpp +++ b/src/d/actor/d_a_e_is.cpp @@ -197,7 +197,7 @@ static void e_is_wait(e_is_class* a_this) { } } -static u8 l_HIOInit; +static u8 hio_set; static daE_IS_HIO_c l_HIO; @@ -605,7 +605,7 @@ static int daE_IS_Delete(e_is_class* a_this) { dComIfG_resDelete(&a_this->phase, "E_IS"); if (a_this->hioInit) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -654,9 +654,9 @@ static int daE_IS_Create(fopAc_ac_c* i_this) { } OS_REPORT("//////////////E_IS SET 2 !!\n"); - if (l_HIOInit == 0) { + if (hio_set == 0) { a_this->hioInit = 1; - l_HIOInit = 1; + hio_set = 1; l_HIO.id = mDoHIO_CREATE_CHILD("動くイデリア石像", &l_HIO); } diff --git a/src/d/actor/d_a_e_mm.cpp b/src/d/actor/d_a_e_mm.cpp index 3ea3a5be48d..b6c19b78af6 100644 --- a/src/d/actor/d_a_e_mm.cpp +++ b/src/d/actor/d_a_e_mm.cpp @@ -87,7 +87,7 @@ static BOOL pl_check(e_mm_class* i_this, f32 i_range, s16) { return 0; } -static u8 l_HIOInit; +static u8 hio_set; static daE_MM_HIO_c l_HIO; @@ -999,7 +999,7 @@ static int daE_MM_Delete(e_mm_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_MM"); if (i_this->field_0xc00) { - l_HIOInit = 0; + hio_set = 0; } if (actor->heap != NULL) { @@ -1054,9 +1054,9 @@ static int daE_MM_Create(fopAc_ac_c* actor) { OS_REPORT("//////////////E_MM SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { i_this->field_0xc00 = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("マグネメット", &l_HIO); } diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 617b0dc8e1d..319811a76bc 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -15,7 +15,7 @@ #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" -static bool l_hioInit; +static bool hio_set; static daE_Nest_HIO_c l_HIO; @@ -924,7 +924,7 @@ static int daE_Nest_Delete(e_nest_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_nest"); if (i_this->mHIOInit) { - l_hioInit = false; + hio_set = false; } if (i_this->heap != NULL) { @@ -980,9 +980,9 @@ static cPhs__Step daE_Nest_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!l_hioInit) { + if (!hio_set) { _this->mHIOInit = true; - l_hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index 123fe49ff42..5c98407484d 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -131,7 +131,7 @@ static int daE_NZ_Draw(e_nz_class* i_this) { return 1; } -bool l_HIOInit; +bool hio_set; static daE_NZ_HIO_c l_HIO; @@ -648,7 +648,7 @@ static int daE_NZ_Delete(e_nz_class* i_this) { fopAcM_GetID(i_this); dComIfG_resDelete(&i_this->mPhase, "E_NZ"); if (i_this->mIsHIOOwner) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -696,9 +696,9 @@ static int daE_NZ_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { i_this->mIsHIOOwner = 1; - l_HIOInit = true; + hio_set = true; // Ghost Rat l_HIO.mId = mDoHIO_CREATE_CHILD("幽霊ネズミ", &l_HIO); } diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 0e28a30c05f..7e0e1c5b77d 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -71,7 +71,7 @@ daE_PO_HIO_c::daE_PO_HIO_c() { mModelSize = 1.0f; } -static u8 l_HIOInit; +static u8 hio_set; static daE_PO_HIO_c l_HIO; static s16 mRollCount; @@ -2839,7 +2839,7 @@ static int daE_PO_Delete(e_po_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_PO"); if (i_this->field_0xECC != 0) { - l_HIOInit = FALSE; + hio_set = FALSE; } if (a_this->heap != NULL) { i_this->mSound1.deleteObject(); @@ -2946,9 +2946,9 @@ static int daE_PO_Create(fopAc_ac_c* i_act_this) { return cPhs_ERROR_e; } - if (l_HIOInit == FALSE) { + if (hio_set == FALSE) { i_this->field_0xECC = 1; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.field_0x04[0] = mDoHIO_CREATE_CHILD("ポウ", (JORReflexible*)&l_HIO); } diff --git a/src/d/actor/d_a_e_rb.cpp b/src/d/actor/d_a_e_rb.cpp index 33b198bff2a..d60287ceecd 100644 --- a/src/d/actor/d_a_e_rb.cpp +++ b/src/d/actor/d_a_e_rb.cpp @@ -43,7 +43,7 @@ static void anm_init(e_rb_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i i_this->modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_rb", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f); } -static u8 l_HIOInit; +static u8 hio_set; static daE_RB_HIO_c l_HIO; @@ -742,7 +742,7 @@ static int daE_RB_Delete(e_rb_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_rb"); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -816,9 +816,9 @@ static int daE_RB_Create(fopAc_ac_c* i_this) { } OS_REPORT("//////////////E_RB SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("リーバ", &l_HIO); } diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp index 6a6bfbb95be..30b28d03a0e 100644 --- a/src/d/actor/d_a_e_sb.cpp +++ b/src/d/actor/d_a_e_sb.cpp @@ -252,7 +252,7 @@ static void* s_bomb_sub(void* arg0, void* arg1) { return NULL; } -static u8 l_HIOInit; +static u8 hio_set; static daE_SB_HIO_c l_HIO; @@ -1059,7 +1059,7 @@ int daE_SB_c::Draw() { int daE_SB_c::Delete() { dComIfG_resDelete(&mPhaseReq, "E_SB"); if (field_0xbbc) { - l_HIOInit = 0; + hio_set = 0; } if (heap != NULL) { @@ -1109,8 +1109,8 @@ cPhs__Step daE_SB_c::Create() { return cPhs_ERROR_e; } - if (l_HIOInit == 0) { - l_HIOInit = 1; + if (hio_set == 0) { + hio_set = 1; field_0xbbc = 1; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index f1b1e51634d..aae75bcccf9 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -202,7 +202,7 @@ static void damage_check(e_sh_class* i_this) { } } -static bool l_HIOInit; +static bool hio_set; static daE_SH_HIO_c l_HIO; @@ -1114,7 +1114,7 @@ static int daE_SH_Delete(e_sh_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_sh"); if (i_this->mInitState != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mChild); } @@ -1213,9 +1213,9 @@ static int daE_SH_Create(fopAc_ac_c* i_this) { } OS_REPORT(""); - if (!l_HIOInit) { + if (!hio_set) { sh->mInitState = 1; - l_HIOInit = true; + hio_set = true; l_HIO.mChild = mDoHIO_CREATE_CHILD("E_sh", &l_HIO); } diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index fe64e2f3bcf..d4baf9725f4 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -150,7 +150,7 @@ void daE_TT_c::calcHitGroundSpeed() { } } -static u8 l_HIOInit; +static u8 hio_set; static daE_TT_HIO_c l_HIO; @@ -1180,7 +1180,7 @@ int daE_TT_c::_delete() { dComIfG_resDelete(&mPhaseReq2, "E_TT"); if (mHIOInit) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -1272,8 +1272,8 @@ int daE_TT_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.id = mDoHIO_CREATE_CHILD("テクタイト", &l_HIO); // Tektite } diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index 3279ad6dd51..e3c58328db0 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -178,7 +178,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { static s8 lbl_244_bss_45; static s8 lbl_244_bss_46; static s8 lbl_244_bss_47; -static bool l_HIOInit; +static bool hio_set; static daE_WB_HIO_c l_HIO; @@ -5464,7 +5464,7 @@ static int daE_WB_Delete(e_wb_class* i_this) { fopAcM_GetID(i_this); dComIfG_resDelete(&i_this->mPhase, i_this->mResName); if (i_this->field_0x17e0 != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -5683,9 +5683,9 @@ static int daE_WB_Create(fopAc_ac_c* a_this) { OS_REPORT("//////////////E_WB SET NON !!\n"); return cPhs_ERROR_e; } else { - if (!l_HIOInit) { + if (!hio_set) { i_this->field_0x17e0 = 1; - l_HIOInit = true; + hio_set = true; l_HIO.mId = mDoHIO_CREATE_CHILD("イノシシ", &l_HIO); } diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index 3a80bc39516..8708d5c3216 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -150,7 +150,7 @@ s16 daE_WS_c::calcTargetAngle(cXyz i_basePos, cXyz i_targetPos) { return cM_atan2s(sp1C.x, sp1C.z); } -static u8 l_HIOInit; +static u8 hio_set; static daE_WS_HIO_c l_HIO; @@ -872,7 +872,7 @@ int daE_WS_c::_delete() { dComIfG_resDelete(&mPhase, "E_WS"); if (mHIOInit) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -920,8 +920,8 @@ int daE_WS_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.id = mDoHIO_CREATE_CHILD("スタルウォール", &l_HIO); } diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index fb53e66cfa8..d57f6c23cc9 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -145,7 +145,7 @@ namespace { }; } // namespace -static u8 l_HIOInit; +static u8 hio_set; static daE_WW_HIO_c l_HIO; @@ -2132,7 +2132,7 @@ static int daE_WW_IsDelete(daE_WW_c* i_this) { int daE_WW_c::_delete() { dComIfG_resDelete(&mPhase, "E_WW"); if (field_0xec4 != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.field_0x04); } @@ -2233,8 +2233,8 @@ int daE_WW_c::create() { return cPhs_ERROR_e; } - if (l_HIOInit == false) { - l_HIOInit = true; + if (hio_set == false) { + hio_set = true; field_0xec4 = 1; l_HIO.field_0x04 = mDoHIO_CREATE_CHILD("ホワイトウルフォス", (JORReflexible*)&l_HIO); } diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index a583fb29d70..93bb9e7f5d4 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -277,7 +277,7 @@ static void damage_check(e_yh_class* i_this) { } } -static bool l_HIOInit; +static bool hio_set; static daE_YH_HIO_c l_HIO; @@ -2064,7 +2064,7 @@ static int daE_YH_Delete(e_yh_class* i_this) { fopAcM_RegisterDeleteID(a_this, "E_YH"); dComIfG_resDelete(&i_this->mPhase, "E_yd"); if (i_this->mIsHIOOwner) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -2157,9 +2157,9 @@ static int daE_YH_Create(fopAc_ac_c* a_this) { OS_REPORT("//////////////E_YH SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { i_this->mIsHIOOwner = true; - l_HIOInit = true; + hio_set = true; l_HIO.mId = mDoHIO_CREATE_CHILD("デグババ", &l_HIO); } diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 3ee4e7aadc1..d6068ff6728 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -270,7 +270,7 @@ int daKago_c::executeBalloonMenu() { return 1; } -static u8 l_HIOInit; +static u8 hio_set; static daKago_HIO_c l_HIO; f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { @@ -3696,7 +3696,7 @@ int daKago_c::_delete() { dComIfG_resDelete(&mPhase, field_0x75c); if (field_0xb54 != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mChild); } @@ -3805,9 +3805,9 @@ int daKago_c::create() { return cPhs_ERROR_e; } - if (l_HIOInit == 0) { + if (hio_set == 0) { field_0xb54 = 1; - l_HIOInit = 1; + hio_set = 1; l_HIO.mChild = mDoHIO_CREATE_CHILD("", &l_HIO); } diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index dc697813eaa..24c177007b4 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -521,7 +521,7 @@ static npc_henna_class* henna; /* 804BBBD4 0001+00 data_804BBBD4 None */ static u8 data_804BBBD4; -static u8 l_HIOInit; +static u8 hio_set; static dmg_rod_HIO_c l_HIO; @@ -6011,7 +6011,7 @@ static int dmg_rod_Delete(dmg_rod_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); } @@ -6270,9 +6270,9 @@ static int dmg_rod_Create(fopAc_ac_c* i_this) { } OS_REPORT("//////////////MG_ROD SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("釣りシステム", &l_HIO); } diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 1846f27af9b..61212d3c962 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -423,7 +423,7 @@ static void* s_fish_sub(void* param_0, void* param_1) { return 0; } -static u8 l_HIOInit; +static u8 hio_set; static daNpc_Henna_HIO_c l_HIO; @@ -2592,7 +2592,7 @@ static bool daNpc_Henna_IsDelete(npc_henna_class* param_0) { static int daNpc_Henna_Delete(npc_henna_class* i_this) { dComIfG_resDelete(&i_this->phase, "Henna"); if (i_this->hio_init != 0) { - l_HIOInit = 0; + hio_set = 0; } return 1; } @@ -2694,9 +2694,9 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) { } OS_REPORT("//////////////NPC_HENNA SET 2 !!\n"); - if (!l_HIOInit ) { + if (!hio_set ) { a_this->hio_init = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; // "Henna" l_HIO.id = mDoHIO_CREATE_CHILD("ヘナさま", &l_HIO); } diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 6e745d74c90..df3fa310721 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -300,7 +300,7 @@ static npc_ks_class* leader; static u32 call_pt; -static u8 l_HIOInit; +static u8 hio_set; static daNpc_Ks_HIO_c l_HIO; @@ -6878,7 +6878,7 @@ static int daNpc_Ks_Delete(npc_ks_class* i_this) { dComIfG_resDelete(&i_this->mPhase, i_this->res_name); if (i_this->hio_init != 0) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.no); } @@ -7402,9 +7402,9 @@ static int daNpc_Ks_Create(fopAc_ac_c* actor) { } OS_REPORT("//////////////NPC_KS SET 2 !!\n"); - if (l_HIOInit == 0) { + if (hio_set == 0) { i_this->hio_init = 1; - l_HIOInit = 1; + hio_set = 1; l_HIO.no = mDoHIO_CREATE_CHILD("コザル", &l_HIO); // Kozaru } diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index 5e410ee76f8..496e90a3c13 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -301,7 +301,7 @@ static s16 climb_angle_get(npc_ne_class* i_this) { } /* 80A92AC5 0003+00 data_80A92AC5 None */ -static bool l_hioInit; +static bool hio_set; static daNpc_Ne_HIO_c l_HIO; @@ -3025,7 +3025,7 @@ static int daNpc_Ne_IsDelete(npc_ne_class* i_this) { static int daNpc_Ne_Delete(npc_ne_class* i_this) { dComIfG_resDelete(&i_this->mPhase, i_this->mResName); if (i_this->mHIOInit != 0) { - l_hioInit = false; + hio_set = false; } if (i_this->heap != NULL) { i_this->mSound.deleteObject(); @@ -3163,9 +3163,9 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) { } } - if (!l_hioInit) { + if (!hio_set) { _this->mHIOInit = 1; - l_hioInit = true; + hio_set = true; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 910f90ac72d..120c05a9997 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -47,7 +47,7 @@ daObj_BattaHIO_c::daObj_BattaHIO_c() { mModelScaleFemale = 1.4f; } -static bool l_HIOInit; +static bool hio_set; static daObj_BattaHIO_c l_HIO; @@ -527,7 +527,7 @@ int daObjBATTA_c::_delete() { dComIfG_resDelete(&mPhase, "Bat"); if (mIsHIOOwner != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -641,8 +641,8 @@ int daObjBATTA_c::create() { OS_REPORT("/////////////////// BATTA SET OK /////////////////\n"); - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; mIsHIOOwner = true; // Golden Bugs l_HIO.mId = mDoHIO_CREATE_CHILD("黄金蟲(バッタ)", &l_HIO); diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index 862aaab6065..6d5cbfbe628 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -272,7 +272,7 @@ int daObjGOMIKABE_c::CreateHeap() { return 1; } -static bool l_HIOInit; +static bool hio_set; static daObjGOMIKABE_HIO_c l_HIO; @@ -309,8 +309,8 @@ int daObjGOMIKABE_c::create() { mBaseScale.set(1.0f, 1.0f, 1.0f); } - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; mIsHIOOwner = 1; // Garbage Wall l_HIO.mId = mDoHIO_CREATE_CHILD("ごみ壁", &l_HIO); @@ -379,7 +379,7 @@ int daObjGOMIKABE_c::Draw() { int daObjGOMIKABE_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName); if (mIsHIOOwner) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } return 1; diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index 704f5d32be6..da3c4778b50 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -52,7 +52,7 @@ void daObjIce_s_c::RideOn_Angle(s16& param_1, f32 param_2, s16 param_3, f32 para cLib_addCalcAngleS(¶m_1, param_3 * (param_2 / param_4), 5, 0x100, 1); } -static u8 l_HIOInit; +static u8 hio_set; static daOBJ_ICE_S_HIO_c l_HIO; @@ -192,8 +192,8 @@ int daObjIce_s_c::create() { return rv; } } - if (!l_HIOInit) { - l_HIOInit = TRUE; + if (!hio_set) { + hio_set = TRUE; field_0x640 = 1; l_HIO.mId = mDoHIO_CREATE_CHILD("氷の足場小", &l_HIO); } @@ -286,7 +286,7 @@ int daObjIce_s_c::Draw() { int daObjIce_s_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName); if (field_0x640 != 0) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.mId); } return 1; diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index 05e30dd828c..205b0e2bc4c 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -24,7 +24,7 @@ void daObj_Kbox_HIO_c::genMessage(JORMContext* ctx) { } #endif -static bool l_HIOInit; +static bool hio_set; static daObj_Kbox_HIO_c l_HIO; @@ -431,7 +431,7 @@ static int daObj_Kbox_Delete(obj_kbox_class* i_this) { fopAcM_GetID(a_this); dComIfG_resDelete(&i_this->mPhase, "Obj_kbox"); if (i_this->mIsHIOOwner) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } dComIfG_Bgsp().Release(i_this->mBgw); @@ -486,9 +486,9 @@ static int daObj_Kbox_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { i_this->mIsHIOOwner = true; - l_HIOInit = true; + hio_set = true; l_HIO.mId = mDoHIO_CREATE_CHILD("スカル魚専用木箱", &l_HIO); } fopAcM_SetMtx(a_this, i_this->mModel->getBaseTRMtx()); diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp index ac9a10a87f1..a1e8f5b110b 100644 --- a/src/d/actor/d_a_obj_key.cpp +++ b/src/d/actor/d_a_obj_key.cpp @@ -50,7 +50,7 @@ static int daObj_Key_Draw(obj_key_class* i_this) { return 1; } -static u8 l_HIOInit; +static u8 hio_set; static daObj_Key_HIO_c l_HIO; @@ -553,7 +553,7 @@ static int daObj_Key_Delete(obj_key_class* i_this) { dComIfG_resDelete(&i_this->phase, "Obj_key"); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -616,9 +616,9 @@ static int daObj_Key_Create(fopAc_ac_c* i_this) { OS_REPORT("//////////////OBJ_KEY SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("カギOBJ", &l_HIO); } diff --git a/src/d/actor/d_a_obj_keyhole.cpp b/src/d/actor/d_a_obj_keyhole.cpp index 67e36b4da9b..7ca8611077b 100644 --- a/src/d/actor/d_a_obj_keyhole.cpp +++ b/src/d/actor/d_a_obj_keyhole.cpp @@ -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); } diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index 7c52cd9eddf..2aa8b200052 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -48,7 +48,7 @@ static void ride_call_back(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param ((obj_kita_class*)param_1)->field_0x590 = 20; } -static bool l_HIOInit; +static bool hio_set; static daObj_Kita_HIO_c l_HIO; @@ -171,7 +171,7 @@ static int daObj_Kita_Delete(obj_kita_class* i_this) { fopAcM_RegisterDeleteID(i_this, "Obj_Kita"); dComIfG_resDelete(&i_this->mPhase, "Obj_kita"); if (i_this->mIsHIOOwner) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -244,9 +244,9 @@ static int daObj_Kita_Create(fopAc_ac_c* a_this) { i_this->mKitas[i].mScaleX = cM_rndFX(0.05f) + 1.0f; } - if (!l_HIOInit) { + if (!hio_set) { i_this->mIsHIOOwner = true; - l_HIOInit = 1; + hio_set = 1; l_HIO.mId = mDoHIO_CREATE_CHILD("風で動く連続板", &l_HIO); } diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index 621413f6329..761cee8f8dc 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -697,14 +697,14 @@ int daObjKUW_c::Execute() { return 1; } -static bool l_HIOInit; +static bool hio_set; static daObj_KuwHIO_c l_HIO; int daObjKUW_c::Delete() { dComIfG_resDelete(&mPhase, "I_Kuw"); if (mIsHIOOwner) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -810,8 +810,8 @@ int daObjKUW_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; mIsHIOOwner = true; l_HIO.mId = mDoHIO_CREATE_CHILD("黄金蟲(クワガタ)", &l_HIO); } diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index 0163bbe96df..d98ee179457 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -88,7 +88,7 @@ static void msima_start(obj_msima_class* i_this) { /* 80C9CEA4 0001+00 data_80C9CEA4 @1009 */ /* 80C9CEA5 0003+00 data_80C9CEA5 None */ -static bool l_HIOInit; +static bool hio_set; static daObj_Msima_HIO_c l_HIO; @@ -366,7 +366,7 @@ static int daObj_Msima_Delete(obj_msima_class* i_this) { fopAcM_GetID(a_this); dComIfG_resDelete(&i_this->mPhase, "MAGNESIMA"); if (i_this->mIsHIOOwner) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } dComIfG_Bgsp().Release(i_this->mpBgW); @@ -458,9 +458,9 @@ static int daObj_Msima_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { i_this->mIsHIOOwner = true; - l_HIOInit = 1; + hio_set = 1; // Magma Island l_HIO.mId = mDoHIO_CREATE_CHILD("マグネ島", &l_HIO); } diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp index 72657355a81..e0f7332d6da 100644 --- a/src/d/actor/d_a_obj_rw.cpp +++ b/src/d/actor/d_a_obj_rw.cpp @@ -170,7 +170,7 @@ static void action(obj_rw_class* i_this) { i_this->field_0x670 = i_this->field_0x66c * (20.0f + TREG_F(16)) * cM_ssin(i_this->field_0x672); } -static u8 l_HIOInit; +static u8 hio_set; static daOBJ_RW_HIO_c l_HIO; @@ -267,7 +267,7 @@ static int daOBJ_RW_Delete(obj_rw_class* i_this) { dComIfG_resDelete(&i_this->phase, "Obj_rw"); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -310,9 +310,9 @@ static int daOBJ_RW_Create(fopAc_ac_c* actor) { OS_REPORT("//////////////OBJ_RW SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { i_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("いのししまる焼き", &l_HIO); } diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index 620671511fb..b457f617cd6 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -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); } diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 617ae6ee6d3..12529225599 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -433,7 +433,7 @@ void daObjTOMBO_c::BoomChk() { } } -static bool l_HIOInit; +static bool hio_set; static daObj_TomHIO_c l_HIO; @@ -533,7 +533,7 @@ void daObjTOMBO_c::Z_BufferChk() { int daObjTOMBO_c::Delete() { dComIfG_resDelete(&mPhase, "Tombo"); if (mIsHIOOwner) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } if (heap != NULL) { @@ -638,8 +638,8 @@ int daObjTOMBO_c::create() { if (!fopAcM_entrySolidHeap(this, useHeapInit, 0xaa0)) { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; mIsHIOOwner = true; // Golden Dragonfly l_HIO.mId = mDoHIO_CREATE_CHILD("黄金蟲(トンボ)", &l_HIO);