Fixed grade sounds disabling in 2P Mode

diff --git a/Themes/GrooveNights/Graphics/PlayerReady.png b/Themes/GrooveNights/Graphics/PlayerReady.png
index 4553181..a215f54 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/PlayerReady.png and b/Themes/GrooveNights/Graphics/PlayerReady.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p1 (res 270x40).png b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p1 (res 270x40).png
index a0753fb..3dbc991 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p1 (res 270x40).png and b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p1 (res 270x40).png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p2 (res 270x40).png b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p2 (res 270x40).png
index 0014921..c927e54 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p2 (res 270x40).png and b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p2 (res 270x40).png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p1 (res 270x40).png b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p1 (res 270x40).png
index ae4c8bc..020f0f0 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p1 (res 270x40).png and b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p1 (res 270x40).png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p2 (res 270x40).png b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p2 (res 270x40).png
index 4ddc870..33f656f 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p2 (res 270x40).png and b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p2 (res 270x40).png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p1 (res 270x40).png b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p1 (res 270x40).png
index 637eda7..f5f7616 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p1 (res 270x40).png and b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p1 (res 270x40).png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p2 (res 270x40).png b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p2 (res 270x40).png
index 067a3fb..f65e097 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p2 (res 270x40).png and b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p2 (res 270x40).png differ

diff --git a/Themes/GrooveNights/Graphics/_grade models/Failed.xml b/Themes/GrooveNights/Graphics/_grade models/Failed.xml
index da01391..b3991f4 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Failed.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Failed.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier01.xml b/Themes/GrooveNights/Graphics/_grade models/Tier01.xml
index f900c16..3813615 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier01.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier01.xml
@@ -106,17 +106,14 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="draworder,20000;diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.25;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(1);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
        self:queuecommand('PlaySound2');
-       end
 end" 
 
 PlaySound2Command="%function(self)

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier02.xml b/Themes/GrooveNights/Graphics/_grade models/Tier02.xml
index 3ca6196..5d70928 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier02.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier02.xml
@@ -106,17 +106,14 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.25;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(1);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
        self:queuecommand('PlaySound2');
-       end
 end" 
 
 PlaySound2Command="%function(self)

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier03.xml b/Themes/GrooveNights/Graphics/_grade models/Tier03.xml
index f469355..506b717 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier03.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier03.xml
@@ -106,17 +106,14 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.25;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(1);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
        self:queuecommand('PlaySound2');
-       end
 end" 
 
 PlaySound2Command="%function(self)

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier04.xml b/Themes/GrooveNights/Graphics/_grade models/Tier04.xml
index 7439b1f..fd3646f 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier04.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier04.xml
@@ -106,16 +106,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.25;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(1);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.1);
        self:accelerate(0.35);
        self:diffusealpha(0);
-       end
 end" 
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier05.xml b/Themes/GrooveNights/Graphics/_grade models/Tier05.xml
index f16ce3f..89e1b89 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier05.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier05.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier06.xml b/Themes/GrooveNights/Graphics/_grade models/Tier06.xml
index 189f572..96451e7 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier06.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier06.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier07.xml b/Themes/GrooveNights/Graphics/_grade models/Tier07.xml
index c5c8845..f27f87c 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier07.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier07.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier08.xml b/Themes/GrooveNights/Graphics/_grade models/Tier08.xml
index 0beac2b..aa877b3 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier08.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier08.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier09.xml b/Themes/GrooveNights/Graphics/_grade models/Tier09.xml
index 6b3211d..693deae 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier09.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier09.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier10.xml b/Themes/GrooveNights/Graphics/_grade models/Tier10.xml
index 5860921..49c4439 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier10.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier10.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier11.xml b/Themes/GrooveNights/Graphics/_grade models/Tier11.xml
index e24d64d..0d9fb30 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier11.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier11.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier12.xml b/Themes/GrooveNights/Graphics/_grade models/Tier12.xml
index 993792e..11b1b77 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier12.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier12.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier13.xml b/Themes/GrooveNights/Graphics/_grade models/Tier13.xml
index 0c52f77..efa8035 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier13.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier13.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier14.xml b/Themes/GrooveNights/Graphics/_grade models/Tier14.xml
index cb896dd..be46071 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier14.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier14.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier15.xml b/Themes/GrooveNights/Graphics/_grade models/Tier15.xml
index bb899f2..9966143 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier15.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier15.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier16.xml b/Themes/GrooveNights/Graphics/_grade models/Tier16.xml
index 95ba48e..5e98815 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier16.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier16.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier17.xml b/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
index ffbf46e..c6ea53d 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
@@ -105,16 +105,13 @@
 <!-- Grade Sound-->
 <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
 PlaySound1Command="%function(self)
-if gnMiniSoundCheck == true then
        if not getSpecialUSB() then
                gnSound = GradeSound(0);
                SOUND:PlayOnce( gnSound )
                end
-       gnMiniSoundCheck = false;
        self:diffusealpha(0.075);
        self:accelerate(0.25);
        self:diffusealpha(0);
-       end
 end"
 />
 <!--Grade Graphics-->

diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index f6601b1..bc34f17 100644 (file)
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -51,7 +51,7 @@ function ScreenEvaluationDoubleShift(pn)
                if pn == PLAYER_1 then
                return -158;
                else
-               return 167;
+               return 155;
                end
        end
 return 0
@@ -253,7 +253,6 @@ if scn == 'ScreenGameplay' then
        gnP2Restarter = 0;
        gnSameGrade = 0;
        gnSoundCheck = true;
-       gnMiniSoundCheck = true;
        gnAward = 0;
 end
 

diff --git a/Themes/GrooveNights/metrics.ini b/Themes/GrooveNights/metrics.ini
index 99be75f..3815c58 100644 (file)
--- a/Themes/GrooveNights/metrics.ini
+++ b/Themes/GrooveNights/metrics.ini
@@ -1215,11 +1215,11 @@ GradeFrameP2OnCommand=addx,EvalTweenDistance();addx,-EvalTweenDistance()
 GradeP1X=SCREEN_CENTER_X-170+EvalX()
 GradeP1Y=SCREEN_CENTER_Y-60
 GradeP1OffCommand=addx,-EvalTweenDistance()
-GradeP1OnCommand=@"zoom,1;x,SCREEN_CENTER_X-234+EvalX()-10+42;y,SCREEN_CENTER_Y-38-120+10;draworder,5000;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
+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()
-GradeP2OnCommand=@"zoom,1;x,SCREEN_CENTER_X+56+EvalX()+10+120+10;y,SCREEN_CENTER_Y-38-120+10;draworder,5000;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
+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
 LargeBannerOffCommand=addy,-SCREEN_CENTER_X
@@ -1275,11 +1275,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,1000;"
+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;"
 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,1000;"
+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;"
 PercentP2OffCommand=linear,0.3;diffuse,0,0,0,1;
 MarvelousLabelX=
 MarvelousLabelY=
@@ -1438,7 +1438,7 @@ 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()
-PerDifficultyAwardP2X=SCREEN_CENTER_X+290+EvalX()-2-261+256
+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()