From 34c332f512cd383cd2131ee799b0a49917a30004 Mon Sep 17 00:00:00 2001
From: Dazed <dazedanon@gmail.com>
Date: Tue, 16 Apr 2024 05:22:34 -0500
Subject: [PATCH] TL Namepops

---
 www/data/Map002.json        |  6 +++---
 www/data/Map007.json        |  2 +-
 www/data/Map008.json        |  2 +-
 www/data/Map014.json        |  8 ++++----
 www/data/Map017.json        |  2 +-
 www/data/Map032.json        |  4 ++--
 www/data/Map035.json        |  2 +-
 www/data/Map043.json        |  4 ++--
 www/data/Map083.json        |  2 +-
 www/data/Map084.json        | 22 +++++++++++-----------
 www/data/Map086.json        | 10 +++++-----
 www/js/plugins/TMNamePop.js |  4 ++--
 12 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/www/data/Map002.json b/www/data/Map002.json
index 0715533..b268772 100644
--- a/www/data/Map002.json
+++ b/www/data/Map002.json
@@ -5420,7 +5420,7 @@
         {
             "id": 1,
             "name": "EV001",
-            "note": "<namePop:保健室 -40 red>",
+            "note": "<namePop:Infirmary -40 red>",
             "pages": [
                 {
                     "conditions": {
@@ -16813,7 +16813,7 @@
         {
             "id": 33,
             "name": "EV033",
-            "note": "<namePop:女子トイレ -40 red>",
+            "note": "<namePop:Women's_Restroom -40 red>",
             "pages": [
                 {
                     "conditions": {
@@ -16906,7 +16906,7 @@
         {
             "id": 34,
             "name": "EV034",
-            "note": "<namePop:男子トイレ -40 red>",
+            "note": "<namePop:Men's_Restroom -40 red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/www/data/Map007.json b/www/data/Map007.json
index 530c168..d04b6fa 100644
--- a/www/data/Map007.json
+++ b/www/data/Map007.json
@@ -4230,7 +4230,7 @@
         {
             "id": 8,
             "name": "EV008",
-            "note": "<namePop:高峰宅 -10 red>",
+            "note": "<namePop:Takamine_Residence -10 red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/www/data/Map008.json b/www/data/Map008.json
index 4cbfb03..f7151aa 100644
--- a/www/data/Map008.json
+++ b/www/data/Map008.json
@@ -5292,7 +5292,7 @@
         {
             "id": 10,
             "name": "EV010",
-            "note": "<namePop:回想 +10 red>",
+            "note": "<namePop:Recollection +10 red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/www/data/Map014.json b/www/data/Map014.json
index fd6ffb4..0b47587 100644
--- a/www/data/Map014.json
+++ b/www/data/Map014.json
@@ -7840,7 +7840,7 @@
         {
             "id": 2,
             "name": "EV002",
-            "note": "<namePop:喫茶カモミール -60 red>",
+            "note": "<namePop:Chamomile_Cafe -60 red>",
             "pages": [
                 {
                     "conditions": {
@@ -14066,7 +14066,7 @@
         {
             "id": 30,
             "name": "EV030",
-            "note": "<namePop:プレマート -60 red>",
+            "note": "<namePop:Premart -60 red>",
             "pages": [
                 {
                     "conditions": {
@@ -14265,7 +14265,7 @@
         {
             "id": 31,
             "name": "EV031",
-            "note": "<namePop:カラオケ -60 red>",
+            "note": "<namePop:Karaoke -60 red>",
             "pages": [
                 {
                     "conditions": {
@@ -17117,7 +17117,7 @@
         {
             "id": 38,
             "name": "EV038",
-            "note": "<namePop:槍村企画 65 red>",
+            "note": "<namePop:Yarimura_Planning 65 red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/www/data/Map017.json b/www/data/Map017.json
index 4742799..2e46d31 100644
--- a/www/data/Map017.json
+++ b/www/data/Map017.json
@@ -8956,7 +8956,7 @@
         {
             "id": 15,
             "name": "EV015",
-            "note": "<namePop:２－Ｃ -40 red>",
+            "note": "<namePop:2-C -40 red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/www/data/Map032.json b/www/data/Map032.json
index 2188fca..af4393b 100644
--- a/www/data/Map032.json
+++ b/www/data/Map032.json
@@ -7132,7 +7132,7 @@
         {
             "id": 6,
             "name": "EV006",
-            "note": "<namePop:美術室 -40 red>",
+            "note": "<namePop:Art_Room -40 red>",
             "pages": [
                 {
                     "conditions": {
@@ -11364,7 +11364,7 @@
         {
             "id": 15,
             "name": "EV015",
-            "note": "<namePop:３－Ａ -40 red>",
+            "note": "<namePop:3-A -40 red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/www/data/Map035.json b/www/data/Map035.json
index 4d67d19..5e1533b 100644
--- a/www/data/Map035.json
+++ b/www/data/Map035.json
@@ -4881,7 +4881,7 @@
         {
             "id": 9,
             "name": "EV009",
-            "note": "<namePop:小鳥遊宅 -60 red>",
+            "note": "<namePop:Takanashi_Residence -60 red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/www/data/Map043.json b/www/data/Map043.json
index 5bbe774..0a07bb0 100644
--- a/www/data/Map043.json
+++ b/www/data/Map043.json
@@ -5148,7 +5148,7 @@
         {
             "id": 4,
             "name": "EV004",
-            "note": "<namePop:ショーパブ -60 red>",
+            "note": "<namePop:Show_Pub -60 red>",
             "pages": [
                 {
                     "conditions": {
@@ -5551,7 +5551,7 @@
         {
             "id": 9,
             "name": "EV009",
-            "note": "<namePop:アダルトショップ -60 red>",
+            "note": "<namePop:Adult_Shop -60 red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/www/data/Map083.json b/www/data/Map083.json
index 194a217..568803e 100644
--- a/www/data/Map083.json
+++ b/www/data/Map083.json
@@ -4590,7 +4590,7 @@
         {
             "id": 30,
             "name": "EV030",
-            "note": "<namePop:プレマート -60 red>",
+            "note": "<namePop:Premart -60 red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/www/data/Map084.json b/www/data/Map084.json
index 5eb5c92..a6f4903 100644
--- a/www/data/Map084.json
+++ b/www/data/Map084.json
@@ -5952,7 +5952,7 @@
         {
             "id": 5,
             "name": "EV005",
-            "note": "<namePop:ミートスパ 5 red>",
+            "note": "<namePop:Meat_Spa 5 red>",
             "pages": [
                 {
                     "conditions": {
@@ -6493,7 +6493,7 @@
         {
             "id": 6,
             "name": "EV006",
-            "note": "<namePop:ナポリタン 5 red>",
+            "note": "<namePop:Neapolitan 5 red>",
             "pages": [
                 {
                     "conditions": {
@@ -8033,7 +8033,7 @@
         {
             "id": 8,
             "name": "EV008",
-            "note": "<namePop:リセット 5 red>",
+            "note": "<namePop:Reset 5 red>",
             "pages": [
                 {
                     "conditions": {
@@ -8151,7 +8151,7 @@
         {
             "id": 9,
             "name": "EV009",
-            "note": "<namePop:オムライス 5 red>",
+            "note": "<namePop:Omelette_Rice 5 red>",
             "pages": [
                 {
                     "conditions": {
@@ -8692,7 +8692,7 @@
         {
             "id": 10,
             "name": "EV010",
-            "note": "<namePop:カレーライス 5 red>",
+            "note": "<namePop:Curry_Rice 5 red>",
             "pages": [
                 {
                     "conditions": {
@@ -9233,7 +9233,7 @@
         {
             "id": 11,
             "name": "EV011",
-            "note": "<namePop:サラダ 5 red>",
+            "note": "<namePop:Salad 5 red>",
             "pages": [
                 {
                     "conditions": {
@@ -9774,7 +9774,7 @@
         {
             "id": 12,
             "name": "EV012",
-            "note": "<namePop:ジャムパン 5 red>",
+            "note": "<namePop:Jam_Bun 5 red>",
             "pages": [
                 {
                     "conditions": {
@@ -10315,7 +10315,7 @@
         {
             "id": 13,
             "name": "EV013",
-            "note": "<namePop:エッグトースト 5 red>",
+            "note": "<namePop:Egg_Toast 5 red>",
             "pages": [
                 {
                     "conditions": {
@@ -10856,7 +10856,7 @@
         {
             "id": 14,
             "name": "EV014",
-            "note": "<namePop:サンドイッチ 5 red>",
+            "note": "<namePop:Sandwich 5 red>",
             "pages": [
                 {
                     "conditions": {
@@ -12173,7 +12173,7 @@
         {
             "id": 17,
             "name": "EV017",
-            "note": "<namePop:ギブアップ 5 red>",
+            "note": "<namePop:Give_Up 5 red>",
             "pages": [
                 {
                     "conditions": {
@@ -12242,7 +12242,7 @@
         {
             "id": 18,
             "name": "EV018",
-            "note": "<namePop:チーズケーキ 5 red>",
+            "note": "<namePop:Cheesecake 5 red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/www/data/Map086.json b/www/data/Map086.json
index 0cf5b72..2cdc5eb 100644
--- a/www/data/Map086.json
+++ b/www/data/Map086.json
@@ -2300,7 +2300,7 @@
         {
             "id": 1,
             "name": "EV001",
-            "note": "<namePop:凌辱回想.1 0 red>",
+            "note": "<namePop:Humiliation_Recollection.1 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -3775,7 +3775,7 @@
         {
             "id": 4,
             "name": "EV004",
-            "note": "<namePop:凌辱回想.2 0 red>",
+            "note": "<namePop:Humiliation_Recollection.2 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -3866,7 +3866,7 @@
         {
             "id": 5,
             "name": "EV005",
-            "note": "<namePop:恋人回想 0 blue>",
+            "note": "<namePop:Lover's_Recollection 0 blue>",
             "pages": [
                 {
                     "conditions": {
@@ -3957,7 +3957,7 @@
         {
             "id": 6,
             "name": "EV006",
-            "note": "<namePop:出産回想 0 purple>",
+            "note": "<namePop:Birth_Recollection 0 purple>",
             "pages": [
                 {
                     "conditions": {
@@ -4048,7 +4048,7 @@
         {
             "id": 7,
             "name": "EV007",
-            "note": "<namePop:エンディング 0 green>",
+            "note": "<namePop:Ending 0 green>",
             "pages": [
                 {
                     "conditions": {
diff --git a/www/js/plugins/TMNamePop.js b/www/js/plugins/TMNamePop.js
index b1517e0..1f47752 100644
--- a/www/js/plugins/TMNamePop.js
+++ b/www/js/plugins/TMNamePop.js
@@ -123,7 +123,7 @@ TMPlugin.NamePop.Parameters = PluginManager.parameters("TMNamePop");
 TMPlugin.NamePop.BackOpacity = +(
   TMPlugin.NamePop.Parameters["backOpacity"] || 96
 );
-TMPlugin.NamePop.FontSize = +(TMPlugin.NamePop.Parameters["fontSize"] || 20);
+TMPlugin.NamePop.FontSize = +(TMPlugin.NamePop.Parameters["fontSize"] || 20) - 2;
 TMPlugin.NamePop.OutlineWidth = +(
   TMPlugin.NamePop.Parameters["outlineWidth"] || 4
 );
@@ -390,7 +390,7 @@ if (!TMPlugin.InterpreterBase) {
         return "";
       }.bind(this)
     );
-    return text;
+    return text.replace(/_/g, ' ');
   };
 
   Sprite_NamePop.prototype.textColor = function (n) {