diff options
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index b14f32a84..e1f939029 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4602,7 +4602,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) { if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) && Flags_GetEventChkInf(EVENTCHKINF_37)) { retTextId = 0x7047; - } else if (Flags_GetEventChkInf(EVENTCHKINF_14)) { + } else if (Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { retTextId = 0x701A; } else if (Flags_GetEventChkInf(EVENTCHKINF_11)) { if (Flags_GetInfTable(INFTABLE_C6)) { @@ -4911,9 +4911,10 @@ u32 func_80035BFC(PlayState* play, s16 arg1) { retTextId = 0x2049; } else if (Flags_GetEventChkInf(EVENTCHKINF_15)) { retTextId = 0x2048; - } else if (Flags_GetEventChkInf(EVENTCHKINF_14)) { + } else if (Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { retTextId = 0x2047; - } else if (Flags_GetEventChkInf(EVENTCHKINF_12) && !Flags_GetEventChkInf(EVENTCHKINF_14)) { + } else if (Flags_GetEventChkInf(EVENTCHKINF_12) && + !Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { retTextId = 0x2044; } else if (Flags_GetEventChkInf(EVENTCHKINF_10)) { if (Flags_GetEventChkInf(EVENTCHKINF_11)) { @@ -4927,7 +4928,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) { break; case 72: if (!LINK_IS_ADULT) { - if (Flags_GetEventChkInf(EVENTCHKINF_14)) { + if (Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { retTextId = 0x2040; } else if (Flags_GetInfTable(INFTABLE_94)) { retTextId = 0x2040; @@ -4935,7 +4936,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) { retTextId = 0x203F; } } else { - if (!Flags_GetEventChkInf(EVENTCHKINF_18)) { + if (!Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED)) { if (!IS_DAY) { retTextId = 0x204E; } else if (Flags_GetInfTable(INFTABLE_9A)) { |