diff options
| author | hiisuya <112015628+hiisuya@users.noreply.github.com> | 2023-12-10 13:36:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-10 14:36:12 -0500 |
| commit | cc96184a96c4fef61917ce895c615cca6e1128fa (patch) | |
| tree | bd081f8682a8245c72c96614198722909926c020 /src/code | |
| parent | 2ab90bc51788c6baac0a94c3acb256be5f39ca12 (diff) | |
Doc Actor: En_Ma1 (Child Malon) (#1584)
* started malon documentation
* docd all event and inf table checks
* doc cleanup
* ran formatter
* fixed misnamed eventcheck
* revert isNotSinging oops
* removed unnecessary comments
* changed from handle to update
* revert vec3f name change
* moved texture information
* isNotSinging to singingDisabled
* rename of inftable and eventchk
* small cleanup
* anim enum change
* enum names for child malon limbs
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 4468e3479..ccd3e20cd 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4782,7 +4782,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) { Flags_GetEventChkInf(EVENTCHKINF_37)) { retTextId = 0x7006; } else { - if (Flags_GetEventChkInf(EVENTCHKINF_12)) { + if (Flags_GetEventChkInf(EVENTCHKINF_RECEIVED_WEIRD_EGG)) { if (Flags_GetInfTable(INFTABLE_71)) { retTextId = 0x7072; } else { @@ -5144,16 +5144,16 @@ u32 func_80035BFC(PlayState* play, s16 arg1) { } break; case 71: - if (Flags_GetEventChkInf(EVENTCHKINF_16)) { + if (Flags_GetEventChkInf(EVENTCHKINF_CAN_LEARN_EPONAS_SONG)) { retTextId = 0x2049; - } else if (Flags_GetEventChkInf(EVENTCHKINF_15)) { + } else if (Flags_GetEventChkInf(EVENTCHKINF_TALKED_TO_CHILD_MALON_AT_RANCH)) { retTextId = 0x2048; } else if (Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { retTextId = 0x2047; - } else if (Flags_GetEventChkInf(EVENTCHKINF_12) && + } else if (Flags_GetEventChkInf(EVENTCHKINF_RECEIVED_WEIRD_EGG) && !Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { retTextId = 0x2044; - } else if (Flags_GetEventChkInf(EVENTCHKINF_10)) { + } else if (Flags_GetEventChkInf(EVENTCHKINF_TALKED_TO_MALON_FIRST_TIME)) { if (Flags_GetEventChkInf(EVENTCHKINF_11)) { retTextId = 0x2043; } else { @@ -5445,16 +5445,16 @@ void func_80036E50(u16 textId, s16 arg1) { return; case 71: if (textId == 0x2041) { - Flags_SetEventChkInf(EVENTCHKINF_10); + Flags_SetEventChkInf(EVENTCHKINF_TALKED_TO_MALON_FIRST_TIME); } if (textId == 0x2044) { - Flags_SetEventChkInf(EVENTCHKINF_12); + Flags_SetEventChkInf(EVENTCHKINF_RECEIVED_WEIRD_EGG); } if (textId == 0x2047) { - Flags_SetEventChkInf(EVENTCHKINF_15); + Flags_SetEventChkInf(EVENTCHKINF_TALKED_TO_CHILD_MALON_AT_RANCH); } if (textId == 0x2048) { - Flags_SetEventChkInf(EVENTCHKINF_16); + Flags_SetEventChkInf(EVENTCHKINF_CAN_LEARN_EPONAS_SONG); } return; case 72: @@ -5596,7 +5596,7 @@ s32 func_800374E0(PlayState* play, Actor* actor, u16 textId) { ret = 0; break; case 0x2043: - if (Flags_GetEventChkInf(EVENTCHKINF_12)) { + if (Flags_GetEventChkInf(EVENTCHKINF_RECEIVED_WEIRD_EGG)) { break; } func_80035B18(play, actor, 0x2044); |