From e7e568f67a7a709f74fac5e1c6b43c2f764ecdbc Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 9 Aug 2021 02:22:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E5=87=A0=E4=B9=8E=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=A8=A1=E5=BC=8F=E5=B7=A6=E4=BE=A7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=EF=BC=8C=E5=AF=B9=E9=BD=90hold=E6=A1=86?=
 =?UTF-8?q?=E4=B8=AD=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 document/mode.txt              |  2 +-
 parts/modes/attacker_h.lua     |  8 ++++----
 parts/modes/attacker_u.lua     |  8 ++++----
 parts/modes/backfire_h.lua     |  4 ++--
 parts/modes/backfire_l.lua     |  4 ++--
 parts/modes/backfire_n.lua     |  4 ++--
 parts/modes/backfire_u.lua     |  4 ++--
 parts/modes/blind_e.lua        |  8 ++++----
 parts/modes/blind_h.lua        |  8 ++++----
 parts/modes/blind_l.lua        |  8 ++++----
 parts/modes/blind_n.lua        |  8 ++++----
 parts/modes/blind_u.lua        |  8 ++++----
 parts/modes/blind_wtf.lua      |  8 ++++----
 parts/modes/c4wtrain_l.lua     |  8 ++++----
 parts/modes/c4wtrain_n.lua     |  8 ++++----
 parts/modes/classic_fast.lua   |  6 ++----
 parts/modes/custom_clear.lua   |  4 ++--
 parts/modes/custom_puzzle.lua  |  4 ++--
 parts/modes/defender_l.lua     |  8 ++++----
 parts/modes/defender_n.lua     |  8 ++++----
 parts/modes/dig_100l.lua       |  2 +-
 parts/modes/dig_10l.lua        |  2 +-
 parts/modes/dig_400l.lua       |  2 +-
 parts/modes/dig_40l.lua        |  2 +-
 parts/modes/dig_h.lua          |  4 ++--
 parts/modes/dig_u.lua          |  4 ++--
 parts/modes/drought_l.lua      |  8 +++++---
 parts/modes/drought_n.lua      |  8 +++++---
 parts/modes/infinite.lua       |  8 ++++----
 parts/modes/infinite_dig.lua   | 12 ++++++------
 parts/modes/marathon_bfmax.lua |  1 -
 parts/modes/marathon_h.lua     |  2 --
 parts/modes/marathon_n.lua     |  1 -
 parts/modes/master_ex.lua      | 14 +++++++-------
 parts/modes/master_final.lua   |  1 -
 parts/modes/master_h.lua       |  1 -
 parts/modes/master_l.lua       |  1 -
 parts/modes/master_n.lua       |  1 -
 parts/modes/master_ph.lua      |  2 --
 parts/modes/master_u.lua       |  1 -
 parts/modes/pc_h.lua           | 12 +++++++-----
 parts/modes/pc_inf.lua         |  4 ++--
 parts/modes/pc_l.lua           | 12 +++++++-----
 parts/modes/pc_n.lua           | 12 +++++++-----
 parts/modes/pctrain_l.lua      |  4 ++--
 parts/modes/pctrain_n.lua      |  4 ++--
 parts/modes/rhythm_e.lua       |  6 +++---
 parts/modes/rhythm_h.lua       |  6 +++---
 parts/modes/rhythm_u.lua       |  6 +++---
 parts/modes/sprintAtk.lua      |  8 ++++----
 parts/modes/sprintFix.lua      |  2 +-
 parts/modes/sprintLock.lua     |  2 +-
 parts/modes/sprintMPH.lua      |  2 +-
 parts/modes/sprintPenta.lua    |  2 +-
 parts/modes/sprintSmooth.lua   |  2 +-
 parts/modes/sprint_1000l.lua   |  2 +-
 parts/modes/sprint_100l.lua    |  2 +-
 parts/modes/sprint_10l.lua     |  2 +-
 parts/modes/sprint_20l.lua     |  2 +-
 parts/modes/sprint_400l.lua    |  2 +-
 parts/modes/sprint_40l.lua     |  2 +-
 parts/modes/stack_100l.lua     |  2 +-
 parts/modes/stack_20l.lua      |  2 +-
 parts/modes/stack_40l.lua      |  2 +-
 parts/modes/survivor_e.lua     |  4 ++--
 parts/modes/survivor_h.lua     |  4 ++--
 parts/modes/survivor_l.lua     |  4 ++--
 parts/modes/survivor_n.lua     |  4 ++--
 parts/modes/survivor_u.lua     |  4 ++--
 parts/modes/tech_finesse.lua   |  8 ++++----
 parts/modes/tech_finesse_f.lua |  8 ++++----
 parts/modes/tech_h.lua         |  8 ++++----
 parts/modes/tech_h_plus.lua    |  8 ++++----
 parts/modes/tech_l.lua         |  8 ++++----
 parts/modes/tech_l_plus.lua    |  8 ++++----
 parts/modes/tech_n.lua         |  8 ++++----
 parts/modes/tech_n_plus.lua    |  8 ++++----
 parts/modes/tsd_e.lua          |  4 ++--
 parts/modes/tsd_h.lua          |  4 ++--
 parts/modes/tsd_u.lua          |  4 ++--
 parts/modes/zen.lua            |  2 +-
 parts/player/draw.lua          |  6 +++---
 82 files changed, 204 insertions(+), 207 deletions(-)

diff --git a/document/mode.txt b/document/mode.txt
index 0488c86c..e0f52a1e 100644
--- a/document/mode.txt
+++ b/document/mode.txt
@@ -138,7 +138,7 @@ return{--返回一个table，你也可以在之前定义一些常量或者函数
 		setFont(55)
 		local r=40-P.stat.row
 		if r<0 then r=0 end
-		mStr(r,69,265)--把计算出来的剩余行数r显示出来
+		mStr(r,63,265)--把计算出来的剩余行数r显示出来
 		PLY.draw.drawTargetLine(P,r)--使用自带的境界高度线绘制函数
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,--游戏结束时需要保存的本局关键信息
diff --git a/parts/modes/attacker_h.lua b/parts/modes/attacker_h.lua
index b0ac1bdd..86dfc81a 100644
--- a/parts/modes/attacker_h.lua
+++ b/parts/modes/attacker_h.lua
@@ -37,10 +37,10 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(55)
-		mStr(P.modeData.wave,69,200)
-		mStr("22",69,320)
-		mText(drawableText.wave,69,260)
-		mText(drawableText.nextWave,69,380)
+		mStr(P.modeData.wave,63,200)
+		mStr("22",63,320)
+		mText(drawableText.wave,63,260)
+		mText(drawableText.nextWave,63,380)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Waves   "..STRING.time(D[2])end,
diff --git a/parts/modes/attacker_u.lua b/parts/modes/attacker_u.lua
index be816881..eddc0e1c 100644
--- a/parts/modes/attacker_u.lua
+++ b/parts/modes/attacker_u.lua
@@ -45,10 +45,10 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(55)
-		mStr(P.modeData.wave,69,200)
-		mStr(20+4*math.min(math.floor(P.modeData.wave/10),2),69,320)
-		mText(drawableText.wave,69,260)
-		mText(drawableText.nextWave,69,380)
+		mStr(P.modeData.wave,63,200)
+		mStr(20+4*math.min(math.floor(P.modeData.wave/10),2),63,320)
+		mText(drawableText.wave,63,260)
+		mText(drawableText.nextWave,63,380)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Waves   "..STRING.time(D[2])end,
diff --git a/parts/modes/backfire_h.lua b/parts/modes/backfire_h.lua
index 15413353..931f5d72 100644
--- a/parts/modes/backfire_h.lua
+++ b/parts/modes/backfire_h.lua
@@ -15,8 +15,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.stat.atk,69,310)
-		mText(drawableText.atk,69,380)
+		mStr(P.stat.atk,63,310)
+		mText(drawableText.atk,63,380)
 	end,
 	score=function(P)return{math.min(math.floor(P.stat.atk),100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
diff --git a/parts/modes/backfire_l.lua b/parts/modes/backfire_l.lua
index 9c1ccd4d..2169bdec 100644
--- a/parts/modes/backfire_l.lua
+++ b/parts/modes/backfire_l.lua
@@ -15,8 +15,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.stat.atk,69,310)
-		mText(drawableText.atk,69,380)
+		mStr(P.stat.atk,63,310)
+		mText(drawableText.atk,63,380)
 	end,
 	score=function(P)return{math.min(math.floor(P.stat.atk),100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
diff --git a/parts/modes/backfire_n.lua b/parts/modes/backfire_n.lua
index f984e392..6f458ec6 100644
--- a/parts/modes/backfire_n.lua
+++ b/parts/modes/backfire_n.lua
@@ -14,8 +14,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.stat.atk,69,310)
-		mText(drawableText.atk,69,380)
+		mStr(P.stat.atk,63,310)
+		mText(drawableText.atk,63,380)
 	end,
 	score=function(P)return{math.min(math.floor(P.stat.atk),100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
diff --git a/parts/modes/backfire_u.lua b/parts/modes/backfire_u.lua
index 364d383c..febac3fd 100644
--- a/parts/modes/backfire_u.lua
+++ b/parts/modes/backfire_u.lua
@@ -15,8 +15,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.stat.atk,69,310)
-		mText(drawableText.atk,69,380)
+		mStr(P.stat.atk,63,310)
+		mText(drawableText.atk,63,380)
 	end,
 	score=function(P)return{math.min(math.floor(P.stat.atk),100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
diff --git a/parts/modes/blind_e.lua b/parts/modes/blind_e.lua
index 1b3ca9f4..3a73486c 100644
--- a/parts/modes/blind_e.lua
+++ b/parts/modes/blind_e.lua
@@ -9,11 +9,11 @@ return{
 		bg='glow',bgm='push',
 	},
 	mesDisp=function(P)
-		mText(drawableText.line,69,300)
-		mText(drawableText.techrash,69,420)
+		mText(drawableText.line,63,300)
+		mText(drawableText.techrash,63,420)
 		setFont(75)
-		mStr(P.stat.row,69,220)
-		mStr(P.stat.clears[4],69,340)
+		mStr(P.stat.row,63,220)
+		mStr(P.stat.clears[4],63,340)
 	end,
 	score=function(P)return{min(P.stat.row,200),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Lines   "..STRING.time(D[2])end,
diff --git a/parts/modes/blind_h.lua b/parts/modes/blind_h.lua
index 24bba924..3a0a7e07 100644
--- a/parts/modes/blind_h.lua
+++ b/parts/modes/blind_h.lua
@@ -13,11 +13,11 @@ return{
 		bg='rgb',bgm='push',
 	},
 	mesDisp=function(P)
-		mText(drawableText.line,69,300)
-		mText(drawableText.techrash,69,420)
+		mText(drawableText.line,63,300)
+		mText(drawableText.techrash,63,420)
 		setFont(75)
-		mStr(P.stat.row,69,220)
-		mStr(P.stat.clears[4],69,340)
+		mStr(P.stat.row,63,220)
+		mStr(P.stat.clears[4],63,340)
 		gc.push('transform')
 		PLY.draw.applyFieldOffset(P)
 		gc.setColor(1,1,1,.1)
diff --git a/parts/modes/blind_l.lua b/parts/modes/blind_l.lua
index 1ba350bc..c013d299 100644
--- a/parts/modes/blind_l.lua
+++ b/parts/modes/blind_l.lua
@@ -14,11 +14,11 @@ return{
 		bg='rgb',bgm='push',
 	},
 	mesDisp=function(P)
-		mText(drawableText.line,69,300)
-		mText(drawableText.techrash,69,420)
+		mText(drawableText.line,63,300)
+		mText(drawableText.techrash,63,420)
 		setFont(75)
-		mStr(P.stat.row,69,220)
-		mStr(P.stat.clears[4],69,340)
+		mStr(P.stat.row,63,220)
+		mStr(P.stat.clears[4],63,340)
 		gc.push('transform')
 		PLY.draw.applyFieldOffset(P)
 		gc.setColor(1,1,1,.1)
diff --git a/parts/modes/blind_n.lua b/parts/modes/blind_n.lua
index 63758eb2..1cea28a1 100644
--- a/parts/modes/blind_n.lua
+++ b/parts/modes/blind_n.lua
@@ -10,11 +10,11 @@ return{
 		bg='glow',bgm='push',
 	},
 	mesDisp=function(P)
-		mText(drawableText.line,69,300)
-		mText(drawableText.techrash,69,420)
+		mText(drawableText.line,63,300)
+		mText(drawableText.techrash,63,420)
 		setFont(75)
-		mStr(P.stat.row,69,220)
-		mStr(P.stat.clears[4],69,340)
+		mStr(P.stat.row,63,220)
+		mStr(P.stat.clears[4],63,340)
 		gc.push('transform')
 		PLY.draw.applyFieldOffset(P)
 		gc.setColor(1,1,1,.1)
diff --git a/parts/modes/blind_u.lua b/parts/modes/blind_u.lua
index 60cbd15d..020b954c 100644
--- a/parts/modes/blind_u.lua
+++ b/parts/modes/blind_u.lua
@@ -13,11 +13,11 @@ return{
 		bg='rgb',bgm='far',
 	},
 	mesDisp=function(P)
-		mText(drawableText.line,69,300)
-		mText(drawableText.techrash,69,420)
+		mText(drawableText.line,63,300)
+		mText(drawableText.techrash,63,420)
 		setFont(75)
-		mStr(P.stat.row,69,220)
-		mStr(P.stat.clears[4],69,340)
+		mStr(P.stat.row,63,220)
+		mStr(P.stat.clears[4],63,340)
 		gc.push('transform')
 		PLY.draw.applyFieldOffset(P)
 		gc.setColor(1,1,1,.1)
diff --git a/parts/modes/blind_wtf.lua b/parts/modes/blind_wtf.lua
index 674f37f5..a092d610 100644
--- a/parts/modes/blind_wtf.lua
+++ b/parts/modes/blind_wtf.lua
@@ -45,11 +45,11 @@ return{
 
 		--Texts
 		gc.setColor(.8,.8,.8)
-		mText(drawableText.line,69,300)
-		mText(drawableText.techrash,69,420)
+		mText(drawableText.line,63,300)
+		mText(drawableText.techrash,63,420)
 		setFont(75)
-		mStr(P.stat.row,69,220)
-		mStr(P.stat.clears[4],69,340)
+		mStr(P.stat.row,63,220)
+		mStr(P.stat.clears[4],63,340)
 	end,
 	score=function(P)return{min(P.stat.row,40),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Lines   "..STRING.time(D[2])end,
diff --git a/parts/modes/c4wtrain_l.lua b/parts/modes/c4wtrain_l.lua
index 0543de6e..7381c557 100644
--- a/parts/modes/c4wtrain_l.lua
+++ b/parts/modes/c4wtrain_l.lua
@@ -54,10 +54,10 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(45)
-		mStr(P.combo,69,310)
-		mStr(P.modeData.maxCombo,69,400)
-		mText(drawableText.combo,69,358)
-		mText(drawableText.maxcmb,69,450)
+		mStr(P.combo,63,310)
+		mStr(P.modeData.maxCombo,63,400)
+		mText(drawableText.combo,63,358)
+		mText(drawableText.maxcmb,63,450)
 	end,
 	score=function(P)return{math.min(P.modeData.maxCombo,100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Combo   "..STRING.time(D[2])end,
diff --git a/parts/modes/c4wtrain_n.lua b/parts/modes/c4wtrain_n.lua
index 9b956b79..fc814f03 100644
--- a/parts/modes/c4wtrain_n.lua
+++ b/parts/modes/c4wtrain_n.lua
@@ -52,10 +52,10 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(45)
-		mStr(P.combo,69,310)
-		mStr(P.modeData.maxCombo,69,400)
-		mText(drawableText.combo,69,358)
-		mText(drawableText.maxcmb,69,450)
+		mStr(P.combo,63,310)
+		mStr(P.modeData.maxCombo,63,400)
+		mText(drawableText.combo,63,358)
+		mText(drawableText.maxcmb,63,450)
 	end,
 	score=function(P)return{math.min(P.modeData.maxCombo,100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Combo   "..STRING.time(D[2])end,
diff --git a/parts/modes/classic_fast.lua b/parts/modes/classic_fast.lua
index f14fab1c..caa780eb 100644
--- a/parts/modes/classic_fast.lua
+++ b/parts/modes/classic_fast.lua
@@ -1,5 +1,3 @@
-local gc=love.graphics
-
 return{
 	color=COLOR.lBlue,
 	env={
@@ -37,8 +35,8 @@ return{
 	mesDisp=function(P)
 		setFont(75)
 		local r=P.modeData.target*.1
-		mStr(r<11 and 18 or r<22 and r+8 or("%02x"):format(r*10-220),69,210)
-		mText(drawableText.speedLV,69,290)
+		mStr(r<11 and 18 or r<22 and r+8 or("%02x"):format(r*10-220),63,210)
+		mText(drawableText.speedLV,63,290)
 		PLY.draw.drawProgress(P.stat.row,P.modeData.target)
 	end,
 	score=function(P)return{P.stat.score,P.stat.row}end,
diff --git a/parts/modes/custom_clear.lua b/parts/modes/custom_clear.lua
index ca1d3e26..0baff7bd 100644
--- a/parts/modes/custom_clear.lua
+++ b/parts/modes/custom_clear.lua
@@ -74,7 +74,7 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(55)
-		mStr(P.stat.row,69,225)
-		mText(drawableText.line,69,290)
+		mStr(P.stat.row,63,225)
+		mText(drawableText.line,63,290)
 	end,
 }
\ No newline at end of file
diff --git a/parts/modes/custom_puzzle.lua b/parts/modes/custom_puzzle.lua
index 3b1e3b64..c80d232e 100644
--- a/parts/modes/custom_puzzle.lua
+++ b/parts/modes/custom_puzzle.lua
@@ -50,8 +50,8 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(55)
-		mStr(P.stat.row,69,225)
-		mText(drawableText.line,69,290)
+		mStr(P.stat.row,63,225)
+		mText(drawableText.line,63,290)
 		gc.push('transform')
 		PLY.draw.applyFieldOffset(P)
 		if P.modeData.showMark==0 then
diff --git a/parts/modes/defender_l.lua b/parts/modes/defender_l.lua
index d9359056..72873cbb 100644
--- a/parts/modes/defender_l.lua
+++ b/parts/modes/defender_l.lua
@@ -44,10 +44,10 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(55)
-		mStr(P.modeData.wave,69,200)
-		mStr(P.modeData.rpm,69,320)
-		mText(drawableText.wave,69,260)
-		mText(drawableText.rpm,69,380)
+		mStr(P.modeData.wave,63,200)
+		mStr(P.modeData.rpm,63,320)
+		mText(drawableText.wave,63,260)
+		mText(drawableText.rpm,63,380)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Waves   "..STRING.time(D[2])end,
diff --git a/parts/modes/defender_n.lua b/parts/modes/defender_n.lua
index be0a3912..1537075d 100644
--- a/parts/modes/defender_n.lua
+++ b/parts/modes/defender_n.lua
@@ -44,10 +44,10 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(55)
-		mStr(P.modeData.wave,69,200)
-		mStr(P.modeData.rpm,69,320)
-		mText(drawableText.wave,69,260)
-		mText(drawableText.rpm,69,380)
+		mStr(P.modeData.wave,63,200)
+		mStr(P.modeData.rpm,63,320)
+		mText(drawableText.wave,63,260)
+		mText(drawableText.rpm,63,380)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Waves   "..STRING.time(D[2])end,
diff --git a/parts/modes/dig_100l.lua b/parts/modes/dig_100l.lua
index a12979a3..3947c1ac 100644
--- a/parts/modes/dig_100l.lua
+++ b/parts/modes/dig_100l.lua
@@ -24,7 +24,7 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(55)
-		mStr(100-P.stat.dig,69,265)
+		mStr(100-P.stat.dig,63,265)
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
 	scoreDisp=function(D)return STRING.time(D[1]).."   "..D[2].." Pieces"end,
diff --git a/parts/modes/dig_10l.lua b/parts/modes/dig_10l.lua
index 813715ec..94b5182f 100644
--- a/parts/modes/dig_10l.lua
+++ b/parts/modes/dig_10l.lua
@@ -21,7 +21,7 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(55)
-		mStr(10-P.stat.dig,69,265)
+		mStr(10-P.stat.dig,63,265)
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
 	scoreDisp=function(D)return STRING.time(D[1]).."   "..D[2].." Pieces"end,
diff --git a/parts/modes/dig_400l.lua b/parts/modes/dig_400l.lua
index 1e15f49c..e1cc86b1 100644
--- a/parts/modes/dig_400l.lua
+++ b/parts/modes/dig_400l.lua
@@ -24,7 +24,7 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(55)
-		mStr(400-P.stat.dig,69,265)
+		mStr(400-P.stat.dig,63,265)
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
 	scoreDisp=function(D)return STRING.time(D[1]).."   "..D[2].." Pieces"end,
diff --git a/parts/modes/dig_40l.lua b/parts/modes/dig_40l.lua
index 40afde95..8e153e48 100644
--- a/parts/modes/dig_40l.lua
+++ b/parts/modes/dig_40l.lua
@@ -24,7 +24,7 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(55)
-		mStr(40-P.stat.dig,69,265)
+		mStr(40-P.stat.dig,63,265)
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
 	scoreDisp=function(D)return STRING.time(D[1]).."   "..D[2].." Pieces"end,
diff --git a/parts/modes/dig_h.lua b/parts/modes/dig_h.lua
index cd14aac6..9f38ccb2 100644
--- a/parts/modes/dig_h.lua
+++ b/parts/modes/dig_h.lua
@@ -23,8 +23,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.modeData.wave,69,310)
-		mText(drawableText.wave,69,375)
+		mStr(P.modeData.wave,63,310)
+		mText(drawableText.wave,63,375)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.row}end,
 	scoreDisp=function(D)return D[1].." Waves   "..D[2].." Lines"end,
diff --git a/parts/modes/dig_u.lua b/parts/modes/dig_u.lua
index 911a08c5..f8d7f325 100644
--- a/parts/modes/dig_u.lua
+++ b/parts/modes/dig_u.lua
@@ -22,8 +22,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.modeData.wave,69,310)
-		mText(drawableText.wave,69,375)
+		mStr(P.modeData.wave,63,310)
+		mText(drawableText.wave,63,375)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.row}end,
 	scoreDisp=function(D)return D[1].." Waves   "..D[2].." Lines"end,
diff --git a/parts/modes/drought_l.lua b/parts/modes/drought_l.lua
index 3322002b..7f5d4790 100644
--- a/parts/modes/drought_l.lua
+++ b/parts/modes/drought_l.lua
@@ -82,9 +82,11 @@ return{
 		bg='blockfall',bgm='reason',
 	},
 	mesDisp=function(P)
-		setFont(70)
-		local R=100-P.stat.row
-		mStr(R>=0 and R or 0,69,265)
+		setFont(55)
+		local r=100-P.stat.row
+		if r<0 then r=0 end
+		mStr(r,63,265)
+		PLY.draw.drawTargetLine(P,r)
 	end,
 	score=function(P)return{math.min(P.stat.row,100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Lines   "..STRING.time(D[2])end,
diff --git a/parts/modes/drought_n.lua b/parts/modes/drought_n.lua
index 5f092a27..242d5c7c 100644
--- a/parts/modes/drought_n.lua
+++ b/parts/modes/drought_n.lua
@@ -12,9 +12,11 @@ return{
 		bg='blockfall',bgm='reason',
 	},
 	mesDisp=function(P)
-		setFont(70)
-		local R=100-P.stat.row
-		mStr(R>=0 and R or 0,69,265)
+		setFont(55)
+		local r=100-P.stat.row
+		if r<0 then r=0 end
+		mStr(r,63,265)
+		PLY.draw.drawTargetLine(P,r)
 	end,
 	score=function(P)return{min(P.stat.row,100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Lines   "..STRING.time(D[2])end,
diff --git a/parts/modes/infinite.lua b/parts/modes/infinite.lua
index 2bb2a07a..2fecb62d 100644
--- a/parts/modes/infinite.lua
+++ b/parts/modes/infinite.lua
@@ -7,9 +7,9 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(45)
-		mStr(("%.1f"):format(P.stat.atk),69,190)
-		mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
-		mText(drawableText.atk,69,243)
-		mText(drawableText.eff,69,363)
+		mStr(("%.1f"):format(P.stat.atk),63,190)
+		mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
+		mText(drawableText.atk,63,243)
+		mText(drawableText.eff,63,363)
 	end,
 }
\ No newline at end of file
diff --git a/parts/modes/infinite_dig.lua b/parts/modes/infinite_dig.lua
index fa6d043c..be1d59e5 100644
--- a/parts/modes/infinite_dig.lua
+++ b/parts/modes/infinite_dig.lua
@@ -44,11 +44,11 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(45)
-		mStr(P.stat.dig,69,190)
-		mStr(P.stat.atk,69,310)
-		mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,420)
-		mText(drawableText.line,69,243)
-		mText(drawableText.atk,69,363)
-		mText(drawableText.eff,69,475)
+		mStr(P.stat.dig,63,190)
+		mStr(P.stat.atk,63,310)
+		mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,420)
+		mText(drawableText.line,63,243)
+		mText(drawableText.atk,63,363)
+		mText(drawableText.eff,63,475)
 	end,
 }
\ No newline at end of file
diff --git a/parts/modes/marathon_bfmax.lua b/parts/modes/marathon_bfmax.lua
index 8c85ecce..2362983a 100644
--- a/parts/modes/marathon_bfmax.lua
+++ b/parts/modes/marathon_bfmax.lua
@@ -1,4 +1,3 @@
-local gc=love.graphics
 local dropSpeed={50,40,30,25,20,15,12,9,7,5,4,3,2,1,1,.5,.5,.25,.25}
 
 return{
diff --git a/parts/modes/marathon_h.lua b/parts/modes/marathon_h.lua
index 98acbd1d..6c23fb86 100644
--- a/parts/modes/marathon_h.lua
+++ b/parts/modes/marathon_h.lua
@@ -1,5 +1,3 @@
-local gc=love.graphics
-
 return{
 	color=COLOR.magenta,
 	env={
diff --git a/parts/modes/marathon_n.lua b/parts/modes/marathon_n.lua
index 3cb3f5a3..4cce1bb3 100644
--- a/parts/modes/marathon_n.lua
+++ b/parts/modes/marathon_n.lua
@@ -1,4 +1,3 @@
-local gc=love.graphics
 local dropSpeed={50,40,30,24,18,14,10,8,6,5,4,3,2,1,1,.5,.5,.25,.25}
 
 return{
diff --git a/parts/modes/master_ex.lua b/parts/modes/master_ex.lua
index 263d93c9..e7bd328e 100644
--- a/parts/modes/master_ex.lua
+++ b/parts/modes/master_ex.lua
@@ -41,16 +41,16 @@ return{
 	},
 	slowMark=true,
 	mesDisp=function(P)
-		mText(drawableText.line,69,300)
-		mText(drawableText.techrash,69,420)
-		mText(drawableText.grade,69,170)
+		mText(drawableText.line,63,300)
+		mText(drawableText.techrash,63,420)
+		mText(drawableText.grade,63,170)
 		setFont(55)
-		mStr(P.modeData.rankName,69,110)
+		mStr(P.modeData.rankName,63,110)
 		setFont(20)
-		mStr(("%.1f"):format(P.modeData.rankPoint/10),69,198)
+		mStr(("%.1f"):format(P.modeData.rankPoint/10),63,198)
 		setFont(75)
-		mStr(P.stat.row,69,220)
-		mStr(P.stat.clears[4],69,340)
+		mStr(P.stat.row,63,220)
+		mStr(P.stat.clears[4],63,340)
 	end,
 	score=function(P)return{P.modeData.rankPoint,P.stat.score}end,
 	scoreDisp=function(D)return sectionName[math.floor(D[1]/10)+1].."   "..D[2]end,
diff --git a/parts/modes/master_final.lua b/parts/modes/master_final.lua
index e1225443..27422231 100644
--- a/parts/modes/master_final.lua
+++ b/parts/modes/master_final.lua
@@ -1,4 +1,3 @@
-local gc=love.graphics
 local function score(P)
 	local D=P.modeData
 
diff --git a/parts/modes/master_h.lua b/parts/modes/master_h.lua
index 73dc6823..4b40ee12 100644
--- a/parts/modes/master_h.lua
+++ b/parts/modes/master_h.lua
@@ -1,4 +1,3 @@
-local gc=love.graphics
 local death_lock={12,11,10,9,8,  7,7,7,7,6}
 local death_wait={10,9, 8, 7,6,  6,6,5,5,4}
 local death_fall={10,9, 8, 7,6,  6,5,5,4,4}
diff --git a/parts/modes/master_l.lua b/parts/modes/master_l.lua
index bd88d001..0895b134 100644
--- a/parts/modes/master_l.lua
+++ b/parts/modes/master_l.lua
@@ -1,4 +1,3 @@
-local gc=love.graphics
 local rush_lock={20,18,16,15,14}
 local rush_wait={12,10, 9, 8, 7}
 local rush_fall={18,16,14,13,12}
diff --git a/parts/modes/master_n.lua b/parts/modes/master_n.lua
index 76988c4e..0c27a229 100644
--- a/parts/modes/master_n.lua
+++ b/parts/modes/master_n.lua
@@ -1,4 +1,3 @@
-local gc=love.graphics
 local rush_lock={20,18,16,15,14,  14,13,12,11,11}
 local rush_wait={12,11,11,10,10,  10,10, 9, 9, 9}
 local rush_fall={18,16,14,13,12,  12,11,11,10,10}
diff --git a/parts/modes/master_ph.lua b/parts/modes/master_ph.lua
index 1ac1c39d..477b3407 100644
--- a/parts/modes/master_ph.lua
+++ b/parts/modes/master_ph.lua
@@ -1,5 +1,3 @@
-local gc=love.graphics
-
 return{
 	color=COLOR.black,
 	env={
diff --git a/parts/modes/master_u.lua b/parts/modes/master_u.lua
index 3d4b866e..89a8b013 100644
--- a/parts/modes/master_u.lua
+++ b/parts/modes/master_u.lua
@@ -1,4 +1,3 @@
-local gc=love.graphics
 local death_lock={12,11,10,9,8,  7,7,7,6,6}
 local death_wait={10, 9, 8,7,6,  6,5,4,4,3}
 local death_fall={10, 9, 8,7,6,  5,5,4,3,3}
diff --git a/parts/modes/pc_h.lua b/parts/modes/pc_h.lua
index 2b57960d..3c208b45 100644
--- a/parts/modes/pc_h.lua
+++ b/parts/modes/pc_h.lua
@@ -9,13 +9,15 @@ return{
 		bg='rgb',bgm='truth',
 	},
 	mesDisp=function(P)
-		setFont(45)
-		local R=100-P.stat.row
-		mStr(R>=0 and R or 0,69,220)
+		setFont(55)
+		local r=100-P.stat.row
+		if r<0 then r=0 end
+		mStr(r,63,220)
+		PLY.draw.drawTargetLine(P,r)
 
 		setFont(70)
-		mStr(P.stat.pc,69,300)
-		mText(drawableText.pc,69,380)
+		mStr(P.stat.pc,63,300)
+		mText(drawableText.pc,63,380)
 	end,
 	score=function(P)return{P.stat.pc,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." PCs   "..STRING.time(D[2])end,
diff --git a/parts/modes/pc_inf.lua b/parts/modes/pc_inf.lua
index 14a1afcb..13dc0351 100644
--- a/parts/modes/pc_inf.lua
+++ b/parts/modes/pc_inf.lua
@@ -23,8 +23,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(70)
-		mStr(P.stat.pc,69,300)
-		mText(drawableText.pc,69,380)
+		mStr(P.stat.pc,63,300)
+		mText(drawableText.pc,63,380)
 	end,
 	score=function(P)return{P.stat.pc,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." PCs   "..STRING.time(D[2])end,
diff --git a/parts/modes/pc_l.lua b/parts/modes/pc_l.lua
index 4ecb20ef..0fc7d396 100644
--- a/parts/modes/pc_l.lua
+++ b/parts/modes/pc_l.lua
@@ -9,13 +9,15 @@ return{
 		bg='rgb',bgm='moonbeam',
 	},
 	mesDisp=function(P)
-		setFont(45)
-		local R=100-P.stat.row
-		mStr(R>=0 and R or 0,69,220)
+		setFont(55)
+		local r=100-P.stat.row
+		if r<0 then r=0 end
+		mStr(r,63,220)
+		PLY.draw.drawTargetLine(P,r)
 
 		setFont(70)
-		mStr(P.stat.pc,69,300)
-		mText(drawableText.pc,69,380)
+		mStr(P.stat.pc,63,300)
+		mText(drawableText.pc,63,380)
 	end,
 	score=function(P)return{P.stat.pc,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." PCs   "..STRING.time(D[2])end,
diff --git a/parts/modes/pc_n.lua b/parts/modes/pc_n.lua
index 6c0b0b74..c1046437 100644
--- a/parts/modes/pc_n.lua
+++ b/parts/modes/pc_n.lua
@@ -7,13 +7,15 @@ return{
 		bg='rgb',bgm='truth',
 	},
 	mesDisp=function(P)
-		setFont(45)
-		local R=100-P.stat.row
-		mStr(R>=0 and R or 0,69,220)
+		setFont(55)
+		local r=100-P.stat.row
+		if r<0 then r=0 end
+		mStr(r,63,220)
+		PLY.draw.drawTargetLine(P,r)
 
 		setFont(70)
-		mStr(P.stat.pc,69,300)
-		mText(drawableText.pc,69,380)
+		mStr(P.stat.pc,63,300)
+		mText(drawableText.pc,63,380)
 	end,
 	score=function(P)return{P.stat.pc,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." PCs   "..STRING.time(D[2])end,
diff --git a/parts/modes/pctrain_l.lua b/parts/modes/pctrain_l.lua
index 95f476f8..083e066d 100644
--- a/parts/modes/pctrain_l.lua
+++ b/parts/modes/pctrain_l.lua
@@ -58,8 +58,8 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(70)
-		mStr(P.stat.pc,69,300)
-		mText(drawableText.pc,69,380)
+		mStr(P.stat.pc,63,300)
+		mText(drawableText.pc,63,380)
 	end,
 	score=function(P)return{P.stat.pc,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." PCs   "..STRING.time(D[2])end,
diff --git a/parts/modes/pctrain_n.lua b/parts/modes/pctrain_n.lua
index 199de097..78185629 100644
--- a/parts/modes/pctrain_n.lua
+++ b/parts/modes/pctrain_n.lua
@@ -49,8 +49,8 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(70)
-		mStr(P.stat.pc,69,300)
-		mText(drawableText.pc,69,380)
+		mStr(P.stat.pc,63,300)
+		mText(drawableText.pc,63,380)
 	end,
 	score=function(P)return{P.stat.pc,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." PCs   "..STRING.time(D[2])end,
diff --git a/parts/modes/rhythm_e.lua b/parts/modes/rhythm_e.lua
index 5377e068..bd766a9e 100644
--- a/parts/modes/rhythm_e.lua
+++ b/parts/modes/rhythm_e.lua
@@ -48,15 +48,15 @@ return{
 		PLY.draw.drawProgress(P.stat.row,P.modeData.target)
 
 		setFont(30)
-		mStr(P.modeData.bpm,69,178)
+		mStr(P.modeData.bpm,63,178)
 
 		gc.setLineWidth(4)
-		gc.circle('line',69,200,30)
+		gc.circle('line',63,200,30)
 
 		local beat=P.modeData.counter/P.modeData.beatFrame
 		gc.setColor(1,1,1,1-beat)
 		gc.setLineWidth(3)
-		gc.circle('line',69,200,30+45*beat)
+		gc.circle('line',63,200,30+45*beat)
 	end,
 	score=function(P)return{math.min(P.stat.row,200),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Lines   "..STRING.time(D[2])end,
diff --git a/parts/modes/rhythm_h.lua b/parts/modes/rhythm_h.lua
index 585c5bbb..078001b0 100644
--- a/parts/modes/rhythm_h.lua
+++ b/parts/modes/rhythm_h.lua
@@ -48,15 +48,15 @@ return{
 		PLY.draw.drawProgress(P.stat.row,P.modeData.target)
 
 		setFont(30)
-		mStr(P.modeData.bpm,69,178)
+		mStr(P.modeData.bpm,63,178)
 
 		gc.setLineWidth(4)
-		gc.circle('line',69,200,30)
+		gc.circle('line',63,200,30)
 
 		local beat=P.modeData.counter/P.modeData.beatFrame
 		gc.setColor(1,1,1,1-beat)
 		gc.setLineWidth(3)
-		gc.circle('line',69,200,30+45*beat)
+		gc.circle('line',63,200,30+45*beat)
 	end,
 	score=function(P)return{math.min(P.stat.row,200),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Lines   "..STRING.time(D[2])end,
diff --git a/parts/modes/rhythm_u.lua b/parts/modes/rhythm_u.lua
index cb957e01..eae0ae3d 100644
--- a/parts/modes/rhythm_u.lua
+++ b/parts/modes/rhythm_u.lua
@@ -54,15 +54,15 @@ return{
 		PLY.draw.drawProgress(P.stat.row,P.modeData.target)
 
 		setFont(30)
-		mStr(P.modeData.bpm,69,178)
+		mStr(P.modeData.bpm,63,178)
 
 		gc.setLineWidth(4)
-		gc.circle('line',69,200,30)
+		gc.circle('line',63,200,30)
 
 		local beat=P.modeData.counter/P.modeData.beatFrame
 		gc.setColor(1,1,1,1-beat)
 		gc.setLineWidth(3)
-		gc.circle('line',69,200,30+45*beat)
+		gc.circle('line',63,200,30+45*beat)
 	end,
 	score=function(P)return{math.min(P.stat.row,200),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Lines   "..STRING.time(D[2])end,
diff --git a/parts/modes/sprintAtk.lua b/parts/modes/sprintAtk.lua
index bb07eaa1..b43354a1 100644
--- a/parts/modes/sprintAtk.lua
+++ b/parts/modes/sprintAtk.lua
@@ -8,10 +8,10 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(45)
-		mStr(("%.1f"):format(P.stat.atk),69,190)
-		mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
-		mText(drawableText.atk,69,243)
-		mText(drawableText.eff,69,363)
+		mStr(("%.1f"):format(P.stat.atk),63,190)
+		mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
+		mText(drawableText.atk,63,243)
+		mText(drawableText.eff,63,363)
 	end,
 	score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
diff --git a/parts/modes/sprintFix.lua b/parts/modes/sprintFix.lua
index 276d1af0..140c85f2 100644
--- a/parts/modes/sprintFix.lua
+++ b/parts/modes/sprintFix.lua
@@ -11,7 +11,7 @@ return{
 		setFont(55)
 		local r=40-P.stat.row
 		if r<0 then r=0 end
-		mStr(r,69,265)
+		mStr(r,63,265)
 		PLY.draw.drawTargetLine(P,r)
 	end,
 	getRank=function(P)
diff --git a/parts/modes/sprintLock.lua b/parts/modes/sprintLock.lua
index 37c319c9..f9142fb8 100644
--- a/parts/modes/sprintLock.lua
+++ b/parts/modes/sprintLock.lua
@@ -10,7 +10,7 @@ return{
 		setFont(55)
 		local r=40-P.stat.row
 		if r<0 then r=0 end
-		mStr(r,69,265)
+		mStr(r,63,265)
 		PLY.draw.drawTargetLine(P,r)
 	end,
 	getRank=function(P)
diff --git a/parts/modes/sprintMPH.lua b/parts/modes/sprintMPH.lua
index 791e4f85..1c1ee4aa 100644
--- a/parts/modes/sprintMPH.lua
+++ b/parts/modes/sprintMPH.lua
@@ -11,7 +11,7 @@ return{
 		setFont(55)
 		local r=40-P.stat.row
 		if r<0 then r=0 end
-		mStr(r,69,265)
+		mStr(r,63,265)
 		PLY.draw.drawTargetLine(P,r)
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
diff --git a/parts/modes/sprintPenta.lua b/parts/modes/sprintPenta.lua
index ce0ae362..5213a8f7 100644
--- a/parts/modes/sprintPenta.lua
+++ b/parts/modes/sprintPenta.lua
@@ -10,7 +10,7 @@ return{
 		setFont(55)
 		local r=40-P.stat.row
 		if r<0 then r=0 end
-		mStr(r,69,265)
+		mStr(r,63,265)
 		PLY.draw.drawTargetLine(P,r)
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
diff --git a/parts/modes/sprintSmooth.lua b/parts/modes/sprintSmooth.lua
index 7f302a29..8824789b 100644
--- a/parts/modes/sprintSmooth.lua
+++ b/parts/modes/sprintSmooth.lua
@@ -11,7 +11,7 @@ return{
 		setFont(55)
 		local r=40-P.stat.row
 		if r<0 then r=0 end
-		mStr(r,69,265)
+		mStr(r,63,265)
 		PLY.draw.drawTargetLine(P,r)
 	end,
 	getRank=function(P)
diff --git a/parts/modes/sprint_1000l.lua b/parts/modes/sprint_1000l.lua
index eade5306..b75d3df3 100644
--- a/parts/modes/sprint_1000l.lua
+++ b/parts/modes/sprint_1000l.lua
@@ -9,7 +9,7 @@ return{
 		setFont(55)
 		local r=1000-P.stat.row
 		if r<0 then r=0 end
-		mStr(r,69,265)
+		mStr(r,63,265)
 		PLY.draw.drawTargetLine(P,r)
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
diff --git a/parts/modes/sprint_100l.lua b/parts/modes/sprint_100l.lua
index f5aeb342..b8347e6e 100644
--- a/parts/modes/sprint_100l.lua
+++ b/parts/modes/sprint_100l.lua
@@ -9,7 +9,7 @@ return{
 		setFont(55)
 		local r=100-P.stat.row
 		if r<0 then r=0 end
-		mStr(r,69,265)
+		mStr(r,63,265)
 		PLY.draw.drawTargetLine(P,r)
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
diff --git a/parts/modes/sprint_10l.lua b/parts/modes/sprint_10l.lua
index c704abf7..9731553d 100644
--- a/parts/modes/sprint_10l.lua
+++ b/parts/modes/sprint_10l.lua
@@ -9,7 +9,7 @@ return{
 		setFont(55)
 		local r=10-P.stat.row
 		if r<0 then r=0 end
-		mStr(r,69,265)
+		mStr(r,63,265)
 		PLY.draw.drawTargetLine(P,r)
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
diff --git a/parts/modes/sprint_20l.lua b/parts/modes/sprint_20l.lua
index d3dc2d78..e41fa588 100644
--- a/parts/modes/sprint_20l.lua
+++ b/parts/modes/sprint_20l.lua
@@ -9,7 +9,7 @@ return{
 		setFont(55)
 		local r=20-P.stat.row
 		if r<0 then r=0 end
-		mStr(r,69,265)
+		mStr(r,63,265)
 		PLY.draw.drawTargetLine(P,r)
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
diff --git a/parts/modes/sprint_400l.lua b/parts/modes/sprint_400l.lua
index 1dff7de2..df3ec0c3 100644
--- a/parts/modes/sprint_400l.lua
+++ b/parts/modes/sprint_400l.lua
@@ -9,7 +9,7 @@ return{
 		setFont(55)
 		local r=400-P.stat.row
 		if r<0 then r=0 end
-		mStr(r,69,265)
+		mStr(r,63,265)
 		PLY.draw.drawTargetLine(P,r)
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
diff --git a/parts/modes/sprint_40l.lua b/parts/modes/sprint_40l.lua
index 9c7ece23..358595c1 100644
--- a/parts/modes/sprint_40l.lua
+++ b/parts/modes/sprint_40l.lua
@@ -9,7 +9,7 @@ return{
 		setFont(55)
 		local r=40-P.stat.row
 		if r<0 then r=0 end
-		mStr(r,69,265)
+		mStr(r,63,265)
 		PLY.draw.drawTargetLine(P,r)
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
diff --git a/parts/modes/stack_100l.lua b/parts/modes/stack_100l.lua
index e4008211..20db7651 100644
--- a/parts/modes/stack_100l.lua
+++ b/parts/modes/stack_100l.lua
@@ -12,7 +12,7 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(55)
-		mStr(P.stat.piece,69,265)
+		mStr(P.stat.piece,63,265)
 	end,
 	score=function(P)return{P.stat.piece,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Pieces".."   "..STRING.time(D[2])end,
diff --git a/parts/modes/stack_20l.lua b/parts/modes/stack_20l.lua
index 1a4e3d39..022bc470 100644
--- a/parts/modes/stack_20l.lua
+++ b/parts/modes/stack_20l.lua
@@ -9,7 +9,7 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(55)
-		mStr(P.stat.piece,69,265)
+		mStr(P.stat.piece,63,265)
 	end,
 	score=function(P)return{P.stat.piece,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Pieces".."   "..STRING.time(D[2])end,
diff --git a/parts/modes/stack_40l.lua b/parts/modes/stack_40l.lua
index 02229a66..987c1794 100644
--- a/parts/modes/stack_40l.lua
+++ b/parts/modes/stack_40l.lua
@@ -11,7 +11,7 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(55)
-		mStr(P.stat.piece,69,265)
+		mStr(P.stat.piece,63,265)
 	end,
 	score=function(P)return{P.stat.piece,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Pieces".."   "..STRING.time(D[2])end,
diff --git a/parts/modes/survivor_e.lua b/parts/modes/survivor_e.lua
index c31681ee..d63b4e3e 100644
--- a/parts/modes/survivor_e.lua
+++ b/parts/modes/survivor_e.lua
@@ -24,8 +24,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.modeData.wave,69,310)
-		mText(drawableText.wave,69,375)
+		mStr(P.modeData.wave,63,310)
+		mText(drawableText.wave,63,375)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Waves   "..STRING.time(D[2])end,
diff --git a/parts/modes/survivor_h.lua b/parts/modes/survivor_h.lua
index 0a57bc47..fcb9bf74 100644
--- a/parts/modes/survivor_h.lua
+++ b/parts/modes/survivor_h.lua
@@ -31,8 +31,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.modeData.wave,69,310)
-		mText(drawableText.wave,69,375)
+		mStr(P.modeData.wave,63,310)
+		mText(drawableText.wave,63,375)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Waves   "..STRING.time(D[2])end,
diff --git a/parts/modes/survivor_l.lua b/parts/modes/survivor_l.lua
index 6fee0efa..f05c5e26 100644
--- a/parts/modes/survivor_l.lua
+++ b/parts/modes/survivor_l.lua
@@ -25,8 +25,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.modeData.wave,69,310)
-		mText(drawableText.wave,69,375)
+		mStr(P.modeData.wave,63,310)
+		mText(drawableText.wave,63,375)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Waves   "..STRING.time(D[2])end,
diff --git a/parts/modes/survivor_n.lua b/parts/modes/survivor_n.lua
index 692c643e..22492d5c 100644
--- a/parts/modes/survivor_n.lua
+++ b/parts/modes/survivor_n.lua
@@ -30,8 +30,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.modeData.wave,69,310)
-		mText(drawableText.wave,69,375)
+		mStr(P.modeData.wave,63,310)
+		mText(drawableText.wave,63,375)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Waves   "..STRING.time(D[2])end,
diff --git a/parts/modes/survivor_u.lua b/parts/modes/survivor_u.lua
index f39f03a5..ec44eaaa 100644
--- a/parts/modes/survivor_u.lua
+++ b/parts/modes/survivor_u.lua
@@ -30,8 +30,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.modeData.wave,69,310)
-		mText(drawableText.wave,69,375)
+		mStr(P.modeData.wave,63,310)
+		mText(drawableText.wave,63,375)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Waves   "..STRING.time(D[2])end,
diff --git a/parts/modes/tech_finesse.lua b/parts/modes/tech_finesse.lua
index 9e604b63..57f918af 100644
--- a/parts/modes/tech_finesse.lua
+++ b/parts/modes/tech_finesse.lua
@@ -11,10 +11,10 @@ return{
 	slowMark=true,
 	mesDisp=function(P)
 		setFont(45)
-		mStr(("%.1f"):format(P.stat.atk),69,190)
-		mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
-		mText(drawableText.atk,69,243)
-		mText(drawableText.eff,69,363)
+		mStr(("%.1f"):format(P.stat.atk),63,190)
+		mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
+		mText(drawableText.atk,63,243)
+		mText(drawableText.eff,63,363)
 	end,
 	score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
diff --git a/parts/modes/tech_finesse_f.lua b/parts/modes/tech_finesse_f.lua
index 03aafaf7..9c3cc051 100644
--- a/parts/modes/tech_finesse_f.lua
+++ b/parts/modes/tech_finesse_f.lua
@@ -24,10 +24,10 @@ return{
 	slowMark=true,
 	mesDisp=function(P)
 		setFont(45)
-		mStr(("%.1f"):format(P.stat.atk),69,190)
-		mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
-		mText(drawableText.atk,69,243)
-		mText(drawableText.eff,69,363)
+		mStr(("%.1f"):format(P.stat.atk),63,190)
+		mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
+		mText(drawableText.atk,63,243)
+		mText(drawableText.eff,63,363)
 	end,
 	score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
diff --git a/parts/modes/tech_h.lua b/parts/modes/tech_h.lua
index 2d92df01..ceaefb21 100644
--- a/parts/modes/tech_h.lua
+++ b/parts/modes/tech_h.lua
@@ -9,10 +9,10 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(45)
-		mStr(("%.1f"):format(P.stat.atk),69,190)
-		mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
-		mText(drawableText.atk,69,243)
-		mText(drawableText.eff,69,363)
+		mStr(("%.1f"):format(P.stat.atk),63,190)
+		mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
+		mText(drawableText.atk,63,243)
+		mText(drawableText.eff,63,363)
 	end,
 	score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
diff --git a/parts/modes/tech_h_plus.lua b/parts/modes/tech_h_plus.lua
index 171733e4..3936f171 100644
--- a/parts/modes/tech_h_plus.lua
+++ b/parts/modes/tech_h_plus.lua
@@ -21,10 +21,10 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(45)
-		mStr(("%.1f"):format(P.stat.atk),69,190)
-		mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
-		mText(drawableText.atk,69,243)
-		mText(drawableText.eff,69,363)
+		mStr(("%.1f"):format(P.stat.atk),63,190)
+		mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
+		mText(drawableText.atk,63,243)
+		mText(drawableText.eff,63,363)
 	end,
 	score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
diff --git a/parts/modes/tech_l.lua b/parts/modes/tech_l.lua
index 2cfe4332..ded89a66 100644
--- a/parts/modes/tech_l.lua
+++ b/parts/modes/tech_l.lua
@@ -9,10 +9,10 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(45)
-		mStr(("%.1f"):format(P.stat.atk),69,190)
-		mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
-		mText(drawableText.atk,69,243)
-		mText(drawableText.eff,69,363)
+		mStr(("%.1f"):format(P.stat.atk),63,190)
+		mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
+		mText(drawableText.atk,63,243)
+		mText(drawableText.eff,63,363)
 	end,
 	score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
diff --git a/parts/modes/tech_l_plus.lua b/parts/modes/tech_l_plus.lua
index eb7081a7..72af918d 100644
--- a/parts/modes/tech_l_plus.lua
+++ b/parts/modes/tech_l_plus.lua
@@ -21,10 +21,10 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(45)
-		mStr(("%.1f"):format(P.stat.atk),69,190)
-		mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
-		mText(drawableText.atk,69,243)
-		mText(drawableText.eff,69,363)
+		mStr(("%.1f"):format(P.stat.atk),63,190)
+		mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
+		mText(drawableText.atk,63,243)
+		mText(drawableText.eff,63,363)
 	end,
 	score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
diff --git a/parts/modes/tech_n.lua b/parts/modes/tech_n.lua
index 773c5784..6b803579 100644
--- a/parts/modes/tech_n.lua
+++ b/parts/modes/tech_n.lua
@@ -9,10 +9,10 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(45)
-		mStr(("%.1f"):format(P.stat.atk),69,190)
-		mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
-		mText(drawableText.atk,69,243)
-		mText(drawableText.eff,69,363)
+		mStr(("%.1f"):format(P.stat.atk),63,190)
+		mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
+		mText(drawableText.atk,63,243)
+		mText(drawableText.eff,63,363)
 	end,
 	score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
diff --git a/parts/modes/tech_n_plus.lua b/parts/modes/tech_n_plus.lua
index 432ebe81..c7894020 100644
--- a/parts/modes/tech_n_plus.lua
+++ b/parts/modes/tech_n_plus.lua
@@ -21,10 +21,10 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(45)
-		mStr(("%.1f"):format(P.stat.atk),69,190)
-		mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
-		mText(drawableText.atk,69,243)
-		mText(drawableText.eff,69,363)
+		mStr(("%.1f"):format(P.stat.atk),63,190)
+		mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
+		mText(drawableText.atk,63,243)
+		mText(drawableText.eff,63,363)
 	end,
 	score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
diff --git a/parts/modes/tsd_e.lua b/parts/modes/tsd_e.lua
index b8ee45cd..3e80eeb3 100644
--- a/parts/modes/tsd_e.lua
+++ b/parts/modes/tsd_e.lua
@@ -20,8 +20,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.modeData.tsd,69,250)
-		mText(drawableText.tsd,69,315)
+		mStr(P.modeData.tsd,63,250)
+		mText(drawableText.tsd,63,315)
 	end,
 	score=function(P)return{P.modeData.tsd,P.stat.time}end,
 	scoreDisp=function(D)return D[1].."TSD   "..STRING.time(D[2])end,
diff --git a/parts/modes/tsd_h.lua b/parts/modes/tsd_h.lua
index 3f2570f8..ef761fe2 100644
--- a/parts/modes/tsd_h.lua
+++ b/parts/modes/tsd_h.lua
@@ -20,8 +20,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.modeData.tsd,69,250)
-		mText(drawableText.tsd,69,315)
+		mStr(P.modeData.tsd,63,250)
+		mText(drawableText.tsd,63,315)
 	end,
 	score=function(P)return{P.modeData.tsd,P.stat.time}end,
 	scoreDisp=function(D)return D[1].."TSD   "..STRING.time(D[2])end,
diff --git a/parts/modes/tsd_u.lua b/parts/modes/tsd_u.lua
index 6dd46e5c..84816f5d 100644
--- a/parts/modes/tsd_u.lua
+++ b/parts/modes/tsd_u.lua
@@ -29,8 +29,8 @@ return{
 	},
 	mesDisp=function(P)
 		setFont(65)
-		mStr(P.modeData.tsd,69,250)
-		mText(drawableText.tsd,69,315)
+		mStr(P.modeData.tsd,63,250)
+		mText(drawableText.tsd,63,315)
 		gc.push('transform')
 		PLY.draw.applyFieldOffset(P)
 		gc.translate(0,P.fieldBeneath+P.fieldUp)
diff --git a/parts/modes/zen.lua b/parts/modes/zen.lua
index 454ac5b9..87664cbd 100644
--- a/parts/modes/zen.lua
+++ b/parts/modes/zen.lua
@@ -9,7 +9,7 @@ return{
 	mesDisp=function(P)
 		setFont(70)
 		local R=200-P.stat.row
-		mStr(R>=0 and R or 0,69,265)
+		mStr(R>=0 and R or 0,63,265)
 	end,
 	score=function(P)return{P.stat.score}end,
 	scoreDisp=function(D)return tostring(D[1])end,
diff --git a/parts/player/draw.lua b/parts/player/draw.lua
index 98e878cd..f74b9255 100644
--- a/parts/player/draw.lua
+++ b/parts/player/draw.lua
@@ -620,7 +620,7 @@ function draw.drawProgress(s1,s2)
 end
 function draw.drawRoyaleInfo(P)
 	setFont(35)
-	mStr(#PLY_ALIVE.."/"..#PLAYERS,69,175)
+	mStr(#PLY_ALIVE.."/"..#PLAYERS,63,175)
 	mStr(P.modeData.ko,80,215)
 	gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222)
 	setFont(20)
@@ -628,10 +628,10 @@ function draw.drawRoyaleInfo(P)
 	gc.print(P.badge,103,227)
 	gc.setColor(.97,.97,.97)
 	setFont(25)
-	gc.print(text.powerUp[P.strength],18,290)
+	mDraw(text.powerUp[P.strength],63,290)
 	gc.setColor(1,1,1)
 	for i=1,P.strength do
-		gc.draw(IMG.badgeIcon,16*i+12,260)
+		gc.draw(IMG.badgeIcon,16*i+6,260)
 	end
 end