Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

d_a_obj_heavySw OK #2091

Merged
merged 6 commits into from
Mar 10, 2024
Merged

d_a_obj_heavySw OK #2091

merged 6 commits into from
Mar 10, 2024

Conversation

Trueffeloot
Copy link
Contributor

Resolves #895

TakaRikka
TakaRikka approved these changes Mar 10, 2024
View reviewed changes
Copy link
Contributor

@TakaRikka TakaRikka left a comment

Choose a reason for hiding this comment

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

lgtm when conflict is fixed

@Trueffeloot
Copy link
Contributor Author

good to go!

@hatal175 hatal175 merged commit dd0fd67 into zeldaret:main Mar 10, 2024
1 check passed
@Trueffeloot Trueffeloot deleted the obj_heavySw branch March 10, 2024 11:51
GinNoOokami pushed a commit to GinNoOokami/tp that referenced this pull request Mar 13, 2024
@Trueffeloot
d_a_obj_heavySw OK (zeldaret#2091)
1e5f3f3 
* match functions

* Match TU

* Cleanup

* remove asm and update progress
hatal175 pushed a commit that referenced this pull request Mar 13, 2024
@GinNoOokami @Trueffeloot @ErraticOocca
d_a_obj_lv3Candle OK (#2093)
567a12a 
* All methods matching

* Some cleanup, stuck on TU match

* d_a_obj_heavySw OK (#2091)

* match functions

* Match TU

* Cleanup

* remove asm and update progress

* d_a_obj_sekizo OK (#2092)

* Test commit.

* Match initBaseMtx and setBaseMtx

* Match Create, Draw. Execute almost matched.

* Match Execute and simpler functions.

* Misc changes for pause.

* Match CreateHeap and Delete. Start cleanup.

* Match create(). Update inherited fopAc_ac_c members.

* Most of sekizo matched, but .data has extra zeros (param_c underutilized?).

* Minor cleanup.

* Remove unused asm and update progress.

* Fix progress.

* Casting and cullMtx feedback.

* Decomp OK, minor cleanup

* Updating progress

---------

Co-authored-by: GinNoOokami <noreply>
Co-authored-by: Trueffel <[email protected]>
Co-authored-by: ErraticOocca <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TakaRikka TakaRikka TakaRikka approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

d_a_obj_heavySw.cpp
3 participants
@Trueffeloot @TakaRikka @hatal175