Formatted Find A Friend Options to be consistent

Author: TekkaGB

Setup/FirstTimeSetup.flow

@@ -56,11 +56,8 @@ void MenuOptions()
 				SET_MSG_VAR(i, 619 + BIT_CHK(6321 + i), 6);
 			}
 			SET_MSG_VAR(8, 619 + BIT_CHK(6334), 6); // Default to direct commands
-			// Set message variables for scheduler mods
-			for (int i = 0; i < 3; i++)
-			{
-				SET_MSG_VAR(i + 9, 619 + BIT_CHK(6340 + i), 6);
-			}
+			SET_MSG_VAR(9, 619 + BIT_CHK(6341), 6);
+			SET_MSG_VAR(10, 619 + BIT_CHK(6342), 6);
 
 			SEL_CHK_PAD(14, 18);
 			SEL_CHK_PAD(15, 18);
@@ -129,18 +126,8 @@ void ToggleOption(int startMsg, int startFlag, int selection, bool subOption)
 		}
 		else if (selection == 4)
 		{
-			MSG(SPOILER_TOGGLE);
-			sel = SEL(ToggleMenu);
-			if (sel == 0)
-				BIT_ON(5678);
-			else if (sel == 1)
-				BIT_OFF(5678);
-			MSG(RemoveInvitations_About);
-			sel = SEL(ToggleMenu);
-			if (sel == 0)
-				BIT_ON(6340);
-			else if (sel == 1)
-				BIT_OFF(6340);
+			CLOSE_MSG_WIN();
+			FindAFriendOptionsToggle();
 		}
 		else if (selection == 9)
 		{
@@ -174,6 +161,50 @@ void ToggleOption(int startMsg, int startFlag, int selection, bool subOption)
 	CLOSE_MSG_WIN();
 }
 
+void FindAFriendOptionsToggle()
+{
+	//Toggle options until done
+	bool done = false;
+	while (!done)
+	{
+		//Set message variables for menu options
+		SET_MSG_VAR(0, 619 + BIT_CHK(5678), 6);
+		SET_MSG_VAR(1, 619 + BIT_CHK(6340), 6);
+		SEL_CHK_PAD(14, 2);
+		SEL_CHK_PAD(15, 2);
+		//Toggle selection or read more about it
+		int selection = ADV_SEL(FindAFriendOptions_Text, FindAFriendOptions, 0);
+		if (selection == 0)
+		{
+			OPEN_MSG_WIN();
+			MSG(SPOILER_TOGGLE);
+			SEL_CHK_PAD(14, 2);
+			int sel = SEL(ToggleMenu);
+			if (sel == 0)
+				BIT_ON(5678);
+			else if (sel == 1)
+				BIT_OFF(5678);
+			CLOSE_MSG_WIN();
+		}
+		else if (selection == 1)
+		{
+			OPEN_MSG_WIN();
+			MSG(RemoveInvitations_About);
+			SEL_CHK_PAD(14, 2);
+			int sel = SEL(ToggleMenu);
+			if (sel == 0)
+				BIT_ON(6340);
+			else if (sel == 1)
+				BIT_OFF(6340);
+			CLOSE_MSG_WIN();
+		}
+		else
+		{
+			done = true;
+		}
+	}
+}
+
 void DungeonOptionsToggle()
 {
 	//Toggle options until done

Setup/FirstTimeSetup.msg

@@ -29,8 +29,8 @@
 [f 0 5 -258][f 2 1]Game Over Skip: [f 2 4 6][e]
 [f 0 5 -258][f 2 1]Reap-Balanced Encounters: [f 2 4 7][e]
 [f 0 5 -258][f 2 1]Default Direct Commands: [f 2 4 8][e]
-[f 0 5 -258][f 2 1]Remove Events: [f 2 4 10][e]
-[f 0 5 -258][f 2 1]Save Everyday: [f 2 4 11][e]
+[f 0 5 -258][f 2 1]Remove Events: [f 2 4 9][e]
+[f 0 5 -258][f 2 1]Save Everyday: [f 2 4 10][e]
 [f 0 5 -258][f 2 1]Next[e]
 [f 0 5 -258][f 2 1]Previous[e]
 
@@ -147,13 +147,21 @@
 [n]on the fly while dungeon crawling. Reloads the
 [n]floor you're currently on.[e]
 
+[msg FindAFriendOptions_Text]
+[f 0 5 -258][f 2 1]Find A Friend Options[e]
+
+[sel FindAFriendOptions]
+[f 0 5 -258][f 2 1]Spoiler-Free Mode: [f 2 4 0][e]
+[f 0 5 -258][f 2 1]Remove Invites: [f 2 4 1][e]
+[f 0 5 -258][f 2 1]Done[e]
+
 [msg SPOILER_TOGGLE[FindAFriend (AnimatedSwine37)]]
 [f 0 5 -258][f 2 1]Set spoiler-free mode
-[n](Only social links you have met will be shown)[f 1 1][e]
+[n](Only social links you have met will be shown)[e]
 
 [msg RemoveInvitations_About[Remove Invites (AnimatedSwine37)]]
-[f 0 5 -258][f 2 1]Remove lunchtime invitations to spend time with a
-[n]Social Link after school? It's highly recommended to 
+[f 0 5 -258][f 2 1]Removes lunchtime invitations to spend time with a
+[n]Social Link after school. It's highly recommended to 
 [n]use this with Find a Friend.[e]
 
 [msg IntroSkipConfig]