Skip to content

d_a_npc_seic almost equivalent#2432

Merged
hatal175 merged 5 commits intozeldaret:mainfrom
carter-ktb21:d_a_npc_seic
May 13, 2025
Merged

d_a_npc_seic almost equivalent#2432
hatal175 merged 5 commits intozeldaret:mainfrom
carter-ktb21:d_a_npc_seic

Conversation

@carter-ktb21
Copy link
Copy Markdown
Contributor

No description provided.

@hatal175
Copy link
Copy Markdown
Contributor

hatal175 commented May 9, 2025

Could you resolve the merge conflicts?

Comment on lines +275 to +280
f32 fVar1 = daNpc_seiC_Param_c::m.field_0x90;
dComIfGp_getAttention().getDistTable(0x28).mDistMax = fVar1;
dComIfGp_getAttention().getDistTable(0x28).mDistMaxRelease = fVar1;

dComIfGp_getAttention().getDistTable(0x27).mDistMax = fVar1;
dComIfGp_getAttention().getDistTable(0x27).mDistMaxRelease = fVar1;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
f32 fVar1 = daNpc_seiC_Param_c::m.field_0x90;
dComIfGp_getAttention().getDistTable(0x28).mDistMax = fVar1;
dComIfGp_getAttention().getDistTable(0x28).mDistMaxRelease = fVar1;
dComIfGp_getAttention().getDistTable(0x27).mDistMax = fVar1;
dComIfGp_getAttention().getDistTable(0x27).mDistMaxRelease = fVar1;
dComIfGp_getAttention().getDistTable(0x28).mDistMax = daNpc_seiC_Param_c::m.field_0x90;
dComIfGp_getAttention().getDistTable(0x28).mDistMaxRelease = daNpc_seiC_Param_c::m.field_0x90;
dComIfGp_getAttention().getDistTable(0x27).mDistMax = daNpc_seiC_Param_c::m.field_0x90;
dComIfGp_getAttention().getDistTable(0x27).mDistMaxRelease = daNpc_seiC_Param_c::m.field_0x90;

And mark as Equivalent # weak func order. Also note that in the debug rom these are accessed with a member pointer, not the global static variable.

Thanks!

@decomp-dev
Copy link
Copy Markdown

decomp-dev bot commented May 12, 2025

Report for GZ2E01 (8f97cd9 - e92b7d7)

📈 Matched code: 59.79% (+0.06%, +7248 bytes)

d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::~daNpc_seiC_c() +72 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::create() +572 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::CreateHeap() +341 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::Delete() +48 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::Execute() +28 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::Draw() +144 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::createHeapCallBack(fopAc_ac_c*) +28 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::getType() +28 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::getFlowNodeNo() +24 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::reset() +333 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::setParam() +276 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | dAttention_c::getDistTable(int) +16 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::evtTalk() +252 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::evtCutProc() +196 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::action() +133 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::beforeMove() +124 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::setAttnPos() +89 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::afterSetMotionAnm(int, int, float, int) +404 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::selectAction() +68 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::chkAction(int (daNpc_seiC_c::*)(void*)) +41 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::setAction(int (daNpc_seiC_c::*)(void*)) +165 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::wait(void*) +41 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_c::talk(void*) +156 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_Create(void*) +28 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_Delete(void*) +28 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_Execute(void*) +28 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpc_seiC_Draw(void*) +28 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | cCcD_GStts::~cCcD_GStts() +68 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | daNpcT_c::~daNpcT_c() +900 bytes -> 100.00%
d_a_npc_seic/d/actor/d_a_npc_seic | cXyz::~cXyz() +56 bytes -> 100.00%
...and 30 more items

@hatal175 hatal175 merged commit e682f65 into zeldaret:main May 13, 2025
1 check passed
meintte pushed a commit to meintte/tp that referenced this pull request May 28, 2025
* Data work and fopacmsetup

* d_a_npc_seic almost equivalent

* Now equivalent and configure.py updated
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants