Skip to content

Misc. framework/d/ improvements#2572

Merged
TakaRikka merged 1 commit intozeldaret:mainfrom
caseif:framework-misc-1
Aug 7, 2025
Merged

Misc. framework/d/ improvements#2572
TakaRikka merged 1 commit intozeldaret:mainfrom
caseif:framework-misc-1

Conversation

@caseif
Copy link
Copy Markdown
Contributor

@caseif caseif commented Aug 6, 2025

This PR fixes some mismatches under framework/d with a couple of one TU now fully matching. I noticed that other framework classes are marked as matching for JP, but I don't have a JP ROM at the moment so I can't test this for the new matches.

@decomp-dev
Copy link
Copy Markdown

decomp-dev bot commented Aug 6, 2025

Report for GZ2E01 (ee608ce - 8a1e0ef)

📈 Matched code: 75.97% (+0.06%, +6580 bytes)
📈 Linked code: 29.76% (+0.08%, +9124 bytes)

✅ 2 new matches
Unit Function Bytes Before After
framework/d/d_kankyo_rain dKyr_rain_move() +12 99.81% 100.00%
framework/d/d_demo dDemo_setDemoData(fopAc_ac_c*, unsigned char, mDoExt_McaMorf*, const char*, int, unsigned short*, unsigned long, signed char) +6 99.15% 100.00%

/* 80039528 */ virtual int JSGFindObject(JStage::TObject**, char const*,
JStage::TEObject) const;

/* 80039AAC */ virtual ~dDemo_system_c();
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.

are you sure all these virtuals should move? make sure it doesn't affect the vtable's function order

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This was the only way that I could find to fix virtual function ordering in the TU. As far as I can tell (based on the .data section of this TU as well as virtual function calls in .text) it shouldn't have broken vtable ordering, but I'm not sure if there's anything else I should check to verify.

@caseif caseif force-pushed the framework-misc-1 branch from d22dccd to 8a1e0ef Compare August 6, 2025 02:21
@TakaRikka TakaRikka merged commit 57c9d64 into zeldaret:main Aug 7, 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.

2 participants