Skip to content

Commit bb93842

Browse files
authored
Merge pull request #21 from AnimatedSwine37/main
Update Find A Friend to 1.9.3
2 parents 83e44d2 + 7fa916c commit bb93842

File tree

2 files changed

+3
-4523
lines changed

2 files changed

+3
-4523
lines changed

OtherMods/FindAFriend.flow

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ void generate_selection_mask()
12061206
}
12071207

12081208
// Ai isn't available Monday, Tuesday, Saturday, Sunday and Holidays
1209-
if ((BIT_CHK(0 + 0x0400 + 468) == 0 && timeOfDay != 5) || GET_SL_LEVEL(21) >= 10 || GET_SL_LEVEL(22) >= 10 || (timeOfDay == 5 && (BIT_CHK(0 + 0x0400 + 1163) == 0 || BIT_CHK(0 + 0x0400 + 0x0800 + 894) || (GET_SL_LEVEL(21) <= 0 && GET_SL_LEVEL(22) <= 0))) || (GET_SL_LEVEL(22) <= 0 && GET_SL_LEVEL(21) <= 0 && spoilerFree) || (GET_SL_LEVEL(22) <= 0 && GET_SL_LEVEL(21) <= 0 && GET_SL_LEVEL(16) < 4 && GET_SL_LEVEL(17) < 4))
1209+
if ((BIT_CHK(0 + 0x0400 + 468) == 0 && timeOfDay != 5) || GET_SL_LEVEL(21) >= 10 || GET_SL_LEVEL(22) >= 10 || (timeOfDay == 5 && (BIT_CHK(0 + 0x0400 + 1163) == 0 || BIT_CHK(0 + 0x0400 + 0x0800 + 894) || (GET_SL_LEVEL(21) <= 0 && GET_SL_LEVEL(22) <= 0))) || (GET_SL_LEVEL(22) <= 0 && GET_SL_LEVEL(21) <= 0 && spoilerFree) || (GET_SL_LEVEL(22) <= 0 && GET_SL_LEVEL(21) <= 0 && GET_SL_LEVEL(16) < 4 && GET_SL_LEVEL(17) < 4) || BIT_CHK(2512))
12101210
{
12111211
pageOneMask = pageOneMask + 2;
12121212
numSelectionsRemoved = numSelectionsRemoved + 1;
@@ -1296,7 +1296,7 @@ void generate_selection_mask()
12961296
kouState = 0;
12971297
}
12981298
// Marie isn't available Monday, Tuesday, Thursday and Friday
1299-
if (BIT_CHK(0 + 0x0400 + 712) == 0 || GET_SL_LEVEL(33) >= 10 || GET_SL_LEVEL(34) >= 10 || timeOfDay == 5 || (GET_SL_LEVEL(33) <= 0 && GET_SL_LEVEL(34) <= 0 && spoilerFree) || BIT_CHK( 0 + 87 ) == 1 || (EVT_FUNCTION_0002( 33 ) == 0 && EVT_FUNCTION_0002( 34 ) == 0 && BIT_CHK( 0 + 0x0400 + 527 ) == 1))
1299+
if (BIT_CHK(0 + 0x0400 + 712) == 0 || GET_SL_LEVEL(33) >= 10 || GET_SL_LEVEL(34) >= 10 || timeOfDay == 5 || (GET_SL_LEVEL(33) <= 0 && GET_SL_LEVEL(34) <= 0 && spoilerFree) || BIT_CHK( 0 + 87 ) == 1 || (EVT_FUNCTION_0002( 33 ) == 0 && EVT_FUNCTION_0002( 34 ) == 0 && BIT_CHK( 0 + 0x0400 + 527 ) == 1) || (CHECK_TIME_SPAN(4, 11, 7, 23) && (CHECK_IF_SL_LVLUP(33) || CHECK_IF_SL_LVLUP(34)) && (GET_SL_LEVEL(33) == 4 || GET_SL_LEVEL(34) == 4)))
13001300
{
13011301
pageOneMask = pageOneMask + 8192;
13021302
numSelectionsRemoved = numSelectionsRemoved + 1;

0 commit comments

Comments
 (0)