Skip to content

Commit 2003a55

Browse files
caseifcaseif
committed
Improve several almost-matching TUs
1 parent f91257c commit 2003a55

File tree

15 files changed

+385
-392
lines changed

15 files changed

+385
-392
lines changed

‎config/GZ2E01/rels/d_a_grass/symbols.txt‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,18 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
230230
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
231231
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
232232
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
233+
data_8052790d = .bss:0x00000045; // type:object size:0x1 scope:local
233234
@4293 = .bss:0x00000048; // type:object size:0xC scope:local
235+
init$4294 = .bss:0x00000054; // type:object size:0x1 scope:local
234236
ang$4292 = .bss:0x00000058; // type:object size:0x6 scope:local
235237
exec_count_dammy$4868 = .bss:0x0000005E; // type:object size:0x2 scope:local
238+
init$4869 = .bss:0x00000060; // type:object size:0x1 scope:local
236239
exec_count_dammy2$4871 = .bss:0x00000062; // type:object size:0x2 scope:local
240+
init$4872 = .bss:0x00000064; // type:object size:0x1 scope:local
237241
mAngleZ$5046 = .bss:0x00000068; // type:object size:0xBB8 scope:local
238242
lbl_73_bss_C20 = .bss:0x00000C20; // type:object size:0x1 data:byte
239243
@5442 = .bss:0x00000C24; // type:object size:0xC scope:local
244+
init$5443 = .bss:0x00000C30; // type:object size:0x1 scope:local
240245
ang$5441 = .bss:0x00000C34; // type:object size:0x6 scope:local
241246
@6340 = .bss:0x00000C3C; // type:object size:0xC scope:local
242247
@6342 = .bss:0x00000C48; // type:object size:0xC scope:local
@@ -325,15 +330,15 @@ sInstance__32JASGlobalInstance<11Z2FxLineMgr> = .bss:0x00000F78; // type:object
325330
sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .bss:0x00000F7C; // type:object size:0x4 scope:global
326331
sInstance__32JASGlobalInstance<11Z2SpeechMgr> = .bss:0x00000F80; // type:object size:0x4 scope:global
327332
sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .bss:0x00000F84; // type:object size:0x4 scope:global
328-
lbl_73_bss_F88 = .bss:0x00000F88; // type:object size:0x1 data:byte
329-
l_setType0$localstatic3$create__9daGrass_cFv = .bss:0x00000F8C; // type:object size:0x2A scope:local data:2byte
330-
lbl_73_bss_FB6 = .bss:0x00000FB6; // type:object size:0x1 data:byte
331-
l_setType1$localstatic5$create__9daGrass_cFv = .bss:0x00000FB8; // type:object size:0x7E scope:local data:2byte
332-
lbl_73_bss_1036 = .bss:0x00001036; // type:object size:0x1 data:byte
333-
l_setType2$localstatic7$create__9daGrass_cFv = .bss:0x00001038; // type:object size:0x12 scope:local data:2byte
334-
lbl_73_bss_104A = .bss:0x0000104A; // type:object size:0x1 data:byte
335-
l_setType3$localstatic9$create__9daGrass_cFv = .bss:0x0000104C; // type:object size:0x2A scope:local data:2byte
336-
lbl_73_bss_1076 = .bss:0x00001076; // type:object size:0x1 data:byte
337-
l_setType4$localstatic11$create__9daGrass_cFv = .bss:0x00001078; // type:object size:0x66 scope:local data:2byte
338-
lbl_73_bss_10DE = .bss:0x000010DE; // type:object size:0x1 data:byte
339-
l_setType5$localstatic13$create__9daGrass_cFv = .bss:0x000010E0; // type:object size:0x2A scope:local data:2byte
333+
init$localstatic4$create__9daGrass_cFv = .bss:0x00000F88; // type:object size:0x1 scope:global data:byte
334+
l_setType0$localstatic3$create__9daGrass_cFv = .bss:0x00000F8C; // type:object size:0x2A scope:global data:2byte
335+
init$localstatic6$create__9daGrass_cFv = .bss:0x00000FB6; // type:object size:0x1 scope:global data:byte
336+
l_setType1$localstatic5$create__9daGrass_cFv = .bss:0x00000FB8; // type:object size:0x7E scope:global data:2byte
337+
init$localstatic8$create__9daGrass_cFv = .bss:0x00001036; // type:object size:0x1 scope:global data:byte
338+
l_setType2$localstatic7$create__9daGrass_cFv = .bss:0x00001038; // type:object size:0x12 scope:global data:2byte
339+
init$localstatic10$create__9daGrass_cFv = .bss:0x0000104A; // type:object size:0x1 scope:global data:byte
340+
l_setType3$localstatic9$create__9daGrass_cFv = .bss:0x0000104C; // type:object size:0x2A scope:global data:2byte
341+
init$localstatic12$create__9daGrass_cFv = .bss:0x00001076; // type:object size:0x1 scope:global data:byte
342+
l_setType4$localstatic11$create__9daGrass_cFv = .bss:0x00001078; // type:object size:0x66 scope:global data:2byte
343+
init$localstatic14$create__9daGrass_cFv = .bss:0x000010DE; // type:object size:0x1 scope:global data:byte
344+
l_setType5$localstatic13$create__9daGrass_cFv = .bss:0x000010E0; // type:object size:0x2A scope:global data:2byte

‎config/GZ2J01/rels/d_a_obj_volcball/splits.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ d/actor/d_a_obj_volcball.cpp:
1313
.text start:0x00000078 end:0x00002324
1414
.rodata start:0x00000000 end:0x000000C0
1515
.data start:0x00000000 end:0x00000270
16+
.bss start:0x00000000 end:0x00000004

‎configure.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,7 +1599,7 @@ def MatchingFor(*versions) -> bool:
15991599
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_rd"),
16001600
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_econt"),
16011601
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_fr"),
1602-
ActorRel(NonMatching, "d_a_grass"),
1602+
ActorRel(Equivalent, "d_a_grass"), # __sinit regalloc
16031603
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag05"),
16041604
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag10"),
16051605
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag11"),
@@ -1609,12 +1609,12 @@ def MatchingFor(*versions) -> bool:
16091609
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_fairy_seirei"),
16101610
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_fish"),
16111611
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_henna"),
1612-
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_kakashi"),
1612+
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_kakashi"),
16131613
ActorRel(NonMatching, "d_a_npc_kkri"),
16141614
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_kolin"),
16151615
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_maro"),
16161616
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_taro"),
1617-
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_tkj"),
1617+
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_tkj"),
16181618
ActorRel(NonMatching, "d_a_obj_bhashi"),
16191619
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bkdoor"),
16201620
ActorRel(NonMatching, "d_a_obj_bosswarp"),
@@ -1861,7 +1861,7 @@ def MatchingFor(*versions) -> bool:
18611861
ActorRel(NonMatching, "d_a_npc_len"),
18621862
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_lf"),
18631863
ActorRel(NonMatching, "d_a_npc_lud"),
1864-
ActorRel(NonMatching, "d_a_npc_midp"),
1864+
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_midp"),
18651865
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_mk"),
18661866
ActorRel(NonMatching, "d_a_npc_moi"),
18671867
ActorRel(NonMatching, "d_a_npc_moir", extra_cflags=[DANPCF_C_HACK]),
@@ -1878,7 +1878,7 @@ def MatchingFor(*versions) -> bool:
18781878
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_prayer", extra_cflags=[DANPCF_C_HACK]),
18791879
ActorRel(NonMatching, "d_a_npc_raca"),
18801880
ActorRel(NonMatching, "d_a_npc_rafrel"),
1881-
ActorRel(NonMatching, "d_a_npc_saru"),
1881+
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_saru"),
18821882
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_seib"),
18831883
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_seic"),
18841884
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_seid"),
@@ -2201,7 +2201,7 @@ def MatchingFor(*versions) -> bool:
22012201
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_udoor"),
22022202
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_usaku"),
22032203
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_vground"),
2204-
ActorRel(NonMatching, "d_a_obj_volcball"),
2204+
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_volcball"),
22052205
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_volcbom"),
22062206
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_warp_kbrg"),
22072207
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_warp_obrg"),

‎include/d/actor/d_a_grass.h‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ class dGrass_data_c {
1313
/* 8051DF54 */ void Direction_Set(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*, csXyz*);
1414
/* 8051E1C8 */ void WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, u16);
1515
/* 8051EB88 */ void hitCheck(int, u16);
16-
/* 80520940 */ ~dGrass_data_c();
17-
/* 8052097C */ dGrass_data_c();
16+
/* 80520940 */ ~dGrass_data_c() {}
17+
/* 8052097C */ dGrass_data_c() {
18+
m_state = 0;
19+
}
1820

1921
/* 0x00 */ u8 m_state;
2022
/* 0x01 */ u8 field_0x01;
@@ -33,7 +35,9 @@ class dGrass_room_c {
3335
public:
3436
/* 8051EDE0 */ void newData(dGrass_data_c*);
3537
/* 8051EDF0 */ void deleteData();
36-
/* 80520928 */ dGrass_room_c();
38+
/* 80520928 */ dGrass_room_c() {
39+
mp_data = NULL;
40+
}
3741

3842
dGrass_data_c* getData() { return mp_data; }
3943

@@ -42,7 +46,9 @@ class dGrass_room_c {
4246

4347
class dGrass_anm_c {
4448
public:
45-
/* 80520934 */ dGrass_anm_c();
49+
/* 80520934 */ dGrass_anm_c() {
50+
m_state = 0;
51+
}
4652

4753
/* 0x00 */ u8 m_state;
4854
/* 0x02 */ s16 m_angY;
@@ -62,7 +68,7 @@ class dGrass_packet_c : public J3DPacket {
6268
/* 805208E4 */ void setAnm(int, s16);
6369

6470
/* 8051F03C */ virtual void draw();
65-
/* 8051BFBC */ virtual ~dGrass_packet_c() {}
71+
/* 8051BFBC */ virtual ~dGrass_packet_c();
6672

6773
typedef void (dGrass_packet_c::*deleteFunc)(int);
6874
static deleteFunc m_deleteRoom;

‎include/d/actor/d_a_npc_midp.h‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class daNpc_midP_c : public daNpcT_c {
2020
TYPE_0,
2121
TYPE_1,
2222
};
23-
2423
/* 80A70C6C */ ~daNpc_midP_c();
2524
/* 80A70D90 */ int create();
2625
/* 80A71074 */ int CreateHeap();
@@ -55,13 +54,13 @@ class daNpc_midP_c : public daNpcT_c {
5554
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
5655
daNpcT_evtData_c const* param_7, char** param_8) :
5756
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
58-
/* 80A7390C */ u16 getEyeballRMaterialNo();
59-
/* 80A73914 */ u16 getEyeballLMaterialNo();
60-
/* 80A7391C */ s32 getHeadJointNo();
61-
/* 80A73924 */ s32 getNeckJointNo();
62-
/* 80A7392C */ s32 getBackboneJointNo();
63-
/* 80A73934 */ BOOL checkChangeJoint(int);
64-
/* 80A73944 */ BOOL checkRemoveJoint(int);
57+
/* 80A7390C */ u16 getEyeballRMaterialNo() { return 3; }
58+
/* 80A73914 */ u16 getEyeballLMaterialNo() { return 2; }
59+
/* 80A7391C */ s32 getHeadJointNo() { return 4; }
60+
/* 80A73924 */ s32 getNeckJointNo() { return 3; }
61+
/* 80A7392C */ s32 getBackboneJointNo() { return 2; }
62+
/* 80A73934 */ BOOL checkChangeJoint(int param_0) { return param_0 == 4; }
63+
/* 80A73944 */ BOOL checkRemoveJoint(int param_0) { return param_0 == 8; }
6564

6665
int getFlowNodeNo() {
6766
u16 nodeNo = home.angle.x;
@@ -88,7 +87,7 @@ STATIC_ASSERT(sizeof(daNpc_midP_c) == 0xfa0);
8887

8988
class daNpc_midP_Param_c {
9089
public:
91-
/* 80A73954 */ ~daNpc_midP_Param_c();
90+
/* 80A73954 */ virtual ~daNpc_midP_Param_c() {}
9291

9392
struct Data {
9493
/* 0x00 */ f32 field_0x00;
@@ -134,5 +133,4 @@ class daNpc_midP_Param_c {
134133
static const Data m;
135134
};
136135

137-
138136
#endif /* D_A_NPC_MIDP_H */

‎include/d/actor/d_a_obj_volcball.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ class daObjVolcBall_c : public fopAc_ac_c, public dEvLib_callback_c {
2727
};
2828

2929
struct vball_s {
30-
/* 80D21FA8 */ ~vball_s() {}
31-
/* 80D2214C */ vball_s() {}
32-
3330
/* 0x000 */ J3DModel* mpModel;
3431
/* 0x004 */ cXyz field_0x4;
3532
/* 0x010 */ cXyz field_0x10;
@@ -108,7 +105,6 @@ class daObjVolcBall_c : public fopAc_ac_c, public dEvLib_callback_c {
108105
/* 80D23A0C */ int _delete();
109106

110107
/* 80D22DDC */ virtual bool eventStart();
111-
/* 80D23B24 */ virtual ~daObjVolcBall_c() {}
112108

113109
u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
114110
u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }

‎include/d/actor/d_a_player.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ class daPy_py_c : public fopAc_ac_c {
10431043
cXyz* getRightHandPosP() { return &mRightHandPos; }
10441044
cXyz* getHeadTopPosP() { return &mHeadTopPos; }
10451045

1046-
const cXyz& getSwordTopPos() const { return mSwordTopPos; }
1046+
const cXyz getSwordTopPos() const { return mSwordTopPos; }
10471047

10481048
u32 checkWolf() const { return checkNoResetFlg1(FLG1_IS_WOLF); }
10491049
u32 checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }

‎include/d/d_kankyo.h‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -507,12 +507,24 @@ inline dScnKy_env_light_c* dKy_getEnvlight() {
507507

508508
class dKankyo_HIO_c {
509509
public:
510-
/* 0x000 */ u8 pad[0xB4];
511-
/* 0x0B4 */ u8 field_0xB4;
512-
/* 0x0B8 */ f32 field_0xB8;
513-
/* 0x0BC */ u8 field_0xBC[0x3F4 - 0xbc];
510+
/* 0x000 */ u8 field_0x000[0x6d - 0x0];
511+
/* 0x000 */ u8 field_0x06d;
512+
/* 0x000 */ u8 field_0x06e[0xb4 - 0x6e];
513+
/* 0x0B4 */ u8 field_0x0b4;
514+
/* 0x0B8 */ f32 field_0x0b8;
515+
/* 0x0BC */ u8 field_0x0bc[0x3f4 - 0xbc];
514516
/* 0x3F4 */ f32 field_0x3f4;
515517
/* 0x3F8 */ f32 field_0x3f8;
518+
/* 0x3FC */ u8 field_0x3fc[0x694 - 0x3fc];
519+
u8 field_0x694;
520+
u8 field_0x695;
521+
u8 field_0x696;
522+
u8 field_0x697[0x698 - 0x697];
523+
bool field_0x698;
524+
u8 field_0x699[0x69c - 0x699];
525+
f32 field_0x69c;
526+
u8 field_0x6a0[0x79b - 0x6a0];
527+
u8 field_0x79b;
516528
};
517529

518530
extern dKankyo_HIO_c g_kankyoHIO;

‎src/d/actor/d_a_grass.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@
99
#include "SSystem/SComponent/c_counter.h"
1010
#include "SSystem/SComponent/c_math.h"
1111
#include "d/d_com_inf_game.h"
12-
#include "dol2asm.h"
13-
#include "m_Do/m_Do_lib.h"
1412
#include "Z2AudioLib/Z2Instances.h"
1513
#include <string.h>
16-
#include <dolphin/gd.h>
1714

18-
#include "d/actor/d_grass.inc"
15+
#include "d/actor/d_grass.inc" // IWYU pragma: keep
1916
#include "d/actor/d_flower.inc"
2017

2118
/* 8051BD4C-8051BEFC 0000EC 01B0+00 1/1 0/0 0/0 .text randam_addcol_set__FPs */
@@ -86,6 +83,9 @@ void daGrass_c::deleteGrass() {
8683
}
8784
}
8885

86+
dGrass_packet_c::~dGrass_packet_c() {
87+
}
88+
8989
/* 8051C040-8051C074 0003E0 0034+00 1/1 0/0 0/0 .text executeGrass__9daGrass_cFv */
9090
void daGrass_c::executeGrass() {
9191
if (m_grass != NULL) {

‎src/d/actor/d_a_npc_midp.cpp‎

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ void daNpc_midP_c::setAttnPos() {
442442
daNpc_midP_Param_c::m.field_0x2c, daNpc_midP_Param_c::m.field_0x28,
443443
daNpc_midP_Param_c::m.field_0x34, daNpc_midP_Param_c::m.field_0x30,
444444
daNpc_midP_Param_c::m.field_0x3c, daNpc_midP_Param_c::m.field_0x38,
445-
daNpc_midP_Param_c::m.field_0x40, dVar5, NULL);
445+
daNpc_midP_Param_c::m.field_0x40, dVar5, &sp48);
446446
mJntAnm.calcJntRad(0.2f, 1.0f, dVar5);
447447
setMtx();
448448

@@ -505,7 +505,7 @@ void daNpc_midP_c::drawGhost() {
505505
/* 80A721E0-80A72228 001660 0048+00 1/1 0/0 0/0 .text selectAction__12daNpc_midP_cFv */
506506
int daNpc_midP_c::selectAction() {
507507
field_0xf84 = NULL;
508-
field_0xf84 = &daNpc_midP_c::talk;
508+
field_0xf84 = &daNpc_midP_c::wait;
509509
return 1;
510510
}
511511

@@ -644,50 +644,7 @@ static int daNpc_midP_IsDelete(void* i_this) {
644644
static u8 lit_3811[12];
645645

646646
/* 80A73D5C-80A73D60 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */
647-
static u8 l_HIO[4];
648-
649-
/* 80A7390C-80A73914 002D8C 0008+00 1/0 0/0 0/0 .text getEyeballRMaterialNo__12daNpc_midP_cFv */
650-
u16 daNpc_midP_c::getEyeballRMaterialNo() {
651-
return 3;
652-
}
653-
654-
/* 80A73914-80A7391C 002D94 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__12daNpc_midP_cFv */
655-
u16 daNpc_midP_c::getEyeballLMaterialNo() {
656-
return 2;
657-
}
658-
659-
/* 80A7391C-80A73924 002D9C 0008+00 1/0 0/0 0/0 .text getHeadJointNo__12daNpc_midP_cFv */
660-
s32 daNpc_midP_c::getHeadJointNo() {
661-
return 4;
662-
}
663-
664-
/* 80A73924-80A7392C 002DA4 0008+00 1/0 0/0 0/0 .text getNeckJointNo__12daNpc_midP_cFv */
665-
s32 daNpc_midP_c::getNeckJointNo() {
666-
return 3;
667-
}
668-
669-
/* 80A7392C-80A73934 002DAC 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__12daNpc_midP_cFv */
670-
s32 daNpc_midP_c::getBackboneJointNo() {
671-
return 2;
672-
}
673-
674-
/* 80A73934-80A73944 002DB4 0010+00 1/0 0/0 0/0 .text checkChangeJoint__12daNpc_midP_cFi */
675-
BOOL daNpc_midP_c::checkChangeJoint(int param_1) {
676-
// NONMATCHING
677-
return (4 - param_1) >> 5 & 0xff;
678-
}
679-
680-
/* 80A73944-80A73954 002DC4 0010+00 1/0 0/0 0/0 .text checkRemoveJoint__12daNpc_midP_cFi */
681-
BOOL daNpc_midP_c::checkRemoveJoint(int param_1) {
682-
// NONMATCHING
683-
return (8 - param_1) >> 5 & 0xff;
684-
}
685-
686-
/* 80A73954-80A7399C 002DD4 0048+00 2/1 0/0 0/0 .text __dt__18daNpc_midP_Param_cFv */
687-
daNpc_midP_Param_c::~daNpc_midP_Param_c() {
688-
// NONMATCHING
689-
690-
}
647+
static daNpc_midP_Param_c l_HIO;
691648

692649
/* 80A73B8C-80A73BAC -00001 0020+00 1/0 0/0 0/0 .data daNpc_midP_MethodTable */
693650
static actor_method_class daNpc_midP_MethodTable = {

0 commit comments

Comments
 (0)