d_a_e_mf equivalent and d_a_e_dn work by carter-ktb21 · Pull Request #2492 · zeldaret/tp

carter-ktb21 · 2025-06-20T18:18:19Z

No description provided.

decomp-dev · 2025-06-20T18:32:58Z

Report for GZ2E01 (`ac06966` - `ee452c0`)

📈 Matched code: 66.70% (+0.62%, +70676 bytes)

✅ 131 new matches:

Unit	Function	Bytes	Before	After
`d_a_e_dn/d/actor/d_a_e_dn`	`action(e_dn_class*)`	+5388	0.07%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`action(e_mf_class*)`	+5325	0.08%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`daE_MF_Execute(e_mf_class*)`	+3293	0.12%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`e_dn_damage(e_dn_class*)`	+2965	0.13%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`e_mf_damage(e_mf_class*)`	+2908	0.14%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`e_dn_fight_run(e_dn_class*)`	+2309	0.17%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`e_mf_fight_run(e_mf_class*)`	+2280	0.18%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`e_dn_gakejump(e_dn_class*)`	+1324	0.30%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`e_mf_gakejump(e_mf_class*)`	+1324	0.30%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`e_dn_bomb_action(e_dn_class*)`	+1289	0.31%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`e_mf_bomb_action(e_mf_class*)`	+1276	0.31%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`nodeCallBack(J3DJoint*, int)`	+1208	0.33%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`nodeCallBack(J3DJoint*, int)`	+1208	0.33%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`search_bomb(e_dn_class*, int)`	+1160	0.34%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`e_dn_stay(e_dn_class*)`	+1153	0.35%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`e_mf_stay(e_mf_class*)`	+1153	0.35%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`search_bomb(e_mf_class*, int)`	+1140	0.35%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`e_mf_wolfbite(e_mf_class*)`	+981	0.41%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`damage_check(e_dn_class*)`	+940	0.42%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`damage_check(e_mf_class*)`	+913	0.44%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`e_dn_wolfbite(e_dn_class*)`	+905	0.44%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`daE_DN_Create(fopAc_ac_c*)`	+873	0.46%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`e_dn_normal(e_dn_class*)`	+853	0.47%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`e_mf_normal(e_mf_class*)`	+853	0.47%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`e_dn_otoreac(e_dn_class*)`	+812	0.49%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`e_mf_otoreac(e_mf_class*)`	+812	0.49%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`daE_MF_Create(fopAc_ac_c*)`	+812	0.49%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`e_dn_reg(e_dn_class*)`	+804	0.50%	100.00%
`d_a_e_dn/d/actor/d_a_e_dn`	`anm_se_set(e_dn_class*)`	+760	0.52%	100.00%
`d_a_e_mf/d/actor/d_a_e_mf`	`anm_se_set(e_mf_class*)`	+760	0.52%	100.00%

...and 101 more new matches

📈 1 improvements in unmatched functions:

Unit	Function	Bytes	Before	After
`d_a_e_dn/d/actor/d_a_e_dn`	`daE_DN_Execute(e_dn_class*)`	+3302	0.12%	99.92%

hatal175 · 2025-06-20T19:13:28Z

@@ -11,16 +15,152 @@
 * 
 */
 class e_dn_class : public fopEn_enemy_c {


This doesn't inherit from fopEn_enemy_c, it has it as a field. When you change it, make sure all a_this assignments take the reference from the member variable

For some reason, doing this messes up the regalloc for a number of functions. Is there some other variation of that process that it should be?

hatal175 · 2025-06-20T19:13:36Z

@@ -11,16 +15,145 @@
 * 
 */
 class e_mf_class : public fopEn_enemy_c {


This doesn't inherit from fopEn_enemy_c, it has it as a field. When you change it, make sure all a_this assignments take the reference from the member variable

hatal175 · 2025-06-20T19:16:15Z

+public:
    /* 8070A70C */ daE_MF_HIO_c();
-    /* 80713464 */ ~daE_MF_HIO_c();
+    /* 80713464 */ virtual ~daE_MF_HIO_c() {};


; can be removed

hatal175 · 2025-06-20T19:24:40Z

+            cLib_addCalcAngleS2(&i_this->field_0x724.x, -0x4000, 1, 0x300);
+
+            if (i_this->mObjAcch.ChkGroundHit()) {
+                if (a_this->health > 0 && daPy_py_c::checkNowWolf() == 0) {


!daPy_py_c::checkNowWolf()

hatal175 · 2025-06-20T19:32:36Z

+                        i_this->mAtInfo.mHitStatus = 0;
+                    }
+
+                    if (i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_UNK) != 0) {


No need for != 0

hatal175 · 2025-06-20T19:32:54Z

+                    }
+
+                    i_this->field_0x724 |= i_this->mAtInfo.mHitBit;
+                    if (i_this->mAtInfo.mHitType == 16 || i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) != 0) {


No need for != 0

hatal175 · 2025-06-20T19:33:00Z

+            if (i_this->field_0xa9c[i].ChkTgHit() != 0) {
+                i_this->mAtInfo.mpCollider = i_this->field_0xa9c[i].GetTgHitObj();
+                if (player->getCutType() != daPy_py_c::CUT_TYPE_WOLF_B_LEFT && player->getCutType() != daPy_py_c::CUT_TYPE_WOLF_B_RIGHT &&
+                    i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_WOLF_ATTACK) != 0) {


No need for != 0

hatal175 · 2025-06-20T19:33:04Z

+                }
+
+                i_this->field_0x10da = 3;
+                if (i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_10000000) != 0) {


No need for != 0

hatal175 · 2025-06-20T19:33:18Z

+                        i_this->mAtInfo.mHitStatus = 0;
+                    }
+
+                    if (i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_UNK) != 0) {


Just change all the ChkAtType

hatal175 · 2025-06-20T19:33:55Z

+            break;
+
+        case ACTION_REG:
+            e_dn_reg(i_this);


Add break;
Not technically necessary but good practice if people add cases

not into it?

hatal175 · 2025-06-20T20:02:33Z

Did you remove/not remove the pointer conversion? Try doing the opposite.

…

On Fri, Jun 20, 2025, 23:00 Carco_21 ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In include/d/actor/d_a_e_dn.h <#2492 (comment)>: > @@ -11,16 +15,152 @@ * */ class e_dn_class : public fopEn_enemy_c { For some reason, doing this messes up the regalloc for a number of functions. Is there some other variation of that process that it should be? — Reply to this email directly, view it on GitHub <#2492 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ACYQXXIIUIU5ODB3NTGJT5L3ERR7XAVCNFSM6AAAAAB7Y5KUPWVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDSNBXGE3DINJVGQ> . You are receiving this because you commented.Message ID: ***@***.***>

carter-ktb21 · 2025-06-20T20:06:05Z

Did you remove/not remove the pointer conversion? Try doing the opposite.

Could you clarify?

I tried "fopEn_enemy_c* a_this = &i_this->actor;". Is there a different way to do it?

hatal175 · 2025-06-20T20:07:45Z

Add the (fopEn_enemy_c*)

…

On Fri, Jun 20, 2025, 23:06 Carco_21 ***@***.***> wrote: *carter-ktb21* left a comment (zeldaret/tp#2492) <#2492 (comment)> Did you remove/not remove the pointer conversion? Try doing the opposite. Could you clarify? I tried "fopEn_enemy_c* a_this = &i_this->actor;". Is there a different way to do it? — Reply to this email directly, view it on GitHub <#2492 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ACYQXXMLFKTYT3KAVPNMQRT3ERSUHAVCNFSM6AAAAAB7Y5KUPWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDSOJSGY3DMMZZGU> . You are receiving this because you commented.Message ID: ***@***.***>

carter-ktb21 · 2025-06-20T20:09:54Z

Add the (fopEn_enemy_c*)

Interesting. That works!

carter-ktb21 added 21 commits June 6, 2025 15:28

Tiny start on d_a_obj_gra2

6f54646

Initial work

0116627

Solid work done

6a81c94

More work

c637ed8

work on some rolling functions and deme camera

95704ee

Almost all functions worked on

49c7f77

All functions worked on

b3fb0e3

Fixed some BaseNpc functions I broke

deb3c88

PR Cleanup

52c4437

PR cleanup part 2

53227b0

Worked on create function

62f5307

Worked up to search_bomb

3d9124d

Work on various action functions

1ddbb5c

Almost all functions worked on

ff79b26

Merge branch 'main' of https://github.com/zeldaret/tp into d_a_e_mf

77f5f5b

d_a_e_mf equivalent

01aa690

Started copying over to d_a_e_dn

5d5859e

Merge branch 'main' of https://github.com/zeldaret/tp into d_a_e_mf

454a709

d_a_e_dn almost equivalent, e_mf cleanup

ab81262

somehow accidentally took out something from gra2 in a previous commit

2ba62d2

Fixed data layout issue in d_a_e_dn

077203b

hatal175 reviewed Jun 20, 2025

View reviewed changes

PR cleanup

4026d30

Took out fopen_enemy_c inheritance

ee452c0

hatal175 approved these changes Jun 20, 2025

View reviewed changes

hatal175 merged commit 7025de1 into zeldaret:main Jun 20, 2025
1 check passed

Conversation

carter-ktb21 commented Jun 20, 2025

Uh oh!

decomp-dev bot commented Jun 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Report for GZ2E01 (ac06966 - ee452c0)

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hatal175 commented Jun 20, 2025 via email

Uh oh!

carter-ktb21 commented Jun 20, 2025

Uh oh!

hatal175 commented Jun 20, 2025 via email

Uh oh!

carter-ktb21 commented Jun 20, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

decomp-dev bot commented Jun 20, 2025 •

edited

Loading

Report for GZ2E01 (`ac06966` - `ee452c0`)