mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-14 20:05:02 +00:00
Code Issues Projects Releases Wiki Activity

Name numerous event info flags

Browse source
This commit is contained in:
JordanLongstaff 2024-11-14 10:14:21 -05:00
parent 8ce69c3ac9
commit 770147bc8b
97 changed files with 723 additions and 716 deletions
Download patch file Download diff file Expand all files Collapse all files

186
src/code/z_actor.c
View file

@ -4742,21 +4742,21 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
switch (arg1) {
case 0:
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
if (Flags_GetInfTable(INFTABLE_05)) {
retTextId = 0x1048;
} else {
retTextId = 0x1047;
}
} else {
if (Flags_GetEventChkInf(EVENTCHKINF_02)) {
if (Flags_GetEventChkInf(EVENTCHKINF_FIRST_SPOKE_TO_MIDO)) {
if (Flags_GetInfTable(INFTABLE_03)) {
retTextId = 0x1032;
} else {
retTextId = 0x1031;
}
} else {
if (Flags_GetInfTable(INFTABLE_00)) {
if (Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA)) {
if (Flags_GetInfTable(INFTABLE_01)) {
retTextId = 0x1003;
} else {
@ -4770,14 +4770,14 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 1:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
if (Flags_GetInfTable(INFTABLE_10)) {
retTextId = 0x1046;
} else {
retTextId = 0x1045;
}
} else {
if (Flags_GetEventChkInf(EVENTCHKINF_03)) {
if (Flags_GetEventChkInf(EVENTCHKINF_COMPLAINED_ABOUT_MIDO)) {
if (Flags_GetInfTable(INFTABLE_0E)) {
retTextId = 0x1034;
} else {
@ -4817,7 +4817,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 2:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
retTextId = 0x1042;
} else {
retTextId = 0x1004;
@ -4834,7 +4834,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 3:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
retTextId = 0x1043;
} else {
if (Flags_GetInfTable(INFTABLE_1E)) {
@ -4853,7 +4853,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 4:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
retTextId = 0x1042;
} else {
retTextId = 0x1007;
@ -4870,7 +4870,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 5:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
retTextId = 0x1044;
} else if (Flags_GetInfTable(INFTABLE_22)) {
retTextId = 0x1009;
@ -4887,7 +4887,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 6:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
retTextId = 0x1042;
} else if (Flags_GetInfTable(INFTABLE_24)) {
retTextId = 0x100B;
@ -4904,7 +4904,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 7:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
retTextId = 0x1043;
} else if (Flags_GetInfTable(INFTABLE_26)) {
retTextId = 0x100D;
@ -4921,7 +4921,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 8:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
retTextId = 0x1043;
} else if (Flags_GetInfTable(INFTABLE_28)) {
retTextId = 0x1019;
@ -4940,7 +4940,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 9:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
retTextId = 0x1049;
} else {
retTextId = 0x1035;
@ -4955,7 +4955,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 10:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
retTextId = 0x104A;
} else {
retTextId = 0x1038;
@ -4972,7 +4972,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 11:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
retTextId = 0x104B;
} else {
retTextId = 0x103C;
@ -4987,7 +4987,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 12:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
retTextId = 0x104C;
} else {
retTextId = 0x103D;
@ -5002,7 +5002,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 13:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) {
retTextId = 0x104D;
} else {
retTextId = 0x103E;
@ -5039,8 +5039,8 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
}
break;
case 17:
if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
if (Flags_GetInfTable(INFTABLE_6C)) {
retTextId = 0x7008;
} else {
@ -5054,8 +5054,8 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
retTextId = 0x702D;
break;
case 18:
if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x7006;
} else {
if (Flags_GetEventChkInf(EVENTCHKINF_RECEIVED_WEIRD_EGG)) {
@ -5074,28 +5074,28 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
if (Flags_GetEventChkInf(EVENTCHKINF_42)) {
retTextId = 0x2012;
} else if (Flags_GetEventChkInf(EVENTCHKINF_41)) {
if (Flags_GetInfTable(INFTABLE_76)) {
if (Flags_GetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD)) {
retTextId = 0x2011;
} else {
retTextId = 0x2010;
}
} else if (Flags_GetEventChkInf(EVENTCHKINF_40)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) {
retTextId = 0x200F;
} else {
retTextId = 0x200E;
}
break;
case 24:
if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x7044;
} else {
retTextId = 0x7015;
}
break;
case 25:
if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x7045;
} else {
Flags_GetInfTable(INFTABLE_C2);
@ -5103,8 +5103,8 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
}
break;
case 26:
if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x7046;
} else {
Flags_GetInfTable(INFTABLE_C2);
@ -5112,12 +5112,12 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
}
break;
case 27:
if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x7047;
} else if (Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
retTextId = 0x701A;
} else if (Flags_GetEventChkInf(EVENTCHKINF_11)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_INGO_AT_RANCH_BEFORE_TALON_RETURNS)) {
if (Flags_GetInfTable(INFTABLE_C6)) {
retTextId = 0x701C;
} else {
@ -5128,8 +5128,8 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
}
break;
case 28:
if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x7048;
} else {
Flags_GetInfTable(INFTABLE_CA);
@ -5137,8 +5137,8 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
}
break;
case 29:
if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x7049;
} else {
Flags_GetInfTable(INFTABLE_CC);
@ -5146,8 +5146,8 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
}
break;
case 30:
if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x704A;
} else {
Flags_GetInfTable(INFTABLE_CE);
@ -5155,8 +5155,8 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
}
break;
case 31:
if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x704B;
} else {
Flags_GetInfTable(INFTABLE_D0);
@ -5164,8 +5164,8 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
}
break;
case 32:
if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x704C;
} else {
Flags_GetInfTable(INFTABLE_D2);
@ -5173,8 +5173,8 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
}
break;
case 33:
if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x704D;
} else {
Flags_GetInfTable(INFTABLE_D4);
@ -5197,11 +5197,11 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 38:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
retTextId = 0x3027;
} else if (Flags_GetEventChkInf(EVENTCHKINF_23)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_BOMBED_DODONGOS_CAVERN_ENTRANCE)) {
retTextId = 0x3021;
} else if (Flags_GetInfTable(INFTABLE_E0)) {
} else if (Flags_GetInfTable(INFTABLE_SPOKE_TO_DODONGOS_CAVERN_ENTRANCE_GORON)) {
retTextId = 0x302A;
} else {
retTextId = 0x3008;
@ -5216,9 +5216,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 39:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
retTextId = 0x3027;
} else if (Flags_GetEventChkInf(EVENTCHKINF_23)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_BOMBED_DODONGOS_CAVERN_ENTRANCE)) {
retTextId = 0x3026;
} else {
retTextId = 0x3009;
@ -5233,11 +5233,11 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 40:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
retTextId = 0x3027;
} else if (Flags_GetEventChkInf(EVENTCHKINF_23)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_BOMBED_DODONGOS_CAVERN_ENTRANCE)) {
retTextId = 0x3026;
} else if (Flags_GetInfTable(INFTABLE_EB)) {
} else if (Flags_GetInfTable(INFTABLE_SPOKE_TO_DMT_BOMB_FLOWER_GORON)) {
retTextId = 0x302B;
} else {
retTextId = 0x300A;
@ -5252,9 +5252,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 41:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
retTextId = 0x3027;
} else if (Flags_GetInfTable(INFTABLE_F0)) {
} else if (Flags_GetInfTable(INFTABLE_SPOKE_TO_GC_ENTRANCE_GORON)) {
retTextId = 0x3015;
} else {
retTextId = 0x3014;
@ -5269,9 +5269,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 42:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
retTextId = 0x3027;
} else if (Flags_GetInfTable(INFTABLE_F4)) {
} else if (Flags_GetInfTable(INFTABLE_SPOKE_TO_GC_ISLAND_GORON)) {
retTextId = 0x3017;
} else {
retTextId = 0x3016;
@ -5286,9 +5286,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 43:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
retTextId = 0x3027;
} else if (Flags_GetInfTable(INFTABLE_F8)) {
} else if (Flags_GetInfTable(INFTABLE_SPOKE_TO_DARUNIA_DOOR_GORON)) {
retTextId = 0x3019;
} else {
retTextId = 0x3018;
@ -5302,7 +5302,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
}
break;
case 48:
if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
retTextId = 0x3029;
} else if (Flags_GetEventChkInf(EVENTCHKINF_20) && Flags_GetEventChkInf(EVENTCHKINF_21)) {
retTextId = 0x301B;
@ -5311,18 +5311,18 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
}
break;
case 49:
if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x402D;
} else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_A_ZORA)) {
retTextId = 0x4007;
} else {
retTextId = 0x4006;
}
break;
case 50:
if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x402E;
} else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_A_ZORA)) {
if (Flags_GetInfTable(INFTABLE_124)) {
retTextId = 0x4009;
} else {
@ -5333,44 +5333,44 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
}
break;
case 51:
if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x402D;
} else if (Flags_GetEventChkInf(EVENTCHKINF_31)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER)) {
if (Flags_GetInfTable(INFTABLE_12A)) {
retTextId = 0x400B;
} else {
retTextId = 0x402F;
}
} else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_A_ZORA)) {
retTextId = 0x400A;
} else {
retTextId = 0x4006;
}
break;
case 52:
if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x402E;
} else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_A_ZORA)) {
retTextId = 0x400C;
} else {
retTextId = 0x4006;
}
break;
case 53:
if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x402D;
} else if (Flags_GetEventChkInf(EVENTCHKINF_33)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
retTextId = 0x4010;
} else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_A_ZORA)) {
retTextId = 0x400F;
} else {
retTextId = 0x4006;
}
break;
case 54:
if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x402E;
} else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_A_ZORA)) {
retTextId = 0x4011;
} else {
retTextId = 0x4006;
@ -5378,9 +5378,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
break;
case 55:
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
if (Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
retTextId = 0x402B;
} else if (Flags_GetEventChkInf(EVENTCHKINF_31)) {
} else if (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER)) {
if (Flags_GetInfTable(INFTABLE_138)) {
retTextId = 0x401C;
} else {
@ -5430,7 +5430,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
!Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
retTextId = 0x2044;
} else if (Flags_GetEventChkInf(EVENTCHKINF_TALKED_TO_MALON_FIRST_TIME)) {
if (Flags_GetEventChkInf(EVENTCHKINF_11)) {
if (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_INGO_AT_RANCH_BEFORE_TALON_RETURNS)) {
retTextId = 0x2043;
} else {
retTextId = 0x2042;
@ -5452,7 +5452,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
if (!Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED)) {
if (!IS_DAY) {
retTextId = 0x204E;
} else if (Flags_GetInfTable(INFTABLE_9A)) {
} else if (Flags_GetInfTable(INFTABLE_SPOKE_TO_INGO_ONCE_AS_ADULT)) {
retTextId = 0x2031;
} else {
retTextId = 0x2030;
@ -5476,13 +5476,13 @@ void func_80036E50(u16 textId, s16 arg1) {
case 0:
switch (textId) {
case 0x1001:
Flags_SetInfTable(INFTABLE_00);
Flags_SetInfTable(INFTABLE_GREETED_BY_SARIA);
return;
case 0x1002:
Flags_SetInfTable(INFTABLE_01);
return;
case 0x1031:
Flags_SetEventChkInf(EVENTCHKINF_03);
Flags_SetEventChkInf(EVENTCHKINF_COMPLAINED_ABOUT_MIDO);
Flags_SetInfTable(INFTABLE_03);
return;
case 0x1047:
@ -5493,13 +5493,13 @@ void func_80036E50(u16 textId, s16 arg1) {
case 1:
switch (textId) {
case 0x102F:
Flags_SetEventChkInf(EVENTCHKINF_02);
Flags_SetEventChkInf(EVENTCHKINF_FIRST_SPOKE_TO_MIDO);
Flags_SetInfTable(INFTABLE_0C);
return;
case 0x1033:
Audio_PlaySfxGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
Flags_SetEventChkInf(EVENTCHKINF_04);
Flags_SetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD);
Flags_SetInfTable(INFTABLE_0E);
return;
case 0x1045:
@ -5509,7 +5509,7 @@ void func_80036E50(u16 textId, s16 arg1) {
Flags_SetInfTable(INFTABLE_15);
return;
case 0x1067:
Flags_SetEventChkInf(EVENTCHKINF_0A);
Flags_SetEventChkInf(EVENTCHKINF_PLAYED_SARIAS_SONG_FOR_MIDO_AS_ADULT);
Flags_SetInfTable(INFTABLE_17);
return;
case 0x1070:
@ -5591,7 +5591,7 @@ void func_80036E50(u16 textId, s16 arg1) {
case 20:
case 21:
if (textId == 0x2010) {
Flags_SetInfTable(INFTABLE_76);
Flags_SetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD);
}
return;
case 25:
@ -5646,28 +5646,28 @@ void func_80036E50(u16 textId, s16 arg1) {
return;
case 38:
if (textId == 0x3008) {
Flags_SetInfTable(INFTABLE_E0);
Flags_SetInfTable(INFTABLE_SPOKE_TO_DODONGOS_CAVERN_ENTRANCE_GORON);
}
return;
case 40:
if (textId == 0x300B) {
Flags_SetInfTable(INFTABLE_EB);
Flags_SetInfTable(INFTABLE_SPOKE_TO_DMT_BOMB_FLOWER_GORON);
}
return;
case 41:
if (textId == 0x3014) {
Flags_SetInfTable(INFTABLE_F0);
Flags_SetInfTable(INFTABLE_SPOKE_TO_GC_ENTRANCE_GORON);
}
return;
case 42:
if (textId == 0x3016) {
Flags_SetInfTable(INFTABLE_F4);
Flags_SetInfTable(INFTABLE_SPOKE_TO_GC_ISLAND_GORON);
}
return;
case 43:
if (textId == 0x3018) {
Flags_SetEventChkInf(EVENTCHKINF_20);
Flags_SetInfTable(INFTABLE_F8);
Flags_SetInfTable(INFTABLE_SPOKE_TO_DARUNIA_DOOR_GORON);
}
return;
case 48:
@ -5681,12 +5681,12 @@ void func_80036E50(u16 textId, s16 arg1) {
case 53:
case 54:
if (textId == 0x4006) {
Flags_SetEventChkInf(EVENTCHKINF_30);
Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_A_ZORA);
}
return;
case 50:
if (textId == 0x4006) {
Flags_SetEventChkInf(EVENTCHKINF_30);
Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_A_ZORA);
}
if (textId == 0x4008) {
Flags_SetInfTable(INFTABLE_124);
@ -5694,7 +5694,7 @@ void func_80036E50(u16 textId, s16 arg1) {
return;
case 51:
if (textId == 0x4006) {
Flags_SetEventChkInf(EVENTCHKINF_30);
Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_A_ZORA);
}
if (textId == 0x400A) {
Flags_SetEventChkInf(EVENTCHKINF_32);
@ -5705,7 +5705,7 @@ void func_80036E50(u16 textId, s16 arg1) {
return;
case 55:
if (textId == 0x401B) {
Flags_SetEventChkInf(EVENTCHKINF_33);
Flags_SetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED);
Flags_SetInfTable(INFTABLE_138);
}
return;
@ -5842,7 +5842,7 @@ s32 func_800374E0(PlayState* play, Actor* actor, u16 textId) {
if (msgCtx->choiceIndex == 1) {
func_80035B18(play, actor, 0x2032);
}
Flags_SetInfTable(INFTABLE_9A);
Flags_SetInfTable(INFTABLE_SPOKE_TO_INGO_ONCE_AS_ADULT);
ret = 0;
break;
case 0x2036:

108
src/code/z_demo.c
View file

@ -78,40 +78,40 @@ typedef struct EntranceCutscene {
} EntranceCutscene; // size = 0x8
EntranceCutscene sEntranceCutsceneTable[] = {
{ ENTR_HYRULE_FIELD_3, 2, EVENTCHKINF_A0, gHyruleFieldIntroCs },
{ ENTR_DEATH_MOUNTAIN_TRAIL_0, 2, EVENTCHKINF_A1, gDMTIntroCs },
{ ENTR_KAKARIKO_VILLAGE_0, 2, EVENTCHKINF_A3, gKakarikoVillageIntroCs },
{ ENTR_ZORAS_DOMAIN_0, 2, EVENTCHKINF_A4, gZorasDomainIntroCs },
{ ENTR_HYRULE_CASTLE_0, 1, EVENTCHKINF_A5, gHyruleCastleIntroCs },
{ ENTR_GORON_CITY_0, 2, EVENTCHKINF_A6, gGoronCityIntroCs },
{ ENTR_TEMPLE_OF_TIME_0, 2, EVENTCHKINF_A7, gTempleOfTimeIntroCs },
{ ENTR_DEKU_TREE_0, 2, EVENTCHKINF_A8, gDekuTreeIntroCs },
{ ENTR_HYRULE_FIELD_3, 2, EVENTCHKINF_ENTERED_HYRULE_FIELD, gHyruleFieldIntroCs },
{ ENTR_DEATH_MOUNTAIN_TRAIL_0, 2, EVENTCHKINF_ENTERED_DEATH_MOUNTAIN_TRAIL, gDMTIntroCs },
{ ENTR_KAKARIKO_VILLAGE_0, 2, EVENTCHKINF_ENTERED_KAKARIKO_VILLAGE, gKakarikoVillageIntroCs },
{ ENTR_ZORAS_DOMAIN_0, 2, EVENTCHKINF_ENTERED_ZORAS_DOMAIN, gZorasDomainIntroCs },
{ ENTR_HYRULE_CASTLE_0, 1, EVENTCHKINF_ENTERED_HYRULE_CASTLE, gHyruleCastleIntroCs },
{ ENTR_GORON_CITY_0, 2, EVENTCHKINF_ENTERED_GORON_CITY, gGoronCityIntroCs },
{ ENTR_TEMPLE_OF_TIME_0, 2, EVENTCHKINF_ENTERED_TEMPLE_OF_TIME, gTempleOfTimeIntroCs },
{ ENTR_DEKU_TREE_0, 2, EVENTCHKINF_ENTERED_DEKU_TREE, gDekuTreeIntroCs },
{ ENTR_HYRULE_FIELD_11, 0, EVENTCHKINF_EPONA_OBTAINED, gHyruleFieldSouthEponaJumpCs },
{ ENTR_HYRULE_FIELD_13, 0, EVENTCHKINF_EPONA_OBTAINED, gHyruleFieldEastEponaJumpCs },
{ ENTR_HYRULE_FIELD_12, 0, EVENTCHKINF_EPONA_OBTAINED, gHyruleFieldWestEponaJumpCs },
{ ENTR_HYRULE_FIELD_15, 0, EVENTCHKINF_EPONA_OBTAINED, gHyruleFieldGateEponaJumpCs },
{ ENTR_HYRULE_FIELD_16, 1, EVENTCHKINF_A9, gHyruleFieldGetOoTCs },
{ ENTR_LAKE_HYLIA_0, 2, EVENTCHKINF_B1, gLakeHyliaIntroCs },
{ ENTR_GERUDO_VALLEY_0, 2, EVENTCHKINF_B2, gGerudoValleyIntroCs },
{ ENTR_GERUDOS_FORTRESS_0, 2, EVENTCHKINF_B3, gGerudoFortressIntroCs },
{ ENTR_LON_LON_RANCH_0, 2, EVENTCHKINF_B4, gLonLonRanchIntroCs },
{ ENTR_JABU_JABU_0, 2, EVENTCHKINF_B5, gJabuJabuIntroCs },
{ ENTR_GRAVEYARD_0, 2, EVENTCHKINF_B6, gGraveyardIntroCs },
{ ENTR_ZORAS_FOUNTAIN_2, 2, EVENTCHKINF_B7, gZorasFountainIntroCs },
{ ENTR_DESERT_COLOSSUS_0, 2, EVENTCHKINF_B8, gDesertColossusIntroCs },
{ ENTR_DEATH_MOUNTAIN_CRATER_0, 2, EVENTCHKINF_B9, gDeathMountainCraterIntroCs },
{ ENTR_HYRULE_CASTLE_0, 0, EVENTCHKINF_BA, gGanonsCastleIntroCs },
{ ENTR_ROYAL_FAMILYS_TOMB_1, 2, EVENTCHKINF_5A, gSunSongGraveSunSongTeachPart2Cs },
{ ENTR_INSIDE_GANONS_CASTLE_2, 2, EVENTCHKINF_BB, gForestBarrierCs },
{ ENTR_INSIDE_GANONS_CASTLE_3, 2, EVENTCHKINF_BC, gWaterBarrierCs },
{ ENTR_INSIDE_GANONS_CASTLE_4, 2, EVENTCHKINF_BD, gShadowBarrierCs },
{ ENTR_INSIDE_GANONS_CASTLE_5, 2, EVENTCHKINF_BE, gFireBarrierCs },
{ ENTR_INSIDE_GANONS_CASTLE_6, 2, EVENTCHKINF_BF, gLightBarrierCs },
{ ENTR_INSIDE_GANONS_CASTLE_7, 2, EVENTCHKINF_AD, gSpiritBarrierCs },
{ ENTR_SPIRIT_TEMPLE_BOSS_0, 0, EVENTCHKINF_C0, gSpiritBossNabooruKnuckleIntroCs },
{ ENTR_GERUDOS_FORTRESS_17, 0, EVENTCHKINF_C7, gGerudoFortressFirstCaptureCs },
{ ENTR_DEATH_MOUNTAIN_CRATER_1, 2, EVENTCHKINF_B9, gDeathMountainCraterIntroCs },
{ ENTR_KOKIRI_FOREST_12, 2, EVENTCHKINF_C6, gKokiriForestDekuSproutCs },
{ ENTR_HYRULE_FIELD_16, 1, EVENTCHKINF_LEARNED_SONG_OF_TIME, gHyruleFieldGetOoTCs },
{ ENTR_LAKE_HYLIA_0, 2, EVENTCHKINF_ENTERED_LAKE_HYLIA, gLakeHyliaIntroCs },
{ ENTR_GERUDO_VALLEY_0, 2, EVENTCHKINF_ENTERED_GERUDO_VALLEY, gGerudoValleyIntroCs },
{ ENTR_GERUDOS_FORTRESS_0, 2, EVENTCHKINF_ENTERED_GERUDOS_FORTRESS, gGerudoFortressIntroCs },
{ ENTR_LON_LON_RANCH_0, 2, EVENTCHKINF_ENTERED_LON_LON_RANCH, gLonLonRanchIntroCs },
{ ENTR_JABU_JABU_0, 2, EVENTCHKINF_ENTERED_JABU_JABUS_BELLY, gJabuJabuIntroCs },
{ ENTR_GRAVEYARD_0, 2, EVENTCHKINF_ENTERED_GRAVEYARD, gGraveyardIntroCs },
{ ENTR_ZORAS_FOUNTAIN_2, 2, EVENTCHKINF_ENTERED_ZORAS_FOUNTAIN, gZorasFountainIntroCs },
{ ENTR_DESERT_COLOSSUS_0, 2, EVENTCHKINF_ENTERED_DESERT_COLOSSUS, gDesertColossusIntroCs },
{ ENTR_DEATH_MOUNTAIN_CRATER_0, 2, EVENTCHKINF_ENTERED_DEATH_MOUNTAIN_CRATER, gDeathMountainCraterIntroCs },
{ ENTR_HYRULE_CASTLE_0, 0, EVENTCHKINF_ENTERED_GANONS_CASTLE_EXTERIOR, gGanonsCastleIntroCs },
{ ENTR_ROYAL_FAMILYS_TOMB_1, 2, EVENTCHKINF_LEARNED_SUNS_SONG, gSunSongGraveSunSongTeachPart2Cs },
{ ENTR_INSIDE_GANONS_CASTLE_2, 2, EVENTCHKINF_COMPLETED_FOREST_TRIAL, gForestBarrierCs },
{ ENTR_INSIDE_GANONS_CASTLE_3, 2, EVENTCHKINF_COMPLETED_WATER_TRIAL, gWaterBarrierCs },
{ ENTR_INSIDE_GANONS_CASTLE_4, 2, EVENTCHKINF_COMPLETED_SHADOW_TRIAL, gShadowBarrierCs },
{ ENTR_INSIDE_GANONS_CASTLE_5, 2, EVENTCHKINF_COMPLETED_FIRE_TRIAL, gFireBarrierCs },
{ ENTR_INSIDE_GANONS_CASTLE_6, 2, EVENTCHKINF_COMPLETED_LIGHT_TRIAL, gLightBarrierCs },
{ ENTR_INSIDE_GANONS_CASTLE_7, 2, EVENTCHKINF_COMPLETED_SPIRIT_TRIAL, gSpiritBarrierCs },
{ ENTR_SPIRIT_TEMPLE_BOSS_0, 0, EVENTCHKINF_NABOORU_ORDERED_TO_FIGHT_BY_TWINROVA, gSpiritBossNabooruKnuckleIntroCs },
{ ENTR_GERUDOS_FORTRESS_17, 0, EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO, gGerudoFortressFirstCaptureCs },
{ ENTR_DEATH_MOUNTAIN_CRATER_1, 2, EVENTCHKINF_ENTERED_DEATH_MOUNTAIN_CRATER, gDeathMountainCraterIntroCs },
{ ENTR_KOKIRI_FOREST_12, 2, EVENTCHKINF_SPOKE_TO_DEKU_TREE_SPROUT, gKokiriForestDekuSproutCs },
};
void* sCutscenesUnknownList[] = {
@ -397,15 +397,15 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) {
break;
case CS_MISC_SET_FLAG_FAST_WINDMILL:
SET_EVENTCHKINF(EVENTCHKINF_65);
SET_EVENTCHKINF(EVENTCHKINF_PLAYED_SONG_OF_STORMS_IN_WINDMILL);
break;
case CS_MISC_SET_FLAG_WELL_DRAINED:
SET_EVENTCHKINF(EVENTCHKINF_67);
SET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL_IN_KAKARIKO);
break;
case CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED:
SET_EVENTCHKINF(EVENTCHKINF_69);
SET_EVENTCHKINF(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER);
break;
case CS_MISC_VISMONO_BLACK_AND_WHITE:
@ -647,8 +647,8 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
gSaveContext.save.info.fw.set = 0;
gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0;
if (!GET_EVENTCHKINF(EVENTCHKINF_45)) {
SET_EVENTCHKINF(EVENTCHKINF_45);
if (!GET_EVENTCHKINF(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL)) {
SET_EVENTCHKINF(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL);
play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
play->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.save.cutsceneIndex = 0xFFF3;
@ -912,7 +912,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
case CS_DEST_KAKARIKO_VILLAGE_NOCTURNE_PART_2:
Item_Give(play, ITEM_SONG_NOCTURNE);
SET_EVENTCHKINF(EVENTCHKINF_54);
SET_EVENTCHKINF(EVENTCHKINF_LEARNED_NOCTURNE_OF_SHADOW);
play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0;
play->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.save.cutsceneIndex = 0xFFF1;
@ -1181,8 +1181,8 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
// all 3 are restored. This cutscene destination sends the player to the correct blue warp destination,
// unless all 3 dungeons have been cleared. In that case, the destination is the Temple of Time which
// plays a cutscene where the door opens.
if (GET_EVENTCHKINF(EVENTCHKINF_48) && GET_EVENTCHKINF(EVENTCHKINF_49) &&
GET_EVENTCHKINF(EVENTCHKINF_4A)) {
if (GET_EVENTCHKINF(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) && GET_EVENTCHKINF(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) &&
GET_EVENTCHKINF(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0;
play->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.save.cutsceneIndex = 0xFFF3;
@ -1218,7 +1218,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
gSaveContext.save.cutsceneIndex = 0xFFF1;
play->transitionType = TRANS_TYPE_FADE_WHITE_FAST;
} else {
SET_EVENTCHKINF(EVENTCHKINF_C8);
SET_EVENTCHKINF(EVENTCHKINF_OBTAINED_SPIRIT_MEDALLION);
play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_8;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_FADE_WHITE;
@ -1359,9 +1359,9 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
break;
case CS_DEST_GANONS_CASTLE_DISPEL_BARRIER_CONDITONAL:
if (Flags_GetEventChkInf(EVENTCHKINF_BB) && Flags_GetEventChkInf(EVENTCHKINF_BC) &&
Flags_GetEventChkInf(EVENTCHKINF_BD) && Flags_GetEventChkInf(EVENTCHKINF_BE) &&
Flags_GetEventChkInf(EVENTCHKINF_BF) && Flags_GetEventChkInf(EVENTCHKINF_AD)) {
if (Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FOREST_TRIAL) && Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_WATER_TRIAL) &&
Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SHADOW_TRIAL) && Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FIRE_TRIAL) &&
Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_LIGHT_TRIAL) && Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SPIRIT_TRIAL)) {
play->csCtx.script = SEGMENTED_TO_VIRTUAL(gTowerBarrierCs);
play->csCtx.curFrame = 0;
gSaveContext.cutsceneTrigger = 1;
@ -1387,7 +1387,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
break;
case CS_DEST_FROM_RAURU_FINAL_MESSAGE_CONDITIONAL:
if (GET_EVENTCHKINF(EVENTCHKINF_C8)) {
if (GET_EVENTCHKINF(EVENTCHKINF_OBTAINED_SPIRIT_MEDALLION)) {
play->nextEntranceIndex = ENTR_GRAVEYARD_8;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_FADE_WHITE;
@ -2394,29 +2394,29 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) {
if ((gSaveContext.gameMode == GAMEMODE_NORMAL) && (gSaveContext.respawnFlag <= 0) &&
(gSaveContext.save.cutsceneIndex < 0xFFF0)) {
if ((gSaveContext.save.entranceIndex == ENTR_DESERT_COLOSSUS_1) && !Flags_GetEventChkInf(EVENTCHKINF_AC)) {
Flags_SetEventChkInf(EVENTCHKINF_AC);
if ((gSaveContext.save.entranceIndex == ENTR_DESERT_COLOSSUS_1) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT)) {
Flags_SetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT);
gSaveContext.save.entranceIndex = ENTR_DESERT_COLOSSUS_0;
gSaveContext.save.cutsceneIndex = 0xFFF0;
} else if ((gSaveContext.save.entranceIndex == ENTR_KAKARIKO_VILLAGE_0) && LINK_IS_ADULT &&
GET_EVENTCHKINF(EVENTCHKINF_48) && GET_EVENTCHKINF(EVENTCHKINF_49) &&
GET_EVENTCHKINF(EVENTCHKINF_4A) && !Flags_GetEventChkInf(EVENTCHKINF_AA)) {
Flags_SetEventChkInf(EVENTCHKINF_AA);
GET_EVENTCHKINF(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) && GET_EVENTCHKINF(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) &&
GET_EVENTCHKINF(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) && !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL)) {
Flags_SetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
gSaveContext.save.cutsceneIndex = 0xFFF0;
} else if ((gSaveContext.save.entranceIndex == ENTR_LOST_WOODS_9) && !Flags_GetEventChkInf(EVENTCHKINF_C1)) {
Flags_SetEventChkInf(EVENTCHKINF_C1);
} else if ((gSaveContext.save.entranceIndex == ENTR_LOST_WOODS_9) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
Item_Give(play, ITEM_OCARINA_FAIRY);
gSaveContext.save.entranceIndex = ENTR_LOST_WOODS_0;
gSaveContext.save.cutsceneIndex = 0xFFF0;
} else if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
LINK_IS_ADULT && !Flags_GetEventChkInf(EVENTCHKINF_C4) &&
LINK_IS_ADULT && !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) &&
(gEntranceTable[((void)0, gSaveContext.save.entranceIndex)].sceneId == SCENE_TEMPLE_OF_TIME)) {
Flags_SetEventChkInf(EVENTCHKINF_C4);
Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
gSaveContext.save.entranceIndex = ENTR_TEMPLE_OF_TIME_0;
gSaveContext.save.cutsceneIndex = 0xFFF8;
} else if (!Flags_GetEventChkInf(EVENTCHKINF_C7) &&
} else if (!Flags_GetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO) &&
(gEntranceTable[((void)0, gSaveContext.save.entranceIndex)].sceneId == SCENE_GANON_BOSS)) {
Flags_SetEventChkInf(EVENTCHKINF_C7);
Flags_SetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO);
gSaveContext.save.entranceIndex = ENTR_GANON_BOSS_0;
gSaveContext.save.cutsceneIndex = 0xFFF0;
}

8
src/code/z_elf_message.c
View file

@ -3,12 +3,12 @@
QuestHintCmd sChildSariaQuestHints[] = {
QUEST_HINT_STRENGTH_UPG(SKIP, 0, false, 3),
QUEST_HINT_FLAG(CHECK, EVENTCHKINF_37, false, 0x61),
QUEST_HINT_FLAG(CHECK, EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP, false, 0x61),
QUEST_HINT_END(0x64),
QUEST_HINT_FLAG(CHECK, EVENTCHKINF_25, false, 0x62),
QUEST_HINT_FLAG(CHECK, EVENTCHKINF_37, false, 0x63),
QUEST_HINT_FLAG(CHECK, EVENTCHKINF_43, false, 0x65),
QUEST_HINT_FLAG(CHECK, EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP, false, 0x62),
QUEST_HINT_FLAG(CHECK, EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP, false, 0x63),
QUEST_HINT_FLAG(CHECK, EVENTCHKINF_OBTAINED_OCARINA_OF_TIME, false, 0x65),
QUEST_HINT_MEDALLION(CHECK, ITEM_MEDALLION_FOREST, false, 0x66),
QUEST_HINT_MEDALLION(CHECK, ITEM_MEDALLION_FIRE, false, 0x66),
QUEST_HINT_MEDALLION(CHECK, ITEM_MEDALLION_WATER, false, 0x66),

10
src/code/z_kankyo.c
View file

@ -2627,23 +2627,23 @@ void Environment_WarpSongLeave(PlayState* play) {
switch (play->nextEntranceIndex) {
case ENTR_DEATH_MOUNTAIN_CRATER_0:
Flags_SetEventChkInf(EVENTCHKINF_B9);
Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DEATH_MOUNTAIN_CRATER);
break;
case ENTR_LAKE_HYLIA_0:
Flags_SetEventChkInf(EVENTCHKINF_B1);
Flags_SetEventChkInf(EVENTCHKINF_ENTERED_LAKE_HYLIA);
break;
case ENTR_DESERT_COLOSSUS_0:
Flags_SetEventChkInf(EVENTCHKINF_B8);
Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DESERT_COLOSSUS);
break;
case ENTR_GRAVEYARD_0:
Flags_SetEventChkInf(EVENTCHKINF_B6);
Flags_SetEventChkInf(EVENTCHKINF_ENTERED_GRAVEYARD);
break;
case ENTR_TEMPLE_OF_TIME_0:
Flags_SetEventChkInf(EVENTCHKINF_A7);
Flags_SetEventChkInf(EVENTCHKINF_ENTERED_TEMPLE_OF_TIME);
break;
case ENTR_SACRED_FOREST_MEADOW_0:

2
src/code/z_message.c
View file

@ -2501,7 +2501,7 @@ void Message_OpenText(PlayState* play, u16 textId) {
textId += (gSaveContext.save.info.inventory.questItems & 0xF0000000 & 0xF0000000) >> QUEST_HEART_PIECE_COUNT;
} else if (msgCtx->textId == 0xC && CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON)) {
textId = 0xB; // Traded Giant's Knife for Biggoron Sword
} else if (msgCtx->textId == 0xB4 && GET_EVENTCHKINF(EVENTCHKINF_96)) {
} else if (msgCtx->textId == 0xB4 && GET_EVENTCHKINF(EVENTCHKINF_SPOKE_TO_CURSED_MAN_IN_SKULL_HOUSE)) {
textId = 0xB5; // Destroyed Gold Skulltula
}
// Ocarina Staff + Dialog

2
src/code/z_parameter.c
View file

@ -1828,7 +1828,7 @@ u8 Item_Give(PlayState* play, u8 item) {
}
} else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) {
if (item == ITEM_POACHERS_SAW) {
SET_ITEMGETINF(ITEMGETINF_1F);
SET_ITEMGETINF(ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE);
}
temp = INV_CONTENT(item);

2
src/code/z_play.c
View file

@ -373,7 +373,7 @@ void Play_Init(GameState* thisx) {
}
} else if ((gEntranceTable[((void)0, gSaveContext.save.entranceIndex)].sceneId == SCENE_KOKIRI_FOREST) &&
LINK_IS_ADULT && !IS_CUTSCENE_LAYER) {
gSaveContext.sceneLayer = GET_EVENTCHKINF(EVENTCHKINF_48) ? 3 : 2;
gSaveContext.sceneLayer = GET_EVENTCHKINF(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) ? 3 : 2;
}
Play_SpawnScene(

6
src/code/z_scene_table.c
View file

@ -1192,9 +1192,9 @@ void Scene_DrawConfigKokiriForest(PlayState* play) {
spA0 = play->roomCtx.drawParams[0] + 500;
} else if (
#if OOT_VERSION < PAL_1_0
!IS_CUTSCENE_LAYER && GET_EVENTCHKINF(EVENTCHKINF_07)
!IS_CUTSCENE_LAYER && GET_EVENTCHKINF(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD)
#else
(!IS_CUTSCENE_LAYER || LINK_IS_ADULT) && GET_EVENTCHKINF(EVENTCHKINF_07)
(!IS_CUTSCENE_LAYER || LINK_IS_ADULT) && GET_EVENTCHKINF(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD)
#endif
) {
spA0 = 2150;
@ -1223,7 +1223,7 @@ void Scene_DrawConfigLakeHylia(PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_scene_table.c", 7058);
if (IS_CUTSCENE_LAYER || (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_69))) {
if (IS_CUTSCENE_LAYER || (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER))) {
play->roomCtx.drawParams[0] = 87;
}

6
src/code/z_sram.c
View file

@ -327,8 +327,8 @@ void Sram_InitDebugSave(void) {
gSaveContext.save.info.horseData.angle = -0x6AD9;
gSaveContext.save.info.infTable[0] |= 0x5009;
gSaveContext.save.info.eventChkInf[0] |= 0x123F;
SET_EVENTCHKINF(EVENTCHKINF_80);
SET_EVENTCHKINF(EVENTCHKINF_C4);
SET_EVENTCHKINF(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE);
SET_EVENTCHKINF(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
gSaveContext.save.info.equips.buttonItems[0] = ITEM_SWORD_KOKIRI;
@ -497,7 +497,7 @@ void Sram_OpenSave(SramContext* sramCtx) {
}
// if zelda cutscene has been watched but lullaby was not obtained, restore cutscene and take away letter
if (GET_EVENTCHKINF(EVENTCHKINF_40) && !CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) {
if (GET_EVENTCHKINF(EVENTCHKINF_OBTAINED_ZELDAS_LETTER) && !CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) {
i = gSaveContext.save.info.eventChkInf[EVENTCHKINF_40_INDEX] & ~EVENTCHKINF_40_MASK;
gSaveContext.save.info.eventChkInf[EVENTCHKINF_40_INDEX] = i;