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

Decompiled ovl_En_Ma1 #83

Merged
merged 18 commits into from
Apr 27, 2020
Merged

Decompiled ovl_En_Ma1 #83

merged 18 commits into from
Apr 27, 2020

Conversation

ethteck
Copy link
Collaborator

@ethteck ethteck commented Apr 19, 2020

I also added a new script, gen_mips_to_c_context.py. You feed it a .s file and it will create a context file for mips_to_c at build/ctx.c . Only tested so far on actors.

s16 ret = 1;
switch (func_8010BDBC(&globalCtx->msgCtx)) {
case 2:
switch (this->actor.textId - 0x2041) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

This looks like it could just be a switch (this->actor.textId), with all cases being properly shifted (case 0x2041 instead of case 0, etc)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I just tried this and it doesn't seem to work.

src/overlays/actors/ovl_En_Ma1/z_en_ma1.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Ma1/z_en_ma1.c Outdated Show resolved Hide resolved
Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>
@Roman971 Roman971 mentioned this pull request Apr 25, 2020
if (this->unk_1E8.unk_00 == 0) {
if (this->unk_1E0 != 0) {
this->unk_1E0 = 0;
func_800F6584(0, this);
Copy link
Collaborator

Choose a reason for hiding this comment

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

this function appears to be called by en_ma1, 2 and 3. I would make this &this->actor, and below where it is used again

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It actually doesn't even take that other arg, which I'll fix in Ma2 after this is merged

src/overlays/actors/ovl_En_Ma1/z_en_ma1.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Ma1/z_en_ma1.c Outdated Show resolved Hide resolved
@fig02 fig02 merged commit d589834 into zeldaret:master Apr 27, 2020
@ethteck ethteck deleted the ovl_En_Ma1 branch April 27, 2020 05:58
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.

4 participants