diff --git a/Multipage-Options-Menu.md b/Multipage-Options-Menu.md index 2016a6d..a75ee2f 100644 --- a/Multipage-Options-Menu.md +++ b/Multipage-Options-Menu.md @@ -32,13 +32,6 @@ index 31275fabd..65c6412bf 100644 const u8 gText_TextSpeedSlow[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}SLOW"); const u8 gText_TextSpeedMid[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}MID"); const u8 gText_TextSpeedFast[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}FAST"); -@@ -1516,8 +1522,6 @@ const u8 gText_BattleSceneOn[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}ON"); - const u8 gText_BattleSceneOff[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}OFF"); - const u8 gText_BattleStyleShift[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}SHIFT"); - const u8 gText_BattleStyleSet[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}SET"); - const u8 gText_SoundMono[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}MONO"); - const u8 gText_SoundStereo[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}STEREO"); - const u8 gText_FrameType[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}TYPE"); @@ -1525,6 +1529,18 @@ const u8 gText_FrameTypeNumber[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}"); const u8 gText_ButtonTypeNormal[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}NORMAL"); const u8 gText_ButtonTypeLR[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}LR"); @@ -56,13 +49,6 @@ index 31275fabd..65c6412bf 100644 ```diff ------------------------------ include/strings.h ------------------------------ index 11ce0b860..c1604ddc1 100644 -@@ -309,8 +309,6 @@ extern const u8 gText_BattleSceneOn[]; - extern const u8 gText_BattleSceneOff[]; - extern const u8 gText_BattleStyleShift[]; - extern const u8 gText_BattleStyleSet[]; - extern const u8 gText_SoundMono[]; - extern const u8 gText_SoundStereo[]; - extern const u8 gText_FrameTypeNumber[]; @@ -318,16 +316,34 @@ extern const u8 gText_FrameType[]; extern const u8 gText_ButtonTypeNormal[]; extern const u8 gText_ButtonTypeLR[]; @@ -292,9 +278,9 @@ enum SetVBlankCallback(VBlankCB); SetMainCallback2(MainCB2); return; -+ } -+} -+ + } +} + +static u8 Process_ChangePage(u8 CurrentPage) +{ + if (JOY_NEW(R_BUTTON)) @@ -329,9 +315,9 @@ enum + DrawOptionsPg2(taskId); + gTasks[taskId].func = Task_OptionMenuFadeIn_Pg2; + break; - } - } - ++ } ++} ++ @@ -280,12 +395,19 @@ static void Task_OptionMenuFadeIn(u8 taskId) static void Task_OptionMenuProcessInput(u8 taskId) @@ -356,8 +342,7 @@ enum @@ -372,6 +487,100 @@ static void Task_OptionMenuProcessInput(u8 taskId) } } - -+ + +static void Task_OptionMenuFadeIn_Pg2(u8 taskId) +{ + if (!gPaletteFade.active) @@ -457,19 +442,17 @@ enum + + return selection; +} - ++ +static void Follower_DrawChoices(u8 selection) +{ + u8 styles[2]; - + styles[0] = 0; + styles[1] = 0; + styles[selection] = 1; - + DrawOptionMenuChoice(gText_FollowerOff, 104, YPOS_FOLLOWER, styles[0]); + DrawOptionMenuChoice(gText_FollowerOn, GetStringRightAlignXOffset(FONT_NORMAL, gText_FollowerOn, 198), YPOS_FOLLOWER, styles[1]); +} - ++ +static u8 Difficulty_ProcessInput(u8 selection) +{ + if (JOY_NEW(DPAD_RIGHT))