Skip to content

Commit 4c9ce97

Browse files
YunataSaviorhatal175
YunataSavior
and
hatal175
authored
d_a_e_gb and d_a_obj_bosswarp OK (#2652)
* d_a_e_gb and d_a_obj_bosswarp OK * fix e_gb and obj_bosswarp symbols * mark e_gb and obj_bosswarp as OK for JPN * Remove nonmatching comment --------- Co-authored-by: hatal175 <hatal175@users.noreply.github.com>
1 parent f91257c commit 4c9ce97

File tree

8 files changed

+55
-357
lines changed

8 files changed

+55
-357
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ __destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:glob
66
__ct__12daE_GB_HIO_cFv = .text:0x000000EC; // type:function size:0x50 scope:global
77
head_anm_init__FP10e_gb_classifUcf = .text:0x0000013C; // type:function size:0xB0 scope:global
88
body_anm_init__FP10e_gb_classifUcf = .text:0x000001EC; // type:function size:0xB0 scope:global
9-
daE_GB_Draw__FP10e_gb_class = .text:0x0000029C; // type:function size:0x1DC scope:global
9+
daE_GB_Draw__FP10e_gb_class = .text:0x0000029C; // type:function size:0x1DC scope:local
1010
e_gb_wait__FP10e_gb_class = .text:0x00000478; // type:function size:0x4E8 scope:global
1111
e_gb_attack_1__FP10e_gb_class = .text:0x00000960; // type:function size:0x550 scope:global
1212
e_gb_attack_2__FP10e_gb_class = .text:0x00000EB0; // type:function size:0x510 scope:global
@@ -16,9 +16,9 @@ e_gb_start__FP10e_gb_class = .text:0x000017C8; // type:function size:0x190 scope
1616
kuki_control1__FP10e_gb_class = .text:0x00001958; // type:function size:0x3AC scope:global
1717
kuki_control2__FP10e_gb_class = .text:0x00001D04; // type:function size:0x174 scope:global
1818
kuki_control3__FP10e_gb_class = .text:0x00001E78; // type:function size:0x1CC scope:global
19-
s_b_sub__FPvPv = .text:0x00002044; // type:function size:0xDC scope:global
19+
s_b_sub__FPvPv = .text:0x00002044; // type:function size:0xDC scope:local
2020
damage_check__FP10e_gb_class = .text:0x00002120; // type:function size:0x1EC scope:global
21-
action__FP10e_gb_class = .text:0x0000230C; // type:function size:0x5EC scope:global
21+
action__FP10e_gb_class = .text:0x0000230C; // type:function size:0x5EC scope:local
2222
e_gf_wait__FP10e_gb_class = .text:0x000028F8; // type:function size:0x24 scope:global
2323
e_gf_chance__FP10e_gb_class = .text:0x0000291C; // type:function size:0x16C scope:global
2424
e_gf_eatbomb__FP10e_gb_class = .text:0x00002A88; // type:function size:0x264 scope:global
@@ -27,12 +27,12 @@ damage_check2__FP10e_gb_class = .text:0x00002EB4; // type:function size:0x210 sc
2727
action2__FP10e_gb_class = .text:0x000030C4; // type:function size:0x164 scope:global
2828
cam_3d_morf__FP10e_gb_classf = .text:0x00003228; // type:function size:0xE4 scope:global
2929
demo_camera__FP10e_gb_class = .text:0x0000330C; // type:function size:0xAE8 scope:global
30-
daE_GB_Execute__FP10e_gb_class = .text:0x00003DF4; // type:function size:0xAAC scope:global
31-
daE_GB_IsDelete__FP10e_gb_class = .text:0x000048A0; // type:function size:0x8 scope:global
32-
daE_GB_Delete__FP10e_gb_class = .text:0x000048A8; // type:function size:0x74 scope:global
33-
useHeapInit__FP10fopAc_ac_c = .text:0x0000491C; // type:function size:0x378 scope:global
30+
daE_GB_Execute__FP10e_gb_class = .text:0x00003DF4; // type:function size:0xAAC scope:local
31+
daE_GB_IsDelete__FP10e_gb_class = .text:0x000048A0; // type:function size:0x8 scope:local
32+
daE_GB_Delete__FP10e_gb_class = .text:0x000048A8; // type:function size:0x74 scope:local
33+
useHeapInit__FP10fopAc_ac_c = .text:0x0000491C; // type:function size:0x378 scope:local
3434
__dt__12J3DFrameCtrlFv = .text:0x00004C94; // type:function size:0x48 scope:global
35-
daE_GB_Create__FP10fopAc_ac_c = .text:0x00004CDC; // type:function size:0x2B8 scope:global
35+
daE_GB_Create__FP10fopAc_ac_c = .text:0x00004CDC; // type:function size:0x2B8 scope:local
3636
__ct__10e_gb_classFv = .text:0x00004F94; // type:function size:0x1A0 scope:global
3737
__dt__12dBgS_ObjAcchFv = .text:0x00005134; // type:function size:0x70 scope:global
3838
__dt__12dBgS_AcchCirFv = .text:0x000051A4; // type:function size:0x70 scope:global
@@ -165,7 +165,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
165165
@5877 = .rodata:0x000001CC; // type:object size:0x4 scope:local
166166
@stringBase0 = .rodata:0x000001D0; // type:object size:0xC scope:local data:string_table
167167
...data.0 = .data:0x00000000; // type:label scope:local
168-
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
168+
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
169169
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
170170
lbl_192_data_10 = .data:0x00000010; // type:object size:0x10
171171
e_prim$3785 = .data:0x00000020; // type:object size:0x8 scope:local
@@ -180,7 +180,7 @@ eno$4864 = .data:0x000000F4; // type:object size:0xA scope:local
180180
key_eno$5459 = .data:0x00000100; // type:object size:0x4 scope:local
181181
head_cc_sph_src$5811 = .data:0x00000104; // type:object size:0x40 scope:local
182182
body_cyl_src$5812 = .data:0x00000144; // type:object size:0x44 scope:local
183-
l_daE_GB_Method = .data:0x00000188; // type:object size:0x20 scope:global
183+
l_daE_GB_Method = .data:0x00000188; // type:object size:0x20 scope:local
184184
g_profile_E_GB = .data:0x000001A8; // type:object size:0x30 scope:global
185185
__vt__10cCcD_GStts = .data:0x000001D8; // type:object size:0xC scope:global
186186
__vt__10dCcD_GStts = .data:0x000001E4; // type:object size:0xC scope:global
@@ -192,6 +192,6 @@ __vt__8cM3dGAab = .data:0x00000238; // type:object size:0xC scope:global
192192
__vt__12J3DFrameCtrl = .data:0x00000244; // type:object size:0xC scope:global
193193
__vt__12daE_GB_HIO_c = .data:0x00000250; // type:object size:0xC scope:global
194194
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
195-
lbl_192_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
195+
lbl_192_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
196196
@3922 = .bss:0x0000000C; // type:object size:0xC scope:local
197-
l_HIO = .bss:0x00000018; // type:object size:0x20 scope:global data:byte
197+
l_HIO = .bss:0x00000018; // type:object size:0x20 scope:local data:byte

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
22
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
33
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
4-
CheckCreateHeap__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x20 scope:global
4+
CheckCreateHeap__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x20 scope:local
55
getNowLevel__Fv = .text:0x00000098; // type:function size:0xA8 scope:global
66
initBaseMtx__15daObjBossWarp_cFv = .text:0x00000140; // type:function size:0x48 scope:global
77
setBaseMtx__15daObjBossWarp_cFv = .text:0x00000188; // type:function size:0x70 scope:global
@@ -30,17 +30,17 @@ demoProc__15daObjBossWarp_cFv = .text:0x000014D4; // type:function size:0x644 sc
3030
setGoal__15daObjBossWarp_cFv = .text:0x00001B18; // type:function size:0xB8 scope:global
3131
draw__15daObjBossWarp_cFv = .text:0x00001BD0; // type:function size:0xAC scope:global
3232
_delete__15daObjBossWarp_cFv = .text:0x00001C7C; // type:function size:0x48 scope:global
33-
daObjBossWarp_Draw__FP15daObjBossWarp_c = .text:0x00001CC4; // type:function size:0x20 scope:global
34-
daObjBossWarp_Execute__FP15daObjBossWarp_c = .text:0x00001CE4; // type:function size:0x20 scope:global
35-
daObjBossWarp_Delete__FP15daObjBossWarp_c = .text:0x00001D04; // type:function size:0x20 scope:global
36-
daObjBossWarp_Create__FP10fopAc_ac_c = .text:0x00001D24; // type:function size:0x20 scope:global
33+
daObjBossWarp_Draw__FP15daObjBossWarp_c = .text:0x00001CC4; // type:function size:0x20 scope:local
34+
daObjBossWarp_Execute__FP15daObjBossWarp_c = .text:0x00001CE4; // type:function size:0x20 scope:local
35+
daObjBossWarp_Delete__FP15daObjBossWarp_c = .text:0x00001D04; // type:function size:0x20 scope:local
36+
daObjBossWarp_Create__FP10fopAc_ac_c = .text:0x00001D24; // type:function size:0x20 scope:local
3737
cLib_calcTimer<i>__FPi = .text:0x00001D44; // type:function size:0x1C scope:global
3838
setPos__11daObjLife_cF4cXyz = .text:0x00001D60; // type:function size:0x1C scope:global
3939
setCurrentPos__16obj_ystone_classF4cXyz = .text:0x00001D7C; // type:function size:0x1C scope:global
4040
_ctors = .ctors:0x00000000; // type:label scope:global
4141
_dtors = .dtors:0x00000000; // type:label scope:global
4242
...rodata.0 = .rodata:0x00000000; // type:label scope:local
43-
l_hair_offset = .rodata:0x00000000; // type:object size:0x54 scope:global
43+
l_hair_offset = .rodata:0x00000000; // type:object size:0x54 scope:local
4444
l_hair_rotate = .rodata:0x00000054; // type:object size:0x54 scope:global
4545
@3683 = .rodata:0x000000A8; // type:object size:0x24 scope:local
4646
@3701 = .rodata:0x000000CC; // type:object size:0x4 scope:local align:4 data:float
@@ -77,10 +77,10 @@ l_dangeon_clr_bitNo$4282 = .rodata:0x00000130; // type:object size:0x24 scope:lo
7777
@4541 = .rodata:0x00000188; // type:object size:0x4 scope:local align:4 data:float
7878
@stringBase0 = .rodata:0x0000018C; // type:object size:0x169 scope:local data:string_table
7979
...data.0 = .data:0x00000000; // type:label scope:local
80-
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
80+
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
8181
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
8282
lbl_91_data_10 = .data:0x00000010; // type:object size:0x10
83-
l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte
83+
l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte
8484
l_clearEvName = .data:0x00000024; // type:object size:0x24 scope:global
8585
l_warp_check_evName = .data:0x00000048; // type:object size:0x4 scope:global
8686
l_warp_cancel_evName = .data:0x0000004C; // type:object size:0x4 scope:global
@@ -100,7 +100,7 @@ action_table$4273 = .data:0x00000158; // type:object size:0x3C scope:local
100100
@4504 = .data:0x00000194; // type:object size:0x2C scope:local
101101
@4503 = .data:0x000001C0; // type:object size:0x1C scope:local
102102
@4502 = .data:0x000001DC; // type:object size:0x3C scope:local
103-
l_daObjBossWarp_Method = .data:0x00000218; // type:object size:0x20 scope:global
103+
l_daObjBossWarp_Method = .data:0x00000218; // type:object size:0x20 scope:local
104104
g_profile_Obj_BossWarp = .data:0x00000238; // type:object size:0x30 scope:global
105105
__vt__12J3DFrameCtrl = .data:0x00000268; // type:object size:0xC scope:global
106-
lbl_91_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
106+
lbl_91_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte

‎config/GZ2J01/rels/d_a_obj_bosswarp/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_bosswarp.cpp:
1313
.text start:0x00000078 end:0x00001D98
1414
.rodata start:0x00000000 end:0x000002F8
1515
.data start:0x00000000 end:0x00000274
16+
.bss start:0x00000000 end:0x00000004

‎configure.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,7 +1617,7 @@ def MatchingFor(*versions) -> bool:
16171617
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_tkj"),
16181618
ActorRel(NonMatching, "d_a_obj_bhashi"),
16191619
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bkdoor"),
1620-
ActorRel(NonMatching, "d_a_obj_bosswarp"),
1620+
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bosswarp"),
16211621
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_cboard"),
16221622
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_digplace"),
16231623
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_eff"),
@@ -1718,7 +1718,7 @@ def MatchingFor(*versions) -> bool:
17181718
ActorRel(Equivalent, "d_a_e_fk"), # weak func order
17191719
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fs"),
17201720
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fz"),
1721-
ActorRel(NonMatching, "d_a_e_gb"),
1721+
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_gb"),
17221722
ActorRel(NonMatching, "d_a_e_ge"),
17231723
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_gi"),
17241724
ActorRel(NonMatching, "d_a_e_gm"),

‎include/d/actor/d_a_e_gb.h‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -113,22 +113,5 @@ class e_gb_class {
113113

114114
STATIC_ASSERT(sizeof(e_gb_class) == 0xef8);
115115

116-
class daE_GB_HIO_c : public JORReflexible{
117-
public:
118-
/* 806C1CEC */ daE_GB_HIO_c();
119-
/* 806C6F98 */ virtual ~daE_GB_HIO_c() {}
120-
121-
void genMessage(JORMContext*);
122-
123-
/* 0x04 */ s8 field_0x4;
124-
/* 0x08 */ f32 field_0x8;
125-
/* 0x0C */ f32 field_0xc;
126-
/* 0x10 */ f32 field_0x10;
127-
/* 0x14 */ s16 field_0x14;
128-
/* 0x18 */ f32 field_0x18;
129-
/* 0x1C */ s16 field_0x1c;
130-
/* 0x1E */ s16 field_0x1e;
131-
};
132-
133116

134117
#endif /* D_A_E_GB_H */

‎include/d/actor/d_a_obj_life_container.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ class daObjLife_c : public daItemBase_c {
6060
actionInitWait2();
6161
}
6262

63-
void setPos(cXyz);
63+
void setPos(cXyz new_pos) {
64+
current.pos = new_pos;
65+
}
6466

6567
private:
6668
/* 0x92C */ fpc_ProcID mItemId;

‎src/d/actor/d_a_e_gb.cpp‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,23 @@
1313
#include "f_op/f_op_actor_enemy.h"
1414
#include "f_op/f_op_camera_mng.h"
1515

16+
class daE_GB_HIO_c : public JORReflexible{
17+
public:
18+
/* 806C1CEC */ daE_GB_HIO_c();
19+
/* 806C6F98 */ virtual ~daE_GB_HIO_c() {}
20+
21+
void genMessage(JORMContext*);
22+
23+
/* 0x04 */ s8 field_0x4;
24+
/* 0x08 */ f32 field_0x8;
25+
/* 0x0C */ f32 field_0xc;
26+
/* 0x10 */ f32 field_0x10;
27+
/* 0x14 */ s16 field_0x14;
28+
/* 0x18 */ f32 field_0x18;
29+
/* 0x1C */ s16 field_0x1c;
30+
/* 0x1E */ s16 field_0x1e;
31+
};
32+
1633

1734
/* 806C1CEC-806C1D3C 0000EC 0050+00 1/1 0/0 0/0 .text __ct__12daE_GB_HIO_cFv */
1835
daE_GB_HIO_c::daE_GB_HIO_c() {
@@ -1509,18 +1526,17 @@ static int daE_GB_Delete(e_gb_class* i_this) {
15091526

15101527
/* 806C651C-806C6894 00491C 0378+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
15111528
static int useHeapInit(fopAc_ac_c* a_this) {
1512-
// NONMATCHING - r30 is used instead of r27 in dComIfG_getObjectRes
15131529
e_gb_class* i_this = (e_gb_class*)a_this;
1514-
1515-
i_this->mpModelMorf1 = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_gb", 29), NULL, NULL,
1516-
(J3DAnmTransform*)dComIfG_getObjectRes("E_gb", 17), 2, 1.0f,
1530+
1531+
i_this->mpModelMorf1 = new mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_gb", 29)), NULL, NULL,
1532+
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("E_gb", 17)), 2, 1.0f,
15171533
0, -1, 1, NULL, 0x80000, 0x11000084);
15181534
if (i_this->mpModelMorf1 == NULL || i_this->mpModelMorf1->getModel() == NULL) {
15191535
return 0;
15201536
}
15211537

1522-
i_this->mpModelMorf2 = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_gb", 31), NULL, NULL,
1523-
(J3DAnmTransform*)dComIfG_getObjectRes("E_gb", 26), 2, 1.0f,
1538+
i_this->mpModelMorf2 = new mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_gb", 31)), NULL, NULL,
1539+
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("E_gb", 26)), 2, 1.0f,
15241540
0, -1, 1, NULL, 0x80000, 0x11000084);
15251541
i_this->field_0x68c = 26;
15261542
if (i_this->mpModelMorf2 == NULL || i_this->mpModelMorf2->getModel() == NULL) {
@@ -1532,13 +1548,14 @@ static int useHeapInit(fopAc_ac_c* a_this) {
15321548
return 0;
15331549
}
15341550

1535-
if (i_this->mBrkAnm->init(i_this->mpModelMorf2->getModel()->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("E_gb", 35),
1551+
if (i_this->mBrkAnm->init(i_this->mpModelMorf2->getModel()->getModelData(),
1552+
static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("E_gb", 35)),
15361553
1, 0, 1.0f, 0, -1) == 0) {
15371554
return 0;
15381555
}
15391556
i_this->mBrkAnm->setPlaySpeed(0.0f);
15401557

1541-
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_gb", 32);
1558+
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("E_gb", 32));
15421559
JUT_ASSERT(3378, modelData != 0);
15431560

15441561
for (int i = 0; i < 18; i++) {
@@ -1551,7 +1568,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
15511568
}
15521569

15531570
if (strcmp(dComIfGp_getStartStageName(), "D_MN05") == 0) {
1554-
modelData = (J3DModelData*)dComIfG_getObjectRes("E_gb", 30);
1571+
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("E_gb", 30));
15551572
JUT_ASSERT(3395, modelData != 0);
15561573
i_this->field_0x66c = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
15571574
if (i_this->field_0x66c == NULL) {

0 commit comments

Comments
 (0)