From ffd4e1fa75a255aac30bf323f02cb273a0d0f2bf Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 21 Dec 2025 17:17:46 -0500 Subject: [PATCH] More data fixes --- config/GZ2E01/rels/d_a_b_bq/symbols.txt | 4 +- config/GZ2E01/rels/d_a_b_dr/symbols.txt | 4 +- config/GZ2E01/rels/d_a_b_gg/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_gnd/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_ob/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_tn/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_yo/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_zant/symbols.txt | 2 +- config/GZ2E01/rels/d_a_cstatue/symbols.txt | 1 + config/GZ2E01/rels/d_a_e_fm/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_rd/symbols.txt | 6 +- config/GZ2E01/rels/d_a_e_rdb/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_rdy/symbols.txt | 2 +- config/GZ2E01/rels/d_a_mg_fish/symbols.txt | 3 +- src/d/actor/d_a_b_tn.cpp | 8 +- src/d/actor/d_a_cstatue.cpp | 14 +- src/d/actor/d_a_door_shutter.cpp | 271 ++++++++++----------- src/d/actor/d_a_e_rdb.cpp | 8 +- 18 files changed, 170 insertions(+), 167 deletions(-) diff --git a/config/GZ2E01/rels/d_a_b_bq/symbols.txt b/config/GZ2E01/rels/d_a_b_bq/symbols.txt index 409dccd6ba3..898084b4079 100644 --- a/config/GZ2E01/rels/d_a_b_bq/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_bq/symbols.txt @@ -292,7 +292,7 @@ __vt__8cM3dGAab = .data:0x000004AC; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000004B8; // type:object size:0xC scope:global __vt__12daB_BQ_HIO_c = .data:0x000004C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +data_805BAD50 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3811 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte -init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte +data_805BAD70 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_b_dr/symbols.txt b/config/GZ2E01/rels/d_a_b_dr/symbols.txt index 9aecebaa77f..4807429dbaa 100644 --- a/config/GZ2E01/rels/d_a_b_dr/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_dr/symbols.txt @@ -279,10 +279,10 @@ __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 -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3795 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x68 scope:global data:byte -init$0000 = .bss:0x000000BC; // type:object size:0x1 scope:local align:1 data:byte +data_805C7974 = .bss:0x000000BC; // type:object size:0x1 scope:local align:1 data:byte @6782 = .bss:0x000000C0; // type:object size:0xC scope:local @6785 = .bss:0x000000D0; // type:object size:0xC scope:local @6786 = .bss:0x000000DC; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_b_gg/symbols.txt b/config/GZ2E01/rels/d_a_b_gg/symbols.txt index 4173b090d02..ba3557c376e 100644 --- a/config/GZ2E01/rels/d_a_b_gg/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_gg/symbols.txt @@ -306,7 +306,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 -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3927 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte s_dis__22@unnamed@d_a_b_gg_cpp@ = .bss:0x00000070; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_b_gnd/symbols.txt b/config/GZ2E01/rels/d_a_b_gnd/symbols.txt index a90584bc217..2bb590d8718 100644 --- a/config/GZ2E01/rels/d_a_b_gnd/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_gnd/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 -lbl_145_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3810 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:local data:byte @4187 = .bss:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_b_ob/symbols.txt b/config/GZ2E01/rels/d_a_b_ob/symbols.txt index 0eef624d9b8..e24d0372d2d 100644 --- a/config/GZ2E01/rels/d_a_b_ob/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_ob/symbols.txt @@ -342,7 +342,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 -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +data_8061B4FD = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte moveSW = .bss:0x00000048; // type:object size:0x4 scope:global moveSW2 = .bss:0x0000004C; // type:object size:0x4 scope:global data:4byte @3767 = .bss:0x00000050; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_b_tn/symbols.txt b/config/GZ2E01/rels/d_a_b_tn/symbols.txt index e37d44fc407..c4bae1e7f56 100644 --- a/config/GZ2E01/rels/d_a_b_tn/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_tn/symbols.txt @@ -327,7 +327,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 -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3936 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x30 scope:global data:byte @3949 = .bss:0x00000084; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_b_yo/symbols.txt b/config/GZ2E01/rels/d_a_b_yo/symbols.txt index eaa6273567f..532ee0f219d 100644 --- a/config/GZ2E01/rels/d_a_b_yo/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_yo/symbols.txt @@ -280,7 +280,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 -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3783 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x5C scope:global data:byte @3802 = .bss:0x000000B0; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_b_zant/symbols.txt b/config/GZ2E01/rels/d_a_b_zant/symbols.txt index fbc5944bfc2..9c25cd6e557 100644 --- a/config/GZ2E01/rels/d_a_b_zant/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_zant/symbols.txt @@ -345,7 +345,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 -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @4164 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x44 scope:global data:byte @4182 = .bss:0x00000098; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_cstatue/symbols.txt b/config/GZ2E01/rels/d_a_cstatue/symbols.txt index 227da383005..146823774d3 100644 --- a/config/GZ2E01/rels/d_a_cstatue/symbols.txt +++ b/config/GZ2E01/rels/d_a_cstatue/symbols.txt @@ -165,6 +165,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @5356 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte effScale$5355 = .bss:0x00000058; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_fm/symbols.txt b/config/GZ2E01/rels/d_a_e_fm/symbols.txt index c30352b53d4..e5876d4d68b 100644 --- a/config/GZ2E01/rels/d_a_e_fm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_fm/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 -lbl_66_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3772 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xB0 scope:local data:byte @3819 = .bss:0x00000104; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_rd/symbols.txt b/config/GZ2E01/rels/d_a_e_rd/symbols.txt index ab176fda44d..cae9547108f 100644 --- a/config/GZ2E01/rels/d_a_e_rd/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_rd/symbols.txt @@ -438,11 +438,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local boss = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte -init$0000 = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @4224 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x50 scope:global data:byte S_find = .bss:0x000000AC; // type:object size:0x2 scope:global data:2byte -init$0000 = .bss:0x000000AE; // type:object size:0x1 scope:local align:1 data:byte +data_80519338 = .bss:0x000000AE; // type:object size:0x1 scope:local align:1 data:byte @4242 = .bss:0x000000B0; // type:object size:0xC scope:local S_find_pos = .bss:0x000000BC; // type:object size:0xC scope:global align:4 data:float data_80519200 = .bss:0x000000C8; // type:object size:0x1 data:byte @@ -452,7 +452,7 @@ target_info_count = .bss:0x000000F4; // type:object size:0x4 scope:global data:4 data_80519230 = .bss:0x000000F8; // type:object size:0x1 scope:local data:byte check_index$5284 = .bss:0x000000FC; // type:object size:0xFF scope:local rd_count = .bss:0x000001FC; // type:object size:0x4 scope:global data:4byte -init$0000 = .bss:0x00000200; // type:object size:0x1 scope:local align:1 data:byte +lbl_70_bss_AE = .bss:0x00000200; // type:object size:0x1 scope:local align:1 data:byte c_start = .bss:0x00000204; // type:object size:0x4 scope:global @11269 = .bss:0x00000208; // type:object size:0xC scope:local init$8899 = .bss:0x00000214; // type:object size:0x1 scope:local diff --git a/config/GZ2E01/rels/d_a_e_rdb/symbols.txt b/config/GZ2E01/rels/d_a_e_rdb/symbols.txt index 35b3170d0d6..0ef48322af8 100644 --- a/config/GZ2E01/rels/d_a_e_rdb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_rdb/symbols.txt @@ -243,7 +243,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 -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @4023 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @5932 = .bss:0x00000060; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_rdy/symbols.txt b/config/GZ2E01/rels/d_a_e_rdy/symbols.txt index 7b7d5f9087c..611015941e9 100644 --- a/config/GZ2E01/rels/d_a_e_rdy/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_rdy/symbols.txt @@ -318,7 +318,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local boss = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte -init$0000 = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @4034 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x50 scope:global data:byte S_find = .bss:0x000000AC; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2E01/rels/d_a_mg_fish/symbols.txt b/config/GZ2E01/rels/d_a_mg_fish/symbols.txt index 36ed31074d5..497e465a627 100644 --- a/config/GZ2E01/rels/d_a_mg_fish/symbols.txt +++ b/config/GZ2E01/rels/d_a_mg_fish/symbols.txt @@ -304,7 +304,8 @@ __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 @1007 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte +lit_1008 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +lit_1007 = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte @3674 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte s_fish_ct = .bss:0x00000070; // type:object size:0x4 scope:global data:4byte diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index ffdc8f35388..b3e1e193282 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -343,7 +343,7 @@ void daB_TN_c::calcWaistAngle() { } /* 8062F01D 0003+00 data_8062F01D None */ -static u8 s_hioinit; +static u8 hio_set; static daB_TN_HIO_c l_HIO; @@ -4913,7 +4913,7 @@ int daB_TN_c::_delete() { dComIfG_resDelete(&mPhaseReq1, "B_tn"); dComIfG_resDelete(&mPhaseReq2, mArcName); if (mHioInit) { - s_hioinit = 0; + hio_set = 0; } if (heap != NULL) { @@ -5073,8 +5073,8 @@ int daB_TN_c::create() { return cPhs_ERROR_e; } - if (s_hioinit == 0) { - s_hioinit = 1; + if (hio_set == 0) { + hio_set = 1; mHioInit = 1; l_HIO.mUnk1 = -1; } diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 4435487b753..af480cb4577 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -397,7 +397,7 @@ int daCstatue_c::create() { return result; } -static int daCstatue_Create(void* actor) { +static int daCstatue_Create(fopAc_ac_c* actor) { return static_cast(actor)->create(); } @@ -413,7 +413,7 @@ daCstatue_c::~daCstatue_c() { dComIfG_resDelete(&mPhaseReq, mResName); } -static int daCstatue_Delete(void* actor) { +static int daCstatue_Delete(daCstatue_c* actor) { static_cast(actor)->~daCstatue_c(); return cPhs_LOADING_e; } @@ -1166,7 +1166,7 @@ int daCstatue_c::execute() { return 1; } -static int daCstatue_Execute(void* actor) { +static int daCstatue_Execute(daCstatue_c* actor) { return static_cast(actor)->execute(); } @@ -1200,12 +1200,16 @@ int daCstatue_c::draw() { return 1; } -static int daCstatue_Draw(void* actor) { +static int daCstatue_Draw(daCstatue_c* actor) { return static_cast(actor)->draw(); } static actor_method_class l_daCstatue_Method = { - daCstatue_Create, daCstatue_Delete, daCstatue_Execute, NULL, daCstatue_Draw, + (process_method_func)daCstatue_Create, + (process_method_func)daCstatue_Delete, + (process_method_func)daCstatue_Execute, + (process_method_func)NULL, + (process_method_func)daCstatue_Draw, }; extern actor_process_profile_definition g_profile_CSTATUE = { diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index f689d3f209d..633b2e2b430 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -50,9 +50,8 @@ char* daDoor20_c::getArcName() { } } -static char bmdName[32]; - char* daDoor20_c::getBmdName() { + static char bmdName[32]; switch(door_param2_c::getKind(this)) { case 0: case 1: @@ -1524,110 +1523,109 @@ void daDoor20_c::startDemoProc() { } } -static char* table[19] = { - "DEFAULT_STOP_OPEN", - "DEFAULT_STOP_OPEN", - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, -}; - -static char* tate_table[4] = { - "DEFAULT_SHUTTER_DOOR_10", - "DEFAULT_SHUTTER_DOOR_10", - "DEFAULT_SHUTTER_DOOR_F_STOP", - "DEFAULT_SHUTTER_DOOR_F_STOP", -}; - -static char* tate_w_table[4] = { - "WOLF_SHUTTER_DOOR_10", - "WOLF_SHUTTER_DOOR_10", - "WOLF_SHUTTER_DOOR_F_STOP", - "WOLF_SHUTTER_DOOR_F_STOP", -}; - -static char* yoko_table[4] = { - "DEFAULT_SHUTTER_DOOR_14", - "DEFAULT_SHUTTER_DOOR_14", - "DEFAULT_SHUTTER_DOOR_F_STOP_14", - "DEFAULT_SHUTTER_DOOR_F_STOP_14", -}; - -static char* yoko_w_table[4] = { - "WOLF_SHUTTER_DOOR_14", - "WOLF_SHUTTER_DOOR_14", - "WOLF_SHUTTER_DOOR_F_STOP_14", - "WOLF_SHUTTER_DOOR_F_STOP_14", -}; - -static char* lv8_table[4] = { - "DEFAULT_SHUTTER_DOOR_18", - "DEFAULT_SHUTTER_DOOR_18", - "DEFAULT_SHUTTER_DOOR_F_STOP_18", - "DEFAULT_SHUTTER_DOOR_F_STOP_18", -}; - -static char* lv8_w_table[4] = { - "WOLF_SHUTTER_DOOR_18", - "WOLF_SHUTTER_DOOR_18", - "WOLF_SHUTTER_DOOR_F_STOP_18", - "WOLF_SHUTTER_DOOR_F_STOP_18", -}; - -static char* knob_table[7] = { - "DEFAULT_KNOB_DOOR_F", - "DEFAULT_KNOB_DOOR_B", - "DEFAULT_KNOB_DOOR_F_STOP", - "DEFAULT_KNOB_DOOR_B_STOP", - "DEFAULT_KNOB_DOOR_NOTOPEN_F", - "DEFAULT_KNOB_DOOR_NOTOPEN_B", - "DEFAULT_KNOB_DOOR_TALK_NOTOPEN_F", -}; - -static char* lv7_table[4] = { - "DEFAULT_SHUTTER_DOOR_20", - "DEFAULT_SHUTTER_DOOR_20", - "DEFAULT_SHUTTER_DOOR_F_STOP_20", - "DEFAULT_SHUTTER_DOOR_F_STOP_20", -}; - -static char* lv7_w_table[4] = { - "WOLF_SHUTTER_DOOR_20", - "WOLF_SHUTTER_DOOR_20", - "WOLF_SHUTTER_DOOR_F_STOP_20", - "WOLF_SHUTTER_DOOR_F_STOP_20", -}; - -static char* lv9_table[4] = { - "DEFAULT_SHUTTER_DOOR_22", - "DEFAULT_SHUTTER_DOOR_22", - "DEFAULT_SHUTTER_DOOR_F_STOP_22", - "DEFAULT_SHUTTER_DOOR_F_STOP_22", -}; - -static char* lv9_w_table[4] = { - "WOLF_SHUTTER_DOOR_22", - "WOLF_SHUTTER_DOOR_22", - "WOLF_SHUTTER_DOOR_F_STOP_22", - "WOLF_SHUTTER_DOOR_F_STOP_22", -}; - - void daDoor20_c::makeEventId() { + static char* table[19] = { + "DEFAULT_STOP_OPEN", + "DEFAULT_STOP_OPEN", + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + }; + + static char* tate_table[4] = { + "DEFAULT_SHUTTER_DOOR_10", + "DEFAULT_SHUTTER_DOOR_10", + "DEFAULT_SHUTTER_DOOR_F_STOP", + "DEFAULT_SHUTTER_DOOR_F_STOP", + }; + + static char* tate_w_table[4] = { + "WOLF_SHUTTER_DOOR_10", + "WOLF_SHUTTER_DOOR_10", + "WOLF_SHUTTER_DOOR_F_STOP", + "WOLF_SHUTTER_DOOR_F_STOP", + }; + + static char* yoko_table[4] = { + "DEFAULT_SHUTTER_DOOR_14", + "DEFAULT_SHUTTER_DOOR_14", + "DEFAULT_SHUTTER_DOOR_F_STOP_14", + "DEFAULT_SHUTTER_DOOR_F_STOP_14", + }; + + static char* yoko_w_table[4] = { + "WOLF_SHUTTER_DOOR_14", + "WOLF_SHUTTER_DOOR_14", + "WOLF_SHUTTER_DOOR_F_STOP_14", + "WOLF_SHUTTER_DOOR_F_STOP_14", + }; + + static char* lv8_table[4] = { + "DEFAULT_SHUTTER_DOOR_18", + "DEFAULT_SHUTTER_DOOR_18", + "DEFAULT_SHUTTER_DOOR_F_STOP_18", + "DEFAULT_SHUTTER_DOOR_F_STOP_18", + }; + + static char* lv8_w_table[4] = { + "WOLF_SHUTTER_DOOR_18", + "WOLF_SHUTTER_DOOR_18", + "WOLF_SHUTTER_DOOR_F_STOP_18", + "WOLF_SHUTTER_DOOR_F_STOP_18", + }; + + static char* knob_table[7] = { + "DEFAULT_KNOB_DOOR_F", + "DEFAULT_KNOB_DOOR_B", + "DEFAULT_KNOB_DOOR_F_STOP", + "DEFAULT_KNOB_DOOR_B_STOP", + "DEFAULT_KNOB_DOOR_NOTOPEN_F", + "DEFAULT_KNOB_DOOR_NOTOPEN_B", + "DEFAULT_KNOB_DOOR_TALK_NOTOPEN_F", + }; + + static char* lv7_table[4] = { + "DEFAULT_SHUTTER_DOOR_20", + "DEFAULT_SHUTTER_DOOR_20", + "DEFAULT_SHUTTER_DOOR_F_STOP_20", + "DEFAULT_SHUTTER_DOOR_F_STOP_20", + }; + + static char* lv7_w_table[4] = { + "WOLF_SHUTTER_DOOR_20", + "WOLF_SHUTTER_DOOR_20", + "WOLF_SHUTTER_DOOR_F_STOP_20", + "WOLF_SHUTTER_DOOR_F_STOP_20", + }; + + static char* lv9_table[4] = { + "DEFAULT_SHUTTER_DOOR_22", + "DEFAULT_SHUTTER_DOOR_22", + "DEFAULT_SHUTTER_DOOR_F_STOP_22", + "DEFAULT_SHUTTER_DOOR_F_STOP_22", + }; + + static char* lv9_w_table[4] = { + "WOLF_SHUTTER_DOOR_22", + "WOLF_SHUTTER_DOOR_22", + "WOLF_SHUTTER_DOOR_F_STOP_22", + "WOLF_SHUTTER_DOOR_F_STOP_22", + }; + for (int i = 0; i < 19; i++) { field_0x692[i] = dComIfGp_getEventManager().getEventIdx(this, table[i], 0xff); field_0x6b8[i] = 0xff; @@ -1831,39 +1829,38 @@ void daDoor20_c::getRestartPos(cXyz* param_1) { param_1->z = current.pos.z - fVar1 * field_0x680.z; } -static char* action_table[29] = { - "WAIT", - "STOP_OPEN", - "STOP_CLOSE", - "OPEN", - "CLOSE", - "SMOKE", - "SMOKE_END", - "SETGOAL", - "UNLOCK", - "SETSTART", - "SETANGLE", - "ADJUSTMENT", - "OPEN_PUSH", - "OPEN_PULL", - "OPEN_PUSH2", - "OPEN_PULL2", - "TALK", - "SETSTART_PUSH", - "SETSTART_PULL", - "END_CHECK", - "DROP_BF", - "DROP_AF", - "DELETE_LOCK", - "OPEN_INIT", - "ADJUSTMENT2", - "NOT_OPEN", - "MESSAGE", - "LIGHT_ANM", - "LIGHT_ANM2", -}; - int daDoor20_c::getDemoAction() { + static char* action_table[29] = { + "WAIT", + "STOP_OPEN", + "STOP_CLOSE", + "OPEN", + "CLOSE", + "SMOKE", + "SMOKE_END", + "SETGOAL", + "UNLOCK", + "SETSTART", + "SETANGLE", + "ADJUSTMENT", + "OPEN_PUSH", + "OPEN_PULL", + "OPEN_PUSH2", + "OPEN_PULL2", + "TALK", + "SETSTART_PUSH", + "SETSTART_PULL", + "END_CHECK", + "DROP_BF", + "DROP_AF", + "DELETE_LOCK", + "OPEN_INIT", + "ADJUSTMENT2", + "NOT_OPEN", + "MESSAGE", + "LIGHT_ANM", + "LIGHT_ANM2", + }; return dComIfGp_evmng_getMyActIdx(field_0x6cc, action_table, 29, 0, 0); } diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index 7b5f083b325..cd7842fb99d 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -876,7 +876,7 @@ static void* shot_s_sub(void* i_actor, void* i_data) { return NULL; } -static u8 s_HIOinit; +static u8 hio_set; static daE_RDB_HIO_c l_HIO; @@ -1738,7 +1738,7 @@ static int daE_RDB_Delete(e_rdb_class* i_this) { fopAcM_GetID(i_this); dComIfG_resDelete(&i_this->mPhase, "E_rdb"); if (i_this->field_0xfce != 0) { - s_HIOinit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.mID); } @@ -1840,9 +1840,9 @@ static int daE_RDB_Create(fopAc_ac_c* actor) { i_this->mAction = ACTION_WAIT; i_this->mMode = 0; - if (s_HIOinit == 0) { + if (hio_set == 0) { i_this->field_0xfce = 1; - s_HIOinit = 1; + hio_set = 1; l_HIO.mID = -1; }