Removed all OffCommand Transitions except for the FUCKING OPTIONS MENU FUCK MY SHIT...

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
index 34bf67a..87e1b1f 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
@@ -153,7 +153,6 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation');
        self:settext(gnModTrim);
                gnModHeight = self:GetHeight();
        end"
-       OffCommand="accelerate,0.3;addx,-EvalTweenDistance()"
        />
        
        <BitmapText Font="_eurostile normal" Text=""
@@ -190,7 +189,6 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation');
        self:settext(gnModTrim);
                gnModHeight = self:GetHeight();
        end"
-       OffCommand="accelerate,0.3;addx,EvalTweenDistance()"
        />      
        
 <!--Current Song-->

diff --git a/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml b/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml
index 34764b8..20039af 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml
@@ -19,23 +19,9 @@
        <Layer Type="Quad"
        Condition="not GAMESTATE:IsCourseMode();"
        OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;linear,0.3;diffusealpha,0;"
-       />
-       
-       <Layer
-       Type="Quad"
-       OnCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+(SCREEN_HEIGHT/2)-50;draworder,10000;decelerate,0.3;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+SCREEN_HEIGHT"
-       />
-
-       <Layer  
-       Type="Quad"
-       OnCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2);draworder,10000;decelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-SCREEN_HEIGHT"
+       OffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;linear,0.3;diffusealpha,1;"      
        />
 
-       <Layer
-       File="TransitionArrow"
-       OnCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
-       MenuBackMessageCommand="hidden,1;"
-       />
 </children></ActorFrame>
        </children>
 

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml b/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
index abcb70f..25d57e9 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
@@ -25,7 +25,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectStyle2'
                
        <Layer
                Type="ActorFrame"
-               OnCommand="x,SCREEN_CENTER_X-206;y,SCREEN_CENTER_Y+15;zoom,1;queuecommand,Update;"
+               OnCommand="x,SCREEN_CENTER_X-206;y,SCREEN_CENTER_Y+15;zoom,0.4;sleep,0.3;queuecommand,Update;"
                UpdateCommand="%function(self) 
                self:stoptweening();
                if GAMESTATE:GetEnv('Vibrate') == 'On' then
@@ -74,7 +74,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectStyle2'
                
        <Layer
                Type="ActorFrame"
-               OnCommand="x,SCREEN_CENTER_X+174;y,SCREEN_CENTER_Y+15;zoom,1;queuecommand,Update;"
+               OnCommand="x,SCREEN_CENTER_X+174;y,SCREEN_CENTER_Y+15;zoom,0.4;sleep,0.3;queuecommand,Update;"
                UpdateCommand="%function(self) 
                self:stoptweening();
                if GAMESTATE:GetEnv('Vibrate') == 'On' then
@@ -107,6 +107,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectStyle2'
                if GAMESTATE:GetEnv('Vibrate') == 'On' then
                        self:vibrate();
                        end
+               self:zoom(gnZoom1);
                if gnChoice == 2 then
                        gnZoom1 = gnZoom1 + gnChoiceTween;
                        if gnZoom1 >= gnMaxZoom then gnZoom1 = gnMaxZoom; end
@@ -116,19 +117,20 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectStyle2'
                        if gnZoom1 <= gnMinZoom then gnZoom1 = gnMinZoom; end
                        self:diffusealpha(gnZoom1+0.1);
                        end
-               self:zoom(gnZoom1);
                self:sleep(0.032);
                self:queuecommand('Update');
                end"
                />
                
                <Layer File="ScreenSelectStyle2 scroll choice2/title"
-               InitCommand="x,SCREEN_CENTER_X+207;y,SCREEN_CENTER_Y+62;queuecommand,Update;"
+               InitCommand="x,SCREEN_CENTER_X+207;y,SCREEN_CENTER_Y+62;queuecommand,Go;"
+               GoCommand="%function(self) self:queuecommand('Update') end"
                UpdateCommand="%function(self)
                self:stoptweening();
                if GAMESTATE:GetEnv('Vibrate') == 'On' then
                        self:vibrate();
                        end
+               self:zoom(gnZoom3);
                if gnChoice == 1 then
                        gnZoom3 = gnZoom3 + gnChoiceTween;
                        if gnZoom3 >= gnMaxZoom then gnZoom3 = gnMaxZoom; end
@@ -138,18 +140,19 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectStyle2'
                        if gnZoom3 <= gnMinZoom then gnZoom3 = gnMinZoom; end
                        self:diffusealpha(gnZoom3+0.1);
                        end
-               self:zoom(gnZoom3);
                self:sleep(0.032);
                self:queuecommand('Update');
                end"
                />
                <Layer File="ScreenSelectStyle2 scroll choice3/title"
-               InitCommand="x,SCREEN_CENTER_X-206;y,SCREEN_CENTER_Y+62;zoom,0.5;queuecommand,Update;"
+               InitCommand="x,SCREEN_CENTER_X-206;y,SCREEN_CENTER_Y+62;queuecommand,Go;"
+               GoCommand="%function(self) self:queuecommand('Update') end"
                UpdateCommand="%function(self)
                self:stoptweening();
                if GAMESTATE:GetEnv('Vibrate') == 'On' then
                        self:vibrate();
                        end
+               self:zoom(gnZoom4);
                if gnChoice == 0 then
                        gnZoom4 = gnZoom4 + gnChoiceTween;
                        if gnZoom4 >= gnMaxZoom then gnZoom4 = gnMaxZoom; end
@@ -159,7 +162,6 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectStyle2'
                        if gnZoom4 <= gnMinZoom then gnZoom4 = gnMinZoom; end
                        self:diffusealpha(gnZoom4+0.1);
                        end
-               self:zoom(gnZoom4);
                self:sleep(0.032);
                self:queuecommand('Update');
                end"

diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index 1459ef8..d0fecd0 100644 (file)
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -143,8 +143,8 @@ ScreenTransitionWhoosh('short');
        gnChoice = 2;
        gnChoiceTween = 0.05;
        gnZoom1 = 0.7;
-       gnZoom3 = 0.7;
-       gnZoom4 = 0.7;
+       gnZoom3 = 0.4;
+       gnZoom4 = 0.4;
        gnMaxZoom = 0.6;
        gnMinZoom = 0.4;
 end

diff --git a/Themes/GrooveNights/metrics.ini b/Themes/GrooveNights/metrics.ini
index 6060d63..a467343 100644 (file)
--- a/Themes/GrooveNights/metrics.ini
+++ b/Themes/GrooveNights/metrics.ini
@@ -458,9 +458,9 @@ BannerResetFadeCommand=stoptweening;diffuse,#FFFFFFFF
 WarningStart=6
 WarningBeepStart=6
 MaxStallSeconds=0
-Text1OnCommand=stoptweening;shadowlength,0;x,9;horizalign,right;pulse;effectperiod,1;effectmagnitude,0.7,0.75,1;
+Text1OnCommand=stoptweening;shadowlength,0;x,9;horizalign,right;pulse;effectperiod,1;effectmagnitude,0.62,0.67,1;
 Text1FormatFunction=function(fSeconds) fSeconds=math.floor(fSeconds); return string.format("%02.0f",fSeconds) end
-Text2OnCommand=stoptweening;shadowlength,0;zoom,0.7;x,10;y,4;horizalign,left;pulse;effectperiod,1;effectmagnitude,0.70,0.75,1;
+Text2OnCommand=stoptweening;shadowlength,0;zoom,0.7;x,10;y,4;horizalign,left;pulse;effectperiod,1;effectmagnitude,0.62,0.67,1;
 Text2FormatFunction=function(fSeconds) local remainder=fSeconds-math.floor(fSeconds); local digit=math.floor(remainder*10); return "."..digit end
 WarningCommand6=%function(self,parent) parent:stoptweening(); parent:zoom(1.1); parent:addy(-1); parent:linear(0.2); parent:addy(1); parent:zoom(1); self:glowblink(); self:effectperiod(0.1666); self:effectcolor1(1,1,1,0.5); self:effectcolor2(0.5,0.5,0.5,0); end
 WarningCommand5=%function(self,parent) parent:stoptweening(); parent:zoom(1.1); parent:addy(-1); parent:linear(0.2); parent:addy(1); parent:zoom(1); end
@@ -936,7 +936,7 @@ StyleIcon=0
 MemoryCardIcons=1
 MusicWheelX=SCREEN_CENTER_X-188
 MusicWheelY=SCREEN_CENTER_Y-27-((gnZoomRatio-1)*2)-46-7
-MusicWheelOffCommand=addx,-20
+MusicWheelOffCommand=
 // Keep this Y and FOVCenterY the same.
 MusicWheelOnCommand=addx,-20;zoomx,0.86;zoomy,0.96;zoomz,1.40;z,0;rotationy,20;sleep,0.5;addx,20;
 FOV=0
@@ -960,13 +960,13 @@ NumWheelItems=20
 MusicWheelItemStartOnCommand=%function(self) if GAMESTATE:GetEnv('Vibrate') == 'On' then       self:vibrate(); end self:ztest(1); self:addx(-420); end
 MusicWheelItemFinishOnCommand=@'sleep,0.35;decelerate,0.2;addx,420;diffuse,'..WheelBackgroundColor()..';'
 MusicWheelItemStartOffCommand=
-MusicWheelItemFinishOffCommand=accelerate,0.2;addx,-420
+MusicWheelItemFinishOffCommand=
 HighlightOnCommand=diffuseshift;effectcolor2,1,1,1,0.7;effectcolor1,1,1,1,0.3;effectperiod,1.0;effectoffset,0.2;effectclock,beat;ztest,1
 HighlightStartOnCommand=ztest,1;addx,-420
 HighlightFinishOnSortCommand=sleep,0.35;linear,0.5;addx,420
 HighlightFinishOnCommand=sleep,0.35;linear,0.5;addx,420
 HighlightStartOffCommand=
-HighlightFinishOffCommand=decelerate,0.2;addx,-420
+HighlightFinishOffCommand=
 HighlightFinishOffSortCommand=decelerate,0.2;addx,-420
 WheelItemOnDelayCenter=0
 WheelItemOnDelayOffset=0.00
@@ -1121,7 +1121,7 @@ NextScreen=@EvaluationNextScreen()
 FailedScreen=@EvaluationNextScreen()
 Class=ScreenEvaluation
 Fallback=ScreenEvaluation
-FooterOnCommand=diffusealpha,0;diffusealpha,1
+FooterOnCommand=diffusealpha,1;
 StageX=SCREEN_CENTER_X
 StageY=SCREEN_TOP+40
 StageOffCommand=
@@ -1163,21 +1163,21 @@ GraphFrameP2OffCommand=
 LifeGraphStartHeight=0
 LifeGraphP1X=SCREEN_CENTER_X-155+EvalX()
 LifeGraphP1Y=SCREEN_CENTER_Y+18
-LifeGraphP1OnCommand=stretchto,SCREEN_CENTER_X-291+EvalX(),SCREEN_CENTER_Y-2,SCREEN_CENTER_X-20+EvalX(),SCREEN_CENTER_Y+38;DrawOrder,1;addx,-EvalTweenDistance();addx,EvalTweenDistance();addy,133;
+LifeGraphP1OnCommand=stretchto,SCREEN_CENTER_X-291+EvalX(),SCREEN_CENTER_Y-2,SCREEN_CENTER_X-20+EvalX(),SCREEN_CENTER_Y+38;DrawOrder,1;addy,133;
 LifeGraphP1OffCommand=%function(self) MESSAGEMAN:Broadcast('ScreenTransition'); end
 LifeGraphP2X=SCREEN_CENTER_X+155+EvalX()
 LifeGraphP2Y=SCREEN_CENTER_Y+18
-LifeGraphP2OnCommand=stretchto,SCREEN_CENTER_X+19+EvalX(),SCREEN_CENTER_Y-2,SCREEN_CENTER_X+290+EvalX(),SCREEN_CENTER_Y+38;DrawOrder,1;addx,EvalTweenDistance();addx,-EvalTweenDistance();addy,133;
+LifeGraphP2OnCommand=stretchto,SCREEN_CENTER_X+19+EvalX(),SCREEN_CENTER_Y-2,SCREEN_CENTER_X+290+EvalX(),SCREEN_CENTER_Y+38;DrawOrder,1;;addy,133;
 LifeGraphP2OffCommand=%function(self) MESSAGEMAN:Broadcast('ScreenTransition'); end
 
 # The graphic has an odd width, and stretchto doesn't work with ComboGraph.
 ComboGraphP1X=SCREEN_CENTER_X-155.5+EvalX()
 ComboGraphP1Y=SCREEN_CENTER_Y+47+134
-ComboGraphP1OnCommand=DrawOrder,1;addx,-EvalTweenDistance();addx,EvalTweenDistance();
+ComboGraphP1OnCommand=DrawOrder,1;
 ComboGraphP1OffCommand=
 ComboGraphP2X=SCREEN_CENTER_X+154.5+EvalX()
 ComboGraphP2Y=SCREEN_CENTER_Y+47+134
-ComboGraphP2OnCommand=DrawOrder,1;addx,EvalTweenDistance();addx,-EvalTweenDistance();
+ComboGraphP2OnCommand=DrawOrder,1;;
 ComboGraphP2OffCommand=
 ComboBarOnCommand=
 ComboBarOffCommand=
@@ -1187,11 +1187,11 @@ BannerWidth=210
 DancePointsP1X=SCREEN_CENTER_X-10+EvalX()
 DancePointsP1Y=SCREEN_CENTER_Y-130
 DancePointsP1OffCommand=
-DancePointsP1OnCommand=diffuseshift;effectperiod,2;addx,-EvalTweenDistance();addx,EvalTweenDistance()
+DancePointsP1OnCommand=diffuseshift;effectperiod,2;
 DancePointsP2X=SCREEN_CENTER_X+236+EvalX()
 DancePointsP2Y=SCREEN_CENTER_Y-130
 DancePointsP2OffCommand=
-DancePointsP2OnCommand=diffuseshift;effectperiod,2;addx,EvalTweenDistance();addx,-EvalTweenDistance()
+DancePointsP2OnCommand=diffuseshift;effectperiod,2;
 # These are implemented in the overlay.
 DifficultyIconP1X=
 DifficultyIconP1Y=
@@ -1211,20 +1211,20 @@ DifficultyMeterP2OffCommand=
 DifficultyMeterP2OnCommand=hidden,1
 GradeFrameP1X=SCREEN_CENTER_X-155+EvalX()
 GradeFrameP1Y=SCREEN_CENTER_Y+54
-GradeFrameP1OffCommand=addx,-EvalTweenDistance()
-GradeFrameP1OnCommand=addx,-EvalTweenDistance();addx,EvalTweenDistance()
+GradeFrameP1OffCommand=
+GradeFrameP1OnCommand=
 GradeFrameP2X=SCREEN_CENTER_X+155+EvalX()
 GradeFrameP2Y=SCREEN_CENTER_Y+54
-GradeFrameP2OffCommand=addx,EvalTweenDistance()
-GradeFrameP2OnCommand=addx,EvalTweenDistance();addx,-EvalTweenDistance()
+GradeFrameP2OffCommand=
+GradeFrameP2OnCommand=
 # Draw the grade over the overlay, since it overlaps the overlay difficulty/name frame.
 GradeP1X=SCREEN_CENTER_X-170+EvalX()
 GradeP1Y=SCREEN_CENTER_Y-60
-GradeP1OffCommand=addx,-EvalTweenDistance()
+GradeP1OffCommand=linear,0.05;zoom,0;
 GradeP1OnCommand=@"zoom,1;x,SCREEN_CENTER_X-234+EvalX()-10+40;y,SCREEN_CENTER_Y-38-120+10;draworder,5000;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 GradeP2X=SCREEN_CENTER_X+170+EvalX()
 GradeP2Y=SCREEN_CENTER_Y-60
-GradeP2OffCommand=addx,EvalTweenDistance()
+GradeP2OffCommand=linear,0.05;zoom,0;
 GradeP2OnCommand=@"zoom,1;x,SCREEN_CENTER_X+56+EvalX()+10+120+14;y,SCREEN_CENTER_Y-38-120+10;draworder,5000;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 LargeBannerX=SCREEN_CENTER_X
 LargeBannerY=SCREEN_CENTER_Y-114-11
@@ -1241,11 +1241,11 @@ MaxComboLabelX=
 MaxComboLabelY=
 MaxComboNumberP1X=SCREEN_CENTER_X-28+EvalX()+8-4
 MaxComboNumberP1Y=SCREEN_CENTER_Y+85+16*5-2-49
-MaxComboNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance();"
+MaxComboNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;"
 MaxComboNumberP1OffCommand=
 MaxComboNumberP2X=SCREEN_CENTER_X+282+EvalX()+8-4
 MaxComboNumberP2Y=SCREEN_CENTER_Y+85+16*5-2-49
-MaxComboNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance();"
+MaxComboNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;;"
 MaxComboNumberP2OffCommand=
 TotalErrorLabelX=
 TotalErrorLabelY=
@@ -1281,11 +1281,11 @@ PercentFrameP2OffCommand=
 PercentFrameP2OnCommand=hidden,1
 PercentP1X=SCREEN_CENTER_X-110+EvalX()-4-88
 PercentP1Y=SCREEN_CENTER_Y-20-83
-PercentP1OnCommand=@"diffusealpha,0;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";linear,0.3;diffusealpha,1;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();zoom,1.10;addx,EvalTweenDistance();horizalign,center;draworder,100000;"
+PercentP1OnCommand=@"diffusealpha,0;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";linear,0.3;diffusealpha,1;diffuse,"..PlayerColor(PLAYER_1)..";zoom,1.10;horizalign,center;draworder,100000;"
 PercentP1OffCommand=linear,0.3;diffuse,0,0,0,1;
 PercentP2X=SCREEN_CENTER_X+194+EvalX()+8
 PercentP2Y=SCREEN_CENTER_Y-20-83
-PercentP2OnCommand=@"diffusealpha,0;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";linear,0.3;diffusealpha,1;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();zoom,1.10;addx,-EvalTweenDistance();horizalign,center;draworder,100000;"
+PercentP2OnCommand=@"diffusealpha,0;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";linear,0.3;diffusealpha,1;diffuse,"..PlayerColor(PLAYER_2)..";zoom,1.10;horizalign,center;draworder,100000;"
 PercentP2OffCommand=linear,0.3;diffuse,0,0,0,1;
 MarvelousLabelX=
 MarvelousLabelY=
@@ -1293,75 +1293,75 @@ MarvelousLabelOffCommand=
 MarvelousLabelOnCommand=hidden,1
 MarvelousNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 MarvelousNumberP1Y=SCREEN_CENTER_Y+85+16*0-1-145
-MarvelousNumberP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
-MarvelousNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance();"
+MarvelousNumberP1OffCommand=
+MarvelousNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 MarvelousNumberP2X=SCREEN_CENTER_X+118+EvalX()+8+139
 MarvelousNumberP2Y=SCREEN_CENTER_Y+85+16*0-1-145
 MarvelousNumberP2OffCommand=
-MarvelousNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance();"
+MarvelousNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";;"
 PerfectLabelX=
 PerfectLabelY=
 PerfectLabelOffCommand=
 PerfectLabelOnCommand=hidden,1
 PerfectNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 PerfectNumberP1Y=SCREEN_CENTER_Y+85+16*1-2-145
-PerfectNumberP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
-PerfectNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance();"
+PerfectNumberP1OffCommand=
+PerfectNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 PerfectNumberP2X=SCREEN_CENTER_X+118+EvalX()+8+139
 PerfectNumberP2Y=SCREEN_CENTER_Y+85+16*1-2-145
 PerfectNumberP2OffCommand=
-PerfectNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance();"
+PerfectNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";;"
 GreatLabelOffCommand=
 GreatLabelOnCommand=hidden,1
 GreatNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 GreatNumberP1Y=SCREEN_CENTER_Y+85+16*2-2-145
-GreatNumberP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
-GreatNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance();"
+GreatNumberP1OffCommand=
+GreatNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 GreatNumberP2X=SCREEN_CENTER_X+118+EvalX()+8+139
 GreatNumberP2Y=SCREEN_CENTER_Y+85+16*2-2-145
 GreatNumberP2OffCommand=
-GreatNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance();"
+GreatNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";;"
 GoodLabelOffCommand=
 GoodLabelOnCommand=hidden,1
 GoodNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 GoodNumberP1Y=SCREEN_CENTER_Y+85+16*3-2-145
-GoodNumberP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
-GoodNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance();"
+GoodNumberP1OffCommand=
+GoodNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 GoodNumberP2X=SCREEN_CENTER_X+118+EvalX()+8+139
 GoodNumberP2Y=SCREEN_CENTER_Y+85+16*3-2-145
 GoodNumberP2OffCommand=
-GoodNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance();"
+GoodNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";;"
 BooLabelOffCommand=
 BooLabelOnCommand=hidden,1
 BooNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 BooNumberP1Y=SCREEN_CENTER_Y+85+16*4-2-145
-BooNumberP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
-BooNumberP1OnCommand=@"addx,-EvalTweenDistance();addx,EvalTweenDistance();zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
+BooNumberP1OffCommand=
+BooNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 BooNumberP2X=SCREEN_CENTER_X+118+EvalX()+8+139
 BooNumberP2Y=SCREEN_CENTER_Y+85+16*4-2-145
 BooNumberP2OffCommand=
-BooNumberP2OnCommand=@"addx,EvalTweenDistance();addx,-EvalTweenDistance();zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)
+BooNumberP2OnCommand=@";zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)
 MissLabelOffCommand=
 MissLabelOnCommand=hidden,1
 MissNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 MissNumberP1Y=SCREEN_CENTER_Y+85+16*5-2-145
-MissNumberP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
-MissNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance();"
+MissNumberP1OffCommand=
+MissNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 MissNumberP2X=SCREEN_CENTER_X+118+EvalX()+8+139
 MissNumberP2Y=SCREEN_CENTER_Y+85+16*5-2-145
 MissNumberP2OffCommand=
-MissNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance();"
+MissNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";;"
 JumpsLabelOnCommand=
 JumpsLabelOffCommand=hidden,1
 JumpsLabelX=
 JumpsLabelY=
 JumpsTextP1X=SCREEN_CENTER_X-28+EvalX()+8-4
 JumpsTextP1Y=SCREEN_CENTER_Y+85+16*0-2-49
-JumpsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance();"
-JumpsTextP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
+JumpsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;"
+JumpsTextP1OffCommand=
 JumpsTextP2X=SCREEN_CENTER_X+282+EvalX()+8-4
 JumpsTextP2Y=SCREEN_CENTER_Y+85+16*0-2-49
-JumpsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance();"
+JumpsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;;"
 JumpsTextP2OffCommand=
 HoldsLabelOnCommand=hidden,1
 HoldsLabelOffCommand=
@@ -1369,11 +1369,11 @@ HoldsLabelX=
 HoldsLabelY=
 HoldsTextP1X=SCREEN_CENTER_X-28+EvalX()+8-4
 HoldsTextP1Y=SCREEN_CENTER_Y+85+16*1-2-49
-HoldsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance();"
-HoldsTextP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
+HoldsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;"
+HoldsTextP1OffCommand=
 HoldsTextP2X=SCREEN_CENTER_X+282+EvalX()+8-4
 HoldsTextP2Y=SCREEN_CENTER_Y+85+16*1-2-49
-HoldsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance();"
+HoldsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;;"
 HoldsTextP2OffCommand=
 MinesLabelOnCommand=hidden,1
 MinesLabelOffCommand=
@@ -1381,11 +1381,11 @@ MinesLabelX=
 MinesLabelY=
 MinesTextP1X=SCREEN_CENTER_X-28+EvalX()+8-4
 MinesTextP1Y=SCREEN_CENTER_Y+85+16*2-2-49
-MinesTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance();"
-MinesTextP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
+MinesTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;"
+MinesTextP1OffCommand=
 MinesTextP2X=SCREEN_CENTER_X+282+EvalX()+8-4
 MinesTextP2Y=SCREEN_CENTER_Y+85+16*2-2-49
-MinesTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance();"
+MinesTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;;"
 MinesTextP2OffCommand=
 HandsLabelOnCommand=hidden,1
 HandsLabelOffCommand=
@@ -1393,11 +1393,11 @@ HandsLabelX=
 HandsLabelY=
 HandsTextP1X=SCREEN_CENTER_X-28+EvalX()+8-4
 HandsTextP1Y=SCREEN_CENTER_Y+85+16*3-2-49
-HandsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance();"
-HandsTextP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
+HandsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;"
+HandsTextP1OffCommand=
 HandsTextP2X=SCREEN_CENTER_X+282+EvalX()+8-4
 HandsTextP2Y=SCREEN_CENTER_Y+85+16*3-2-49
-HandsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance();"
+HandsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;;"
 HandsTextP2OffCommand=
 RollsLabelOnCommand=hidden,1
 RollsLabelOffCommand=
@@ -1405,61 +1405,61 @@ RollsLabelX=
 RollsLabelY=
 RollsTextP1X=SCREEN_CENTER_X-28+EvalX()+8-4
 RollsTextP1Y=SCREEN_CENTER_Y+85+16*4-2-49
-RollsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance();"
-RollsTextP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
+RollsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;"
+RollsTextP1OffCommand=
 RollsTextP2X=SCREEN_CENTER_X+282+EvalX()+8-4
 RollsTextP2Y=SCREEN_CENTER_Y+85+16*4-2-49
-RollsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance();"
+RollsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;;"
 RollsTextP2OffCommand=
 PlayerOptionsP1X=SCREEN_CENTER_X-110+EvalX()+8-16+1
 PlayerOptionsP1Y=SCREEN_CENTER_Y-68
-PlayerOptionsP1OnCommand=hidden,1;vertalign,top;DrawOrder,1;zoom,0.5;WrapWidthPixels,386;shadowlength,0;addx,-EvalTweenDistance();addx,EvalTweenDistance() 
-PlayerOptionsP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
+PlayerOptionsP1OnCommand=hidden,1;vertalign,top;DrawOrder,1;zoom,0.5;WrapWidthPixels,386;shadowlength,0;
+PlayerOptionsP1OffCommand=
 PlayerOptionsP2X=SCREEN_CENTER_X+192+EvalX()+8-8+1
 PlayerOptionsP2Y=SCREEN_CENTER_Y-68
-PlayerOptionsP2OnCommand=hidden,1;vertalign,top;DrawOrder,1;zoom,0.5;WrapWidthPixels,386;shadowlength,0;addx,EvalTweenDistance();addx,-EvalTweenDistance()
+PlayerOptionsP2OnCommand=hidden,1;vertalign,top;DrawOrder,1;zoom,0.5;WrapWidthPixels,386;shadowlength,0;
 PlayerOptionsP2OffCommand=
 PlayerOptionsSeparator=, 
 DisqualifiedP1X=SCREEN_CENTER_X-108+EvalX()-42-4
 DisqualifiedP1Y=SCREEN_CENTER_Y+18+140
-DisqualifiedP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
-DisqualifiedP1OnCommand=@"DrawOrder,1;zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance();draworder,1000;shadowlength,0;"
+DisqualifiedP1OffCommand=
+DisqualifiedP1OnCommand=@"DrawOrder,1;zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";draworder,1000;shadowlength,0;"
 DisqualifiedP2X=SCREEN_CENTER_X+196+EvalX()-38-4
 DisqualifiedP2Y=SCREEN_CENTER_Y+18+140
 DisqualifiedP2OffCommand=
-DisqualifiedP2OnCommand=@"DrawOrder,1;zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance();draworder,1000;shadowlength,0;"
+DisqualifiedP2OnCommand=@"DrawOrder,1;zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";;draworder,1000;shadowlength,0;"
 ScoreLabelOffCommand=
 ScoreLabelOnCommand=hidden,1
 ScoreNumberP1X=SCREEN_CENTER_X-143+EvalX()+8
 ScoreNumberP1Y=SCREEN_CENTER_Y+171
-ScoreNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-EvalTweenDistance()
-ScoreNumberP1OnCommand=addx,-EvalTweenDistance();addx,EvalTweenDistance()
+ScoreNumberP1OffCommand=
+ScoreNumberP1OnCommand=
 ScoreNumberP2X=SCREEN_CENTER_X+145+EvalX()+8
 ScoreNumberP2Y=SCREEN_CENTER_Y+171
-ScoreNumberP2OffCommand=sleep,0.0;
-ScoreNumberP2OnCommand=addx,EvalTweenDistance();addx,-EvalTweenDistance()
+ScoreNumberP2OffCommand=
+ScoreNumberP2OnCommand=
 SpinGrades=0
 
 PerDifficultyAwardP1X=SCREEN_CENTER_X-20+EvalX()-2-261
 PerDifficultyAwardP1Y=SCREEN_CENTER_Y+65-149
 PerDifficultyAwardP1OnCommand=@"zoom,0.55;draworder,1;horizalign,left;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
-PerDifficultyAwardP1OffCommand=accelerate,.3;addx,-EvalTweenDistance()
+PerDifficultyAwardP1OffCommand=
 PerDifficultyAwardP2X=SCREEN_CENTER_X+290+EvalX()-2-261+257
 PerDifficultyAwardP2Y=SCREEN_CENTER_Y+65-149
 PerDifficultyAwardP2OnCommand=@"DrawOrder,1;horizalign,right;zoom,.55;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
-PerDifficultyAwardP2OffCommand=accelerate,.3;addx,EvalTweenDistance()
+PerDifficultyAwardP2OffCommand=
 PeakComboAwardP1X=SCREEN_CENTER_X-290+EvalX()+2
 PeakComboAwardP1Y=SCREEN_CENTER_Y+65+131-38
-PeakComboAwardP1OnCommand=DrawOrder,1;zoom,.5;addx,-EvalTweenDistance();addx,EvalTweenDistance()
-PeakComboAwardP1OffCommand=accelerate,.3;addx,-EvalTweenDistance()
+PeakComboAwardP1OnCommand=DrawOrder,1;zoom,.5;
+PeakComboAwardP1OffCommand=
 PeakComboAwardP2X=SCREEN_CENTER_X+20+EvalX()+2
 PeakComboAwardP2Y=SCREEN_CENTER_Y+65+131-38
-PeakComboAwardP2OnCommand=DrawOrder,1;zoom,.5;addx,EvalTweenDistance();addx,-EvalTweenDistance()
-PeakComboAwardP2OffCommand=accelerate,.3;addx,EvalTweenDistance()
+PeakComboAwardP2OnCommand=DrawOrder,1;zoom,.5;
+PeakComboAwardP2OffCommand=
 MachineRecordP1X=SCREEN_CENTER_X-108+EvalX()-48+132-2
 MachineRecordP1Y=SCREEN_CENTER_Y-13-80+120+131
 MachineRecordP1OnCommand=horizalign,right;zoom,.5;shadowlength,0;cropright,1;cropright,0;DiffuseShift;EffectColor1,0.7,0.8,0.9,1;draworder,5;
-MachineRecordP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
+MachineRecordP1OffCommand=
 MachineRecordP2X=SCREEN_CENTER_X+196+EvalX()-42+132-2
 MachineRecordP2Y=SCREEN_CENTER_Y-13-80+120+131
 MachineRecordP2OnCommand=horizalign,right;zoom,.5;shadowlength,0;cropleft,1;cropleft,0;DiffuseShift;EffectColor1,0.7,0.8,0.9,1;draworder,5;
@@ -1590,7 +1590,7 @@ ComboBarOffCommand=
 DancePointsP1X=SCREEN_WIDTH-146
 DancePointsP1Y=SCREEN_HEIGHT-140
 DancePointsP1OffCommand=
-DancePointsP1OnCommand=diffuseshift;effectperiod,2;addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2
+DancePointsP1OnCommand=diffuseshift;effectperiod,2;
 DancePointsP2X=SCREEN_WIDTH+306
 DancePointsP2Y=SCREEN_HEIGHT-240
 DancePointsP2OffCommand=
@@ -1598,7 +1598,7 @@ DancePointsP2OnCommand=diffuseshift;effectperiod,2;addx,SCREEN_WIDTH/2;addx,-SCR
 GradeFrameP1X=SCREEN_WIDTH-77
 GradeFrameP1Y=SCREEN_HEIGHT-2
 GradeFrameP1OffCommand=
-GradeFrameP1OnCommand=addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2
+GradeFrameP1OnCommand=
 GradeFrameP2X=SCREEN_WIDTH+237
 GradeFrameP2Y=SCREEN_HEIGHT-20
 GradeFrameP2OffCommand=
@@ -1606,7 +1606,7 @@ GradeFrameP2OnCommand=addx,SCREEN_WIDTH/2;addx,-SCREEN_WIDTH/2
 GradeP1X=SCREEN_WIDTH-76
 GradeP1Y=SCREEN_HEIGHT-53
 GradeP1OffCommand=
-GradeP1OnCommand=diffuseshift;effectperiod,2;addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2
+GradeP1OnCommand=diffuseshift;effectperiod,2;
 GradeP2X=SCREEN_WIDTH+238
 GradeP2Y=SCREEN_HEIGHT-53
 GradeP2OffCommand=
@@ -1616,7 +1616,7 @@ MarvelousLabelOnCommand=
 MarvelousNumberP1X=SCREEN_CENTER_X-120
 MarvelousNumberP1Y=SCREEN_CENTER_Y-15+16*0
 MarvelousNumberP1OffCommand=
-MarvelousNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2"
+MarvelousNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 MarvelousNumberP2X=SCREEN_CENTER_X+212
 MarvelousNumberP2Y=SCREEN_CENTER_Y-15+16*0
 MarvelousNumberP2OffCommand=
@@ -1626,7 +1626,7 @@ PerfectLabelOnCommand=
 PerfectNumberP1X=SCREEN_CENTER_X-120
 PerfectNumberP1Y=SCREEN_CENTER_Y-15+16*1
 PerfectNumberP1OffCommand=
-PerfectNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2"
+PerfectNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 PerfectNumberP2X=SCREEN_CENTER_X+212
 PerfectNumberP2Y=SCREEN_CENTER_Y-15+16*1
 PerfectNumberP2OffCommand=
@@ -1636,7 +1636,7 @@ GreatLabelOnCommand=
 GreatNumberP1X=SCREEN_CENTER_X-120
 GreatNumberP1Y=SCREEN_CENTER_Y-15+16*2
 GreatNumberP1OffCommand=
-GreatNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2"
+GreatNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 GreatNumberP2X=SCREEN_CENTER_X+212
 GreatNumberP2Y=SCREEN_CENTER_Y-15+16*2
 GreatNumberP2OffCommand=
@@ -1646,7 +1646,7 @@ GoodLabelOnCommand=
 GoodNumberP1X=SCREEN_CENTER_X-120
 GoodNumberP1Y=SCREEN_CENTER_Y-15+16*3
 GoodNumberP1OffCommand=
-GoodNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2"
+GoodNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 GoodNumberP2X=SCREEN_CENTER_X+212
 GoodNumberP2Y=SCREEN_CENTER_Y-15+16*3
 GoodNumberP2OffCommand=
@@ -1656,7 +1656,7 @@ BooLabelOnCommand=
 BooNumberP1X=SCREEN_CENTER_X-120
 BooNumberP1Y=SCREEN_CENTER_Y-15+16*4
 BooNumberP1OffCommand=
-BooNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2"
+BooNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 BooNumberP2X=SCREEN_CENTER_X+212
 BooNumberP2Y=SCREEN_CENTER_Y-15+16*4
 BooNumberP2OffCommand=
@@ -1666,7 +1666,7 @@ MissLabelOnCommand=
 MissNumberP1X=SCREEN_CENTER_X-120
 MissNumberP1Y=SCREEN_CENTER_Y-15+16*5
 MissNumberP1OffCommand=
-MissNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2"
+MissNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 MissNumberP2X=SCREEN_CENTER_X+212
 MissNumberP2Y=SCREEN_CENTER_Y-15+16*5
 MissNumberP2OffCommand=
@@ -1677,7 +1677,7 @@ MaxComboLabelOnCommand=diffuse,1,1,1,0
 MaxComboNumberP1X=SCREEN_CENTER_X-125
 MaxComboNumberP1Y=SCREEN_CENTER_Y-15+16*11
 MaxComboNumberP1OffCommand=
-MaxComboNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2"
+MaxComboNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 MaxComboNumberP2X=SCREEN_CENTER_X+207
 MaxComboNumberP2Y=SCREEN_CENTER_Y-15+16*11
 MaxComboNumberP2OffCommand=
@@ -1710,7 +1710,7 @@ PercentFrameP2OffCommand=
 PercentFrameP2OnCommand=hidden,1
 PercentP1X=SCREEN_CENTER_X-165
 PercentP1Y=SCREEN_CENTER_Y-35
-PercentP1OnCommand=@"DrawOrder,1;zoom,0.7;diffuse,"..PlayerColor(PLAYER_1)..";addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2"
+PercentP1OnCommand=@"DrawOrder,1;zoom,0.7;diffuse,"..PlayerColor(PLAYER_1)..";"
 PercentP1OffCommand=sleep,0.0;
 PercentP2X=SCREEN_CENTER_X+165
 PercentP2Y=SCREEN_CENTER_Y-35
@@ -1722,7 +1722,7 @@ JumpsLabelX=
 JumpsLabelY=
 JumpsTextP1X=SCREEN_CENTER_X-136
 JumpsTextP1Y=SCREEN_CENTER_Y-15+16*6
-JumpsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2"
+JumpsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;"
 JumpsTextP1OffCommand=
 JumpsTextP2X=SCREEN_CENTER_X+196
 JumpsTextP2Y=SCREEN_CENTER_Y-15+16*6
@@ -1734,7 +1734,7 @@ HoldsLabelX=
 HoldsLabelY=
 HoldsTextP1X=SCREEN_CENTER_X-136
 HoldsTextP1Y=SCREEN_CENTER_Y-15+16*7
-HoldsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2"
+HoldsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;"
 HoldsTextP1OffCommand=
 HoldsTextP2X=SCREEN_CENTER_X+196
 HoldsTextP2Y=SCREEN_CENTER_Y-15+16*7
@@ -1746,7 +1746,7 @@ MinesLabelX=
 MinesLabelY=
 MinesTextP1X=SCREEN_CENTER_X-136
 MinesTextP1Y=SCREEN_CENTER_Y-15+16*8
-MinesTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2"
+MinesTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;"
 MinesTextP1OffCommand=
 MinesTextP2X=SCREEN_CENTER_X+196
 MinesTextP2Y=SCREEN_CENTER_Y-15+16*8
@@ -1758,7 +1758,7 @@ HandsLabelX=
 HandsLabelY=
 HandsTextP1X=SCREEN_CENTER_X-136
 HandsTextP1Y=SCREEN_CENTER_Y-15+16*9
-HandsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2"
+HandsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;"
 HandsTextP1OffCommand=
 HandsTextP2X=SCREEN_CENTER_X+196
 HandsTextP2Y=SCREEN_CENTER_Y-15+16*9
@@ -1770,7 +1770,7 @@ RollsLabelX=
 RollsLabelY=
 RollsTextP1X=SCREEN_CENTER_X-136
 RollsTextP1Y=SCREEN_CENTER_Y-15+16*10
-RollsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2"
+RollsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;"
 RollsTextP1OffCommand=
 RollsTextP2X=SCREEN_CENTER_X+196
 RollsTextP2Y=SCREEN_CENTER_Y-15+16*10
@@ -1782,13 +1782,13 @@ PlayerOptionsP2OffCommand=
 PlayerOptionsP2OnCommand=hidden,1
 ScoreLabelX=SCREEN_CENTER_X
 ScoreLabelY=SCREEN_CENTER_Y+190
-ScoreLabelOffCommand=sleep,0.0;accelerate,0.3;addy,SCREEN_HEIGHT
+ScoreLabelOffCommand=
 ScoreLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.8;decelerate,0.3;addy,-SCREEN_HEIGHT
 SpinGrades=0
 WinFrameP1X=SCREEN_CENTER_X-166
 WinFrameP1Y=SCREEN_CENTER_Y+54
 WinFrameP1OffCommand=
-WinFrameP1OnCommand=addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2
+WinFrameP1OnCommand=
 WinFrameP2X=SCREEN_CENTER_X+166
 WinFrameP2Y=SCREEN_CENTER_Y+54
 WinFrameP2OffCommand=
@@ -1796,7 +1796,7 @@ WinFrameP2OnCommand=addx,SCREEN_WIDTH/2;addx,-SCREEN_WIDTH/2
 WinP1X=SCREEN_CENTER_X-166
 WinP1Y=SCREEN_CENTER_Y-60
 WinP1OffCommand=
-WinP1OnCommand=addx,-SCREEN_WIDTH/2;addx,SCREEN_WIDTH/2
+WinP1OnCommand=
 WinP2X=SCREEN_CENTER_X+166
 WinP2Y=SCREEN_CENTER_Y-60
 WinP2OffCommand=
@@ -2462,11 +2462,11 @@ DifficultyMeterP2ReverseX=0
 DifficultyMeterP2ReverseY=0
 DifficultyMeterP2X=0
 DifficultyMeterP2Y=0
-EnemyFaceOffCommand=accelerate,0.8;addy,-200
+EnemyFaceOffCommand=
 EnemyFaceOnCommand=addy,-200;addy,200
 EnemyFaceX=SCREEN_CENTER_X
 EnemyFaceY=SCREEN_CENTER_Y-168
-EnemyHealthOffCommand=accelerate,0.8;addy,-200
+EnemyHealthOffCommand=
 EnemyHealthOnCommand=addy,-200;addy,200
 EnemyHealthX=SCREEN_CENTER_X
 EnemyHealthY=SCREEN_CENTER_Y-220
@@ -2509,7 +2509,7 @@ ScoreFrameOnCommand=hidden,1
 StageFrameX=SCREEN_CENTER_X-1
 StageFrameY=SCREEN_BOTTOM-33
 StageFrameOnCommand=addy,100;addy,-100
-StageFrameOffCommand=accelerate,0.8;addy,150
+StageFrameOffCommand=
 ShowScoreInRave=0
 ScoreP1OffCommand=addy,0;
 ScoreP1OnCommand=addy,-100;addy,100;
@@ -2875,7 +2875,7 @@ MemoryCardDisplayP2OnCommand=DrawOrder,111
 MemoryCardDisplayP2OffCommand=
 TimerX=SCREEN_RIGHT-45
 TimerY=SCREEN_TOP+40
-TimerOffCommand=accelerate,0.3;addx,200;
+TimerOffCommand=
 TimerOnCommand=DrawOrder,10;zoom,1.1;addx,200;decelerate,0.3;addx,-200
 
 [ScreenOptions]
@@ -2919,9 +2919,11 @@ ShowScrollBar=0
 PageX=SCREEN_CENTER_X
 PageY=SCREEN_CENTER_Y+12
 PageOnCommand=@'diffuse,'..BackgroundColor()..';'
+PageOffCommand=accelerate,0.3;addx,-SCREEN_WIDTH;
 LineHighlightOnCommand=ztest,1;addx,-10;diffusealpha,0.5;
 LineHighlightChangeCommand=stoptweening;linear,0.15;zoomy,1;zoomx,1.26;
 LineHighlightChangeToExitCommand=zoomy,1
+LineHighlightOffCommand=accelerate,0.3;addx,-SCREEN_WIDTH;
 ScrollBarX=SCREEN_CENTER_X-151
 ScrollBarY=SCREEN_CENTER_Y+14-28-16+12
 ScrollBarHeight=296-52
@@ -2929,8 +2931,8 @@ ScrollBarTime=.2
 ShowBpmInSpeedTitle=0
 SeparateExitRow=1
 SeparateExitRowY=SCREEN_CENTER_Y+113+40-56-18+12
-ItemsLongRowSharedX=SCREEN_CENTER_X-94-40
-MoreX=SCREEN_CENTER_X-101+HorizontalRecovery()+1-40
+ItemsLongRowSharedX=SCREEN_CENTER_X-94-40-13
+MoreX=SCREEN_CENTER_X-101+HorizontalRecovery()+1-40-13
 MoreY=SCREEN_CENTER_Y+112+40-56-18+12
 MoreOnCommand=%function(self) if gnTotalDone == nil then gnTotalDone = 0; end if gnP1Ready == nil then gnP1Ready = 0; end if gnP2Ready == nil then gnP2Ready = 0; end self:diffuse(1,1,1,0.5); end
 MoreShowMoreCommand=
@@ -2952,7 +2954,7 @@ ItemsOnCommand=zoom,0.5;maxwidth,600;
 #Labels are the names for each option row
 LabelsX=SCREEN_CENTER_X-245+25-85+22
 LabelsOnCommand=zoom,0.5;horizalign,left;ShadowLength,0;maxwidth,180;
-LabelsOffCommand=%function(self) MESSAGEMAN:Broadcast('ScreenTransition'); end
+LabelsOffCommand=%function(self) MESSAGEMAN:Broadcast('ScreenTransition'); self:accelerate(0.3); self:addx(-SCREEN_WIDTH); end
 CapitalizeAllOptionNames=1
 TweenSeconds=0.15
 
@@ -3893,8 +3895,8 @@ Fallback=ScreenOperatorMenu
 Fallback=ScreenOperatorMenu
 TextX=SCREEN_CENTER_X-200
 TextY=SCREEN_CENTER_Y
-TextOnCommand=horizalign,left;zoom,0.8;addx,-SCREEN_WIDTH;decelerate,0.3;addx,SCREEN_WIDTH
-TextOffCommand=accelerate,0.3;addx,SCREEN_WIDTH
+TextOnCommand=horizalign,left;zoom,0.8;
+TextOffCommand=
 
 # yuck.  fallback needs cleaning up.
 [ScreenDemonstration]
@@ -4401,24 +4403,24 @@ waveP2OnCommand=stoptweening;diffusealpha,0;linear,0.5;diffusealpha,1;sleep,2;li
 # graphic.
 
 [Grade]
-Tier01=☆☆☆☆
-Tier02=☆☆☆
-Tier03=☆☆
-Tier04=☆
-Tier05=S+
-Tier06=S
-Tier07=S-
-Tier08=A+
-Tier09=A
-Tier10=A-
-Tier11=B+
-Tier12=B
-Tier13=B-
-Tier14=C+
-Tier15=C
-Tier16=C-
-Tier17=D
-Failed=Fail
+Tier01=100%: ****
+Tier02=^99%: ***
+Tier03=^98%: **
+Tier04=^96%: *
+Tier05=^94%: S+
+Tier06=^92%: S+
+Tier07=^89%: S-
+Tier08=^86%: A+
+Tier09=^83%: A
+Tier10=^80%: A-
+Tier11=^76%: B+
+Tier12=^72%: B
+Tier13=^68%: B-
+Tier14=^64%: C+
+Tier15=^60%: C
+Tier16=^55%: C-
+Tier17=^0%: D
+Failed=Fail: F
 
 [PlayerStageStats]
 NumGradeTiersUsed=17