Skip to content

d_a_obj_mie OK#2602

Merged
TakaRikka merged 1 commit intozeldaret:mainfrom
hatal175:obj_mie
Aug 25, 2025
Merged

d_a_obj_mie OK#2602
TakaRikka merged 1 commit intozeldaret:mainfrom
hatal175:obj_mie

Conversation

@hatal175
Copy link
Contributor

No description provided.

@YunataSavior
Copy link
Contributor

@hatal175 , if you tried marking the TU as Matching, would it go through?

@hatal175
Copy link
Contributor Author

It didn't. I think it had extra data in the .data section.

@hatal175
Copy link
Contributor Author

I've no idea what segfaulted in the github build

@decomp-dev
Copy link

decomp-dev bot commented Aug 24, 2025

Report for GZ2E01 (46a11f2 - 43f0385)

📈 Matched code: 79.62% (+0.06%, +6852 bytes)
📈 Linked code: 48.17% (+0.06%, +6860 bytes)

✅ 34 new matches
Unit Function Bytes Before After
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::Execute() +2708 0.15% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::create() +461 0.86% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::~daObj_Mie_c() +425 16.54% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::getWallAngle(short, short*) +396 1.00% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::Draw() +333 1.19% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::setWaterPrtcl() +292 1.35% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::setMtx() +173 2.27% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::calcRollAngle(short, int) +156 2.50% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::CreateHeap() +136 2.86% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::setSmokePrtcl() +120 3.23% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::srchPouyaa(void*, void*) +113 3.45% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie __sinit_d_a_obj_mie_cpp +113 3.45% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie dBgS_AcchCir::~dBgS_AcchCir() +109 3.57% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie dBgS_ObjAcch::~dBgS_ObjAcch() +109 3.57% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie dCcD_GStts::~dCcD_GStts() +89 4.35% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::setEnvTevColor() +89 4.35% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::setHamonPrtcl() +76 5.00% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie cM3dGLin::~cM3dGLin() +69 5.56% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie cM3dGCyl::~cM3dGCyl() +69 5.56% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie cM3dGAab::~cM3dGAab() +69 5.56% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie cM3dGPla::~cM3dGPla() +69 5.56% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie cCcD_GStts::~cCcD_GStts() +69 5.56% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::setRoomNo() +65 5.88% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie cXyz::~cXyz() +57 6.67% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::Delete() +49 7.69% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_c::createHeapCallBack(fopAc_ac_c*) +28 12.50% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_Create(void*) +28 12.50% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_Delete(void*) +28 12.50% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_Execute(void*) +28 12.50% 100.00%
d_a_obj_mie/d/actor/d_a_obj_mie daObj_Mie_Draw(void*) +28 12.50% 100.00%

...and 4 more new matches

@TakaRikka
Copy link
Contributor

is the pch data actually being linked? cause objdiff is just going to show it for any TU that includes it now, making it a bit annoying to diff, but it shouldnt actually effect anything when trying to build due to it being stripped

@hatal175
Copy link
Contributor Author

hatal175 commented Aug 25, 2025 via email

@YunataSavior
Copy link
Contributor

@hatal175 , in daObj_Mie_c::setWaterPrtcl, change emttrId[8] to emttrId[4]. It will then work.

@hatal175 hatal175 changed the title d_a_obj_mie equivalent d_a_obj_mie OK Aug 25, 2025
@hatal175
Copy link
Contributor Author

Good catch. Kinda hard to work on data after pch change in objdiff.

@YunataSavior
Copy link
Contributor

encounter/objdiff#247

I pulled @LagoLunatic 's changes for objdiff locally, rebuilt objdiff, and I was able to view the diff easily.

@TakaRikka TakaRikka merged commit 19c8b69 into zeldaret:main Aug 25, 2025
1 check passed
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