summaryrefslogtreecommitdiff
path: root/src/code/z_actor.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/code/z_actor.c')
-rw-r--r--src/code/z_actor.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 109bc4acb..a11713117 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -4932,21 +4932,21 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
switch (arg1) {
case 0:
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
- if (Flags_GetInfTable(INFTABLE_05)) {
+ if (Flags_GetInfTable(INFTABLE_SARIA_SPOKE_IN_HER_HOUSE)) {
retTextId = 0x1048;
} else {
retTextId = 0x1047;
}
} else {
if (Flags_GetEventChkInf(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS)) {
- if (Flags_GetInfTable(INFTABLE_03)) {
+ if (Flags_GetInfTable(INFTABLE_SARIA_WAS_TOLD_ABOUT_MIDO)) {
retTextId = 0x1032;
} else {
retTextId = 0x1031;
}
} else {
- if (Flags_GetInfTable(INFTABLE_00)) {
- if (Flags_GetInfTable(INFTABLE_01)) {
+ if (Flags_GetInfTable(INFTABLE_SARIA_GREETED_LINK)) {
+ if (Flags_GetInfTable(INFTABLE_SARIA_NOTICED_FAIRY)) {
retTextId = 0x1003;
} else {
retTextId = 0x1002;
@@ -4966,7 +4966,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
retTextId = 0x1045;
}
} else {
- if (Flags_GetEventChkInf(EVENTCHKINF_03)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_SARIA_WAS_TOLD_ABOUT_MIDO)) {
if (Flags_GetInfTable(INFTABLE_0E)) {
retTextId = 0x1034;
} else {
@@ -5659,17 +5659,17 @@ void func_80036E50(u16 textId, s16 arg1) {
case 0:
switch (textId) {
case 0x1001:
- Flags_SetInfTable(INFTABLE_00);
+ Flags_SetInfTable(INFTABLE_SARIA_GREETED_LINK);
return;
case 0x1002:
- Flags_SetInfTable(INFTABLE_01);
+ Flags_SetInfTable(INFTABLE_SARIA_NOTICED_FAIRY);
return;
case 0x1031:
- Flags_SetEventChkInf(EVENTCHKINF_03);
- Flags_SetInfTable(INFTABLE_03);
+ Flags_SetEventChkInf(EVENTCHKINF_SARIA_WAS_TOLD_ABOUT_MIDO);
+ Flags_SetInfTable(INFTABLE_SARIA_WAS_TOLD_ABOUT_MIDO);
return;
case 0x1047:
- Flags_SetInfTable(INFTABLE_05);
+ Flags_SetInfTable(INFTABLE_SARIA_SPOKE_IN_HER_HOUSE);
return;
}
return;