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

Decompiled ovl_En_Ma1 #83

Merged
merged 18 commits into from
Apr 27, 2020
Merged

Decompiled ovl_En_Ma1 #83

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c9ab47a
first steps
ethteck Apr 15, 2020
72bcf6a
some more
ethteck Apr 16, 2020
2dfe1fa
Merge branch 'master' into ovl_En_Ma1
ethteck Apr 16, 2020
ff03030
fixing merge
ethteck Apr 16, 2020
fa42675
Merge branch 'master' into ovl_En_Ma1
ethteck Apr 18, 2020
6e68b00
more progress
ethteck Apr 18, 2020
412efaf
progs
ethteck Apr 18, 2020
b2655f1
Decompiled ovl_En_Ma1
ethteck Apr 19, 2020
8ff4e4c
newline
ethteck Apr 19, 2020
72d8dc9
Merge branch 'master' into ovl_En_Ma1
ethteck Apr 20, 2020
0018de9
Pr suggestion
ethteck Apr 20, 2020
ccc4ccb
Fixing some small things
ethteck Apr 23, 2020
43867ca
Update src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
ethteck Apr 25, 2020
d1b16cd
Merge branch 'master' into ovl_En_Ma1
ethteck Apr 25, 2020
6752373
Removing padding
ethteck Apr 25, 2020
c999103
Merge branch 'master' into ovl_En_Ma1
ethteck Apr 26, 2020
727647d
Fixing script
ethteck Apr 26, 2020
489b27f
Fixing some things
ethteck Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixing merge
  • Loading branch information
@ethteck
ethteck committed Apr 16, 2020
commit ff030304bbaa60acbfe18b00701ac8f3c9597d94
4 changes: 2 additions & 2 deletions src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ void EnMa1_Init(EnMa1* this, GlobalContext* globalCtx) {
this->actor.unk_1F = 6;
this->unk_1E8.unk_00 = 0;

if ((!(gSaveContext.eventChkInf[1] & 0x10)) || (CHECK_QUEST_ITEM(ITEM_SONG_EPONA))) {
if ((!(gSaveContext.eventChkInf[1] & 0x10)) || (CHECK_QUEST_ITEM(QUEST_SONG_EPONA))) {
this->actionFunc = (ActorFunc)func_80AA0D88;
func_80AA0A84(this, 2);
} else {
Expand All @@ -254,7 +254,7 @@ void func_80AA0D88(EnMa1* this, GlobalContext* globalCtx) {

if ((globalCtx->sceneNum == 0x5F) && (gSaveContext.eventChkInf[1] & 0x10)) {
ethteck marked this conversation as resolved.
Show resolved Hide resolved
Actor_Kill(&this->actor);
} else if ((!(gSaveContext.eventChkInf[1] & 0x10)) || (CHECK_QUEST_ITEM(ITEM_SONG_EPONA))) {
} else if ((!(gSaveContext.eventChkInf[1] & 0x10)) || (CHECK_QUEST_ITEM(QUEST_SONG_EPONA))) {
if (this->unk_1E8.unk_00 == 2) {
this->actionFunc = (ActorFunc)func_80AA0EA0;
globalCtx->msgCtx.unk_E3E7 = 4;
Expand Down