song select: refresh a folder's song count text when the count changes

The folder texts are cached on first draw, but the engine fills in a
folder's song count with a background scan after the boxes are first
drawn, so the count text stayed at 0 for the rest of the session (e.g.
the folder under the cursor at startup kept showing 0 songs). The cache
now remembers the count it was built with and rebuilds that one text
when box.tja_count changes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Graphics/background/animation.json

@@ -36,22 +36,13 @@
     {
         "id": 4,
         "type": "move",
-        "duration": 266,
-        "total_distance": -40,
-        "ease_out": "quadratic",
-        "comment": "donbg 3,5 bounce up"
-    },
-    {
-        "id": 5,
-        "type": "move",
-        "duration": 266,
-        "total_distance": -40,
+        "duration": 532,
+        "total_distance": 0,
         "ease_in": "quadratic",
-        "delay": {
-            "reference_id": 4,
-            "property": "duration"
-        },
-        "comment": "donbg 3,5 bounce down"
+        "waypoints": [
+            { "at": 266, "value": -40, "ease_out": "quadratic" }
+        ],
+        "comment": "donbg 3,5 bounce up/down (merged from old ids 4+5)"
     },
     {
         "id": 6,
@@ -62,11 +53,7 @@
         "ease_in": "quadratic",
         "ease_out": "quadratic",
         "delay": {
-            "init_val": {
-                "reference_id": 4,
-                "property": "duration"
-            },
-            "reference_id": 5,
+            "reference_id": 4,
             "property": "duration"
         },
         "loop": true,
@@ -82,11 +69,7 @@
         "ease_out": "quadratic",
         "delay": {
             "init_val": {
-                "init_val": {
-                    "reference_id": 4,
-                    "property": "duration"
-                },
-                "reference_id": 5,
+                "reference_id": 4,
                 "property": "duration"
             },
             "reference_id": 6,
@@ -102,11 +85,7 @@
         "total_distance": 10,
         "reverse_delay": 0,
         "delay": {
-            "init_val": {
-                "reference_id": 4,
-                "property": "duration"
-            },
-            "reference_id": 5,
+            "reference_id": 4,
             "property": "duration"
         },
         "loop": true,
@@ -196,22 +175,13 @@
     {
         "id": 17,
         "type": "move",
-        "duration": 516,
-        "total_distance": 400,
-        "ease_in": "cubic",
-        "comment": "bg fever 4 bg move down"
-    },
-    {
-        "id": 18,
-        "type": "move",
-        "duration": 200,
-        "total_distance": 40,
-        "delay": {
-            "reference_id": 17,
-            "property": "duration"
-        },
+        "duration": 716,
+        "total_distance": 360,
         "ease_out": "quadratic",
-        "comment": "bg fever 4 bg move up"
+        "waypoints": [
+            { "at": 516, "value": 400, "ease_in": "cubic" }
+        ],
+        "comment": "bg fever 4 bg move down/up (merged from old ids 17+18)"
     },
     {
         "id": 19,
@@ -247,23 +217,14 @@
     {
         "id": 22,
         "type": "move",
-        "duration": 333,
-        "total_distance": 600,
+        "duration": 499,
+        "total_distance": 500,
         "start_position": -500,
-        "ease_out": "quadratic",
-        "comment": "bg fever 2 move in"
-    },
-    {
-        "id": 23,
-        "type": "move",
-        "duration": 166,
-        "total_distance": 100,
-        "delay": {
-            "reference_id": 22,
-            "property": "duration"
-        },
         "ease_in": "quadratic",
-        "comment": "bg fever 2 move out"
+        "waypoints": [
+            { "at": 333, "value": 600, "ease_out": "quadratic" }
+        ],
+        "comment": "bg fever 2 move in/out (merged from old ids 22+23)"
     },
     {
         "id": 24,

Graphics/dan_result/exam_info/texture.json

@@ -17,15 +17,18 @@
   },
   "exam_max": {
     "x": 473,
-    "y": 401
+    "y": 401,
+    "x2": 0
   },
   "exam_gold": {
     "x": 473,
-    "y": 401
+    "y": 401,
+    "x2": 0
   },
   "exam_red": {
     "x": 473,
-    "y": 401
+    "y": 401,
+    "x2": 0
   },
   "exam_combo": {
     "x": 1072,

Graphics/dan_result/gauge/texture.json

@@ -5,11 +5,13 @@
   },
   "1p_bar": {
     "x": 490,
-    "y": 123
+    "y": 123,
+    "x2": 0
   },
   "rainbow": {
     "x": 482,
-    "y": 119
+    "y": 119,
+    "x2": 0
   },
   "2p_unfilled": {
     "x": 482,

Graphics/entry/animation.json

@@ -22,24 +22,14 @@
     {
         "id": 2,
         "type": "move",
-        "duration": 350,
-        "total_distance": -295,
-        "ease_out": "quadratic",
-        "lock_input": true,
-        "comment": "move donchan's drum up"
-    },
-    {
-        "id": 3,
-        "type": "move",
-        "duration": 200,
-        "total_distance": 50,
-        "delay": {
-            "reference_id": 2,
-            "property": "duration"
-        },
+        "duration": 550,
+        "total_distance": -245,
         "ease_in": "quadratic",
         "lock_input": true,
-        "comment": "move donchan's drum a little down"
+        "waypoints": [
+            { "at": 350, "value": -295, "ease_out": "quadratic" }
+        ],
+        "comment": "move donchan's drum up/down a little (merged from old ids 2+3)"
     },
     {
         "id": 4,
@@ -47,11 +37,7 @@
         "duration": 350,
         "total_distance": -170,
         "delay": {
-            "init_val": {
-                "reference_id": 2,
-                "property": "duration"
-            },
-            "reference_id": 3,
+            "reference_id": 2,
             "property": "duration"
         },
         "ease_out": "quadratic",

Graphics/entry/side_select/texture.json

@@ -53,35 +53,19 @@
         "x2": 677,
         "y2": 348
     },
-    "1P_en": {
+    "1P": {
         "x": 261,
         "y": 400
     },
-    "1P_highlight_en": {
+    "1P_highlight": {
         "x": 261,
         "y": 400
     },
-    "2P_en": {
+    "2P": {
         "x": 762,
         "y": 400
     },
-    "2P_highlight_en": {
-        "x": 762,
-        "y": 400
-    },
-    "1P_ja": {
-        "x": 261,
-        "y": 400
-    },
-    "1P_highlight_ja": {
-        "x": 261,
-        "y": 400
-    },
-    "2P_ja": {
-        "x": 762,
-        "y": 400
-    },
-    "2P_highlight_ja": {
+    "2P_highlight": {
         "x": 762,
         "y": 400
     },

Graphics/game/hit_effect/texture.json

@@ -1,90 +1,114 @@
-{
-  "judge_bad": {
-      "x": 370,
-      "y": -40
-  },
-  "judge_ok": {
-      "x": 370,
-      "y": -40
-  },
-  "judge_good": {
-      "x": 370,
-      "y": -40
-  },
-  "hit_effect_good_big": {
-      "x": 342
-    },
-  "outer_good_big": {
-      "x": 304,
-      "y": -41,
-      "crop": [
-      [0, 0, 224, 224],
-      [224, 0, 224, 224],
-      [448, 0, 224, 224],
-      [672, 0, 224, 224]]
-    },
-  "hit_effect_good": {
-      "x": 342
-    },
-  "hit_effect_ok": {
-      "x": 342
-    },
-  "outer_good": {
-      "x": 304,
-      "y": -41,
-      "crop": [
-      [0, 0, 224, 224],
-      [224, 0, 224, 224],
-      [448, 0, 224, 224],
-      [672, 0, 224, 224]]
-    },
-  "outer_ok": {
-      "x": 304,
-      "y": -41,
-      "crop": [
-      [0, 0, 224, 224],
-      [224, 0, 224, 224],
-      [448, 0, 224, 224],
-      [672, 0, 224, 224]]
-    },
-  "hit_effect_ok_big": {
-      "x": 342
-    },
-  "outer_ok_big": {
-      "x": 304,
-      "y": -41,
-      "crop": [
-      [0, 0, 224, 224],
-      [224, 0, 224, 224],
-      [448, 0, 224, 224],
-      [672, 0, 224, 224]]
-    },
-  "explosion": [
-    {
-    "crop": [
-      [0, 0, 192, 192],
-      [192, 0, 192, 192],
-      [384, 0, 192, 192],
-      [576, 0, 192, 192],
-      [0, 192, 192, 192],
-      [192, 192, 192, 192],
-      [384, 192, 192, 192],
-      [576, 192, 192, 192],
-      [0, 384, 192, 192],
-      [192, 384, 192, 192],
-      [384, 384, 192, 192],
-      [576, 384, 192, 192],
-      [0, 576, 192, 192],
-      [192, 576, 192, 192],
-      [384, 576, 192, 192],
-      [576, 576, 192, 192],
-      [0, 768, 192, 192],
-      [192, 768, 192, 192],
-      [384, 768, 192, 192],
-      [576, 768, 192, 192],
-      [0, 960, 192, 192],
-      [192, 960, 192, 192],
-      [384, 960, 192, 192]]
-    }
-  ]
-}
+{
+  "judge_bad": {
+      "x": 370,
+      "y": -40
+  },
+  "judge_ok": {
+      "x": 370,
+      "y": -40
+  },
+  "judge_good": {
+      "x": 370,
+      "y": -40
+  },
+  "hit_effect_good_big": {
+      "x": 342
+    },
+  "outer_good_big": {
+      "x": 304,
+      "y": -41,
+      "crop": [
+      [0, 0, 224, 224],
+      [224, 0, 224, 224],
+      [448, 0, 224, 224],
+      [672, 0, 224, 224]]
+    },
+  "hit_effect_good": {
+      "x": 342
+    },
+  "hit_effect_ok": {
+      "x": 342
+    },
+  "outer_good": {
+      "x": 304,
+      "y": -41,
+      "crop": [
+      [0, 0, 224, 224],
+      [224, 0, 224, 224],
+      [448, 0, 224, 224],
+      [672, 0, 224, 224]]
+    },
+  "outer_ok": {
+      "x": 304,
+      "y": -41,
+      "crop": [
+      [0, 0, 224, 224],
+      [224, 0, 224, 224],
+      [448, 0, 224, 224],
+      [672, 0, 224, 224]]
+    },
+  "hit_effect_ok_big": {
+      "x": 342
+    },
+  "outer_ok_big": {
+      "x": 304,
+      "y": -41,
+      "crop": [
+      [0, 0, 224, 224],
+      [224, 0, 224, 224],
+      [448, 0, 224, 224],
+      [672, 0, 224, 224]]
+    },
+  "explosion": [
+    {
+    "crop": [
+      [0, 0, 192, 192],
+      [192, 0, 192, 192],
+      [384, 0, 192, 192],
+      [576, 0, 192, 192],
+      [0, 192, 192, 192],
+      [192, 192, 192, 192],
+      [384, 192, 192, 192],
+      [576, 192, 192, 192],
+      [0, 384, 192, 192],
+      [192, 384, 192, 192],
+      [384, 384, 192, 192],
+      [576, 384, 192, 192],
+      [0, 576, 192, 192],
+      [192, 576, 192, 192],
+      [384, 576, 192, 192],
+      [576, 576, 192, 192],
+      [0, 768, 192, 192],
+      [192, 768, 192, 192],
+      [384, 768, 192, 192],
+      [576, 768, 192, 192],
+      [0, 960, 192, 192],
+      [192, 960, 192, 192],
+      [384, 960, 192, 192]]
+    }
+  ],
+  "outer_effect_ok": {
+      "x": 304,
+      "y": -41
+    },
+  "outer_effect_good": {
+      "x": 304,
+      "y": -41
+    },
+    "firework": {
+      "crop": [
+      [0, 0, 256, 256],
+      [256, 0, 256, 256],
+      [512, 0, 256, 256],
+      [768, 0, 256, 256],
+      [0, 256, 256, 256],
+      [256, 256, 256, 256],
+      [512, 256, 256, 256],
+      [768, 256, 256, 256],
+      [0, 512, 256, 256],
+      [256, 512, 256, 256],
+      [512, 512, 256, 256],
+      [768, 512, 256, 256],
+      [0, 768, 256, 256]]
+    }
+}

Graphics/game/notes/texture.json

@@ -1,74 +1,113 @@
-{
-  "0": {},
-  "1": {
-  "crop": [
-      [0, 0, 128, 128],
-      [128, 0, 128, 128],
-      [256, 0, 128, 128]]
-  },
-  "2": {
-  "crop": [
-      [0, 0, 128, 128],
-      [128, 0, 128, 128],
-      [256, 0, 128, 128]]
-  },
-  "3": {
-  "crop": [
-      [0, 0, 128, 128],
-      [128, 0, 128, 128]]
-  },
-  "4": {
-  "crop": [
-      [0, 0, 128, 128],
-      [128, 0, 128, 128]]
-  },
-  "5": {
-  "crop": [
-      [0, 0, 128, 128],
-      [128, 0, 128, 128],
-      [256, 0, 128, 128]]
-  },
-  "6": {
-  "crop": [
-      [0, 0, 128, 128],
-      [128, 0, 128, 128]]
-  },
-  "7": {
-  "crop": [
-      [0, 0, 128, 128],
-      [128, 0, 128, 128],
-      [256, 0, 128, 128]]
-  },
-  "8": {},
-  "9": {
-    "frame_order": [
-      0,
-      0
-    ]
-  },
-  "10": {
-    "frame_order": [
-      0,
-      0
-    ]
-  },
-  "moji": {
-  "crop": [
-      [0, 0, 168, 32],
-      [0, 32, 168, 32],
-      [0, 64, 168, 32],
-      [0, 96, 168, 32],
-      [0, 128, 168, 32],
-      [0, 160, 168, 32],
-      [0, 192, 168, 32],
-      [0, 224, 168, 32],
-      [0, 256, 168, 32],
-      [0, 288, 168, 32],
-      [0, 320, 168, 32],
-      [0, 352, 168, 32]]
-  },
-  "moji_drumroll_mid": {},
-  "moji_drumroll_mid_big": {},
-  "drumroll_tail": {},
-  "drumroll_big_tail": {}
-}
+{
+  "0": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 0, 8, 136],
+      [8, 0, 8, 136]
+    ]
+  },
+  "1": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 136, 128, 128],
+      [128, 136, 128, 128],
+      [256, 136, 128, 128]
+    ]
+  },
+  "2": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 264, 128, 128],
+      [128, 264, 128, 128],
+      [256, 264, 128, 128]
+    ]
+  },
+  "3": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 392, 128, 128],
+      [128, 392, 128, 128]
+    ]
+  },
+  "4": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 520, 128, 128],
+      [128, 520, 128, 128]
+    ]
+  },
+  "5": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 648, 128, 128],
+      [128, 648, 128, 128],
+      [256, 648, 128, 128]
+    ]
+  },
+  "6": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 776, 128, 128],
+      [128, 776, 128, 128]
+    ]
+  },
+  "7": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 904, 128, 128],
+      [128, 904, 128, 128],
+      [256, 904, 128, 128]
+    ]
+  },
+  "8": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 1032, 48, 128],
+      [48, 1032, 72, 128]
+    ]
+  },
+  "9": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 1160, 128, 128],
+      [0, 1160, 128, 128]
+    ]
+  },
+  "10": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 1288, 128, 128],
+      [0, 1288, 128, 128]
+    ]
+  },
+  "moji": {
+    "crop": [
+      [0, 0, 168, 32],
+      [0, 32, 168, 32],
+      [0, 64, 168, 32],
+      [0, 96, 168, 32],
+      [0, 128, 168, 32],
+      [0, 160, 168, 32],
+      [0, 192, 168, 32],
+      [0, 224, 168, 32],
+      [0, 256, 168, 32],
+      [0, 288, 168, 32],
+      [0, 320, 168, 32],
+      [0, 352, 168, 32]
+    ]
+  },
+  "moji_drumroll_mid": {},
+  "moji_drumroll_mid_big": {},
+  "drumroll_tail": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 1416, 48, 128]
+    ]
+  },
+  "drumroll_big_tail": {
+    "file": "notes_atlas.png",
+    "crop": [
+      [0, 1544, 72, 128]
+    ]
+  }
+}

Graphics/game/notes_nijiiro/texture.json

@@ -1,28 +0,0 @@
-{
-  "0": {},
-  "1": {},
-  "2": {},
-  "3": {},
-  "4": {},
-  "5": {},
-  "6": {},
-  "7": {},
-  "8": {},
-  "9": {
-    "frame_order": [
-      0,
-      0
-    ]
-  },
-  "10": {
-    "frame_order": [
-      0,
-      0
-    ]
-  },
-  "moji": {},
-  "moji_drumroll_mid": {},
-  "moji_drumroll_mid_big": {},
-  "drumroll_tail": {},
-  "drumroll_big_tail": {}
-}

Graphics/game/practice/texture.json

@@ -13,6 +13,14 @@
     "x": 334,
     "y": 364
   },
+  "jump_point_progress": {
+    "x": 334,
+    "y": 364
+  },
+  "jump_point_arrow": {
+    "x": 0,
+    "y": 0
+  },
   "large_drum": [
     {
       "x": 397,
@@ -127,6 +135,40 @@
       "y": 514
     }
   ],
+  "confirm": [
+    {
+      "x": 513,
+      "y": 514
+    },
+    {
+      "x": 983,
+      "y": 514
+    }
+  ],
+  "delete": [
+    {
+      "x": 513,
+      "y": 514
+    },
+    {
+      "x": 983,
+      "y": 514
+    }
+  ],
+  "jump_point_editing": {
+    "x": 348,
+    "y": 40
+  },
+  "finish": [
+    {
+      "x": 513,
+      "y": 514
+    },
+    {
+      "x": 983,
+      "y": 514
+    }
+  ],
   "speed_l_kat": [
     {
       "x": 387,

Graphics/game/song_info/texture.json

@@ -1,18 +1,6 @@
 {
   "genre": {
     "x": 1103,
-    "y": 75,
-    "crop": [
-      [0, 0, 144, 24],
-      [0, 24, 144, 24],
-      [0, 48, 144, 24],
-      [0, 72, 144, 24],
-      [0, 96, 144, 24],
-      [0, 120, 144, 24],
-      [0, 144, 144, 24],
-      [0, 168, 144, 24],
-      [0, 192, 144, 24]
-    ],
-    "frame_order": [0, 0, 1, 2, 3, 4, 5, 6, 7]
+    "y": 75
   }
 }

Graphics/settings_template.json

@@ -1565,6 +1565,30 @@
           }
         }
       },
+      "device": {
+        "path": "audio/device",
+        "name": {
+          "en": "Audio Device",
+          "ja": "オーディオデバイス",
+          "zh": "音频设备",
+          "ko": "오디오 장치"
+        },
+        "description": {
+          "en": "Output device to use for the selected backend. Default uses the system default device.",
+          "ja": "選択したバックエンドで使用する出力デバイス。デフォルトはシステムの既定デバイスを使用します。",
+          "zh": "为所选后端使用的输出设备。默认使用系统默认设备。",
+          "ko": "선택한 백엔드에서 사용할 출력 장치. 기본값은 시스템 기본 장치를 사용합니다."
+        },
+        "type": "audiodevice",
+        "values": {
+          "": {
+            "en": "Default",
+            "ja": "デフォルト",
+            "zh": "默认",
+            "ko": "기본값"
+          }
+        }
+      },
       "sample_rate": {
         "path": "audio/sample_rate",
         "name": {

Graphics/skin_config.json

@@ -13,14 +13,14 @@
       "dan_select_rank_plate": false,
       "entry_credit_arcade": false,
       "dan_confirm_yes_left": false,
-      "songselect_2p_join": false,
-      "costume_preset_slots": false,
       "dan_title_horizontal": false,
       "dan_chip_name_black": false,
       "dan_exam_grid": false,
       "dan_select_total_notes": true,
       "combo_color_tiers": false,
-      "gauge_cell_fade_in": false
+      "gauge_cell_fade_in": false,
+      "dan_exam_value_center": false,
+      "disable_chara_3d": false
     },
     "chara_3d": {
       "scale": 650.0,
@@ -147,6 +147,28 @@
       "ko": "사용 안 함"
     }
   },
+  "entry_1p": {
+    "x": 156,
+    "y": 40,
+    "font_size": 26,
+    "text": {
+      "en": "Left",
+      "ja": "左でつかう",
+      "zh": "使用左侧",
+      "ko": "왼쪽 사용"
+    }
+  },
+  "entry_2p": {
+    "x": 99,
+    "y": 40,
+    "font_size": 26,
+    "text": {
+      "en": "Right",
+      "ja": "右でつかう",
+      "zh": "使用右侧",
+      "ko": "오른쪽 사용"
+    }
+  },
   "entry_question": {
     "x": 636,
     "y": 143,
@@ -356,9 +378,17 @@
   "song_tja_count": {
     "x": 560,
     "y": 130,
-    "width": 118,
+    "width": 184,
     "font_size": 35
   },
+  "song_count": {
+    "text": {
+      "en": "{0} Songs",
+      "ja": "全{0}曲",
+      "zh": "全{0}曲",
+      "ko": "전{0}곡"
+    }
+  },
   "box_texture": {
     "x": 48,
     "y": 330
@@ -466,6 +496,21 @@
   "score_info_bg_offset": {
     "y": 50
   },
+  "leaderboard_title": {
+    "text": { "ja": "自己ベスト", "en": "My Best", "zh": "个人最佳", "ko": "개인 최고 기록" }
+  },
+  "leaderboard_title_long": {
+    "x": 76,
+    "y": 275,
+    "width": 134,
+    "height": 27
+  },
+  "leaderboard_title_short": {
+    "x": 76,
+    "y": 449,
+    "width": 134,
+    "height": 27
+  },
   "score_info_counter_margin": {
     "x": 24,
     "width": 14
@@ -735,7 +780,7 @@
   },
   "judge_counter_3": {
     "x": 270,
-    "y": 477
+    "y": 515
   },
   "judge_counter_4": {
     "x": 515,
@@ -848,9 +893,6 @@
   "score_counter_2p_y_offset": {
     "y": 130
   },
-  "score_counter_animation_start_y": {
-    "y": 148
-  },
   "score_counter_animation_p2_offset": {
     "y": 510
   },
@@ -926,6 +968,58 @@
     "width": 344,
     "height": 424
   },
+  "box_folder_explanation": {
+    "x": 776,
+    "y": 131,
+    "width": 43,
+    "height": 73,
+    "font_size": 34
+  },
+  "box_folder_explanation_box": {
+    "x": 650,
+    "y": 125,
+    "width": 160,
+    "height": 400
+  },
+  "box_back_text": {
+    "x": 47,
+    "y": 173,
+    "font_size": 40,
+    "text": { "ja": "もどる", "en": "Back", "zh": "返回", "ko": "뒤로" }
+  },
+  "diff_tower_easy": {
+    "text": { "ja": "かんたん", "en": "Easy", "zh": "简单", "ko": "쉬움" }
+  },
+  "diff_tower_normal": {
+    "text": { "ja": "ふつう", "en": "Normal", "zh": "普通", "ko": "보통" }
+  },
+  "diff_tower_hard": {
+    "text": { "ja": "むずかしい", "en": "Hard", "zh": "困难", "ko": "어려움" }
+  },
+  "diff_tower_oni": {
+    "text": { "ja": "おに", "en": "Oni", "zh": "魔王", "ko": "귀신" }
+  },
+  "diff_tower_ura": {
+    "text": { "ja": "おに", "en": "Ura", "zh": "里魔王", "ko": "우라" }
+  },
+  "diff_tower_label_box": {
+    "x": 475,
+    "y": 158,
+    "width": 53,
+    "height": 152
+  },
+  "difficulty_bar_label_box": {
+    "x": 481,
+    "y": 256,
+    "width": 26,
+    "height": 96
+  },
+  "selected_diff_text_box": {
+    "x": 125,
+    "y": 203,
+    "width": 140,
+    "height": 61
+  },
   "neiro_counter_x_offset": {
     "x": 60
   },
@@ -943,5 +1037,21 @@
   },
   "song_select_bg_diff_p2_offset": {
     "x": 1025
+  },
+  "game_p2_y": {
+    "y": 360
+  },
+  "dan_exam_value_center": {
+    "x": 0,
+    "width": 0
+  },
+  "yellow_box_bottom": {
+  "y": 543
+  },
+  "loading_countdown": {
+    "x": 0,
+    "y": 0,
+    "width": 0,
+    "height": 0
   }
 }

Graphics/song_select/animation.json

@@ -224,58 +224,15 @@
   {
     "id": 22,
     "type": "move",
-    "total_distance": 30,
-    "duration": 116.67,
-    "ease_out": "quadratic",
-    "comment": "diff sort confirmation bounce up"
-  },
-  {
-    "id": 23,
-    "type": "move",
-    "total_distance": 30,
-    "duration": 116.67,
-    "delay": {
-      "reference_id": 22,
-      "property": "duration"
-    },
+    "total_distance": 0,
+    "duration": 400,
     "ease_in": "quadratic",
-    "comment": "diff sort confirmation bounce down"
-  },
-  {
-    "id": 24,
-    "type": "move",
-    "total_distance": 10,
-    "duration": 83.33,
-    "delay": {
-      "init_val": {
-        "reference_id": 22,
-        "property": "duration"
-      },
-      "reference_id": 23,
-      "property": "duration"
-    },
-    "ease_out": "quadratic",
-    "comment": "diff sort confirmation bounce up 2"
-  },
-  {
-    "id": 25,
-    "type": "move",
-    "total_distance": 10,
-    "duration": 83.33,
-    "delay": {
-      "init_val": {
-        "init_val": {
-          "reference_id": 22,
-          "property": "duration"
-        },
-        "reference_id": 23,
-        "property": "duration"
-      },
-      "reference_id": 24,
-      "property": "duration"
-    },
-    "ease_in": "quadratic",
-    "comment": "diff sort confirmation bounce down 2"
+    "waypoints": [
+      { "at": 116.67, "value": -30, "ease_out": "quadratic" },
+      { "at": 233.34, "value": 0, "ease_in": "quadratic" },
+      { "at": 316.67, "value": -10, "ease_out": "quadratic" }
+    ],
+    "comment": "diff sort confirmation double bounce (merged from old ids 22+23+24+25)"
   },
   {
     "id": 26,