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.

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

Decompile ovl_En_Insect #244

Merged
merged 22 commits into from
Jul 18, 2020
Merged

Decompile ovl_En_Insect #244

merged 22 commits into from
Jul 18, 2020

Conversation

nfaltermeier
Copy link
Contributor

Two non-matching functions left unfortunately, but I did manage to match the big function, so I'll call it a win.

Copy link
Collaborator

@Roman971 Roman971 left a comment

Choose a reason for hiding this comment

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

This looks alright to me but I have a few comments, mostly regarding naming and cleanliness.
Also make sure to run the format script on this file.

include/macros.h Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Insect/z_en_insect.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Insect/z_en_insect.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Insect/z_en_insect.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Insect/z_en_insect.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Insect/z_en_insect.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Insect/z_en_insect.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Insect/z_en_insect.c Outdated Show resolved Hide resolved
nfaltermeier and others added 2 commits July 14, 2020 20:47
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
src/overlays/actors/ovl_En_Insect/z_en_insect.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Insect/z_en_insect.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Insect/z_en_insect.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Insect/z_en_insect.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Insect/z_en_insect.c Outdated Show resolved Hide resolved
@fig02 fig02 merged commit a982d40 into zeldaret:master Jul 18, 2020
@nfaltermeier nfaltermeier deleted the ovl_en_insect branch July 19, 2020 06:21
louist103 pushed a commit to louist103/oot that referenced this pull request Jan 3, 2023
* Start decompiling bugs

* Decomp func_80A7BFA0

* Match 4 functions

* Match a few functions, really close on another

* Consolidate if statements

* Progress on func_80A7C86C

* Decompile a few small functions

* func_80A7CEC0 still needs stack and regalloc work

* Finish up func_80A7CEC0, do a couple functions

* Start on func_80A7D460

* func_80A7D460 is mostly down to regalloc

* Match update and draw, more work on func_80A7D460

* func_80A7D460 is really close to matching

* func_80A7D460 matches

* Cleanup

* Run formatter

* Missed reversing a couple flout comparisons

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* PR Comments

* PR Comments #2

* Missed one

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
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