falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

e_mk_bo OK (#2724)

This commit is contained in:
YunataSavior 2025-10-04 12:34:09 -07:00 committed by GitHub
parent 0c058d2a2c
commit c3cd595107
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/GZ2E01/rels/d_a_e_mk_bo/symbols.txt
View File

@ -3,7 +3,7 @@ _epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
__register_global_object = .text:0x00000078; // type:function size:0x1C scope:global
__destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global
daE_MK_BO_Draw__FP13e_mk_bo_class = .text:0x000000EC; // type:function size:0x144 scope:global
daE_MK_BO_Draw__FP13e_mk_bo_class = .text:0x000000EC; // type:function size:0x144 scope:local
hit_check__FP13e_mk_bo_class = .text:0x00000230; // type:function size:0x254 scope:global
e_mk_bo_shot__FP13e_mk_bo_class = .text:0x00000484; // type:function size:0x610 scope:global
e_mk_bo_start__FP13e_mk_bo_class = .text:0x00000A94; // type:function size:0x50C scope:global
@ -12,12 +12,12 @@ e_mk_bo_hasira__FP13e_mk_bo_class = .text:0x00001304; // type:function size:0x2A
e_mk_bo_demo_ground__FP13e_mk_bo_class = .text:0x000015A4; // type:function size:0x5C scope:global
e_mk_bo_demo_spin__FP13e_mk_bo_class = .text:0x00001600; // type:function size:0x4C4 scope:global
action__FP13e_mk_bo_class = .text:0x00001AC4; // type:function size:0x1E0 scope:global
daE_MK_BO_Execute__FP13e_mk_bo_class = .text:0x00001CA4; // type:function size:0x628 scope:global
daE_MK_BO_IsDelete__FP13e_mk_bo_class = .text:0x000022CC; // type:function size:0x8 scope:global
daE_MK_BO_Delete__FP13e_mk_bo_class = .text:0x000022D4; // type:function size:0x50 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x00002324; // type:function size:0x1FC scope:global
daE_MK_BO_Execute__FP13e_mk_bo_class = .text:0x00001CA4; // type:function size:0x628 scope:local
daE_MK_BO_IsDelete__FP13e_mk_bo_class = .text:0x000022CC; // type:function size:0x8 scope:local
daE_MK_BO_Delete__FP13e_mk_bo_class = .text:0x000022D4; // type:function size:0x50 scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x00002324; // type:function size:0x1FC scope:local
__dt__12J3DFrameCtrlFv = .text:0x00002520; // type:function size:0x48 scope:global
daE_MK_BO_Create__FP10fopAc_ac_c = .text:0x00002568; // type:function size:0x268 scope:global
daE_MK_BO_Create__FP10fopAc_ac_c = .text:0x00002568; // type:function size:0x268 scope:local
__dt__8cM3dGSphFv = .text:0x000027D0; // type:function size:0x48 scope:global
__dt__8cM3dGAabFv = .text:0x00002818; // type:function size:0x48 scope:global
__dt__10dCcD_GSttsFv = .text:0x00002860; // type:function size:0x5C scope:global
@ -66,7 +66,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@4730 = .rodata:0x00000094; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x00000098; // type:object size:0x5 scope:local data:string_table
...data.0 = .data:0x00000000; // type:label scope:local
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_211_data_10 = .data:0x00000010; // type:object size:0x10
bo_eno_1$4378 = .data:0x00000020; // type:object size:0x8 scope:local
@ -74,7 +74,7 @@ bo_eno_2$4379 = .data:0x00000028; // type:object size:0x8 scope:local
bo_eno_12$4402 = .data:0x00000030; // type:object size:0x4 scope:local
bo_eno_end$4410 = .data:0x00000034; // type:object size:0x8 scope:local
at_sph_src$4657 = .data:0x0000003C; // type:object size:0x40 scope:local
l_daE_MK_BO_Method = .data:0x0000007C; // type:object size:0x20 scope:global
l_daE_MK_BO_Method = .data:0x0000007C; // type:object size:0x20 scope:local
g_profile_E_MK_BO = .data:0x0000009C; // type:object size:0x30 scope:global
__vt__12dBgS_AcchCir = .data:0x000000CC; // type:object size:0xC scope:global
__vt__10cCcD_GStts = .data:0x000000D8; // type:object size:0xC scope:global

2
configure.py
View File

@ -1738,7 +1738,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_md"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_mf"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_mk"),
ActorRel(NonMatching, "d_a_e_mk_bo"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_mk_bo"),
ActorRel(NonMatching, "d_a_e_mm"),
ActorRel(NonMatching, "d_a_e_mm_mt"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_ms"),

9
src/d/actor/d_a_e_mk_bo.cpp
View File

@ -556,7 +556,6 @@ static void action(e_mk_bo_class* i_this) {
}
/* 8071E8A4-8071EECC 001CA4 0628+00 2/1 0/0 0/0 .text daE_MK_BO_Execute__FP13e_mk_bo_class */
// NONMATCHING - regalloc on retail
static int daE_MK_BO_Execute(e_mk_bo_class* i_this) {
fopAc_ac_c* actor = &i_this->enemy;
cXyz sp64;
@ -591,10 +590,10 @@ static int daE_MK_BO_Execute(e_mk_bo_class* i_this) {
cLib_addCalcAngleS2(&i_this->field_0x5fa, actor->current.angle.y, 4, 0x1000);
mDoMtx_stack_c::transS(actor->current.pos.x, actor->current.pos.y, actor->current.pos.z);
mDoMtx_stack_c::YrotM(i_this->field_0x5fa);
mDoMtx_stack_c::ZrotM(actor->shape_angle.z);
mDoMtx_stack_c::YrotM(actor->shape_angle.y);
mDoMtx_stack_c::XrotM(actor->shape_angle.x);
mDoMtx_stack_c::YrotM(s16(i_this->field_0x5fa));
mDoMtx_stack_c::ZrotM(s16(actor->shape_angle.z));
mDoMtx_stack_c::YrotM(s16(actor->shape_angle.y));
mDoMtx_stack_c::XrotM(s16(actor->shape_angle.x));
fopAc_ac_c* a_parent = fopAcM_SearchByID(actor->parentActorID);
if (a_parent == NULL) {