From d0b46941def40d5a6bd912a74f058dd2efec0290 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sat, 20 Aug 2011 22:12:57 -0500
Subject: [PATCH] fallback metrics editing complete for now

---
 Themes/_fallback/metrics.ini | 330 ++++++++++++++++-------------------
 1 file changed, 150 insertions(+), 180 deletions(-)

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 987f0bd9a8..4a22fd0cf1 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1501,13 +1501,7 @@ OptionOrderDown=
 OptionOrderLeft=
 OptionOrderRight=
 OptionOrderAuto=
-# !!
-OptionOrderBUp=""
-OptionOrderBDown=""
-OptionOrderBLeft=""
-OptionOrderBRight=""
-OptionOrderBAuto=""
-# !!
+#
 ShowIcon=false
 ShowCursor=false
 ShowScroller=false
@@ -1588,7 +1582,6 @@ IdleTimeoutSeconds=0
 # xxx: apparently this isn't needed, according to Chris Danford, but it makes
 # things work, so we're keeping it in until the problem is fixed.
 UpdateOnMessage="PlayerJoined"
-UseTwoLists=false
 
 [ScreenSelectMasterBlank]
 Fallback="ScreenSelectMaster"
@@ -1692,17 +1685,11 @@ IdleCommentSeconds=-1
 IdleTimeoutSeconds=-1
 IdleTimeoutScreen=Branch.AfterInit()
 DoublePressToSelect=false
-UseTwoLists=false
 OptionOrderUp=""
 OptionOrderDown=""
 OptionOrderLeft=""
 OptionOrderRight=""
 OptionOrderAuto=""
-OptionOrderBUp=""
-OptionOrderBDown=""
-OptionOrderBLeft=""
-OptionOrderBRight=""
-OptionOrderBAuto=""
 #
 PreSwitchPageSeconds=
 PostSwitchPageSeconds=
@@ -1720,11 +1707,8 @@ LogoOffCommand=
 [ScreenProfileLoad]
 Class="ScreenProfileLoad"
 Fallback="ScreenWithMenuElementsBlank"
-#
 NextScreen=Branch.AfterProfileLoad()
-#~ NextScreen="ScreenSelectProfile"
 PrevScreen=Branch.TitleMenu()
-#
 TimerSeconds=-1
 #
 LoadEdits=true
@@ -1756,10 +1740,8 @@ CodeDownRight="DownRight"
 # (formerly known as ScreenSelectPlayMode before sm-ssc v1.0 beta 3)
 Class="ScreenSelectMaster"
 Fallback="ScreenSelectMaster"
-#
 NextScreen=Branch.AfterSelectPlayMode()
 PrevScreen=Branch.TitleMenu()
-#
 TimerSeconds=40
 #
 DefaultChoice="Single"
@@ -1791,10 +1773,8 @@ ShowIcon=false
 # (formerly known as ScreenSelectPlayStyle before sm-ssc v1.0 beta 3)
 Class="ScreenSelectMaster"
 Fallback="ScreenSelectMaster"
-#
 NextScreen=Branch.GetGameInformationScreen
 PrevScreen=Branch.TitleMenu()
-#
 TimerSeconds=40
 #
 DefaultChoice="Normal"
@@ -1818,7 +1798,6 @@ ChoiceEndless="applydefaultoptions;name,Endless;text,Endless;playmode,endless;sc
 [ScreenSelectCharacter]
 Class="ScreenSelectMaster"
 Fallback="ScreenSelectMaster"
-#
 NextScreen=Branch.GetGameInformationScreen
 PrevScreen=Branch.TitleMenu()
 #
@@ -1832,11 +1811,8 @@ ShowIcon=false
 [ScreenGameInformation]
 Class="ScreenSelectMaster"
 Fallback="ScreenSelectMaster"
-#
-#~ NextScreen="ScreenSelectMusic"
 NextScreen=GAMESTATE:IsCourseMode() and "ScreenSelectCourse" or "ScreenSelectMusic"
 PrevScreen=Branch.TitleMenu()
-#
 TimerSeconds=15
 #
 DefaultChoice="Delay"
@@ -1853,14 +1829,13 @@ ShowIcon=false
 [ScreenSelectMusic]
 Class="ScreenSelectMusic"
 Fallback="ScreenWithMenuElements"
-#
 NextScreen=Branch.PlayerOptions()
 PrevScreen=Branch.TitleMenu()
 #
 MusicWheelType="MusicWheel"
 Codes=""
 #
-TimerSeconds=60
+TimerSeconds=120
 DoRouletteOnMenuTimer=true
 RouletteTimerSeconds=15
 IdleCommentSeconds=20
@@ -2003,7 +1978,6 @@ ShowStepsType=false
 StepsTypeX=0
 StepsTypeY=0
 StepsTypeOnCommand=
-#
 
 [StepsDisplayGameplay]
 Fallback="StepsDisplay"
@@ -2011,7 +1985,6 @@ Fallback="StepsDisplay"
 [ScreenStageInformation]
 Class="ScreenSplash"
 Fallback="ScreenSplash"
-#
 NextScreen=Branch.GameplayScreen()
 PrevScreen=Branch.BackOutOfStageInformation()
 PrepareScreen="ScreenGameplay"
@@ -2022,19 +1995,27 @@ WaitForChildrenBeforeTweeningOut=true
 TimerSeconds=1
 #
 ScreenBeginCommand=%SetFail
-#
+
 [ScreenOptions]
 Fallback="ScreenWithMenuElements"
+
 NavigationMode="normal"
 InputMode="individual"
 ForceAllPlayers=false
+#
 RepeatRate=12
 RepeatDelay=0.25
+#
+OptionRowNormalMetricsGroup="OptionRow"
+OptionRowExitMetricsGroup="OptionRowExit"
+#
 NumRowsShown=8
 RowInitCommand=
 RowOnCommand=
 RowOffCommand=
 RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-146+36*offsetFromCenter) end
+#
+ShowExplanations=true
 ExplanationP1X=SCREEN_CENTER_X-256-20
 ExplanationP1Y=SCREEN_CENTER_Y+174
 ExplanationP1OnCommand=shadowlength,1;wrapwidthpixels,192/0.5;zoom,0.5;halign,0;cropright,1;linear,0.5;cropright,0
@@ -2047,6 +2028,7 @@ ExplanationTogetherX=SCREEN_CENTER_X
 ExplanationTogetherY=SCREEN_CENTER_Y+184
 ExplanationTogetherOnCommand=shadowlength,0;zoom,0.75;wrapwidthpixels,(SCREEN_WIDTH*0.9375)*1.25;cropright,1;linear,0.5;cropright,0
 ExplanationTogetherOffCommand=stoptweening
+#
 DisqualifyP1X=
 DisqualifyP1Y=
 DisqualifyP1OnCommand=visible,false
@@ -2055,25 +2037,32 @@ DisqualifyP2X=
 DisqualifyP2Y=
 DisqualifyP2OnCommand=visible,false
 DisqualifyP2OffCommand=
+#
 PageX=SCREEN_CENTER_X
 PageY=SCREEN_CENTER_Y
 PageOnCommand=
 ContainerOnCommand=
 ContainerOffCommand=
+#
 CursorOnCommand=
+CursorTweenSeconds=0.3
+#
+LineHighlightX=SCREEN_CENTER_X
 LineHighlightP1OnCommand=
 LineHighlightP1ChangeCommand=
 LineHighlightP1ChangeToExitCommand=
 LineHighlightP2OnCommand=
 LineHighlightP2ChangeCommand=
 LineHighlightP2ChangeToExitCommand=
+#
 ShowScrollBar=false
 ScrollBarHeight=0
 ScrollBarTime=0
-LineHighlightX=SCREEN_CENTER_X
+#
 ShowExitRow=true
 SeparateExitRow=true
 SeparateExitRowY=SCREEN_CENTER_Y+140
+#
 MoreX=
 MoreY=
 MoreOnCommand=visible,false
@@ -2081,16 +2070,14 @@ MoreExitSelectedP1Command=
 MoreExitSelectedP2Command=
 MoreExitUnselectedP1Command=
 MoreExitUnselectedP2Command=
-ShowExplanations=true
+#
 AllowRepeatingChangeValueInput=false
-CursorTweenSeconds=0.3
 WrapValueInRow=true
-OptionRowNormalMetricsGroup="OptionRow"
-OptionRowExitMetricsGroup="OptionRowExit"
 
 [ScreenOptionsMaster]
 Fallback="ScreenOptions"
 Class="ScreenOptionsMaster"
+
 NoteSkinSortOrder=""
 StepsUseChartName=false
 
@@ -2104,6 +2091,7 @@ ExitTitleDefault=""
 ExitTitle,1="screen," .. Screen.Metric("NextScreen") .. ";name,ExitTitle"
 
 # Player options
+## legacy speed row
 Speed="12;"
 SpeedDefault="mod,1x,no randomspeed"
 Speed,1="mod,0.25x;name,x0.25"
@@ -2333,11 +2321,13 @@ LifeTypeDefault=""
 LifeType,1="mod,bar;name,Bar"
 LifeType,2="mod,battery;name,Battery"
 LifeType,3="mod,lifetime;name,LifeTime"
+#
 BarDrain="3;together"
 BarDrainDefault=""
 BarDrain,1="mod,normal-drain;name,Normal"
 BarDrain,2="mod,norecover;name,NoRecover"
 BarDrain,3="mod,suddendeath;name,SuddenDeath"
+#
 BatLives="10;together"
 BatLivesDefault=""
 BatLives,1="mod,1 life;name,1"
@@ -2350,19 +2340,22 @@ BatLives,7="mod,7 lives;name,7"
 BatLives,8="mod,8 lives;name,8"
 BatLives,9="mod,9 lives;name,9"
 BatLives,10="mod,10 lives;name,10"
+#
 Fail="4;together"
 FailDefault="mod,faildefault"
 Fail,1="mod,failimmediate;name,Immediate"
 Fail,2="mod,failimmediatecontinue;name,ImmediateContinue"
 Fail,3="mod,failatend;name,FailAtEnd"
 Fail,4="mod,failoff;name,Off"
+#
 Assist="4;together"
 AssistDefault=""
 Assist,1="mod,no clap,no metronome;name,Off"
 Assist,2="mod,clap,no metronome;name,Clap"
 Assist,3="mod,no clap,metronome;name,Metronome"
 Assist,4="mod,clap,metronome;name,Both"
-Rate="13;together"
+#
+Rate="14;together"
 RateDefault="mod,1.0xmusic;mod,no haste"
 Rate,1="mod,0.25xmusic;name,0.25x"
 Rate,2="mod,0.50xmusic;name,0.5x"
@@ -2378,26 +2371,31 @@ Rate,11="mod,1.3xmusic;name,1.3x"
 Rate,12="mod,1.5xmusic;name,1.5x"
 Rate,13="mod,1.75xmusic;name,1.75x"
 Rate,14="mod,2.0xmusic;name,2.0x"
+#
 AutoAdjust="4;together"
 AutoAdjustDefault=""
 AutoAdjust,1="mod,no autosync;name,Off"
 AutoAdjust,2="mod,autosyncsong;name,Sync Song"
 AutoAdjust,3="mod,autosyncmachine;name,Sync Machine"
 AutoAdjust,4="mod,autosynctempo;name,Sync Tempo"
+#
 SoundEffect="3;together"
 SoundEffectDefault=""
 SoundEffect,1="mod,no effect;name,Off"
 SoundEffect,2="mod,EffectSpeed;name,EffectSpeed"
 SoundEffect,3="mod,EffectPitch;name,EffectPitch"
+#
 Background="3;together"
 BackgroundDefault=""
 Background,1="mod,no effect;name,Default"
 Background,2="mod,staticbg;name,StaticBG"
 Background,3="mod,randombg;name,RandomBG"
+#
 SaveScores="2;together"
 SaveScoresDefault=""
 SaveScores,1="mod,no savescore;name,Off"
 SaveScores,2="mod,savescore;name,On"
+#
 SaveReplays="2;together"
 SaveReplaysDefault=""
 SaveReplays,1="mod,no savereplay;name,Off"
@@ -2413,15 +2411,16 @@ RandomModifiers,2="mod,random;name,Random"
 Edit Steps="1;together;SelectNone"
 Edit StepsDefault=""
 Edit Steps,1="screen,ScreenOptionsManageEditSteps;name,Transfer To USB Drive"
+#
 Transfer To USB Drive="1;together;SelectNone"
 Transfer To USB DriveDefault=""
 Transfer To USB Drive,1="screen,ScreenOptionsManageEditSteps;name,Transfer To USB Drive"
+#
 Transfer From USB Drive="1;together;SelectNone"
 Transfer From USB DriveDefault=""
 Transfer From USB Drive,1="screen,ScreenOptionsManageEditSteps;name,Transfer From USB Drive"
 
 [ScreenOptionsSimple]
-# more work on this needs to be done; bug me about it -aj
 Fallback="ScreenOptionsMaster"
 NavigationMode="menu"
 InputMode="together"
@@ -2463,31 +2462,28 @@ PrevScreen=Branch.AfterInit()
 
 LineNames="SystemDirection,KeyConfig,GameType,6,8,Reload,Credits,MoreOptions"
 # LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9"
-Line1="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
-Line2="gamecommand;screen,ScreenTestInput;name,Test Input"
-Line13="gamecommand;screen,ScreenSelectGame;name,Select Game"
-Line3="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
-Line4="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
-Line5="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options"
-Line10="gamecommand;screen,ScreenOptionsUI;name,UI Options"
-Line11="gamecommand;screen,ScreenOptionsInput;name,Input Options"
-Line12="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options"
-Line6="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
-Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
-Line9="gamecommand;screen,ScreenReloadSongs;name,Reload Songs"
-
-LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
 LineSystemDirection="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction"
 LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
 LineGameType="gamecommand;screen,ScreenSelectGame;name,Select Game"
-LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
+Line6="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
+Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
 LineReload="gamecommand;screen,ScreenReloadSongs;name,Reload Songs"
 LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits"
 LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options"
 
+# for ScreenOptionsExtended:
+Line2="gamecommand;screen,ScreenTestInput;name,Test Input"
+LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
+Line3="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
+Line10="gamecommand;screen,ScreenOptionsUI;name,UI Options"
+Line11="gamecommand;screen,ScreenOptionsInput;name,Input Options"
+Line4="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
+Line12="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options"
+Line5="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options"
+LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
+
 [ScreenOptionsExtended]
 Fallback="ScreenOptionsService"
-#
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
 #
@@ -2495,22 +2491,24 @@ LineNames="2,Sync,3,10,11,4,12,5,Theme"
 
 [ScreenOptionsServiceChild]
 Fallback="ScreenOptionsMaster"
+PrevScreen="ScreenOptionsService"
+NextScreen="ScreenOptionsService"
+TimerSeconds=-1
+TimerOnCommand=visible,false
+AllowOperatorMenuButton=false
+#
+ForceAllPlayers=true
 LightsMode="LightsMode_MenuStartAndDirections"
 NavigationMode="normal"
 InputMode="together"
-TimerOnCommand=visible,false
+#
 ShowStyleIcon=false
-TimerSeconds=-1
-AllowOperatorMenuButton=false
-ForceAllPlayers=true
-PrevScreen="ScreenOptionsService"
-NextScreen="ScreenOptionsService"
 HelpText=Screen.String("HelpTextOptionsAndBack")
-
+#
 LineHighlightP1OnCommand=visible,false
 LineHighlightP1ChangeCommand=
 LineHighlightP1ChangeToExitCommand=
-
+#
 LineHighlightP2OnCommand=visible,false
 LineHighlightP2ChangeCommand=
 LineHighlightP2ChangeToExitCommand=
@@ -2527,23 +2525,27 @@ Fallback="ScreenOptionsServiceChild"
 Class="ScreenMiniMenu"
 Fallback="ScreenOptions"
 PrevScreen=
-ShowHelp=false
 TimerSeconds=-1
+AllowRepeatingChangeValueInput=true
+#
+ShowHelp=false
 ShowExplanations=false
 ShowExitRow=false
-ContainerOnCommand=
-ContainerOffCommand=
-NumRowsShown=30
-RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:y( SCREEN_CENTER_Y + indexOffset * 20 ); end
 ShowStyleIcon=false
+#
 HeaderX=SCREEN_CENTER_X
 HeaderY=SCREEN_TOP+40
 HeaderOnCommand=
 HeaderOffCommand=
-AllowRepeatingChangeValueInput=true
-CursorOnCommand=visible,false
+#
 OptionRowNormalMetricsGroup="OptionRowMiniMenu"
+NumRowsShown=30
+RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:y( SCREEN_CENTER_Y + indexOffset * 20 ); end
 ColorDisabled=color("0.8,0.8,0.8,0.975")
+#
+ContainerOnCommand=
+ContainerOffCommand=
+CursorOnCommand=visible,false
 
 [OptionRowMiniMenu]
 Fallback="OptionRow"
@@ -2685,12 +2687,10 @@ Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsExtended"
 PrevScreen="ScreenOptionsExtended"
 LineNames="Score,3,4,8,11,13,14,15,16,28,29,30"
-#Line2="conf,ScoringType"
 LineScore="lua,UserPrefScoringMode()"
 Line3="conf,TimingWindowScale"
 Line4="conf,LifeDifficulty"
 Line8="lua,GamePrefDefaultFail()"
-# Line8="conf,DefaultFailType"
 Line11="conf,AllowW1"
 Line13="conf,HiddenSongs"
 Line14="conf,EasterEggs"
@@ -2701,9 +2701,11 @@ Line29="conf,AutogenGroupCourses"
 Line30="conf,FastLoad"
 
 # unused options
+#Line2="conf,ScoringType"
 #Line5="conf,ProgressiveLifebar"
 #Line6="conf,ProgressiveStageLifebar"
 #Line7="conf,ProgressiveNonstopLifebar"
+#Line8="conf,DefaultFailType"
 #Line24="conf,AutoPlay"
 #Line31="conf,OnlyPreferredDifficulties"
 
@@ -2820,7 +2822,6 @@ LineNames="1,2,3A,3B,4,5,6,R,7,8,9,10,11,12,13,14,16,17"
 Line1="lua,SpeedMods()"
 # Line1="list,Speed"
 Line2="list,Accel"
-#Line3="list,Effect"
 Line3A="list,EffectsReceptor"
 Line3B="list,EffectsArrow"
 #
@@ -2838,7 +2839,6 @@ Line13="list,Hide"
 Line14="list,Persp"
 Line16="list,Steps"
 Line17="list,Characters"
-
 #
 
 [ScreenPlayerOptionsRestricted]
@@ -2846,25 +2846,21 @@ Fallback="ScreenPlayerOptions"
 NextScreen="ScreenStageInformation"
 LineNames="1,8,16,17"
 
-# funny
-
 [ScreenSongOptions]
 Fallback="ScreenOptions"
 Class="ScreenSongOptions"
-#
 PrevScreen="ScreenPlayerOptions"
 NextScreen="ScreenStageInformation"
-#
-PlayMusic=false
-#
 TimerSeconds=30
+PlayMusic=false
+StopMusicOnBack=false
 #
 LineNames="1,2,3,4,5,6,7,8,9,10"
 #,11
+
 Line1="list,LifeType"
 Line2="list,BarDrain"
 Line3="list,BatLives"
-# Line4="list,Fail"
 Line4="lua,GamePrefDefaultFail()"
 Line5="list,Assist"
 Line6="list,Rate"
@@ -2873,7 +2869,7 @@ Line8="list,AutoAdjust"
 Line9="list,Background"
 Line10="list,SaveScores"
 Line11="list,SaveReplays"
-StopMusicOnBack=false
+## Line4="list,Fail"
 
 [ScreenSplash]
 Class="ScreenSplash"
@@ -2899,12 +2895,10 @@ StartScreen=Branch.TitleMenu()
 CancelScreen=Branch.TitleMenu()
 #
 LightsMode="LightsMode_Attract"
-#
 PlayMusic=false
 #
 ResetGameState=true
 BackGoesToStartScreen=true
-#
 AttractVolume=true
 #
 TimerMetricsGroup="MenuTimerNoSound"
@@ -2912,7 +2906,6 @@ TimerMetricsGroup="MenuTimerNoSound"
 [ScreenRanking]
 Class="ScreenRanking"
 Fallback="ScreenAttract"
-#
 TimerSeconds=-1
 #
 ResetGameState=true
@@ -2958,6 +2951,7 @@ Bullet2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
 Bullet3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
 Bullet4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
 Bullet5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
+#
 NameStartX=SCREEN_CENTER_X-140
 NameStartY=SCREEN_CENTER_Y-100
 Name1OnCommand=diffusealpha,1;halign,0;addx,SCREEN_WIDTH;sleep,0.2;bounceend,1;addx,-SCREEN_WIDTH
@@ -2970,6 +2964,7 @@ Name2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
 Name3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
 Name4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
 Name5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
+#
 ScoreStartX=SCREEN_CENTER_X+200
 ScoreStartY=SCREEN_CENTER_Y-100
 Score1OnCommand=diffusealpha,1;halign,1;addx,SCREEN_WIDTH;sleep,0.2;bounceend,1;addx,-SCREEN_WIDTH
@@ -2982,6 +2977,7 @@ Score2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
 Score3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
 Score4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
 Score5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
+#
 PointsStartX=SCREEN_CENTER_X+60
 PointsStartY=SCREEN_CENTER_Y-100
 Points1OnCommand=diffusealpha,1;addx,SCREEN_WIDTH;sleep,0.2;bounceend,1;addx,-SCREEN_WIDTH
@@ -2994,6 +2990,7 @@ Points2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
 Points3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
 Points4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
 Points5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
+#
 TimeStartX=SCREEN_CENTER_X+240
 TimeStartY=SCREEN_CENTER_Y-100
 Time1OnCommand=diffusealpha,1;addx,SCREEN_WIDTH;sleep,0.2;bounceend,1;addx,-SCREEN_WIDTH
@@ -3006,6 +3003,7 @@ Time2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
 Time3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
 Time4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
 Time5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
+#
 DifficultyStartX=SCREEN_CENTER_X-154
 DifficultyY=SCREEN_CENTER_Y-209
 DifficultyBeginnerOnCommand=
@@ -3018,6 +3016,7 @@ DifficultyEasyOffCommand=
 DifficultyMediumOffCommand=
 DifficultyHardOffCommand=
 DifficultyChallengeOffCommand=
+#
 TitleOnCommand=x,-210;ztest,1;diffuse,0,0,0,1;maxwidth,160
 TitleOffCommand=
 FrameOnCommand=ztest,1
@@ -3030,28 +3029,21 @@ ScoreOffCommand=
 
 # 05 # C
 [ScreenGameplay]
-#
 Fallback="ScreenWithMenuElementsBlank"
 Class="ScreenGameplayNormal"
-#
 NextScreen=Branch.AfterGameplay()
 PrevScreen=Branch.BackOutOfStageInformation()
+TimerSeconds=-1
 #
 ShowLifeMeterForDisabledPlayers=false
 StopCourseEarly=false
 ShowEvaluationOnFail=true
 ShowScoreInRave=false
-#
 UnpauseWithStart=true
-#
 InitialBackgroundBrightness=1.0
-TimerSeconds=-1
-#
 SecondsBetweenComments=10.0
 ScoreKeeperClass=ScoreKeeperClass()
-#
 TickEarlySeconds=0
-#
 LightsMode="LightsMode_Gameplay"
 #
 PlayerType="Player"
@@ -3212,7 +3204,6 @@ ScoreboardC3P2OnCommand=zoom,0.825;strokecolor,Color("Outline");shadowlength,1
 [ScreenGameplayEditCourse]
 Class="ScreenGameplayNormal"
 Fallback="ScreenGameplay"
-
 PrevScreen="ScreenOptionsCourseOverview"
 NextScreen="ScreenOptionsCourseOverview"
 
@@ -3224,23 +3215,21 @@ PlayerType="PlayerShared"
 [ScreenEvaluation]
 Class="ScreenEvaluation"
 Fallback="ScreenWithMenuElements"
-#
 NextScreen=Branch.AfterEvaluation()
 PrevScreen=Branch.AfterEvaluation()
-#
+TimerSeconds=20
 LightsMode="LightsMode_MenuStartOnly"
 #
 Summary=false
 CheckpointsWithJudgments=EvalUsesCheckpointsWithJudgments()
 #
-TimerSeconds=20
-#
 PlayerOptionsSeparator=","
 PlayerOptionsHideFailType=false
 MaxComboNumDigits=4
 #
 ShowBannerArea=true
 RollingNumbersClass="RollingNumbersJudgment"
+#
 ShowSharedJudgmentLineLabels=false
 ShowJudgmentLineW1=false
 ShowJudgmentLineW2=false
@@ -3318,9 +3307,7 @@ PrevScreen=Branch.AfterEvaluation()
 
 [ScreenEvaluationSummary]
 Fallback="ScreenEvaluation"
-#
 NextScreen=Branch.AfterSummary()
-#
 Summary=true
 
 [ScreenNameEntry]
@@ -3363,19 +3350,15 @@ PlayerP2OnePlayerTwoSidesX=SCREEN_CENTER_X
 [ScreenNameEntryTraditional]
 Class="ScreenNameEntryTraditional"
 Fallback="ScreenWithMenuElements"
-#
-TimerSeconds=30
-#
-RepeatRate=15
-RepeatDelay=1/4
-#
 NextScreen="ScreenProfileSaveSummary"
-#
-HelpText="Enter your name!"
+CancelTransitionsOut=true
+TimerSeconds=30
 ForceTimer=true
 ForceTimerWait=true
+RepeatRate=15
+RepeatDelay=1/4
+HelpText="Enter your name!"
 #
-CancelTransitionsOut=true
 MaxRankingNameLength=4
 CodeNames="Backspace,Left,Right,NextRow1=NextRow,NextRow2=NextRow,PrevRow,JumpToEnter,Enter"
 CodeLeft="+MenuLeft"
@@ -3390,35 +3373,29 @@ CodeEnter="Start"
 [ScreenProfileSave]
 Class="ScreenProfileSave"
 Fallback="ScreenWithMenuElementsBlank"
-#
 NextScreen=Branch.AfterProfileSave()
 PrevScreen=Branch.TitleMenu()
-#
 TimerSeconds=-1
 
 [ScreenProfileSaveSummary]
 Fallback="ScreenProfileSave"
-#
 NextScreen=Branch.AfterSaveSummary()
 PrevScreen=Branch.AfterSaveSummary()
 
 [ScreenGameOver]
 Class="ScreenEnding"
 Fallback="ScreenAttract"
-#
 PrevScreen=Branch.TitleMenu()
 NextScreen=Branch.TitleMenu()
 StartScreen=Branch.TitleMenu()
-#
 TimerSeconds=10
-#
 ResetGameState=true
 #
 RemoveCardP1X=SCREEN_WIDTH*0.1
 RemoveCardP1Y=SCREEN_CENTER_Y
 RemoveCardP1OnCommand=
 RemoveCardP1OffCommand=
-
+#
 RemoveCardP2X=SCREEN_WIDTH*0.9
 RemoveCardP2Y=SCREEN_CENTER_Y
 RemoveCardP2OnCommand=
@@ -3434,49 +3411,56 @@ QuestionX=SCREEN_CENTER_X
 QuestionY=SCREEN_CENTER_Y-60
 QuestionOnCommand=zoom,0.7;wrapwidthpixels,600
 QuestionOffCommand=
+#
 CursorOnCommand=
 CursorOffCommand=
+#
 Answer1Of1X=SCREEN_CENTER_X
 Answer1Of1Y=SCREEN_CENTER_Y+120
 Answer1Of1OnCommand=maxwidth,100
 Answer1Of1OffCommand=
+##
 Answer1Of2X=SCREEN_CENTER_X-50
 Answer1Of2Y=SCREEN_CENTER_Y+120
 Answer1Of2OnCommand=maxwidth,100
 Answer1Of2OffCommand=
+#
 Answer2Of2X=SCREEN_CENTER_X+50
 Answer2Of2Y=SCREEN_CENTER_Y+120
 Answer2Of2OnCommand=maxwidth,100
 Answer2Of2OffCommand=
+###
 Answer1Of3X=SCREEN_CENTER_X-170
 Answer1Of3Y=SCREEN_CENTER_Y+120
 Answer1Of3OnCommand=maxwidth,100
 Answer1Of3OffCommand=
+#
 Answer2Of3X=SCREEN_CENTER_X-20
 Answer2Of3Y=SCREEN_CENTER_Y+120
 Answer2Of3OnCommand=maxwidth,100
 Answer2Of3OffCommand=
+#
 Answer3Of3X=SCREEN_CENTER_X+150
 Answer3Of3Y=SCREEN_CENTER_Y+120
 Answer3Of3OnCommand=maxwidth,100
 Answer3Of3OffCommand=
 
-#
-# stuff for edit mode:
-#
-
+## stuff for edit mode: ##
 [ScreenOptionsEdit]
 Class="ScreenOptionsMaster"
 Fallback="ScreenOptionsSimpleService"
-; This NextScreen is only used for the "exit" choice.
+# This NextScreen is only used for the "exit" choice.
 NextScreen=Branch.TitleMenu()
 PrevScreen=Branch.TitleMenu()
-#LineNames="1,2,3,4,5,6"
+
 LineNames="1,2,3"
 Line1="gamecommand;screen,ScreenEditMenu;name,Edit Songs/Steps"
 Line2="gamecommand;screen,ScreenPracticeMenu;name,Practice Songs/Steps"
 Line3="gamecommand;screen,ScreenOptionsExportPackage;name,Export Packages"
+
+# broken:
 # Line4="gamecommand;screen,ScreenOptionsManageCourses;name,Edit Courses"
+# unused:
 # Line4="gamecommand;screen,ScreenServiceActionCopyEditsMachineToMemoryCard;name,Transfer Edits to USB"
 # Line5="gamecommand;screen,ScreenOptionsGraphicsSound;name,Transfer Edits from USB"
 # Line6="gamecommand;screen,ScreenOptionsAdvanced;name,Clear USB edits"
@@ -3581,6 +3565,10 @@ Fallback="ScreenWithMenuElements"
 Class="ScreenEditMenu"
 NextScreen="ScreenEdit"
 PrevScreen="ScreenOptionsEdit"
+TimerSeconds=-1
+ShowStyleIcon=false
+HelpText=Screen.String("HelpTextOptionsAndBack")
+#
 EditMenuType="EditMenu"
 ExplanationX=SCREEN_CENTER_X
 ExplanationY=SCREEN_BOTTOM-56
@@ -3588,12 +3576,8 @@ ExplanationOnCommand=wrapwidthpixels,SCREEN_WIDTH*0.9375/0.675;shadowlength,1;zo
 NumStepsLoadedFromProfileX=SCREEN_RIGHT-180
 NumStepsLoadedFromProfileY=SCREEN_TOP+42
 NumStepsLoadedFromProfileOnCommand=visible,false
-ShowStyleIcon=false
-TimerSeconds=-1
-HelpText=Screen.String("HelpTextOptionsAndBack")
 
 # could use a redo but whatever
-
 [ScreenEdit]
 Class="ScreenEdit"
 Fallback="ScreenWithMenuElementsBlank"
@@ -3663,7 +3647,6 @@ PreviewLengthFormat="%s:\n  %.6f secs\n"
 [ScreenPracticeMenu]
 Fallback="ScreenEditMenu"
 Class="ScreenEditMenu"
-#
 NextScreen="ScreenPractice"
 PrevScreen="ScreenOptionsEdit"
 EditMenuType="PracticeMenu"
@@ -3677,7 +3660,6 @@ Fallback="ScreenEdit"
 Class="ScreenEdit"
 NextScreen="ScreenOptionsEdit"
 PrevScreen="ScreenOptionsEdit"
-#
 EditMode="EditMode_Practice"
 
 [ScreenEditOptions]
@@ -3689,7 +3671,9 @@ CancelTransitionsOut=true
 PlayMusic=false
 TimerSeconds=-1
 ShowStyleIcon=false
+
 LineNames="1,2,3,4,5,6,R,7,8,9,10,Attacks,11,12,13,14,15,16"
+# uses legacy speed line
 Line1="list,Speed"
 Line2="list,Accel"
 Line3="list,Effect"
@@ -3714,7 +3698,6 @@ OutCancelCommand=
 Fallback="StepsDisplay"
 
 # oh, right, minimenus.
-
 [ScreenMiniMenuEditHelp]
 Fallback="ScreenMiniMenu"
 ShowFooter=false
@@ -3783,7 +3766,6 @@ Fallback="ScreenMiniMenu"
 Fallback="ScreenMiniMenu"
 
 # Export Packages
-
 [ScreenOptionsExportPackage]
 Class="ScreenOptionsExportPackage"
 Fallback="ScreenOptionsSimpleService"
@@ -3808,7 +3790,6 @@ Fallback="OptionRowService"
 TitleX=SCREEN_CENTER_X-150
 
 # Manage Courses
-
 [OptionRowCourseOverview]
 Fallback="OptionRowService"
 ItemsLongRowSharedX=SCREEN_CENTER_X-100
@@ -3857,7 +3838,6 @@ EditScreen="ScreenOptionsEditCourse"
 OptionRowNormalMetricsGroup="OptionRowCourseOverview"
 
 # visual/interactive syncing
-
 [ScreenGameplaySyncMachine]
 Class="ScreenGameplaySyncMachine"
 Fallback="ScreenGameplay"
@@ -3886,8 +3866,7 @@ SongOptionsOnCommand=visible,false
 Fallback="Player"
 ComboOnCommand=visible,false
 
-# sm-ssc helper screens
-
+# SM5 helper screens
 [ScreenHowToInstallSongs]
 Class="ScreenSplash"
 Fallback="ScreenSplash"
@@ -3897,8 +3876,7 @@ ShowStyleIcon=false
 TimerSeconds=-1
 ShowHelp=false
 
-# stuff for online mode:
-
+# stuff for legacy/deprecated online mode:
 [ScreenSMOnlineLogin]
 Class="ScreenSMOnlineLogin"
 Fallback="ScreenOptionsServiceChild"
@@ -4069,38 +4047,6 @@ Class="ScreenNetSelectMusic"
 RoomSelectScreen="ScreenNetRoom"
 Fallback="ScreenNetSelectMusic"
 
-[ModIcon]
-TextX=0
-TextY=0
-TextOnCommand=maxwidth,40;uppercase,true;shadowlength,0;diffuse,color("#f6ff00")
-CropTextToWidth=50
-StopWords="1X,default,Overhead,Off"
-
-[ModIconSelectMusic]
-Fallback="ModIcon"
-TextY=-1
-TextOnCommand=maxwidth,38;uppercase,true;shadowlength,0
-
-[ModIconRow]
-NumModIcons=6
-ModIconOnCommand=
-SpacingX=0
-SpacingY=52
-ModIconMetricsGroup="ModIcon"
-
-[ModIconRowSelectMusic]
-Fallback="ModIconRow"
-SpacingX=46
-SpacingY=0
-ModIconMetricsGroup="ModIconSelectMusic"
-
-[GraphDisplay]
-BodyWidth=140
-BodyHeight=38
-
-[ComboGraph]
-BodyWidth=140
-
 [ScreenNetEvaluation]
 Class="ScreenNetEvaluation"
 Fallback="ScreenEvaluationNormal"
@@ -4144,35 +4090,61 @@ UserDY=24
 UserOnCommand=
 UserOffCommand=
 
-# Arcade
+#
+[ModIcon]
+TextX=0
+TextY=0
+TextOnCommand=maxwidth,40;uppercase,true;shadowlength,0;diffuse,color("#f6ff00")
+CropTextToWidth=50
+StopWords="1X,default,Overhead,Off"
 
+[ModIconSelectMusic]
+Fallback="ModIcon"
+TextY=-1
+TextOnCommand=maxwidth,38;uppercase,true;shadowlength,0
+
+[ModIconRow]
+NumModIcons=6
+ModIconOnCommand=
+SpacingX=0
+SpacingY=52
+ModIconMetricsGroup="ModIcon"
+
+[ModIconRowSelectMusic]
+Fallback="ModIconRow"
+SpacingX=46
+SpacingY=0
+ModIconMetricsGroup="ModIconSelectMusic"
+
+#
+[GraphDisplay]
+BodyWidth=140
+BodyHeight=38
+
+[ComboGraph]
+BodyWidth=140
+
+# Arcade
 [ScreenLogo]
 Fallback="ScreenAttract"
-#
 PrevScreen=Branch.Init()
 NextScreen="ScreenHowToPlay"
 StartScreen=Branch.TitleMenu()
-#
-ForceTimer=true
 TimerSeconds=5
-#
+ForceTimer=true
 TimerMetricsGroup="MenuTimerNoSound"
 TimerOnCommand=visible,false
 
 [ScreenHowToPlay]
 Class="ScreenHowToPlay"
 Fallback="ScreenAttract"
-#
-ForceTimer=true
-TimerSeconds=25
-#
 PrevScreen="ScreenLogo"
 NextScreen="ScreenDemonstration"
 StartScreen=Branch.TitleMenu()
-#
-ResetGameState=false
+TimerSeconds=25
 SecondsToShow=25
-#
+ForceTimer=true
+ResetGameState=false
 PlayMusic=true
 #
 UseLifeMeterBar=true
@@ -4205,7 +4177,6 @@ Fallback="ScreenTitleMenu"
 ChoiceNames="1"
 
 # ScrollerOnCommand=visible,false
-#
 IdleCommentSeconds=-1
 IdleTimeoutSeconds=-1
 IdleTimeoutScreen=Branch.AfterInit()
@@ -4213,7 +4184,6 @@ IdleTimeoutScreen=Branch.AfterInit()
 [ScreenDemonstration]
 Fallback="ScreenGameplay"
 Class="ScreenDemonstration"
-#
 NextScreen="ScreenInit"
 StartScreen=Branch.TitleMenu()
 PlayMusic=false