diff --git a/data/Map005.json b/data/Map005.json
index d4543b8..1898f2c 100644
--- a/data/Map005.json
+++ b/data/Map005.json
@@ -4644,7 +4644,7 @@
         {
             "id": 17,
             "name": "EV017",
-            "note": "<namePop:！_0_blue>",
+            "note": "<namePop:！ 0 blue>",
             "pages": [
                 {
                     "conditions": {
@@ -5916,7 +5916,7 @@
         {
             "id": 20,
             "name": "EV020",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -7876,7 +7876,7 @@
         {
             "id": 25,
             "name": "EV025",
-            "note": "<namePop:DLC_0_red>",
+            "note": "<namePop:DLC 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -8135,7 +8135,7 @@
         {
             "id": 26,
             "name": "EV026",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -8336,7 +8336,7 @@
         {
             "id": 27,
             "name": "EV027",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map009.json b/data/Map009.json
index 17bbf74..d008c79 100644
--- a/data/Map009.json
+++ b/data/Map009.json
@@ -3197,7 +3197,7 @@
         {
             "id": 9,
             "name": "EV009",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map010.json b/data/Map010.json
index b6f1608..5b8c454 100644
--- a/data/Map010.json
+++ b/data/Map010.json
@@ -3130,7 +3130,7 @@
         {
             "id": 8,
             "name": "EV008",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map011.json b/data/Map011.json
index 9db7599..e19bdc6 100644
--- a/data/Map011.json
+++ b/data/Map011.json
@@ -4145,7 +4145,7 @@
         {
             "id": 12,
             "name": "EV012",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map012.json b/data/Map012.json
index b4dec64..65ac7f2 100644
--- a/data/Map012.json
+++ b/data/Map012.json
@@ -3038,7 +3038,7 @@
         {
             "id": 3,
             "name": "情報部",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -4769,7 +4769,7 @@
         {
             "id": 5,
             "name": "技術部",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -7390,7 +7390,7 @@
         {
             "id": 6,
             "name": "技術部",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -9763,7 +9763,7 @@
         {
             "id": 23,
             "name": "EV023",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -10511,7 +10511,7 @@
         {
             "id": 24,
             "name": "EV024",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -11283,7 +11283,7 @@
         {
             "id": 25,
             "name": "EV025",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -12062,7 +12062,7 @@
         {
             "id": 26,
             "name": "",
-            "note": "<namePop:！_0_blue>",
+            "note": "<namePop:！ 0 blue>",
             "pages": [
                 {
                     "conditions": {
@@ -12180,7 +12180,7 @@
         {
             "id": 27,
             "name": "EV027",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -12692,7 +12692,7 @@
         {
             "id": 28,
             "name": "EV028",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map013.json b/data/Map013.json
index 63648fa..115c743 100644
--- a/data/Map013.json
+++ b/data/Map013.json
@@ -4070,7 +4070,7 @@
         {
             "id": 1,
             "name": "EV001",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -6602,7 +6602,7 @@
         {
             "id": 2,
             "name": "EV002",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -7711,7 +7711,7 @@
         {
             "id": 13,
             "name": "EV013",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -7911,7 +7911,7 @@
         {
             "id": 15,
             "name": "EV015",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -8060,7 +8060,7 @@
         {
             "id": 16,
             "name": "技術部",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map014.json b/data/Map014.json
index 361517f..cacf83e 100644
--- a/data/Map014.json
+++ b/data/Map014.json
@@ -4359,7 +4359,7 @@
         {
             "id": 9,
             "name": "",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map015.json b/data/Map015.json
index e0fe724..bbc0a4a 100644
--- a/data/Map015.json
+++ b/data/Map015.json
@@ -4197,7 +4197,7 @@
         {
             "id": 3,
             "name": "EV003",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map016.json b/data/Map016.json
index c495361..50cb1fb 100644
--- a/data/Map016.json
+++ b/data/Map016.json
@@ -4010,7 +4010,7 @@
         {
             "id": 4,
             "name": "EV004",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map020.json b/data/Map020.json
index f5aebc9..45dec4c 100644
--- a/data/Map020.json
+++ b/data/Map020.json
@@ -12568,7 +12568,7 @@
         {
             "id": 22,
             "name": "EV022",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map025.json b/data/Map025.json
index 3e5c7e3..573e0a9 100644
--- a/data/Map025.json
+++ b/data/Map025.json
@@ -15261,7 +15261,7 @@
         {
             "id": 2,
             "name": "出口",
-            "note": "<namePop:!_0_black>",
+            "note": "<namePop:! 0 black>",
             "pages": [
                 {
                     "conditions": {
@@ -15438,7 +15438,7 @@
         {
             "id": 3,
             "name": "EV003",
-            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
+            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -15934,7 +15934,7 @@
         {
             "id": 4,
             "name": "EV004",
-            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
+            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -16430,7 +16430,7 @@
         {
             "id": 5,
             "name": "EV005",
-            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
+            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -16926,7 +16926,7 @@
         {
             "id": 6,
             "name": "EV006",
-            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
+            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -17747,7 +17747,7 @@
         {
             "id": 8,
             "name": "EV008",
-            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
+            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -18243,7 +18243,7 @@
         {
             "id": 9,
             "name": "EV009",
-            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
+            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -18739,7 +18739,7 @@
         {
             "id": 10,
             "name": "EV010",
-            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
+            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -19235,7 +19235,7 @@
         {
             "id": 11,
             "name": "EV011",
-            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
+            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -19731,7 +19731,7 @@
         {
             "id": 12,
             "name": "EV012",
-            "note": "<RateMap: 0.5><namePop:♥_0_pink>",
+            "note": "<RateMap: 0.5><namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -20651,7 +20651,7 @@
         {
             "id": 14,
             "name": "EV014",
-            "note": "<RateMap:0.5><namePop:♥_0_blue>",
+            "note": "<RateMap:0.5><namePop:♥ 0 blue>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map026.json b/data/Map026.json
index eb049d9..adf758a 100644
--- a/data/Map026.json
+++ b/data/Map026.json
@@ -4387,7 +4387,7 @@
         {
             "id": 4,
             "name": "EV004",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -5621,7 +5621,7 @@
         {
             "id": 7,
             "name": "EV007",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -6038,7 +6038,7 @@
         {
             "id": 12,
             "name": "EV012",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -6591,7 +6591,7 @@
         {
             "id": 13,
             "name": "EV013",
-            "note": "<namePop:￥_0_red>",
+            "note": "<namePop:￥ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -6872,7 +6872,7 @@
         {
             "id": 16,
             "name": "",
-            "note": "<namePop:！_0_blue>",
+            "note": "<namePop:！ 0 blue>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map031.json b/data/Map031.json
index b798bb2..5a82cfe 100644
--- a/data/Map031.json
+++ b/data/Map031.json
@@ -26556,7 +26556,7 @@
         {
             "id": 31,
             "name": "EV031",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -29796,7 +29796,7 @@
         {
             "id": 71,
             "name": "扉（市街地）",
-            "note": "<namePop:⇓_0_red>",
+            "note": "<namePop:⇓ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -30826,7 +30826,7 @@
         {
             "id": 76,
             "name": "EV076",
-            "note": "<namePop:！_0_red>",
+            "note": "<namePop:！ 0 red>",
             "pages": [
                 {
                     "conditions": {
@@ -39001,7 +39001,7 @@
         {
             "id": 135,
             "name": "",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
@@ -40029,7 +40029,7 @@
         {
             "id": 136,
             "name": "EV136",
-            "note": "<namePop:！_0_blue>",
+            "note": "<namePop:！ 0 blue>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map032.json b/data/Map032.json
index 4405256..010e620 100644
--- a/data/Map032.json
+++ b/data/Map032.json
@@ -5768,7 +5768,7 @@
         {
             "id": 13,
             "name": "EV013",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map033.json b/data/Map033.json
index 5f8e625..9d963a1 100644
--- a/data/Map033.json
+++ b/data/Map033.json
@@ -4070,7 +4070,7 @@
         {
             "id": 1,
             "name": "EV001",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map034.json b/data/Map034.json
index cc1013e..de879f4 100644
--- a/data/Map034.json
+++ b/data/Map034.json
@@ -1934,7 +1934,7 @@
         {
             "id": 7,
             "name": "EV007",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map045.json b/data/Map045.json
index 6aaeef3..405a050 100644
--- a/data/Map045.json
+++ b/data/Map045.json
@@ -4239,7 +4239,7 @@
         {
             "id": 7,
             "name": "",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map047.json b/data/Map047.json
index 2ea8a95..4ebf255 100644
--- a/data/Map047.json
+++ b/data/Map047.json
@@ -4505,7 +4505,7 @@
         {
             "id": 2,
             "name": "EV002",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {
diff --git a/data/Map049.json b/data/Map049.json
index 9105aad..7ab207c 100644
--- a/data/Map049.json
+++ b/data/Map049.json
@@ -4988,7 +4988,7 @@
         {
             "id": 12,
             "name": "EV012",
-            "note": "<namePop:♥_0_pink>",
+            "note": "<namePop:♥ 0 pink>",
             "pages": [
                 {
                     "conditions": {