Revert "Fix wmic (#642)"

This reverts commit 0ee90abe98.

.git-blame-ignore-revs

@@ -37,4 +37,7 @@ f8b20774e3f035eeddb9211a28a391b20db74456
 
 # Revert a revert (scripted cutscene path)
 d73f86d26ec2dbf031c01f588ba4be11842db09c
-fe0ab0aa454f4ae12ced9502db8a01e7bca3e04c
+fe0ab0aa454f4ae12ced9502db8a01e7bca3e04c
+
+# Forgot the # in the commit message
+484bbcb22aa8f28b62912abb6d8c89fb58e63889

.github/workflows/linux.yml

@@ -1,22 +1,25 @@
+name: Linux Builds
 
-name: Linux Build
 on:
   push:
   workflow_dispatch:
+
 jobs:
   build:
     name: Linux Build
     permissions: write-all
     runs-on: ubuntu-24.04
     steps:
-      - name: Pulling the source
-        uses: actions/checkout@v2
+      - name: Pulling the new commit
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Setting up Haxe
         uses: krdlab/setup-haxe@v2
         with:
           haxe-version: 4.3.7
       - name: Restore existing build cache for faster compilation
-        uses: actions/cache@v3
+        uses: actions/cache@v4.2.3
         with:
           # not caching the bin folder to prevent asset duplication and stuff like that
           key: cache-build-linux
@@ -24,8 +27,8 @@ jobs:
             .haxelib/
             export/release/linux/haxe/
             export/release/linux/obj/
-          restore-keys: |
-            cache-build-linux
+      - run: |
+          echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
       - name: Installing LibVLC
         run: |
           sudo apt-get install libvlc-dev libvlccore-dev
@@ -34,7 +37,7 @@ jobs:
           haxe -cp commandline -D analyzer-optimize --run Main setup -s
       - name: Building the game
         run: |
-          haxelib run lime build linux
+          haxelib run lime build linux -DCOMPILE_EXPERIMENTAL
       # - name: Tar files
       #   run: tar -zcvf CodenameEngine.tar.gz -C export/release/linux/bin .
       - name: Uploading artifact (executable)
@@ -67,7 +70,7 @@ jobs:
               }
             }
       - name: Uploading new cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4.2.3
         with:
           # caching again since for some reason it doesnt work with the first post cache shit
           key: cache-build-linux
@@ -75,5 +78,72 @@ jobs:
             .haxelib/
             export/release/linux/haxe/
             export/release/linux/obj/
-          restore-keys: |
-            cache-build-linux
+
+# didnt compile debug in the same job or github would have said that job wasn't completed until debug was done too (debug uploads are not essential)
+  debug_build:
+    name: Linux Debug Build
+    permissions: write-all
+    runs-on: ubuntu-24.04
+    needs: build # since its low priority, it'll run after, so actions will concentrate first on normal builds
+    steps:
+      - name: Pulling the new commit
+        uses: actions/checkout@v4
+      - name: Setting up Haxe
+        uses: krdlab/setup-haxe@v2
+        with:
+          haxe-version: 4.3.7
+      - name: Restore existing build cache for faster compilation
+        uses: actions/cache@v4.2.3
+        with:
+          # not caching the bin folder to prevent asset duplication and stuff like that
+          key: cache-build-linux-debug
+          path: |
+            .haxelib/
+            export/debug/linux/haxe/
+            export/debug/linux/obj/
+      - run: |
+          echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
+      - name: Installing LibVLC
+        run: |
+          sudo apt-get install libvlc-dev libvlccore-dev
+      - name: Installing/Updating libraries
+        run: |
+          haxe -cp commandline -D analyzer-optimize --run Main setup -s
+      - name: Building the game
+        run: |
+          haxelib run lime build linux -debug
+      # - name: Tar files
+      #   run: tar -zcvf CodenameEngine.tar.gz -C export/debug/linux/bin .
+      - name: Uploading artifact (entire build)
+        uses: actions/upload-artifact@v4
+        with:
+          name: Codename Engine Debug
+          path: export/debug/linux/bin/
+      - name: Clearing already existing cache
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const caches = await github.rest.actions.getActionsCacheList({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            })
+            for (const cache of caches.data.actions_caches) {
+              if (cache.key == "cache-build-linux-debug") {
+                console.log('Clearing ' + cache.key + '...')
+                await github.rest.actions.deleteActionsCacheById({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  cache_id: cache.id,
+                })
+                console.log("Cache cleared.")
+              }
+            }
+      - name: Uploading new cache
+        uses: actions/cache@v4.2.3
+        with:
+          # caching again since for some reason it doesnt work with the first post cache shit
+          key: cache-build-linux-debug
+          path: |
+            .haxelib/
+            export/debug/linux/haxe/
+            export/debug/linux/obj/

.github/workflows/macos.yml

@@ -1,22 +1,25 @@
+name: Mac OS Builds
 
-name: Mac OS Build
 on:
   push:
   workflow_dispatch:
+
 jobs:
   build:
     name: Mac OS Build
     permissions: write-all
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - name: Pulling the new commit
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Setting up Haxe
         uses: krdlab/setup-haxe@v2
         with:
           haxe-version: 4.3.7
       - name: Restore existing build cache for faster compilation
-        uses: actions/cache@v3
+        uses: actions/cache@v4.2.3
         with:
           # not caching the bin folder to prevent asset duplication and stuff like that
           key: cache-build-mac
@@ -24,14 +27,14 @@ jobs:
             .haxelib/
             export/release/macos/haxe/
             export/release/macos/obj/
-          restore-keys: |
-            cache-build-mac
+      - run: |
+          echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
       - name: Installing/Updating libraries
         run: |
           haxe -cp commandline -D analyzer-optimize --run Main setup -s
       - name: Building the game
         run: |
-          haxelib run lime build mac
+          arch -x86_64 haxelib run lime build mac -DCOMPILE_EXPERIMENTAL
       - name: Tar files
         run: tar -zcvf CodenameEngine.tar.gz -C export/release/macos/bin .
       - name: Uploading artifact (executable)
@@ -64,7 +67,7 @@ jobs:
               }
             }
       - name: Uploading new cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4.2.3
         with:
           # caching again since for some reason it doesnt work with the first post cache shit
           key: cache-build-mac
@@ -72,5 +75,69 @@ jobs:
             .haxelib/
             export/release/macos/haxe/
             export/release/macos/obj/
-          restore-keys: |
-            cache-build-mac
+
+# didnt compile debug in the same job or github would have said that job wasn't completed until debug was done too (debug uploads are not essential)
+  debug_build:
+    name: Mac OS Debug Build
+    permissions: write-all
+    runs-on: macos-14
+    needs: build # since its low priority, it'll run after, so actions will concentrate first on normal builds
+    steps:
+      - name: Pulling the new commit
+        uses: actions/checkout@v4
+      - name: Setting up Haxe
+        uses: krdlab/setup-haxe@v2
+        with:
+          haxe-version: 4.3.7
+      - name: Restore existing build cache for faster compilation
+        uses: actions/cache@v4.2.3
+        with:
+          # not caching the bin folder to prevent asset duplication and stuff like that
+          key: cache-build-mac-debug
+          path: |
+            .haxelib/
+            export/debug/macos/haxe/
+            export/debug/macos/obj/
+      - run: |
+          echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
+      - name: Installing/Updating libraries
+        run: |
+          haxe -cp commandline -D analyzer-optimize --run Main setup -s
+      - name: Building the game
+        run: |
+          arch -x86_64 haxelib run lime build mac -debug
+      - name: Tar files
+        run: tar -zcvf CodenameEngine.tar.gz -C export/debug/macos/bin .
+      - name: Uploading artifact (entire build)
+        uses: actions/upload-artifact@v4
+        with:
+          name: Codename Engine Debug
+          path: CodenameEngine.tar.gz
+      - name: Clearing already existing cache
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const caches = await github.rest.actions.getActionsCacheList({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            })
+            for (const cache of caches.data.actions_caches) {
+              if (cache.key == "cache-build-mac-debug") {
+                console.log('Clearing ' + cache.key + '...')
+                await github.rest.actions.deleteActionsCacheById({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  cache_id: cache.id,
+                })
+                console.log("Cache cleared.")
+              }
+            }
+      - name: Uploading new cache
+        uses: actions/cache@v4.2.3
+        with:
+          # caching again since for some reason it doesnt work with the first post cache shit
+          key: cache-build-mac-debug
+          path: |
+            .haxelib/
+            export/debug/macos/haxe/
+            export/debug/macos/obj/

.github/workflows/release.yml

@@ -22,6 +22,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Download Windows Full Build
         uses: dawidd6/action-download-artifact@v6
@@ -184,7 +186,7 @@ jobs:
           name: Release ${{ github.event.inputs.tag_name }}
           draft: true
           prerelease: ${{ github.event.inputs.prerelease }}
-          body: ${{ steps.build_body.outputs.body }} 
+          body: ${{ steps.build_body.outputs.body }}
           generate_release_notes: true
           files: |
             renamed/Codename Engine-Windows.zip

.github/workflows/windows.yml

@@ -1,8 +1,9 @@
+name: Windows Builds
 
-name: Windows Build
 on:
   push:
   workflow_dispatch:
+
 jobs:
   build:
     name: Windows Build
@@ -10,13 +11,15 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Pulling the new commit
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Setting up Haxe
         uses: krdlab/setup-haxe@v2
         with:
           haxe-version: 4.3.7
       - name: Restore existing build cache for faster compilation
-        uses: actions/cache@v3
+        uses: actions/cache@v4.2.3
         with:
           # not caching the bin folder to prevent asset duplication and stuff like that
           key: cache-build-windows
@@ -24,14 +27,14 @@ jobs:
             .haxelib/
             export/release/windows/haxe/
             export/release/windows/obj/
-          restore-keys: |
-            cache-build-windows
+      - run: |
+          echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
       - name: Installing/Updating libraries
         run: |
           haxe -cp commandline -D analyzer-optimize --run Main setup -s --no-vscheck
       - name: Building the game
         run: |
-          haxelib run lime build windows
+          haxelib run lime build windows -DCOMPILE_EXPERIMENTAL
       - name: Uploading artifact (executable)
         uses: actions/upload-artifact@v4
         with:
@@ -62,7 +65,7 @@ jobs:
               }
             }
       - name: Uploading new cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4.2.3
         with:
           # caching again since for some reason it doesnt work with the first post cache shit
           key: cache-build-windows
@@ -70,5 +73,67 @@ jobs:
             .haxelib/
             export/release/windows/haxe/
             export/release/windows/obj/
-          restore-keys: |
-            cache-build-windows
+
+# didnt compile debug in the same job or github would have said that job wasn't completed until debug was done too (debug uploads are not essential)
+  debug_build:
+    name: Windows Debug Build
+    permissions: write-all
+    runs-on: windows-latest
+    needs: build # since its low priority, it'll run after, so actions will concentrate first on normal builds
+    steps:
+      - name: Pulling the new commit
+        uses: actions/checkout@v4
+      - name: Setting up Haxe
+        uses: krdlab/setup-haxe@v2
+        with:
+          haxe-version: 4.3.7
+      - name: Restore existing build cache for faster compilation
+        uses: actions/cache@v4.2.3
+        with:
+          # not caching the bin folder to prevent asset duplication and stuff like that
+          key: cache-build-windows-debug
+          path: |
+            .haxelib/
+            export/debug/windows/haxe/
+            export/debug/windows/obj/
+      - run: |
+          echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
+      - name: Installing/Updating libraries
+        run: |
+          haxe -cp commandline -D analyzer-optimize --run Main setup -s --no-vscheck
+      - name: Building the game
+        run: |
+          haxelib run lime build windows -debug
+      - name: Uploading artifact (entire build)
+        uses: actions/upload-artifact@v4
+        with:
+          name: Codename Engine Debug
+          path: export/debug/windows/bin
+      - name: Clearing already existing cache
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const caches = await github.rest.actions.getActionsCacheList({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            })
+            for (const cache of caches.data.actions_caches) {
+              if (cache.key == "cache-build-windows-debug") {
+                console.log('Clearing ' + cache.key + '...')
+                await github.rest.actions.deleteActionsCacheById({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  cache_id: cache.id,
+                })
+                console.log("Cache cleared.")
+              }
+            }
+      - name: Uploading new cache
+        uses: actions/cache@v4.2.3
+        with:
+          # caching again since for some reason it doesnt work with the first post cache shit
+          key: cache-build-windows-debug
+          path: |
+            .haxelib/
+            export/debug/windows/haxe/
+            export/debug/windows/obj/

FEATURES.md

@@ -73,7 +73,7 @@ _**QOL = Quality of Life**_
         - If you need to rearrange the weeks in-game, you can use the `data/weeks/weeks.txt` file.
 	- Editors for Charts and Characters (Stage coming soon)
 		- Undos/Redos supported
-		- Warning on closing unsaved work
+		- Warning on closing unsaved work.
 		- Clean UI (for ocd freaks)
 		- Mature Chart editor (Character editor rework soon)
 		- Features not found in other editors!

README.md

@@ -68,7 +68,7 @@ The engine uses [HaxeFlixel](https://haxeflixel.com/) and it mainly features:
 </details>
 
 <details>
-  <summary><h2>How to setup and build</h2></summary>
+  <summary><h2>How to setup and build the engine and its documentation</h2></summary>
 
   Check out our guide [HERE](building/README.md)
 </details>

art/SECRET REPO INSTRUCTIONS.md

@@ -1,10 +0,0 @@
-## DEV (PRIVATE) REPO INSTRUCTIONS TO SYNC UP WITH IT INSTEAD OF SYNCING WITH THE PUBLIC ONE
-- Open a Command Prompt window in the public codename repo folder
-- Type those commands:
-    - `git remote add dev https://www.github.com/YoshiCrafter29/CodenameEngine-Dev`
-    - `git branch --set-upstream-to dev/main`
-- GitHub desktop should be synchronized with the dev repo now. If you're unsure,
-    - Repo name should still say "CodenameEngine"
-    - Current branch should still say "main"
-    - "Fetch" button should say "Fetch dev"
-    - You shouldn't have any commit to push.

art/generateDoc.bat

@@ -1,8 +0,0 @@
-@ECHO OFF
-cd ..
-echo Building Game...
-lime build windows --haxeflag="-xml docs/doc.xml" -D doc-gen -D DOCUMENTATION --no-output
-echo art
-
-echo Generated the api xml file at docs/doc.xml
-echo Please put this in codename-website/api-generator/api/doc.xml

assets/data/characters/gf-christmas.xml

@@ -2,13 +2,6 @@
 <character x="115" y="325" sprite="gf-christmas" icon="gf" color="#A5004D">
 	<anim name="danceLeft" anim="GF Dancing Beat" x="0" y="-9" fps="24" loop="false" indices="0..14"/>
 	<anim name="danceRight" anim="GF Dancing Beat" x="0" y="-9" fps="24" loop="false" indices="15..30"/>
-	<anim name="singUP" anim="GF Up Note" x="0" y="-9" fps="24" loop="false"/>
-	<anim name="singDOWN" anim="GF Down Note" x="0" y="-9" fps="24" loop="false"/>
-	<anim name="singLEFT" anim="GF left note" x="0" y="-9" fps="24" loop="false"/>
-	<anim name="singRIGHT" anim="GF Right Note" x="0" y="-9" fps="24" loop="false"/>
-	<anim name="scared" anim="GF FEAR" x="0" y="-9" fps="24" loop="true"/>
-	<anim name="hairBlow" anim="GF Dancing Beat Hair blowing" x="0" y="-9" fps="24" loop="false" indices="0..3"/>
-	<anim name="hairFall" anim="GF Dancing Beat Hair Landing" x="0" y="-9" fps="24" loop="false" indices="0..11"/>
 	<anim name="cheer" anim="GF Cheer" x="0" y="-9" fps="24" loop="false"/>
 	<anim name="sad" anim="gf sad" x="-51" y="306" fps="24" loop="true" indices="0..12"/>
 </character>

assets/data/characters/gf.xml

@@ -1,14 +1,14 @@
 <!DOCTYPE codename-engine-character>
-<character x="100" y="275" sprite="gf" icon="gf" color="#A5004D">
-	<anim name="cheer" anim="GF Cheer" x="0" y="0" fps="24" loop="false"/>
-	<anim name="singUP" anim="GF Up Note" x="0" y="0" fps="24" loop="false"/>
-	<anim name="singLEFT" anim="GF left note" x="0" y="0" fps="24" loop="false"/>
-	<anim name="singRIGHT" anim="GF Right Note" x="0" y="0" fps="24" loop="false"/>
-	<anim name="singDOWN" anim="GF Down Note" x="0" y="0" fps="24" loop="false"/>
-	<anim name="danceLeft" anim="GF Dancing Beat" x="0" y="0" fps="24" loop="false" indices="0..14"/>
-	<anim name="danceRight" anim="GF Dancing Beat" x="0" y="0" fps="24" loop="false" indices="15..30"/>
-	<anim name="hairBlow" anim="GF Dancing Beat Hair blowing" x="0" y="0" fps="24" loop="true" indices="0,1,2,3"/>
-	<anim name="hairFall" anim="GF Dancing Beat Hair Landing" x="0" y="0" fps="24" loop="false" indices="0..11"/>
-	<anim name="scared" anim="GF FEAR" x="0" y="0" fps="24" loop="true"/>
-	<anim name="sad" anim="gf sad" x="0" y="0" fps="24" loop="true" indices="0..12"/>
+<character x="100" y="275" color="#A5004D">
+	<anim name="cheer" anim="GF Cheer"/>
+	<anim name="singUP" anim="GF Up Note"/>
+	<anim name="singLEFT" anim="GF left note"/>
+	<anim name="singRIGHT" anim="GF Right Note"/>
+	<anim name="singDOWN" anim="GF Down Note"/>
+	<anim name="danceLeft" anim="GF Dancing Beat" indices="0..14"/>
+	<anim name="danceRight" anim="GF Dancing Beat" indices="15..30"/>
+	<anim name="hairBlow" anim="GF Dancing Beat Hair blowing" loop="true" indices="0..3"/>
+	<anim name="hairFall" anim="GF Dancing Beat Hair Landing" indices="0..11"/>
+	<anim name="scared" anim="GF FEAR " loop="true"/>
+	<anim name="sad" anim="gf sad" x="-51" y="315" loop="true" indices="0..12"/>
 </character>

assets/data/stages/mall.xml

@@ -11,7 +11,7 @@
 	<sprite name="fgSnow" x="-600" y="680" sprite="fgSnow"/>
 
 
-	<girlfriend x="540" y="110"/>
+	<girlfriend x="440" y="110"/>
 	<dad/>
 	<boyfriend x="1030" camyoffset="-150" camxoffset="-150"/>
 

assets/images/characters/gf-car/spritemap1.json

@@ -1,28 +1,28 @@
-{"ATLAS": {"SPRITES":[ 
-{"SPRITE" : {"name": "0000","x":1636,"y":275,"w":183,"h":115,"rotated": false}},
-{"SPRITE" : {"name": "0001","x":215,"y":360,"w":84,"h":140,"rotated": false}},
-{"SPRITE" : {"name": "0002","x":419,"y":358,"w":251,"h":121,"rotated": false}},
-{"SPRITE" : {"name": "0003","x":1636,"y":394,"w":120,"h":65,"rotated": false}},
-{"SPRITE" : {"name": "0004","x":4,"y":360,"w":108,"h":126,"rotated": false}},
-{"SPRITE" : {"name": "0005","x":674,"y":358,"w":102,"h":147,"rotated": false}},
-{"SPRITE" : {"name": "0006","x":116,"y":360,"w":95,"h":130,"rotated": false}},
-{"SPRITE" : {"name": "0007","x":2038,"y":4,"w":1,"h":4,"rotated": false}},
-{"SPRITE" : {"name": "0008","x":4,"y":4,"w":411,"h":352,"rotated": false}},
-{"SPRITE" : {"name": "0009","x":419,"y":4,"w":398,"h":350,"rotated": false}},
-{"SPRITE" : {"name": "0010","x":1303,"y":275,"w":329,"h":162,"rotated": false}},
-{"SPRITE" : {"name": "0011","x":303,"y":360,"w":90,"h":103,"rotated": false}},
-{"SPRITE" : {"name": "0012","x":1823,"y":4,"w":211,"h":236,"rotated": false}},
-{"SPRITE" : {"name": "0013","x":1823,"y":244,"w":208,"h":235,"rotated": false}},
-{"SPRITE" : {"name": "0014","x":821,"y":258,"w":478,"h":262,"rotated": false}},
-{"SPRITE" : {"name": "0015","x":821,"y":4,"w":521,"h":250,"rotated": false}},
-{"SPRITE" : {"name": "0016","x":1346,"y":4,"w":473,"h":267,"rotated": false}}
-]},
-"meta": {
-"app": "Adobe Animate",
-"version": "22.0.5.191",
-"image": "spritemap1.png",
-"format": "RGBA8888",
-"size": {"w":2043,"h":524},
-"resolution": "1"
-}
+{"ATLAS":{"SPRITES":[
+{"SPRITE":{"name":"0","x":1662,"y":282,"w":194,"h":117,"rotated":false}},
+{"SPRITE":{"name":"1","x":1790,"y":417,"w":92,"h":136,"rotated":false}},
+{"SPRITE":{"name":"2","x":1193,"y":539,"w":259,"h":123,"rotated":false}},
+{"SPRITE":{"name":"3","x":483,"y":553,"w":125,"h":68,"rotated":false}},
+{"SPRITE":{"name":"4","x":1662,"y":417,"w":110,"h":127,"rotated":false}},
+{"SPRITE":{"name":"5","x":1886,"y":0,"w":105,"h":149,"rotated":false}},
+{"SPRITE":{"name":"6","x":1886,"y":167,"w":97,"h":130,"rotated":false}},
+{"SPRITE":{"name":"7","x":1398,"y":0,"w":470,"h":264,"rotated":false}},
+{"SPRITE":{"name":"8","x":867,"y":0,"w":513,"h":254,"rotated":false}},
+{"SPRITE":{"name":"9","x":0,"y":372,"w":465,"h":270,"rotated":false}},
+{"SPRITE":{"name":"10","x":1900,"y":315,"w":101,"h":118,"rotated":false}},
+{"SPRITE":{"name":"11","x":867,"y":272,"w":308,"h":367,"rotated":false}},
+{"SPRITE":{"name":"12","x":483,"y":371,"w":338,"h":164,"rotated":false}},
+{"SPRITE":{"name":"13","x":0,"y":0,"w":422,"h":354,"rotated":false}},
+{"SPRITE":{"name":"14","x":440,"y":0,"w":409,"h":353,"rotated":false}},
+{"SPRITE":{"name":"15","x":1900,"y":451,"w":92,"h":103,"rotated":false}},
+{"SPRITE":{"name":"16","x":1193,"y":282,"w":218,"h":239,"rotated":false}},
+{"SPRITE":{"name":"17","x":1429,"y":282,"w":215,"h":237,"rotated":false}}]},
+"meta":{
+"app":"Adobe Animate (Better TA Extension)",
+"version":"24.0.2.12",
+"image":"spritemap1.png",
+"format":"RGBA8888",
+"size":{"w":2031,"h":662},
+"resolution":"1"
 }
+}

assets/images/characters/gf-christmas/spritemap1.json

@@ -1,58 +1,40 @@
-{"ATLAS": {"SPRITES":[ 
-{"SPRITE" : {"name": "0000","x":994,"y":1029,"w":187,"h":118,"rotated": false}},
-{"SPRITE" : {"name": "0001","x":1953,"y":524,"w":84,"h":140,"rotated": false}},
-{"SPRITE" : {"name": "0002","x":471,"y":430,"w":258,"h":137,"rotated": false}},
-{"SPRITE" : {"name": "0003","x":1300,"y":641,"w":122,"h":66,"rotated": false}},
-{"SPRITE" : {"name": "0004","x":1825,"y":1078,"w":108,"h":126,"rotated": false}},
-{"SPRITE" : {"name": "0005","x":360,"y":695,"w":103,"h":149,"rotated": false}},
-{"SPRITE" : {"name": "0006","x":1945,"y":867,"w":95,"h":130,"rotated": false}},
-{"SPRITE" : {"name": "0007","x":2034,"y":4,"w":1,"h":4,"rotated": false}},
-{"SPRITE" : {"name": "0008","x":943,"y":650,"w":309,"h":375,"rotated": false}},
-{"SPRITE" : {"name": "0009","x":4,"y":4,"w":778,"h":422,"rotated": false}},
-{"SPRITE" : {"name": "0010","x":786,"y":4,"w":761,"h":393,"rotated": false}},
-{"SPRITE" : {"name": "0011","x":1551,"y":4,"w":411,"h":352,"rotated": false}},
-{"SPRITE" : {"name": "0012","x":1551,"y":360,"w":398,"h":350,"rotated": false}},
-{"SPRITE" : {"name": "0013","x":4,"y":1028,"w":329,"h":162,"rotated": false}},
-{"SPRITE" : {"name": "0014","x":1945,"y":1001,"w":90,"h":103,"rotated": false}},
-{"SPRITE" : {"name": "0015","x":1300,"y":401,"w":211,"h":236,"rotated": false}},
-{"SPRITE" : {"name": "0016","x":782,"y":1029,"w":208,"h":235,"rotated": false}},
-{"SPRITE" : {"name": "0017","x":782,"y":910,"w":117,"h":83,"rotated": false}},
-{"SPRITE" : {"name": "0018","x":994,"y":1151,"w":117,"h":83,"rotated": false}},
-{"SPRITE" : {"name": "0019","x":1937,"y":1108,"w":103,"h":83,"rotated": false}},
-{"SPRITE" : {"name": "0020","x":1115,"y":1151,"w":117,"h":83,"rotated": false}},
-{"SPRITE" : {"name": "0021","x":1654,"y":714,"w":287,"h":360,"rotated": false}},
-{"SPRITE" : {"name": "0022","x":471,"y":571,"w":179,"h":67,"rotated": false}},
-{"SPRITE" : {"name": "0023","x":654,"y":571,"w":118,"h":75,"rotated": false}},
-{"SPRITE" : {"name": "0024","x":1966,"y":223,"w":55,"h":112,"rotated": false}},
-{"SPRITE" : {"name": "0025","x":1966,"y":4,"w":64,"h":106,"rotated": false}},
-{"SPRITE" : {"name": "0026","x":1185,"y":1029,"w":67,"h":70,"rotated": false}},
-{"SPRITE" : {"name": "0027","x":337,"y":1182,"w":122,"h":62,"rotated": false}},
-{"SPRITE" : {"name": "0028","x":1647,"y":1078,"w":174,"h":97,"rotated": false}},
-{"SPRITE" : {"name": "0029","x":360,"y":870,"w":82,"h":14,"rotated": false}},
-{"SPRITE" : {"name": "0030","x":1647,"y":1179,"w":128,"h":61,"rotated": false}},
-{"SPRITE" : {"name": "0031","x":463,"y":1182,"w":124,"h":58,"rotated": false}},
-{"SPRITE" : {"name": "0032","x":1966,"y":114,"w":59,"h":105,"rotated": false}},
-{"SPRITE" : {"name": "0033","x":1953,"y":360,"w":87,"h":160,"rotated": false}},
-{"SPRITE" : {"name": "0034","x":1945,"y":714,"w":92,"h":149,"rotated": false}},
-{"SPRITE" : {"name": "0035","x":1426,"y":641,"w":104,"h":42,"rotated": false}},
-{"SPRITE" : {"name": "0036","x":1953,"y":692,"w":73,"h":18,"rotated": false}},
-{"SPRITE" : {"name": "0037","x":1426,"y":687,"w":72,"h":19,"rotated": false}},
-{"SPRITE" : {"name": "0038","x":360,"y":848,"w":72,"h":18,"rotated": false}},
-{"SPRITE" : {"name": "0039","x":1953,"y":668,"w":73,"h":20,"rotated": false}},
-{"SPRITE" : {"name": "0040","x":471,"y":650,"w":468,"h":256,"rotated": false}},
-{"SPRITE" : {"name": "0041","x":786,"y":401,"w":510,"h":245,"rotated": false}},
-{"SPRITE" : {"name": "0042","x":4,"y":430,"w":463,"h":261,"rotated": false}},
-{"SPRITE" : {"name": "0043","x":360,"y":910,"w":418,"h":268,"rotated": false}},
-{"SPRITE" : {"name": "0044","x":1256,"y":1008,"w":387,"h":271,"rotated": false}},
-{"SPRITE" : {"name": "0045","x":1256,"y":714,"w":394,"h":290,"rotated": false}},
-{"SPRITE" : {"name": "0046","x":4,"y":695,"w":352,"h":329,"rotated": false}}
-]},
-"meta": {
-"app": "Adobe Animate",
-"version": "22.0.5.191",
-"image": "spritemap1.png",
-"format": "RGBA8888",
-"size": {"w":2044,"h":1283},
-"resolution": "1"
-}
+{"ATLAS":{"SPRITES":[
+{"SPRITE":{"name":"0","x":349,"y":867,"w":254,"h":136,"rotated":false}},
+{"SPRITE":{"name":"1","x":1648,"y":328,"w":287,"h":363,"rotated":false}},
+{"SPRITE":{"name":"2","x":1571,"y":709,"w":185,"h":117,"rotated":false}},
+{"SPRITE":{"name":"3","x":1686,"y":855,"w":86,"h":136,"rotated":false}},
+{"SPRITE":{"name":"4","x":349,"y":1021,"w":122,"h":68,"rotated":false}},
+{"SPRITE":{"name":"5","x":1774,"y":709,"w":110,"h":128,"rotated":false}},
+{"SPRITE":{"name":"6","x":621,"y":867,"w":105,"h":148,"rotated":false}},
+{"SPRITE":{"name":"7","x":1571,"y":844,"w":97,"h":131,"rotated":false}},
+{"SPRITE":{"name":"8","x":800,"y":1,"w":543,"h":308,"rotated":false}},
+{"SPRITE":{"name":"9","x":800,"y":1,"w":543,"h":308,"rotated":false}},
+{"SPRITE":{"name":"10","x":800,"y":1,"w":543,"h":308,"rotated":false}},
+{"SPRITE":{"name":"11","x":800,"y":1,"w":543,"h":308,"rotated":false}},
+{"SPRITE":{"name":"12","x":800,"y":1,"w":543,"h":308,"rotated":false}},
+{"SPRITE":{"name":"13","x":800,"y":1,"w":543,"h":308,"rotated":false}},
+{"SPRITE":{"name":"14","x":800,"y":1,"w":543,"h":308,"rotated":false}},
+{"SPRITE":{"name":"15","x":800,"y":1,"w":543,"h":308,"rotated":false}},
+{"SPRITE":{"name":"16","x":1363,"y":1,"w":543,"h":308,"rotated":false}},
+{"SPRITE":{"name":"17","x":1,"y":444,"w":771,"h":404,"rotated":false}},
+{"SPRITE":{"name":"18","x":791,"y":700,"w":302,"h":369,"rotated":false}},
+{"SPRITE":{"name":"19","x":1111,"y":957,"w":120,"h":86,"rotated":false}},
+{"SPRITE":{"name":"20","x":1790,"y":855,"w":120,"h":86,"rotated":false}},
+{"SPRITE":{"name":"21","x":1790,"y":959,"w":106,"h":86,"rotated":false}},
+{"SPRITE":{"name":"22","x":1249,"y":957,"w":120,"h":86,"rotated":false}},
+{"SPRITE":{"name":"23","x":0,"y":0,"w":781,"h":425,"rotated":false}},
+{"SPRITE":{"name":"24","x":0,"y":867,"w":331,"h":164,"rotated":false}},
+{"SPRITE":{"name":"25","x":799,"y":328,"w":413,"h":354,"rotated":false}},
+{"SPRITE":{"name":"26","x":1230,"y":328,"w":400,"h":353,"rotated":false}},
+{"SPRITE":{"name":"27","x":1387,"y":954,"w":90,"h":103,"rotated":false}},
+{"SPRITE":{"name":"28","x":1111,"y":700,"w":213,"h":239,"rotated":false}},
+{"SPRITE":{"name":"29","x":1342,"y":699,"w":211,"h":237,"rotated":false}}]},
+"meta":{
+"app":"Adobe Animate (Better TA Extension)",
+"version":"24.0.2.12",
+"image":"spritemap1.png",
+"format":"RGBA8888",
+"size":{"w":1965,"h":1089},
+"resolution":"1"
 }
+}

assets/images/characters/gf/spritemap1.json

@@ -1,57 +1,55 @@
-{"ATLAS": {"SPRITES":[ 
-{"SPRITE" : {"name": "0000","x":1623,"y":602,"w":287,"h":360,"rotated": false}},
-{"SPRITE" : {"name": "0001","x":1310,"y":269,"w":309,"h":375,"rotated": false}},
-{"SPRITE" : {"name": "0002","x":4,"y":4,"w":420,"h":359,"rotated": false}},
-{"SPRITE" : {"name": "0003","x":428,"y":4,"w":406,"h":358,"rotated": false}},
-{"SPRITE" : {"name": "0004","x":4,"y":639,"w":336,"h":165,"rotated": false}},
-{"SPRITE" : {"name": "0005","x":125,"y":808,"w":90,"h":103,"rotated": false}},
-{"SPRITE" : {"name": "0006","x":1819,"y":4,"w":215,"h":242,"rotated": false}},
-{"SPRITE" : {"name": "0007","x":1217,"y":648,"w":213,"h":240,"rotated": false}},
-{"SPRITE" : {"name": "0008","x":606,"y":660,"w":191,"h":120,"rotated": false}},
-{"SPRITE" : {"name": "0009","x":606,"y":784,"w":90,"h":151,"rotated": false}},
-{"SPRITE" : {"name": "0010","x":344,"y":660,"w":258,"h":124,"rotated": false}},
-{"SPRITE" : {"name": "0011","x":448,"y":859,"w":122,"h":67,"rotated": false}},
-{"SPRITE" : {"name": "0012","x":1914,"y":755,"w":108,"h":126,"rotated": false}},
-{"SPRITE" : {"name": "0013","x":1914,"y":602,"w":103,"h":149,"rotated": false}},
-{"SPRITE" : {"name": "0014","x":700,"y":784,"w":95,"h":130,"rotated": false}},
-{"SPRITE" : {"name": "0015","x":2038,"y":4,"w":1,"h":4,"rotated": false}},
-{"SPRITE" : {"name": "0016","x":838,"y":253,"w":468,"h":256,"rotated": false}},
-{"SPRITE" : {"name": "0017","x":838,"y":4,"w":510,"h":245,"rotated": false}},
-{"SPRITE" : {"name": "0018","x":1352,"y":4,"w":463,"h":261,"rotated": false}},
-{"SPRITE" : {"name": "0019","x":4,"y":367,"w":418,"h":268,"rotated": false}},
-{"SPRITE" : {"name": "0020","x":826,"y":513,"w":387,"h":271,"rotated": false}},
-{"SPRITE" : {"name": "0021","x":428,"y":366,"w":394,"h":290,"rotated": false}},
-{"SPRITE" : {"name": "0022","x":1623,"y":269,"w":352,"h":329,"rotated": false}},
-{"SPRITE" : {"name": "0023","x":1143,"y":788,"w":67,"h":70,"rotated": false}},
-{"SPRITE" : {"name": "0024","x":1033,"y":875,"w":122,"h":62,"rotated": false}},
-{"SPRITE" : {"name": "0025","x":1217,"y":513,"w":64,"h":106,"rotated": false}},
-{"SPRITE" : {"name": "0026","x":1979,"y":359,"w":55,"h":112,"rotated": false}},
-{"SPRITE" : {"name": "0027","x":799,"y":788,"w":98,"h":118,"rotated": false}},
-{"SPRITE" : {"name": "0028","x":1979,"y":250,"w":59,"h":105,"rotated": false}},
-{"SPRITE" : {"name": "0029","x":1434,"y":749,"w":87,"h":160,"rotated": false}},
-{"SPRITE" : {"name": "0030","x":1525,"y":749,"w":92,"h":149,"rotated": false}},
-{"SPRITE" : {"name": "0031","x":219,"y":887,"w":104,"h":42,"rotated": false}},
-{"SPRITE" : {"name": "0032","x":527,"y":811,"w":73,"h":18,"rotated": false}},
-{"SPRITE" : {"name": "0033","x":527,"y":788,"w":72,"h":19,"rotated": false}},
-{"SPRITE" : {"name": "0034","x":527,"y":833,"w":72,"h":18,"rotated": false}},
-{"SPRITE" : {"name": "0035","x":1217,"y":623,"w":73,"h":20,"rotated": false}},
-{"SPRITE" : {"name": "0036","x":344,"y":788,"w":179,"h":67,"rotated": false}},
-{"SPRITE" : {"name": "0037","x":219,"y":808,"w":118,"h":75,"rotated": false}},
-{"SPRITE" : {"name": "0038","x":901,"y":875,"w":128,"h":61,"rotated": false}},
-{"SPRITE" : {"name": "0039","x":1914,"y":885,"w":124,"h":58,"rotated": false}},
-{"SPRITE" : {"name": "0040","x":901,"y":788,"w":117,"h":83,"rotated": false}},
-{"SPRITE" : {"name": "0041","x":1022,"y":788,"w":117,"h":83,"rotated": false}},
-{"SPRITE" : {"name": "0042","x":341,"y":859,"w":103,"h":83,"rotated": false}},
-{"SPRITE" : {"name": "0043","x":4,"y":808,"w":117,"h":83,"rotated": false}},
-{"SPRITE" : {"name": "0044","x":1434,"y":648,"w":174,"h":97,"rotated": false}},
-{"SPRITE" : {"name": "0045","x":1819,"y":250,"w":82,"h":14,"rotated": false}}
-]},
-"meta": {
-"app": "Adobe Animate",
-"version": "21.0.1.37179",
-"image": "spritemap1.png",
-"format": "RGBA8888",
-"size": {"w":2043,"h":966},
-"resolution": "1"
-}
+{"ATLAS":{"SPRITES":[
+{"SPRITE":{"name":"0","x":1129,"y":977,"w":86,"h":17,"rotated":false}},
+{"SPRITE":{"name":"1","x":1690,"y":1012,"w":86,"h":17,"rotated":false}},
+{"SPRITE":{"name":"2","x":1656,"y":852,"w":126,"h":64,"rotated":false}},
+{"SPRITE":{"name":"3","x":1915,"y":841,"w":121,"h":77,"rotated":false}},
+{"SPRITE":{"name":"4","x":1382,"y":980,"w":131,"h":64,"rotated":false}},
+{"SPRITE":{"name":"5","x":1132,"y":283,"w":420,"h":270,"rotated":false}},
+{"SPRITE":{"name":"6","x":1570,"y":277,"w":389,"h":273,"rotated":false}},
+{"SPRITE":{"name":"7","x":0,"y":743,"w":397,"h":292,"rotated":false}},
+{"SPRITE":{"name":"8","x":431,"y":267,"w":354,"h":332,"rotated":false}},
+{"SPRITE":{"name":"9","x":1592,"y":568,"w":190,"h":117,"rotated":false}},
+{"SPRITE":{"name":"10","x":1444,"y":826,"w":86,"h":136,"rotated":false}},
+{"SPRITE":{"name":"11","x":723,"y":852,"w":260,"h":123,"rotated":false}},
+{"SPRITE":{"name":"12","x":1548,"y":947,"w":124,"h":68,"rotated":false}},
+{"SPRITE":{"name":"13","x":1001,"y":852,"w":110,"h":128,"rotated":false}},
+{"SPRITE":{"name":"14","x":1933,"y":0,"w":106,"h":148,"rotated":false}},
+{"SPRITE":{"name":"15","x":1129,"y":828,"w":97,"h":131,"rotated":false}},
+{"SPRITE":{"name":"16","x":803,"y":283,"w":311,"h":369,"rotated":false}},
+{"SPRITE":{"name":"17","x":1592,"y":703,"w":167,"h":101,"rotated":false}},
+{"SPRITE":{"name":"18","x":1835,"y":852,"w":57,"h":105,"rotated":false}},
+{"SPRITE":{"name":"19","x":1977,"y":270,"w":66,"h":104,"rotated":false}},
+{"SPRITE":{"name":"20","x":1910,"y":936,"w":70,"h":73,"rotated":false}},
+{"SPRITE":{"name":"21","x":1244,"y":828,"w":182,"h":69,"rotated":false}},
+{"SPRITE":{"name":"22","x":1690,"y":934,"w":127,"h":60,"rotated":false}},
+{"SPRITE":{"name":"23","x":418,"y":617,"w":287,"h":363,"rotated":false}},
+{"SPRITE":{"name":"24","x":1244,"y":915,"w":120,"h":86,"rotated":false}},
+{"SPRITE":{"name":"25","x":1777,"y":748,"w":120,"h":86,"rotated":false}},
+{"SPRITE":{"name":"26","x":1933,"y":166,"w":106,"h":86,"rotated":false}},
+{"SPRITE":{"name":"27","x":1915,"y":737,"w":120,"h":86,"rotated":false}},
+{"SPRITE":{"name":"28","x":1800,"y":568,"w":89,"h":162,"rotated":false}},
+{"SPRITE":{"name":"29","x":1907,"y":568,"w":95,"h":151,"rotated":false}},
+{"SPRITE":{"name":"30","x":1977,"y":392,"w":61,"h":107,"rotated":false}},
+{"SPRITE":{"name":"31","x":415,"y":998,"w":107,"h":45,"rotated":false}},
+{"SPRITE":{"name":"32","x":727,"y":993,"w":77,"h":22,"rotated":false}},
+{"SPRITE":{"name":"33","x":634,"y":998,"w":75,"h":23,"rotated":false}},
+{"SPRITE":{"name":"34","x":822,"y":993,"w":75,"h":22,"rotated":false}},
+{"SPRITE":{"name":"35","x":540,"y":998,"w":76,"h":24,"rotated":false}},
+{"SPRITE":{"name":"36","x":1445,"y":0,"w":470,"h":259,"rotated":false}},
+{"SPRITE":{"name":"37","x":431,"y":0,"w":513,"h":249,"rotated":false}},
+{"SPRITE":{"name":"38","x":962,"y":0,"w":465,"h":265,"rotated":false}},
+{"SPRITE":{"name":"39","x":723,"y":670,"w":331,"h":164,"rotated":false}},
+{"SPRITE":{"name":"40","x":0,"y":0,"w":413,"h":354,"rotated":false}},
+{"SPRITE":{"name":"41","x":0,"y":372,"w":400,"h":353,"rotated":false}},
+{"SPRITE":{"name":"42","x":1548,"y":826,"w":90,"h":103,"rotated":false}},
+{"SPRITE":{"name":"43","x":1132,"y":571,"w":213,"h":239,"rotated":false}},
+{"SPRITE":{"name":"44","x":1363,"y":571,"w":211,"h":237,"rotated":false}}]},
+"meta":{
+"app":"Adobe Animate (Better TA Extension)",
+"version":"24.0.2.12",
+"image":"spritemap1.png",
+"format":"RGBA8888",
+"size":{"w":2064,"h":1065},
+"resolution":"1"
 }
+}

assets/images/characters/pico-speakers/spritemap1.json

@@ -1,60 +1,60 @@
-{"ATLAS": {"SPRITES":[ 
-{"SPRITE" : {"name": "0000","x":4076,"y":2,"w":9,"h":12,"rotated": false}},
-{"SPRITE" : {"name": "0001","x":1957,"y":2,"w":524,"h":501,"rotated": false}},
-{"SPRITE" : {"name": "0002","x":716,"y":2,"w":721,"h":621,"rotated": false}},
-{"SPRITE" : {"name": "0003","x":2331,"y":505,"w":139,"h":109,"rotated": false}},
-{"SPRITE" : {"name": "0004","x":3244,"y":725,"w":303,"h":170,"rotated": false}},
-{"SPRITE" : {"name": "0005","x":1691,"y":516,"w":248,"h":277,"rotated": false}},
-{"SPRITE" : {"name": "0006","x":2495,"y":843,"w":173,"h":229,"rotated": false}},
-{"SPRITE" : {"name": "0007","x":2,"y":642,"w":262,"h":221,"rotated": false}},
-{"SPRITE" : {"name": "0008","x":2331,"y":616,"w":118,"h":117,"rotated": false}},
-{"SPRITE" : {"name": "0009","x":3549,"y":865,"w":261,"h":139,"rotated": false}},
-{"SPRITE" : {"name": "0010","x":3209,"y":897,"w":202,"h":122,"rotated": false}},
-{"SPRITE" : {"name": "0011","x":580,"y":913,"w":202,"h":122,"rotated": false}},
-{"SPRITE" : {"name": "0012","x":2831,"y":304,"w":45,"h":42,"rotated": false}},
-{"SPRITE" : {"name": "0013","x":1957,"y":505,"w":372,"h":311,"rotated": false}},
-{"SPRITE" : {"name": "0014","x":1439,"y":516,"w":250,"h":325,"rotated": false}},
-{"SPRITE" : {"name": "0015","x":716,"y":625,"w":235,"h":286,"rotated": false}},
-{"SPRITE" : {"name": "0016","x":953,"y":625,"w":245,"h":249,"rotated": false}},
-{"SPRITE" : {"name": "0017","x":3644,"y":373,"w":136,"h":133,"rotated": false}},
-{"SPRITE" : {"name": "0018","x":2331,"y":735,"w":150,"h":91,"rotated": false}},
-{"SPRITE" : {"name": "0019","x":3644,"y":508,"w":151,"h":95,"rotated": false}},
-{"SPRITE" : {"name": "0020","x":784,"y":913,"w":140,"h":90,"rotated": false}},
-{"SPRITE" : {"name": "0021","x":3644,"y":605,"w":149,"h":92,"rotated": false}},
-{"SPRITE" : {"name": "0022","x":2670,"y":932,"w":144,"h":87,"rotated": false}},
-{"SPRITE" : {"name": "0023","x":2670,"y":843,"w":152,"h":87,"rotated": false}},
-{"SPRITE" : {"name": "0024","x":4087,"y":2,"w":1,"h":4,"rotated": false}},
-{"SPRITE" : {"name": "0025","x":2831,"y":373,"w":411,"h":352,"rotated": false}},
-{"SPRITE" : {"name": "0026","x":3244,"y":373,"w":398,"h":350,"rotated": false}},
-{"SPRITE" : {"name": "0027","x":266,"y":642,"w":329,"h":162,"rotated": false}},
-{"SPRITE" : {"name": "0028","x":597,"y":642,"w":90,"h":103,"rotated": false}},
-{"SPRITE" : {"name": "0029","x":1200,"y":625,"w":211,"h":236,"rotated": false}},
-{"SPRITE" : {"name": "0030","x":2831,"y":727,"w":208,"h":235,"rotated": false}},
-{"SPRITE" : {"name": "0031","x":2483,"y":2,"w":738,"h":300,"rotated": false}},
-{"SPRITE" : {"name": "0032","x":2483,"y":304,"w":346,"h":537,"rotated": false}},
-{"SPRITE" : {"name": "0033","x":2,"y":865,"w":235,"h":158,"rotated": false}},
-{"SPRITE" : {"name": "0034","x":3812,"y":865,"w":216,"h":141,"rotated": false}},
-{"SPRITE" : {"name": "0035","x":2000,"y":818,"w":299,"h":155,"rotated": false}},
-{"SPRITE" : {"name": "0036","x":1200,"y":863,"w":179,"h":208,"rotated": false}},
-{"SPRITE" : {"name": "0037","x":1691,"y":818,"w":307,"h":154,"rotated": false}},
-{"SPRITE" : {"name": "0038","x":3644,"y":702,"w":320,"h":161,"rotated": false}},
-{"SPRITE" : {"name": "0039","x":266,"y":806,"w":312,"h":155,"rotated": false}},
-{"SPRITE" : {"name": "0040","x":239,"y":963,"w":224,"h":108,"rotated": false}},
-{"SPRITE" : {"name": "0041","x":3223,"y":2,"w":580,"h":369,"rotated": false}},
-{"SPRITE" : {"name": "0042","x":3805,"y":2,"w":269,"h":698,"rotated": false}},
-{"SPRITE" : {"name": "0043","x":1413,"y":843,"w":205,"h":222,"rotated": false}},
-{"SPRITE" : {"name": "0044","x":3041,"y":727,"w":166,"h":292,"rotated": false}},
-{"SPRITE" : {"name": "0045","x":953,"y":876,"w":203,"h":137,"rotated": false}},
-{"SPRITE" : {"name": "0046","x":1439,"y":2,"w":516,"h":512,"rotated": false}},
-{"SPRITE" : {"name": "0047","x":2,"y":2,"w":712,"h":638,"rotated": false}},
-{"SPRITE" : {"name": "0048","x":2301,"y":843,"w":192,"h":227,"rotated": false}}
-]},
-"meta": {
-"app": "Adobe Animate",
-"version": "21.0.1.37179",
-"image": "spritemap1.png",
-"format": "RGBA8888",
-"size": {"w":4090,"h":1074},
-"resolution": "1"
-}
+{"ATLAS":{"SPRITES":[
+{"SPRITE":{"name":"0","x":2834,"y":332,"w":12,"h":15,"rotated":false}},
+{"SPRITE":{"name":"1","x":1476,"y":532,"w":527,"h":503,"rotated":false}},
+{"SPRITE":{"name":"2","x":733,"y":0,"w":725,"h":623,"rotated":false}},
+{"SPRITE":{"name":"3","x":0,"y":659,"w":741,"h":304,"rotated":false}},
+{"SPRITE":{"name":"4","x":2311,"y":0,"w":349,"h":540,"rotated":false}},
+{"SPRITE":{"name":"5","x":759,"y":641,"w":583,"h":373,"rotated":false}},
+{"SPRITE":{"name":"6","x":2021,"y":0,"w":272,"h":702,"rotated":false}},
+{"SPRITE":{"name":"7","x":1476,"y":0,"w":518,"h":514,"rotated":false}},
+{"SPRITE":{"name":"8","x":0,"y":0,"w":715,"h":641,"rotated":false}},
+{"SPRITE":{"name":"9","x":619,"y":1032,"w":205,"h":122,"rotated":false}},
+{"SPRITE":{"name":"10","x":842,"y":1032,"w":205,"h":122,"rotated":false}},
+{"SPRITE":{"name":"11","x":2311,"y":558,"w":115,"h":112,"rotated":false}},
+{"SPRITE":{"name":"12","x":2801,"y":947,"w":305,"h":172,"rotated":false}},
+{"SPRITE":{"name":"13","x":2678,"y":0,"w":375,"h":314,"rotated":false}},
+{"SPRITE":{"name":"14","x":2870,"y":332,"w":252,"h":328,"rotated":false}},
+{"SPRITE":{"name":"15","x":3071,"y":0,"w":239,"h":290,"rotated":false}},
+{"SPRITE":{"name":"16","x":3135,"y":678,"w":220,"h":246,"rotated":false}},
+{"SPRITE":{"name":"17","x":3597,"y":248,"w":173,"h":231,"rotated":false}},
+{"SPRITE":{"name":"18","x":3769,"y":0,"w":225,"h":190,"rotated":false}},
+{"SPRITE":{"name":"19","x":1290,"y":1053,"w":131,"h":81,"rotated":false}},
+{"SPRITE":{"name":"20","x":3905,"y":814,"w":132,"h":85,"rotated":false}},
+{"SPRITE":{"name":"21","x":1733,"y":1053,"w":122,"h":80,"rotated":false}},
+{"SPRITE":{"name":"22","x":3905,"y":917,"w":129,"h":82,"rotated":false}},
+{"SPRITE":{"name":"23","x":1589,"y":1053,"w":126,"h":78,"rotated":false}},
+{"SPRITE":{"name":"24","x":1439,"y":1053,"w":132,"h":77,"rotated":false}},
+{"SPRITE":{"name":"25","x":3778,"y":814,"w":109,"h":107,"rotated":false}},
+{"SPRITE":{"name":"26","x":3124,"y":1123,"w":3,"h":7,"rotated":false}},
+{"SPRITE":{"name":"27","x":3145,"y":1123,"w":3,"h":7,"rotated":false}},
+{"SPRITE":{"name":"28","x":3673,"y":497,"w":260,"h":141,"rotated":false}},
+{"SPRITE":{"name":"29","x":3788,"y":208,"w":237,"h":161,"rotated":false}},
+{"SPRITE":{"name":"30","x":3542,"y":660,"w":218,"h":144,"rotated":false}},
+{"SPRITE":{"name":"31","x":3124,"y":947,"w":301,"h":158,"rotated":false}},
+{"SPRITE":{"name":"32","x":3371,"y":498,"w":284,"h":144,"rotated":false}},
+{"SPRITE":{"name":"33","x":0,"y":981,"w":295,"h":150,"rotated":false}},
+{"SPRITE":{"name":"34","x":313,"y":981,"w":288,"h":145,"rotated":false}},
+{"SPRITE":{"name":"35","x":3443,"y":942,"w":182,"h":212,"rotated":false}},
+{"SPRITE":{"name":"36","x":3371,"y":255,"w":208,"h":225,"rotated":false}},
+{"SPRITE":{"name":"37","x":3373,"y":660,"w":151,"h":264,"rotated":false}},
+{"SPRITE":{"name":"38","x":3778,"y":656,"w":206,"h":140,"rotated":false}},
+{"SPRITE":{"name":"39","x":3557,"y":0,"w":194,"h":230,"rotated":false}},
+{"SPRITE":{"name":"40","x":2678,"y":485,"w":47,"h":44,"rotated":false}},
+{"SPRITE":{"name":"41","x":2870,"y":678,"w":247,"h":251,"rotated":false}},
+{"SPRITE":{"name":"42","x":2678,"y":332,"w":138,"h":135,"rotated":false}},
+{"SPRITE":{"name":"43","x":1065,"y":1053,"w":207,"h":101,"rotated":false}},
+{"SPRITE":{"name":"44","x":2452,"y":947,"w":331,"h":164,"rotated":false}},
+{"SPRITE":{"name":"45","x":2021,"y":720,"w":413,"h":354,"rotated":false}},
+{"SPRITE":{"name":"46","x":2452,"y":558,"w":400,"h":353,"rotated":false}},
+{"SPRITE":{"name":"47","x":3951,"y":387,"w":90,"h":103,"rotated":false}},
+{"SPRITE":{"name":"48","x":3140,"y":308,"w":213,"h":239,"rotated":false}},
+{"SPRITE":{"name":"49","x":3328,"y":0,"w":211,"h":237,"rotated":false}}]},
+"meta":{
+"app":"Adobe Animate (Better TA Extension)",
+"version":"24.0.2.12",
+"image":"spritemap1.png",
+"format":"RGBA8888",
+"size":{"w":4061,"h":1154},
+"resolution":"1"
 }
+}

assets/images/game/cutscenes/tank/stress-pico/spritemap1.json

@@ -1,145 +1,241 @@
-{"ATLAS": {"SPRITES":[ 
-{"SPRITE" : {"name": "0000","x":2847,"y":969,"w":327,"h":397,"rotated": false}},
-{"SPRITE" : {"name": "0001","x":2441,"y":894,"w":110,"h":159,"rotated": false}},
-{"SPRITE" : {"name": "0002","x":1709,"y":1631,"w":197,"h":185,"rotated": false}},
-{"SPRITE" : {"name": "0003","x":408,"y":1773,"w":92,"h":155,"rotated": false}},
-{"SPRITE" : {"name": "0004","x":236,"y":1639,"w":274,"h":132,"rotated": false}},
-{"SPRITE" : {"name": "0005","x":3427,"y":1495,"w":133,"h":74,"rotated": false}},
-{"SPRITE" : {"name": "0006","x":3270,"y":540,"w":121,"h":162,"rotated": false}},
-{"SPRITE" : {"name": "0007","x":359,"y":649,"w":518,"h":294,"rotated": false}},
-{"SPRITE" : {"name": "0008","x":1957,"y":2,"w":775,"h":483,"rotated": false}},
-{"SPRITE" : {"name": "0009","x":1014,"y":2,"w":941,"h":607,"rotated": false}},
-{"SPRITE" : {"name": "0010","x":2,"y":2,"w":1010,"h":645,"rotated": false}},
-{"SPRITE" : {"name": "0011","x":4059,"y":2,"w":20,"h":142,"rotated": false}},
-{"SPRITE" : {"name": "0012","x":4035,"y":616,"w":40,"h":83,"rotated": false}},
-{"SPRITE" : {"name": "0013","x":2755,"y":1508,"w":64,"h":57,"rotated": false}},
-{"SPRITE" : {"name": "0014","x":3176,"y":1171,"w":91,"h":48,"rotated": false}},
-{"SPRITE" : {"name": "0015","x":3245,"y":1737,"w":88,"h":41,"rotated": false}},
-{"SPRITE" : {"name": "0016","x":3064,"y":1368,"w":109,"h":93,"rotated": false}},
-{"SPRITE" : {"name": "0017","x":3402,"y":2,"w":655,"h":434,"rotated": false}},
-{"SPRITE" : {"name": "0018","x":1957,"y":487,"w":626,"h":405,"rotated": false}},
-{"SPRITE" : {"name": "0019","x":3402,"y":438,"w":631,"h":438,"rotated": false}},
-{"SPRITE" : {"name": "0020","x":1170,"y":1211,"w":393,"h":287,"rotated": false}},
-{"SPRITE" : {"name": "0021","x":2847,"y":540,"w":421,"h":427,"rotated": false}},
-{"SPRITE" : {"name": "0022","x":2734,"y":2,"w":666,"h":536,"rotated": false}},
-{"SPRITE" : {"name": "0023","x":542,"y":1480,"w":224,"h":221,"rotated": false}},
-{"SPRITE" : {"name": "0024","x":3657,"y":1736,"w":186,"h":175,"rotated": false}},
-{"SPRITE" : {"name": "0025","x":4035,"y":764,"w":56,"h":52,"rotated": false}},
-{"SPRITE" : {"name": "0026","x":502,"y":1876,"w":126,"h":104,"rotated": false}},
-{"SPRITE" : {"name": "0027","x":1709,"y":1818,"w":135,"h":104,"rotated": false}},
-{"SPRITE" : {"name": "0028","x":2,"y":1440,"w":232,"h":236,"rotated": false}},
-{"SPRITE" : {"name": "0029","x":3938,"y":1437,"w":139,"h":109,"rotated": false}},
-{"SPRITE" : {"name": "0030","x":2755,"y":1627,"w":235,"h":158,"rotated": false}},
-{"SPRITE" : {"name": "0031","x":1147,"y":1500,"w":198,"h":233,"rotated": false}},
-{"SPRITE" : {"name": "0032","x":2,"y":1860,"w":118,"h":117,"rotated": false}},
-{"SPRITE" : {"name": "0033","x":1565,"y":1398,"w":262,"h":221,"rotated": false}},
-{"SPRITE" : {"name": "0034","x":3845,"y":1736,"w":222,"h":145,"rotated": false}},
-{"SPRITE" : {"name": "0035","x":979,"y":1480,"w":166,"h":292,"rotated": false}},
-{"SPRITE" : {"name": "0036","x":3657,"y":1592,"w":276,"h":142,"rotated": false}},
-{"SPRITE" : {"name": "0037","x":925,"y":1774,"w":203,"h":138,"rotated": false}},
-{"SPRITE" : {"name": "0038","x":236,"y":1467,"w":304,"h":170,"rotated": false}},
-{"SPRITE" : {"name": "0039","x":4081,"y":2,"w":1,"h":4,"rotated": false}},
-{"SPRITE" : {"name": "0040","x":2441,"y":1055,"w":135,"h":127,"rotated": false}},
-{"SPRITE" : {"name": "0041","x":2,"y":1678,"w":195,"h":180,"rotated": false}},
-{"SPRITE" : {"name": "0042","x":2751,"y":1787,"w":160,"h":144,"rotated": false}},
-{"SPRITE" : {"name": "0043","x":713,"y":945,"w":243,"h":261,"rotated": false}},
-{"SPRITE" : {"name": "0044","x":2375,"y":1508,"w":378,"h":121,"rotated": false}},
-{"SPRITE" : {"name": "0045","x":3064,"y":1495,"w":361,"h":128,"rotated": false}},
-{"SPRITE" : {"name": "0046","x":713,"y":1211,"w":455,"h":267,"rotated": false}},
-{"SPRITE" : {"name": "0047","x":2,"y":1112,"w":272,"h":326,"rotated": false}},
-{"SPRITE" : {"name": "0048","x":3710,"y":878,"w":249,"h":557,"rotated": false}},
-{"SPRITE" : {"name": "0049","x":2585,"y":540,"w":260,"h":701,"rotated": false}},
-{"SPRITE" : {"name": "0050","x":1014,"y":611,"w":291,"h":598,"rotated": false}},
-{"SPRITE" : {"name": "0051","x":1307,"y":611,"w":315,"h":540,"rotated": false}},
-{"SPRITE" : {"name": "0052","x":2,"y":649,"w":355,"h":461,"rotated": false}},
-{"SPRITE" : {"name": "0053","x":359,"y":945,"w":352,"h":373,"rotated": false}},
-{"SPRITE" : {"name": "0054","x":3064,"y":1625,"w":347,"h":110,"rotated": false}},
-{"SPRITE" : {"name": "0055","x":2039,"y":1248,"w":379,"h":216,"rotated": false}},
-{"SPRITE" : {"name": "0056","x":2827,"y":1368,"w":235,"h":257,"rotated": false}},
-{"SPRITE" : {"name": "0057","x":2100,"y":1879,"w":140,"h":92,"rotated": false}},
-{"SPRITE" : {"name": "0058","x":776,"y":1886,"w":119,"h":79,"rotated": false}},
-{"SPRITE" : {"name": "0059","x":1565,"y":1249,"w":434,"h":147,"rotated": false}},
-{"SPRITE" : {"name": "0060","x":276,"y":1320,"w":433,"h":145,"rotated": false}},
-{"SPRITE" : {"name": "0061","x":3270,"y":878,"w":438,"h":342,"rotated": false}},
-{"SPRITE" : {"name": "0062","x":3176,"y":1222,"w":385,"h":271,"rotated": false}},
-{"SPRITE" : {"name": "0063","x":3563,"y":1437,"w":373,"h":153,"rotated": false}},
-{"SPRITE" : {"name": "0064","x":3245,"y":1786,"w":202,"h":122,"rotated": false}},
-{"SPRITE" : {"name": "0065","x":3449,"y":1786,"w":202,"h":122,"rotated": false}},
-{"SPRITE" : {"name": "0066","x":3064,"y":1861,"w":150,"h":91,"rotated": false}},
-{"SPRITE" : {"name": "0067","x":3938,"y":1548,"w":151,"h":95,"rotated": false}},
-{"SPRITE" : {"name": "0068","x":3845,"y":1883,"w":140,"h":90,"rotated": false}},
-{"SPRITE" : {"name": "0069","x":2913,"y":1861,"w":149,"h":92,"rotated": false}},
-{"SPRITE" : {"name": "0070","x":630,"y":1886,"w":144,"h":87,"rotated": false}},
-{"SPRITE" : {"name": "0071","x":3935,"y":1645,"w":152,"h":87,"rotated": false}},
-{"SPRITE" : {"name": "0072","x":2441,"y":1243,"w":384,"h":263,"rotated": false}},
-{"SPRITE" : {"name": "0073","x":1624,"y":611,"w":248,"h":277,"rotated": false}},
-{"SPRITE" : {"name": "0074","x":1624,"y":894,"w":413,"h":353,"rotated": false}},
-{"SPRITE" : {"name": "0075","x":2039,"y":894,"w":400,"h":352,"rotated": false}},
-{"SPRITE" : {"name": "0076","x":1829,"y":1466,"w":330,"h":163,"rotated": false}},
-{"SPRITE" : {"name": "0077","x":3987,"y":1883,"w":90,"h":103,"rotated": false}},
-{"SPRITE" : {"name": "0078","x":2161,"y":1466,"w":212,"h":238,"rotated": false}},
-{"SPRITE" : {"name": "0079","x":768,"y":1480,"w":209,"h":236,"rotated": false}},
-{"SPRITE" : {"name": "0080","x":2242,"y":1879,"w":86,"h":84,"rotated": false}},
-{"SPRITE" : {"name": "0081","x":879,"y":649,"w":126,"h":148,"rotated": false}},
-{"SPRITE" : {"name": "0082","x":1908,"y":1631,"w":216,"h":168,"rotated": false}},
-{"SPRITE" : {"name": "0083","x":2575,"y":1631,"w":174,"h":192,"rotated": false}},
-{"SPRITE" : {"name": "0084","x":1130,"y":1901,"w":106,"h":75,"rotated": false}},
-{"SPRITE" : {"name": "0085","x":3961,"y":1367,"w":129,"h":63,"rotated": false}},
-{"SPRITE" : {"name": "0086","x":1829,"y":1398,"w":158,"h":60,"rotated": false}},
-{"SPRITE" : {"name": "0087","x":3270,"y":704,"w":123,"h":148,"rotated": false}},
-{"SPRITE" : {"name": "0088","x":3961,"y":878,"w":123,"h":148,"rotated": false}},
-{"SPRITE" : {"name": "0089","x":199,"y":1773,"w":207,"h":142,"rotated": false}},
-{"SPRITE" : {"name": "0090","x":1238,"y":1901,"w":91,"h":53,"rotated": false}},
-{"SPRITE" : {"name": "0091","x":276,"y":1112,"w":65,"h":96,"rotated": false}},
-{"SPRITE" : {"name": "0092","x":276,"y":1210,"w":65,"h":96,"rotated": false}},
-{"SPRITE" : {"name": "0093","x":2518,"y":1825,"w":136,"h":102,"rotated": false}},
-{"SPRITE" : {"name": "0094","x":1537,"y":1857,"w":136,"h":102,"rotated": false}},
-{"SPRITE" : {"name": "0095","x":3427,"y":1592,"w":228,"h":192,"rotated": false}},
-{"SPRITE" : {"name": "0096","x":1541,"y":1621,"w":166,"h":234,"rotated": false}},
-{"SPRITE" : {"name": "0097","x":512,"y":1703,"w":205,"h":171,"rotated": false}},
-{"SPRITE" : {"name": "0098","x":2126,"y":1706,"w":205,"h":171,"rotated": false}},
-{"SPRITE" : {"name": "0099","x":719,"y":1718,"w":204,"h":166,"rotated": false}},
-{"SPRITE" : {"name": "0100","x":1147,"y":1735,"w":206,"h":164,"rotated": false}},
-{"SPRITE" : {"name": "0101","x":1874,"y":611,"w":79,"h":185,"rotated": false}},
-{"SPRITE" : {"name": "0102","x":3176,"y":969,"w":83,"h":200,"rotated": false}},
-{"SPRITE" : {"name": "0103","x":3563,"y":1222,"w":86,"h":180,"rotated": false}},
-{"SPRITE" : {"name": "0104","x":3961,"y":1028,"w":89,"h":186,"rotated": false}},
-{"SPRITE" : {"name": "0105","x":2375,"y":1631,"w":198,"h":183,"rotated": false}},
-{"SPRITE" : {"name": "0106","x":1908,"y":1801,"w":190,"h":120,"rotated": false}},
-{"SPRITE" : {"name": "0107","x":2656,"y":1825,"w":86,"h":145,"rotated": false}},
-{"SPRITE" : {"name": "0108","x":1355,"y":1724,"w":180,"h":170,"rotated": false}},
-{"SPRITE" : {"name": "0109","x":3961,"y":1216,"w":111,"h":149,"rotated": false}},
-{"SPRITE" : {"name": "0110","x":4035,"y":516,"w":39,"h":98,"rotated": false}},
-{"SPRITE" : {"name": "0111","x":1307,"y":1153,"w":118,"h":47,"rotated": false}},
-{"SPRITE" : {"name": "0112","x":1427,"y":1153,"w":120,"h":43,"rotated": false}},
-{"SPRITE" : {"name": "0113","x":2441,"y":1184,"w":120,"h":41,"rotated": false}},
-{"SPRITE" : {"name": "0114","x":3216,"y":1910,"w":95,"h":33,"rotated": false}},
-{"SPRITE" : {"name": "0115","x":3563,"y":1404,"w":95,"h":31,"rotated": false}},
-{"SPRITE" : {"name": "0116","x":3563,"y":1404,"w":95,"h":31,"rotated": false}},
-{"SPRITE" : {"name": "0117","x":2330,"y":1906,"w":95,"h":34,"rotated": false}},
-{"SPRITE" : {"name": "0118","x":2585,"y":487,"w":131,"h":47,"rotated": false}},
-{"SPRITE" : {"name": "0119","x":4059,"y":258,"w":31,"h":18,"rotated": false}},
-{"SPRITE" : {"name": "0120","x":1355,"y":1896,"w":122,"h":66,"rotated": false}},
-{"SPRITE" : {"name": "0121","x":2992,"y":1737,"w":251,"h":122,"rotated": false}},
-{"SPRITE" : {"name": "0122","x":879,"y":799,"w":114,"h":133,"rotated": false}},
-{"SPRITE" : {"name": "0123","x":1347,"y":1500,"w":192,"h":222,"rotated": false}},
-{"SPRITE" : {"name": "0124","x":4035,"y":818,"w":39,"h":34,"rotated": false}},
-{"SPRITE" : {"name": "0125","x":4035,"y":701,"w":50,"h":61,"rotated": false}},
-{"SPRITE" : {"name": "0126","x":1874,"y":798,"w":64,"h":78,"rotated": false}},
-{"SPRITE" : {"name": "0127","x":4035,"y":438,"w":52,"h":76,"rotated": false}},
-{"SPRITE" : {"name": "0128","x":958,"y":934,"w":46,"h":63,"rotated": false}},
-{"SPRITE" : {"name": "0129","x":4059,"y":146,"w":30,"h":41,"rotated": false}},
-{"SPRITE" : {"name": "0130","x":4059,"y":189,"w":23,"h":35,"rotated": false}},
-{"SPRITE" : {"name": "0131","x":4059,"y":226,"w":20,"h":30,"rotated": false}},
-{"SPRITE" : {"name": "0132","x":4059,"y":278,"w":17,"h":22,"rotated": false}},
-{"SPRITE" : {"name": "0133","x":2333,"y":1816,"w":183,"h":88,"rotated": false}}
-]},
-"meta": {
-"app": "Adobe Animate",
-"version": "21.0.1.37179",
-"image": "spritemap1.png",
-"format": "RGBA8888",
-"size": {"w":4093,"h":1988},
-"resolution": "1"
-}
+{"ATLAS":{"SPRITES":[
+{"SPRITE":{"name":"0","x":2564,"y":2,"w":23,"h":144,"rotated":false}},
+{"SPRITE":{"name":"1","x":3024,"y":522,"w":42,"h":85,"rotated":false}},
+{"SPRITE":{"name":"2","x":2598,"y":1211,"w":67,"h":60,"rotated":false}},
+{"SPRITE":{"name":"3","x":3964,"y":932,"w":93,"h":51,"rotated":false}},
+{"SPRITE":{"name":"4","x":3691,"y":1016,"w":91,"h":43,"rotated":false}},
+{"SPRITE":{"name":"5","x":3877,"y":270,"w":111,"h":95,"rotated":false}},
+{"SPRITE":{"name":"6","x":3449,"y":1124,"w":113,"h":127,"rotated":false}},
+{"SPRITE":{"name":"7","x":367,"y":1129,"w":382,"h":123,"rotated":false}},
+{"SPRITE":{"name":"8","x":2,"y":1122,"w":364,"h":131,"rotated":false}},
+{"SPRITE":{"name":"9","x":2,"y":1122,"w":364,"h":131,"rotated":false}},
+{"SPRITE":{"name":"10","x":2437,"y":1136,"w":31,"h":31,"rotated":false}},
+{"SPRITE":{"name":"11","x":1599,"y":1133,"w":350,"h":113,"rotated":false}},
+{"SPRITE":{"name":"12","x":1599,"y":1133,"w":350,"h":113,"rotated":false}},
+{"SPRITE":{"name":"13","x":2670,"y":1175,"w":142,"h":94,"rotated":false}},
+{"SPRITE":{"name":"14","x":3877,"y":366,"w":122,"h":82,"rotated":false}},
+{"SPRITE":{"name":"15","x":1162,"y":1112,"w":436,"h":151,"rotated":false}},
+{"SPRITE":{"name":"16","x":1599,"y":985,"w":435,"h":147,"rotated":false}},
+{"SPRITE":{"name":"17","x":1599,"y":985,"w":435,"h":147,"rotated":false}},
+{"SPRITE":{"name":"18","x":779,"y":692,"w":440,"h":344,"rotated":false}},
+{"SPRITE":{"name":"19","x":1550,"y":711,"w":388,"h":273,"rotated":false}},
+{"SPRITE":{"name":"20","x":2106,"y":2,"w":376,"h":155,"rotated":false}},
+{"SPRITE":{"name":"21","x":2,"y":2,"w":932,"h":689,"rotated":false}},
+{"SPRITE":{"name":"22","x":3907,"y":1171,"w":48,"h":36,"rotated":false}},
+{"SPRITE":{"name":"23","x":3907,"y":1171,"w":48,"h":36,"rotated":false}},
+{"SPRITE":{"name":"24","x":3858,"y":1206,"w":48,"h":40,"rotated":false}},
+{"SPRITE":{"name":"25","x":3762,"y":1093,"w":48,"h":64,"rotated":false}},
+{"SPRITE":{"name":"26","x":3713,"y":1060,"w":48,"h":66,"rotated":false}},
+{"SPRITE":{"name":"27","x":3885,"y":1095,"w":48,"h":67,"rotated":false}},
+{"SPRITE":{"name":"28","x":2106,"y":158,"w":48,"h":69,"rotated":false}},
+{"SPRITE":{"name":"29","x":2481,"y":498,"w":48,"h":71,"rotated":false}},
+{"SPRITE":{"name":"30","x":1162,"y":1037,"w":48,"h":73,"rotated":false}},
+{"SPRITE":{"name":"31","x":4018,"y":188,"w":48,"h":76,"rotated":false}},
+{"SPRITE":{"name":"32","x":3455,"y":856,"w":48,"h":78,"rotated":false}},
+{"SPRITE":{"name":"33","x":3785,"y":1011,"w":48,"h":81,"rotated":false}},
+{"SPRITE":{"name":"34","x":4002,"y":1164,"w":48,"h":82,"rotated":false}},
+{"SPRITE":{"name":"35","x":3953,"y":1083,"w":48,"h":87,"rotated":false}},
+{"SPRITE":{"name":"36","x":3904,"y":1004,"w":48,"h":90,"rotated":false}},
+{"SPRITE":{"name":"37","x":4013,"y":1070,"w":48,"h":93,"rotated":false}},
+{"SPRITE":{"name":"38","x":3964,"y":984,"w":48,"h":98,"rotated":false}},
+{"SPRITE":{"name":"39","x":1550,"y":985,"w":48,"h":103,"rotated":false}},
+{"SPRITE":{"name":"40","x":3848,"y":894,"w":50,"h":109,"rotated":false}},
+{"SPRITE":{"name":"41","x":3797,"y":894,"w":50,"h":116,"rotated":false}},
+{"SPRITE":{"name":"42","x":2777,"y":452,"w":50,"h":121,"rotated":false}},
+{"SPRITE":{"name":"43","x":4002,"y":585,"w":50,"h":119,"rotated":false}},
+{"SPRITE":{"name":"44","x":3913,"y":886,"w":50,"h":117,"rotated":false}},
+{"SPRITE":{"name":"45","x":3059,"y":2,"w":52,"h":129,"rotated":false}},
+{"SPRITE":{"name":"46","x":3964,"y":886,"w":123,"h":45,"rotated":false}},
+{"SPRITE":{"name":"47","x":1770,"y":228,"w":123,"h":43,"rotated":false}},
+{"SPRITE":{"name":"48","x":3424,"y":486,"w":99,"h":35,"rotated":false}},
+{"SPRITE":{"name":"49","x":2979,"y":1141,"w":99,"h":34,"rotated":false}},
+{"SPRITE":{"name":"50","x":2979,"y":1141,"w":99,"h":34,"rotated":false}},
+{"SPRITE":{"name":"51","x":2590,"y":360,"w":99,"h":36,"rotated":false}},
+{"SPRITE":{"name":"52","x":3709,"y":783,"w":35,"h":21,"rotated":false}},
+{"SPRITE":{"name":"53","x":1220,"y":711,"w":329,"h":400,"rotated":false}},
+{"SPRITE":{"name":"54","x":3042,"y":979,"w":112,"h":161,"rotated":false}},
+{"SPRITE":{"name":"55","x":2929,"y":163,"w":199,"h":188,"rotated":false}},
+{"SPRITE":{"name":"56","x":2175,"y":574,"w":96,"h":158,"rotated":false}},
+{"SPRITE":{"name":"57","x":1623,"y":570,"w":277,"h":134,"rotated":false}},
+{"SPRITE":{"name":"58","x":1550,"y":1089,"w":38,"h":22,"rotated":false}},
+{"SPRITE":{"name":"59","x":3666,"y":152,"w":124,"h":165,"rotated":false}},
+{"SPRITE":{"name":"60","x":1623,"y":272,"w":309,"h":297,"rotated":false}},
+{"SPRITE":{"name":"61","x":3801,"y":2,"w":121,"h":91,"rotated":false}},
+{"SPRITE":{"name":"62","x":3281,"y":522,"w":320,"h":77,"rotated":false}},
+{"SPRITE":{"name":"63","x":3921,"y":755,"w":17,"h":22,"rotated":false}},
+{"SPRITE":{"name":"64","x":1351,"y":272,"w":162,"h":74,"rotated":false}},
+{"SPRITE":{"name":"65","x":3801,"y":94,"w":69,"h":50,"rotated":false}},
+{"SPRITE":{"name":"66","x":2273,"y":574,"w":277,"h":174,"rotated":false}},
+{"SPRITE":{"name":"67","x":2261,"y":1136,"w":175,"h":123,"rotated":false}},
+{"SPRITE":{"name":"68","x":4058,"y":932,"w":32,"h":49,"rotated":false}},
+{"SPRITE":{"name":"69","x":3791,"y":270,"w":66,"h":38,"rotated":false}},
+{"SPRITE":{"name":"70","x":3079,"y":1141,"w":71,"h":40,"rotated":false}},
+{"SPRITE":{"name":"71","x":2690,"y":360,"w":82,"h":29,"rotated":false}},
+{"SPRITE":{"name":"72","x":3602,"y":516,"w":88,"h":69,"rotated":false}},
+{"SPRITE":{"name":"73","x":4022,"y":806,"w":69,"h":27,"rotated":false}},
+{"SPRITE":{"name":"74","x":1894,"y":228,"w":30,"h":40,"rotated":false}},
+{"SPRITE":{"name":"75","x":3987,"y":654,"w":10,"h":13,"rotated":false}},
+{"SPRITE":{"name":"76","x":3896,"y":1084,"w":7,"h":7,"rotated":false}},
+{"SPRITE":{"name":"77","x":3834,"y":1074,"w":9,"h":9,"rotated":false}},
+{"SPRITE":{"name":"78","x":3885,"y":1084,"w":10,"h":10,"rotated":false}},
+{"SPRITE":{"name":"79","x":3441,"y":736,"w":12,"h":12,"rotated":false}},
+{"SPRITE":{"name":"80","x":3811,"y":1128,"w":19,"h":17,"rotated":false}},
+{"SPRITE":{"name":"81","x":3971,"y":654,"w":15,"h":14,"rotated":false}},
+{"SPRITE":{"name":"82","x":3858,"y":1150,"w":7,"h":7,"rotated":false}},
+{"SPRITE":{"name":"83","x":3794,"y":452,"w":5,"h":5,"rotated":false}},
+{"SPRITE":{"name":"84","x":3326,"y":751,"w":32,"h":57,"rotated":false}},
+{"SPRITE":{"name":"85","x":2583,"y":147,"w":6,"h":7,"rotated":false}},
+{"SPRITE":{"name":"86","x":935,"y":617,"w":198,"h":66,"rotated":false}},
+{"SPRITE":{"name":"87","x":426,"y":692,"w":352,"h":436,"rotated":false}},
+{"SPRITE":{"name":"88","x":3814,"y":452,"w":156,"h":69,"rotated":false}},
+{"SPRITE":{"name":"89","x":2829,"y":452,"w":194,"h":197,"rotated":false}},
+{"SPRITE":{"name":"90","x":2670,"y":733,"w":181,"h":216,"rotated":false}},
+{"SPRITE":{"name":"91","x":3791,"y":150,"w":93,"h":119,"rotated":false}},
+{"SPRITE":{"name":"92","x":4000,"y":372,"w":86,"h":75,"rotated":false}},
+{"SPRITE":{"name":"93","x":3587,"y":320,"w":113,"h":195,"rotated":false}},
+{"SPRITE":{"name":"94","x":2483,"y":2,"w":80,"h":151,"rotated":false}},
+{"SPRITE":{"name":"95","x":3493,"y":2,"w":177,"h":149,"rotated":false}},
+{"SPRITE":{"name":"96","x":3327,"y":183,"w":9,"h":8,"rotated":false}},
+{"SPRITE":{"name":"97","x":3787,"y":452,"w":6,"h":6,"rotated":false}},
+{"SPRITE":{"name":"98","x":4002,"y":705,"w":57,"h":48,"rotated":false}},
+{"SPRITE":{"name":"99","x":2574,"y":147,"w":8,"h":8,"rotated":false}},
+{"SPRITE":{"name":"100","x":3814,"y":605,"w":8,"h":12,"rotated":false}},
+{"SPRITE":{"name":"101","x":1589,"y":1089,"w":9,"h":10,"rotated":false}},
+{"SPRITE":{"name":"102","x":3701,"y":318,"w":85,"h":140,"rotated":false}},
+{"SPRITE":{"name":"103","x":2,"y":692,"w":423,"h":429,"rotated":false}},
+{"SPRITE":{"name":"104","x":3533,"y":152,"w":132,"h":167,"rotated":false}},
+{"SPRITE":{"name":"105","x":3249,"y":961,"w":66,"h":16,"rotated":false}},
+{"SPRITE":{"name":"106","x":3576,"y":808,"w":52,"h":43,"rotated":false}},
+{"SPRITE":{"name":"107","x":3858,"y":1163,"w":46,"h":42,"rotated":false}},
+{"SPRITE":{"name":"108","x":3834,"y":1011,"w":13,"h":62,"rotated":false}},
+{"SPRITE":{"name":"109","x":3654,"y":1025,"w":34,"h":29,"rotated":false}},
+{"SPRITE":{"name":"110","x":3811,"y":1150,"w":46,"h":65,"rotated":false}},
+{"SPRITE":{"name":"111","x":3701,"y":459,"w":112,"h":46,"rotated":false}},
+{"SPRITE":{"name":"112","x":2035,"y":898,"w":226,"h":223,"rotated":false}},
+{"SPRITE":{"name":"113","x":3233,"y":351,"w":190,"h":170,"rotated":false}},
+{"SPRITE":{"name":"114","x":3654,"y":1060,"w":58,"h":55,"rotated":false}},
+{"SPRITE":{"name":"115","x":3885,"y":94,"w":112,"h":94,"rotated":false}},
+{"SPRITE":{"name":"116","x":3576,"y":706,"w":132,"h":101,"rotated":false}},
+{"SPRITE":{"name":"117","x":1939,"y":493,"w":235,"h":239,"rotated":false}},
+{"SPRITE":{"name":"118","x":3242,"y":1150,"w":141,"h":111,"rotated":false}},
+{"SPRITE":{"name":"119","x":2822,"y":2,"w":236,"h":160,"rotated":false}},
+{"SPRITE":{"name":"120","x":2475,"y":749,"w":194,"h":236,"rotated":false}},
+{"SPRITE":{"name":"121","x":3455,"y":736,"w":120,"h":119,"rotated":false}},
+{"SPRITE":{"name":"122","x":2551,"y":398,"w":225,"h":189,"rotated":false}},
+{"SPRITE":{"name":"123","x":3923,"y":2,"w":130,"h":81,"rotated":false}},
+{"SPRITE":{"name":"124","x":3691,"y":621,"w":132,"h":83,"rotated":false}},
+{"SPRITE":{"name":"125","x":3531,"y":1025,"w":122,"h":80,"rotated":false}},
+{"SPRITE":{"name":"126","x":3814,"y":522,"w":129,"h":82,"rotated":false}},
+{"SPRITE":{"name":"127","x":3709,"y":705,"w":125,"h":77,"rotated":false}},
+{"SPRITE":{"name":"128","x":3885,"y":189,"w":132,"h":76,"rotated":false}},
+{"SPRITE":{"name":"129","x":2035,"y":1122,"w":225,"h":142,"rotated":false}},
+{"SPRITE":{"name":"130","x":2777,"y":187,"w":151,"h":264,"rotated":false}},
+{"SPRITE":{"name":"131","x":2551,"y":588,"w":277,"h":144,"rotated":false}},
+{"SPRITE":{"name":"132","x":3327,"y":197,"w":205,"h":140,"rotated":false}},
+{"SPRITE":{"name":"133","x":2175,"y":401,"w":305,"h":172,"rotated":false}},
+{"SPRITE":{"name":"134","x":2841,"y":1136,"w":137,"h":129,"rotated":false}},
+{"SPRITE":{"name":"135","x":3129,"y":172,"w":197,"h":178,"rotated":false}},
+{"SPRITE":{"name":"136","x":2,"y":1122,"w":364,"h":131,"rotated":false}},
+{"SPRITE":{"name":"137","x":3424,"y":338,"w":162,"h":147,"rotated":false}},
+{"SPRITE":{"name":"138","x":1933,"y":228,"w":223,"h":264,"rotated":false}},
+{"SPRITE":{"name":"139","x":1351,"y":2,"w":418,"h":269,"rotated":false}},
+{"SPRITE":{"name":"140","x":1599,"y":1133,"w":350,"h":113,"rotated":false}},
+{"SPRITE":{"name":"141","x":1599,"y":985,"w":435,"h":147,"rotated":false}},
+{"SPRITE":{"name":"142","x":3921,"y":670,"w":80,"h":84,"rotated":false}},
+{"SPRITE":{"name":"143","x":2564,"y":147,"w":9,"h":8,"rotated":false}},
+{"SPRITE":{"name":"144","x":2437,"y":1168,"w":31,"h":27,"rotated":false}},
+{"SPRITE":{"name":"145","x":3664,"y":808,"w":110,"h":88,"rotated":false}},
+{"SPRITE":{"name":"146","x":3024,"y":608,"w":43,"h":39,"rotated":false}},
+{"SPRITE":{"name":"147","x":3563,"y":1106,"w":55,"h":58,"rotated":false}},
+{"SPRITE":{"name":"148","x":3971,"y":619,"w":19,"h":34,"rotated":false}},
+{"SPRITE":{"name":"149","x":3416,"y":1250,"w":30,"h":23,"rotated":false}},
+{"SPRITE":{"name":"150","x":1939,"y":898,"w":82,"h":85,"rotated":false}},
+{"SPRITE":{"name":"151","x":4054,"y":39,"w":34,"h":41,"rotated":false}},
+{"SPRITE":{"name":"152","x":3691,"y":516,"w":122,"h":104,"rotated":false}},
+{"SPRITE":{"name":"153","x":3762,"y":1060,"w":17,"h":32,"rotated":false}},
+{"SPRITE":{"name":"154","x":3745,"y":783,"w":28,"h":20,"rotated":false}},
+{"SPRITE":{"name":"155","x":3524,"y":486,"w":45,"h":35,"rotated":false}},
+{"SPRITE":{"name":"156","x":4000,"y":266,"w":74,"h":105,"rotated":false}},
+{"SPRITE":{"name":"157","x":3775,"y":836,"w":137,"h":57,"rotated":false}},
+{"SPRITE":{"name":"158","x":3384,"y":1250,"w":31,"h":23,"rotated":false}},
+{"SPRITE":{"name":"159","x":3504,"y":908,"w":24,"h":24,"rotated":false}},
+{"SPRITE":{"name":"160","x":4013,"y":984,"w":55,"h":85,"rotated":false}},
+{"SPRITE":{"name":"161","x":4054,"y":2,"w":40,"h":36,"rotated":false}},
+{"SPRITE":{"name":"162","x":3775,"y":783,"w":163,"h":52,"rotated":false}},
+{"SPRITE":{"name":"163","x":1950,"y":1133,"w":73,"h":115,"rotated":false}},
+{"SPRITE":{"name":"164","x":3531,"y":962,"w":159,"h":62,"rotated":false}},
+{"SPRITE":{"name":"165","x":3811,"y":1093,"w":20,"h":34,"rotated":false}},
+{"SPRITE":{"name":"166","x":4067,"y":230,"w":27,"h":32,"rotated":false}},
+{"SPRITE":{"name":"167","x":4067,"y":188,"w":24,"h":41,"rotated":false}},
+{"SPRITE":{"name":"168","x":3504,"y":856,"w":26,"h":51,"rotated":false}},
+{"SPRITE":{"name":"169","x":2929,"y":352,"w":86,"h":98,"rotated":false}},
+{"SPRITE":{"name":"170","x":3824,"y":605,"w":146,"h":64,"rotated":false}},
+{"SPRITE":{"name":"171","x":1589,"y":1100,"w":9,"h":10,"rotated":false}},
+{"SPRITE":{"name":"172","x":3327,"y":172,"w":8,"h":10,"rotated":false}},
+{"SPRITE":{"name":"173","x":3939,"y":806,"w":82,"h":27,"rotated":false}},
+{"SPRITE":{"name":"174","x":3944,"y":522,"w":141,"h":62,"rotated":false}},
+{"SPRITE":{"name":"175","x":3024,"y":352,"w":208,"h":169,"rotated":false}},
+{"SPRITE":{"name":"176","x":3129,"y":2,"w":208,"h":169,"rotated":false}},
+{"SPRITE":{"name":"177","x":3042,"y":814,"w":206,"h":164,"rotated":false}},
+{"SPRITE":{"name":"178","x":3072,"y":522,"w":208,"h":161,"rotated":false}},
+{"SPRITE":{"name":"179","x":779,"y":1037,"w":382,"h":218,"rotated":false}},
+{"SPRITE":{"name":"180","x":935,"y":357,"w":237,"h":259,"rotated":false}},
+{"SPRITE":{"name":"181","x":3155,"y":979,"w":86,"h":203,"rotated":false}},
+{"SPRITE":{"name":"182","x":3364,"y":751,"w":90,"h":183,"rotated":false}},
+{"SPRITE":{"name":"183","x":3357,"y":961,"w":91,"h":188,"rotated":false}},
+{"SPRITE":{"name":"184","x":2852,"y":814,"w":185,"h":122,"rotated":false}},
+{"SPRITE":{"name":"185","x":3787,"y":318,"w":89,"h":133,"rotated":false}},
+{"SPRITE":{"name":"186","x":2590,"y":187,"w":183,"h":172,"rotated":false}},
+{"SPRITE":{"name":"187","x":3242,"y":979,"w":114,"h":151,"rotated":false}},
+{"SPRITE":{"name":"188","x":4047,"y":834,"w":42,"h":36,"rotated":false}},
+{"SPRITE":{"name":"189","x":1134,"y":617,"w":53,"h":63,"rotated":false}},
+{"SPRITE":{"name":"190","x":3166,"y":1183,"w":67,"h":80,"rotated":false}},
+{"SPRITE":{"name":"191","x":3848,"y":1004,"w":55,"h":79,"rotated":false}},
+{"SPRITE":{"name":"192","x":3834,"y":1084,"w":50,"h":65,"rotated":false}},
+{"SPRITE":{"name":"193","x":3629,"y":808,"w":33,"h":43,"rotated":false}},
+{"SPRITE":{"name":"194","x":3493,"y":152,"w":26,"h":38,"rotated":false}},
+{"SPRITE":{"name":"195","x":3971,"y":585,"w":23,"h":33,"rotated":false}},
+{"SPRITE":{"name":"196","x":2530,"y":498,"w":20,"h":24,"rotated":false}},
+{"SPRITE":{"name":"197","x":3939,"y":755,"w":121,"h":50,"rotated":false}},
+{"SPRITE":{"name":"198","x":3913,"y":836,"w":133,"h":49,"rotated":false}},
+{"SPRITE":{"name":"199","x":3971,"y":449,"w":119,"h":69,"rotated":false}},
+{"SPRITE":{"name":"200","x":3072,"y":684,"w":253,"h":125,"rotated":false}},
+{"SPRITE":{"name":"201","x":3441,"y":600,"w":116,"h":135,"rotated":false}},
+{"SPRITE":{"name":"202","x":2475,"y":986,"w":194,"h":224,"rotated":false}},
+{"SPRITE":{"name":"203","x":1770,"y":2,"w":335,"h":225,"rotated":false}},
+{"SPRITE":{"name":"204","x":2157,"y":158,"w":217,"h":242,"rotated":false}},
+{"SPRITE":{"name":"205","x":3249,"y":810,"w":114,"h":150,"rotated":false}},
+{"SPRITE":{"name":"206","x":3326,"y":600,"w":114,"h":150,"rotated":false}},
+{"SPRITE":{"name":"207","x":3835,"y":670,"w":85,"h":87,"rotated":false}},
+{"SPRITE":{"name":"208","x":3671,"y":2,"w":129,"h":147,"rotated":false}},
+{"SPRITE":{"name":"209","x":2852,"y":650,"w":219,"h":163,"rotated":false}},
+{"SPRITE":{"name":"210","x":3338,"y":2,"w":154,"h":194,"rotated":false}},
+{"SPRITE":{"name":"211","x":1514,"y":272,"w":108,"h":68,"rotated":false}},
+{"SPRITE":{"name":"212","x":3664,"y":897,"w":132,"h":64,"rotated":false}},
+{"SPRITE":{"name":"213","x":2437,"y":1211,"w":160,"h":62,"rotated":false}},
+{"SPRITE":{"name":"214","x":3449,"y":935,"w":81,"h":188,"rotated":false}},
+{"SPRITE":{"name":"215","x":2841,"y":950,"w":200,"h":185,"rotated":false}},
+{"SPRITE":{"name":"216","x":3384,"y":1150,"w":63,"h":99,"rotated":false}},
+{"SPRITE":{"name":"217","x":2481,"y":398,"w":63,"h":99,"rotated":false}},
+{"SPRITE":{"name":"218","x":3558,"y":600,"w":132,"h":105,"rotated":false}},
+{"SPRITE":{"name":"219","x":3531,"y":856,"w":132,"h":105,"rotated":false}},
+{"SPRITE":{"name":"220","x":2590,"y":2,"w":231,"h":184,"rotated":false}},
+{"SPRITE":{"name":"221","x":2670,"y":950,"w":170,"h":224,"rotated":false}},
+{"SPRITE":{"name":"222","x":2273,"y":749,"w":198,"h":144,"rotated":false}},
+{"SPRITE":{"name":"223","x":3691,"y":962,"w":93,"h":53,"rotated":false}},
+{"SPRITE":{"name":"224","x":2979,"y":1183,"w":186,"h":91,"rotated":false}},
+{"SPRITE":{"name":"225","x":1939,"y":733,"w":333,"h":164,"rotated":false}},
+{"SPRITE":{"name":"226","x":935,"y":2,"w":415,"h":354,"rotated":false}},
+{"SPRITE":{"name":"227","x":1220,"y":357,"w":402,"h":353,"rotated":false}},
+{"SPRITE":{"name":"228","x":3998,"y":84,"w":90,"h":103,"rotated":false}},
+{"SPRITE":{"name":"229","x":2375,"y":158,"w":214,"h":239,"rotated":false}},
+{"SPRITE":{"name":"230","x":2262,"y":898,"w":212,"h":237,"rotated":false}}]},
+"meta":{
+"app":"Adobe Animate (Better TA Extension)",
+"version":"22.0.3.179",
+"image":"spritemap1.png",
+"format":"RGBA8888",
+"size":{"w":4096,"h":1280},
+"resolution":"1"
 }
+}

assets/languages/en/Editors.xml

@@ -203,6 +203,7 @@
 					<str id="paste">Paste</str>
 					<str id="cut">Cut</str>
 					<str id="delete">Delete</str>
+					<str id="deletestacked">Delete Stacked Notes</str>
 				</group>
 
 				<str id="topBar.chart">Chart</str>
@@ -223,6 +224,7 @@
 					<str id="resetZoom">Reset Zoom</str>
 					<str id="showSectionsSeparator">Show Sections Separator</str>
 					<str id="showBeatsSeparator">Show Beats Separator</str>
+					<str id="showCameraHighlights">Show Camera Highlights</str>
 					<str id="rainbowWaveforms">Rainbow Waveforms</str>
 					<str id="lowDetailWaveforms">Low Detail Waveforms</str>
 					<str id="scrollLeft">Scroll Left</str>
@@ -236,8 +238,9 @@
 					<str id="goEnd">Go forward to the end</str> <!-- used to be "Go to the end" -->
 					<str id="addOpponentCamera">Add camera on Opponent</str>
 					<str id="addPlayerCamera">Add camera on Player</str>
-					<str id="muteInst">Mute instrumental</str>
-					<str id="muteVoices">Mute voices</str>
+					<str id="inst">Instrumental</str>
+					<str id="voices">Voices</str>
+					<str id="hitsounds">Hitsounds</str>
 				</group>
 
 				<group name="BookmarkMenu" prefix="bookmarks.">
@@ -250,6 +253,7 @@
 					<str id="editBookmarkListTitle">Bookmark List</str>
 					<str id="editBookmarksTitle">Edit Bookmarks</str>
 					<str id="newBookmarkName">New Bookmark</str>
+					<str id="bookmarkList">Bookmark List</str>
 				</group>
 
 				<str id="topBar.note">Note</str>
@@ -258,6 +262,7 @@
 					<str id="subtractSustainLength">Subtract sustain length</str>
 					<str id="selectAll">Select all</str>
 					<str id="selectMeasure">Select measure</str>
+					<str id="noteTypesList">Note Types List</str>
 					<str id="editNoteTypesList">Edit Note Types List</str>
 				</group>
 				<str id="topBar.snap">Snap</str>
@@ -308,8 +313,9 @@
 			<group name="StrumlineOptions" prefix="strumLine.">
 				<str id="button-name">Options ↓</str>
 
+				<str id="waveforms">Waveforms</str>
 				<str id="hitsounds">Hitsounds</str>
-				<str id="muteVocals">Mute Vocals</str>
+				<str id="vocals">Vocals</str>
 				<str id="edit">Edit</str>
 				<str id="delete">Delete</str>
 
@@ -433,6 +439,8 @@
 					<str id="position">Position (X, Y)</str>
 					<str id="fps">FPS</str>
 					<str id="indices">Indices (Frames)</str>
+					<str id="looping">Looping?</str>
+					<str id="label">Label</str>
 				</group>
 
 				<group name="CharacterSpriteScreen" prefix="characterSpriteScreen.">

assets/languages/en/Options.xml

@@ -48,6 +48,7 @@
 		<str id="category.engine">Engine</str>
 		<group name="engine" prefix="engine.">
 			<str id="switchMod">Switch Mod</str>
+			<str id="fpsCounter">FPS Counter</str>
 		</group>
 
 		<str id="category.volume">Volume</str>

assets/languages/es/Editors.xml

@@ -16,7 +16,7 @@
 		<str id="animation">Animación</str>
 		<str id="atlas">Atlas</str>
 		<str id="spritemap">Mapa de sprites</str>
-		
+
 		<str id="directory">Ubicación ({0}/)</str>
 		<str id="found">{0} {1} Encontrado</str>
 		<str id="foundplural">{0} {1} Encontrados</str>
@@ -188,6 +188,7 @@
 					<str id="paste">Pegar</str>
 					<str id="cut">Cortar</str>
 					<str id="delete">Eliminar</str>
+					<str id="deletestacked">Eliminar Notas Apiladas</str>
 				</group>
 
 				<str id="topBar.chart">Chart</str>

assets/languages/es/Options.xml

@@ -46,8 +46,9 @@
 
 		<group name="engine" prefix="engine.">
 			<str id="switchMod">Cambiar Mod</str>
+			<str id="fpsCounter">Contador de FPS</str>
 		</group>
-		
+
 		<str id="category.volume">Volumen</str>
 		<str id="volume.up">Arriba</str>
 		<str id="volume.down">Abajo</str>

assets/languages/it/Editors.xml

@@ -194,6 +194,7 @@
 						<str id="paste">Incolla</str>
 						<str id="cut">Taglia</str>
 						<str id="delete">Elimina</str>
+						<str id="deletestacked">Elimina Note Impilate</str>
 					</group>
 
 					<str id="topBar.chart">Chart</str>

assets/languages/it/Options.xml

@@ -46,6 +46,7 @@
 
 		<group name="engine" prefix="engine.">
 			<str id="switchMod">Cambia Mod</str>
+			<str id="fpsCounter">Contatore FPS</str>
 		</group>
 
 		<str id="volume.up">Su</str>

assets/languages/pl/Editors.xml

@@ -18,7 +18,7 @@
 		<str id="animation">Animacja</str>
 		<str id="atlas">Atlas</str>
 		<str id="spritemap">Mapa sprite'ów</str>
-		
+
 		<str id="directory">Folder ({0}/)</str>
 		<str id="found">{0} {1} Znaleziono</str>
 		<str id="foundplural">{0} {1} Znaleziono</str>
@@ -87,7 +87,7 @@
 		<group name="CharterEventScreen" prefix="charterEventScreen.">
 			<str id="title-creating">Stwórz Grupę Wydarzeń</str>
 			<str id="title-editing">Edytuj Grupę Wydarzeń</str>
-			
+
 			<str id="noEvent">Brak Wydarzenia</str>
 
 			<str id="strumLine.format">Struma #{0} ({1})</str>
@@ -197,6 +197,7 @@
 				<str id="paste">Wklej</str>
 				<str id="cut">Wytnij</str>
 				<str id="delete">Usuń</str>
+				<str id="deletestacked">Usuń Notatki Ułożone w Stos</str>
 			</group>
 
 			<str id="topBar.chart">Mapa</str>
@@ -223,7 +224,7 @@
 				<str id="scrollRight">Przewiń w Prawo</str>
 				<str id="scrollReset">Resetuj Przewinięcie</str>
 			</group>
-			
+
 			<str id="topBar.song">Ścieżka</str>
 			<group name="SongMenu" prefix="song.">
 				<str id="goStart">Wróć do początku</str>

assets/languages/pl/Options.xml

@@ -44,8 +44,9 @@
 		<str id="category.engine">Silnik</str>
 		<group name="engine" prefix="engine.">
 			<str id="switchMod">Zmień Moda</str>
+			<str id="fpsCounter">Licznik FPS</str>
 		</group>
-		
+
 		<str id="category.volume">Głośność</str>
 		<str id="volume.up">Głóśniej</str>
 		<str id="volume.down">Ciszej</str>

assets/languages/pt/Editors.xml

@@ -203,6 +203,7 @@
 					<str id="paste">Colar</str>
 					<str id="cut">Cortar</str>
 					<str id="delete">Apagar</str>
+					<str id="deletestacked">Apagar Notas Empilhadas</str>
 				</group>
 
 				<str id="topBar.chart">Mapa</str>

assets/languages/pt/Options.xml

@@ -48,6 +48,7 @@
 		<str id="category.engine">Codename Engine</str>
 		<group name="engine" prefix="engine.">
 			<str id="switchMod">Trocar Mod</str>
+			<str id="fpsCounter">Contador de FPS</str>
 		</group>
 
 		<str id="category.volume">Volume</str>

assets/songs/guns/cutscene.hx

@@ -12,7 +12,7 @@ function create() {
 	tankman = new FunkinSprite(game.dad.x + game.dad.globalOffset.x + 520, game.dad.y + game.dad.globalOffset.y + 225);
 	tankman.antialiasing = true;
 	tankman.loadSprite(Paths.image('game/cutscenes/tank/guns-tankman'));
-	tankman.animateAtlas.anim.addBySymbol('tank', 'TANK TALK 2', 0, false);
+	tankman.addAnim('tank', 'TANK TALK 2', 0, false);
 
 	game.insert(game.members.indexOf(game.dad), tankman);
 	game.dad.visible = false;
@@ -65,4 +65,4 @@ function destroy() {
 	for(thing in [tankman, tankTalk]) thing.destroy();
 	if(destroyDistorto) distorto.destroy();
 	FlxTween.tween(FlxG.camera, {zoom: game.defaultCamZoom}, 0.7, {ease: FlxEase.quadInOut, startDelay: 0});
-}
+}

assets/songs/stress/cutscene.hx

@@ -33,20 +33,20 @@ function create() {
 	tankman = new FunkinSprite(game.dad.x + game.dad.globalOffset.x + 520, game.dad.y + game.dad.globalOffset.y + 225);
 	tankman.antialiasing = true;
 	tankman.loadSprite(Paths.image('game/cutscenes/tank/stress-tankman'));
-	tankman.animateAtlas.anim.addBySymbol('p1', 'TANK TALK 3 P1 UNCUT', 0, false);
-	tankman.animateAtlas.anim.addBySymbol('p2', 'TANK TALK 3 P2 UNCUT', 0, false);
+	tankman.addAnim('p1', 'TANK TALK 3 P1 UNCUT', 0, false);
+	tankman.addAnim('p2', 'TANK TALK 3 P2 UNCUT', 0, false);
 	tankman.playAnim('p1');
 
-	pico = new FunkinSprite(game.gf.x + game.gf.globalOffset.x + 150, game.gf.y + game.gf.globalOffset.y + 395);
+	pico = new FunkinSprite(game.gf.x + game.gf.globalOffset.x - 615, game.gf.y + game.gf.globalOffset.y - 130);
 	pico.antialiasing = true;
 	pico.loadSprite(Paths.image('game/cutscenes/tank/stress-pico'));
-	pico.animateAtlas.anim.addBySymbol('die', 'GF Time to Die sequence', 24, false);
-	pico.animateAtlas.anim.addBySymbol('saves', 'Pico Saves them sequence', 24, false);
-	pico.animateAtlas.anim.addBySymbol('idle', 'Pico Dual Wield on Speaker idle', 24, true);
+	pico.addAnim('die', 'die', 24, false, null, null, 0, 0, null, true);
+	pico.addAnim('saves', 'saves', 24, false, null, null, 0, 0, null, true);
+	pico.addAnim('idle', 'idle', 24, true, null, null, 0, 0, null, true);
 	pico.scrollFactor.set(0.95, 0.95);
 	pico.playAnim("idle");
 	pico.visible = false;
-	game.insert(game.members.indexOf(game.gf) + 1, pico);
+	game.insert(game.members.indexOf(game.gf) + 2, pico);
 
 	game.insert(game.members.indexOf(game.dad) + 1, tankman);
 	game.dad.visible = false;
@@ -59,7 +59,11 @@ function update(elapsed) {
 			lipSync(tankman, 0, 16750);
 			if (stressCutscene.time > 15100) {
 				step = 1;
-				focusOn(game.gf);
+
+				//focusOn(game.gf);
+				game.camFollow.x += 350;
+				game.camFollow.y -= 200;
+
 				pico.visible = true;
 				pico.playAnim('die', true);
 
@@ -118,7 +122,7 @@ function update(elapsed) {
 }
 
 function lipSync(char:FunkinSprite, begin:Float, end:Float) {
-	char.animateAtlas.anim.curFrame = Std.int(FlxMath.remapToRange(stressCutscene.time, begin, end, 0, char.animateAtlas.anim.length-1));
+	char.anim.curAnim.curFrame = Std.int(FlxMath.remapToRange(stressCutscene.time, begin, end, 0, char.anim.curAnim.numFrames - 1));
 }
 
 function focusOn(char, snap:Bool = false) {

assets/songs/ugh/cutscene.hx

@@ -12,8 +12,8 @@ function create() {
 	tankman = new FunkinSprite(game.dad.x + game.dad.globalOffset.x + 520, game.dad.y + game.dad.globalOffset.y + 225);
 	tankman.antialiasing = true;
 	tankman.loadSprite(Paths.image('game/cutscenes/tank/ugh-tankman'));
-	tankman.animateAtlas.anim.addBySymbol('1', 'TANK TALK 1 P1', 0, false);
-	tankman.animateAtlas.anim.addBySymbol('2', 'TANK TALK 1 P2', 0, false);
+	tankman.addAnim('1', 'TANK TALK 1 P1', 0, false);
+	tankman.addAnim('2', 'TANK TALK 1 P2', 0, false);
 
 	game.insert(game.members.indexOf(game.dad), tankman);
 	game.dad.visible = false;
@@ -77,4 +77,4 @@ function destroy() {
 	for(timer in timers) timer.cancel();
 	for(thing in [tankTalk1, tankTalk2, bfBeep, tankman]) thing.destroy();
 	if(destroyDistorto) distorto.destroy();
-}
+}

building/README.md

@@ -1,6 +1,6 @@
-Here's the full guide on how to setup and compile Codename Engine!<br>
-
-> **Open the instructions for your platform**
+# Compiling Codename Engine
+Do you want to turn your source code into a playable build to play? Then you want to **compile the source code**, follow this guide.
+> **Open the instructions for your platform.**
 <details>
     <summary>Windows</summary>
 
@@ -38,3 +38,22 @@ Here's the full guide on how to setup and compile Codename Engine!<br>
 > You can also run `./cne-windows.bat -help` or `./cne-unix.sh -help` (depending on your platform) to check out more useful commands!<br>
 > For example `./cne-windows test` or `./cne-unix.sh test` builds the game and uses the source assets folder instead of the export one for easier development (although you can still use `lime test` normally).
 > - If you're running the terminal from the project's main folder, use instead `./building/cne-windows.bat -COMMAND HERE` or `./building/cne-unix.sh -COMMAND HERE` depending on your platform.
+
+# Generating Codename Engine's API documentation
+**Mainly recommended if you intend to fork the engine and make your own custom version to publish.**<br>Do you want to generate an API documentation so people can understand and mod your playable build? This documentation can be uploaded to your website.<br>If you just want to compile the engine normally for your hardcoded mod or for yourself you can skip this step.
+> **Select your platform to continue.**
+<details>
+    <summary>Windows</summary>
+
+1. Run `generate-docs-windows.bat` using cmd or double-clicking it and wait for the `doc.xml` to be generated inside the `docs` folder.
+</details>
+<details>
+    <summary>MacOS/Linux</summary>
+
+1. Run `generate-docs-unix.sh` using the terminal or double-clicking it and wait for the `doc.xml` to be generated inside the `docs` folder.
+</details>
+
+2. You can use this `doc.xml` file to generate a full HTML documentation (that you can open in your browser for example) using Haxe's [dox](https://github.com/HaxeFoundation/dox) generator; check [Codename Engine's webiste](https://github.com/CodenameCrew/codename-website/tree/main/api-generator) for example.
+
+> [!CAUTION]
+> The doc.xml might contain some sensible paths of your computer: make sure to filter the file before publishing it for everyone if you want to keep those paths private!<br>To filter and delete those paths, you may use Codename Engine's website's [doc filter Python script](https://github.com/CodenameCrew/codename-website/blob/main/api-generator/api/filter.py) by simply running it in the same folder of your `doc.xml` file. This script will also delete everything irrelevant to the engine that was generated in your documentation, such as libraries' (like OpenFL or Flixel) APIs.

building/alsoft.txt

@@ -1,14 +1,17 @@
-[general]
+[General]
 sample-type=float32
 stereo-mode=speakers
-stereo-encoding=panpot
 hrtf=false
 cf_level=0
-resampler=fast_bsinc24
-front-stablizer=false
 output-limiter=false
+front-stabilizer=false
 volume-adjust=0
+period_size=441
+sources=512
+sends=64
+dither=false
+
 [decoder]
-hq-mode=false
-distance-comp=false
+hq-mode=true
+distance-comp=true
 nfc=false

building/generate-docs-unix.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+cd "$(dirname "$0")/.."
+echo "Generating documentation..."
+if [ $(uname) == "Darwin" ]; then
+    echo "Platform is macOS"
+    haxelib run lime build mac --haxeflag="-xml docs/doc.xml" -D doc-gen -D DOCUMENTATION --no-output
+else
+    echo "Platform is not macOS; assuming platform to be Linux compatible"
+    haxelib run lime build linux --haxeflag="-xml docs/doc.xml" -D doc-gen -D DOCUMENTATION --no-output
+fi
+
+echo "The XML file for the API documentation has been generated at docs/doc.xml."
+echo "For updating the API documentation hosted at the website, please replace codename-website/api-generator/api/doc.xml with the file listed above."

building/generate-docs-windows.bat

@@ -0,0 +1,8 @@
+@ECHO OFF
+cd /d "%~dp0.."
+echo Generating documentation...
+echo Platform is based on Windows
+haxelib run lime build windows --haxeflag="-xml docs/doc.xml" -D doc-gen -D DOCUMENTATION --no-output
+
+echo The XML file for the API documentation has been generated at docs/doc.xml.
+echo For updating the API documentation hosted at the website, please replace codename-website/api-generator/api/doc.xml with the file listed above.

building/libs.xml

@@ -4,19 +4,17 @@
 		<print pretty="true">Preparing installation...</print>
 
 		<!-- OpenFL & Lime (Required for Flixel) -->
-		<git name="openfl" url="https://github.com/CodenameCrew/cne-openfl" />
+		<git name="openfl" url="https://github.com/CodenameCrew/cne-openfl" ref="old" />
 		<lib name="lime" version="8.1.2" />
-		<!-- <git name="lime" url="https://github.com/CodenameCrew/cne-lime" />  disabled for now until fixed -->
 
 		<!-- Flixel -->
-		<git name="flixel" url="https://github.com/CodenameCrew/cne-flixel" />
-		<git name="flixel-addons" url="https://github.com/CodenameCrew/cne-flixel-addons" />
+		<git name="flixel" url="https://github.com/CodenameCrew/cne-flixel" ref="old" />
+		<git name="flixel-addons" url="https://github.com/CodenameCrew/cne-flixel-addons" ref="old" />
 
 		<!-- Other Libraries -->
 		<git name="hscript-improved" url="https://github.com/CodenameCrew/hscript-improved" ref="codename-dev" />
-		<git name="flxanimate" url="https://github.com/CodenameCrew/cne-flxanimate" />
-		<git name="hxdiscord_rpc" url="https://github.com/CodenameCrew/cne-hxdiscord_rpc" skipDeps="true" />
-		<git name="funkin-modchart" url="https://github.com/TheoDevelops/FunkinModchart" ref="f30676579d8de7ccac7d12e13b664e8b2c42c6bf" skipDeps="true" />
+		<git name="hxdiscord_rpc" url="https://github.com/CodenameCrew/cne-hxdiscord_rpc" ref="old" skipDeps="true" />
+		<lib name="funkin-modchart" skipDeps="true" />
 		<lib name="hxvlc" version="1.9.3" skipDeps="true" />
 
 		<!-- Documentation and other features -->
@@ -31,7 +29,9 @@
 		<lib global="true" name="hxp" /> <lib name="hxp" />
 		<lib global="true" name="format" /> <lib name="format" />
 
-		<git name="hxcpp" url="https://github.com/CodenameCrew/cne-hxcpp" />
+		<git name="hxcpp" url="https://github.com/CodenameCrew/cne-hxcpp" ref="old" />
+
+		<git name="flixel-animate" url="https://github.com/CodenameCrew/cne-flixel-animate/" ref="old" skipDeps="true"/>
 	</if>
 
 	<!-- Hxcpp Building -->

project.xml

@@ -50,7 +50,7 @@
 	<!-- _________________________________ Engine Settings _______________________________ -->
 
 	<!-- Comment this out to disable updates !-->
-	<define name="UPDATE_CHECKING" unless="web || hl || neko"/>
+	<define name="UPDATE_CHECKING" unless="web || hl || neko || debug"/>
 
 	<!-- Comment this out to disable Discord RPC !-->
 	<section if="cpp">
@@ -74,6 +74,9 @@
 		 Reduces compilation time at the cost of limited HScript flexibility. !-->
 	<define name="CUSTOM_CLASSES" unless="STRIPPED_COMPILE" />
 
+	<!-- Comment this out to disable abstract support in hscript. !-->
+	<haxedef name="HSCRIPT_ABSTRACT_SUPPORT" unless="STRIPPED_COMPILE" />
+
 	<!-- Comment this out to disable multithreading !-->
 	<haxedef name="ALLOW_MULTITHREADING" unless="web || flash" />
 
@@ -130,7 +133,7 @@
 	<haxelib name="hxvlc" if="VIDEO_CUTSCENES" />
 	<haxelib name="away3d" if="THREE_D_SUPPORT" />
 	<haxelib name="format" />
-	<haxelib name="flxanimate" />
+	<haxelib name="flixel-animate" />
 	<haxelib name="nape-haxe4" if="NAPE_ENABLED"/>
 
 	<haxelib name="hscript-improved" />
@@ -189,6 +192,9 @@
 	<haxedef name="USE_ADAPTED_ASSETS" if="USE_ADAPTED_ASSETS" />
 	<haxedef name="openfl_dpi_aware" if="openfl_dpi_aware" />
 
+	<!-- Disable it for more concise compilation errors. -->
+	<haxedef name="message.reporting" value="pretty" />
+
 	<!-- _________________________________ Custom _______________________________ -->
 
 	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->

source/flixel/sound/FlxSound.hx

@@ -21,6 +21,7 @@ import flixel.math.FlxMath;
 import flixel.math.FlxPoint;
 import flixel.system.FlxAssets.FlxSoundAsset;
 import flixel.tweens.FlxTween;
+import flixel.util.FlxDestroyUtil;
 import flixel.util.FlxSignal;
 import flixel.util.FlxStringUtil;
 import flixel.FlxBasic;
@@ -136,11 +137,18 @@ class FlxSound extends FlxBasic {
 	public var radius:Float;
 
 	/**
-	 * Whether the proximity alters the pan or not
+	 * Whether the proximity alters the pan or not.
 	 * @since raltyMod
 	 */
 	public var proximityPan:Bool;
 
+	/**
+	 * Controls how much this object is affected by camera scrolling. `0` = no movement (e.g. a static sound),
+	 * This is only useful if used with proximity (Initialized once proximity is used).
+	 * @since raltyMod
+	 */
+	public var scrollFactor(default, null):FlxPoint;
+
 	/**
 	 * Stores for how much channels are in the loaded sound.
 	 * @since raltyMod
@@ -302,6 +310,8 @@ class FlxSound extends FlxBasic {
 		_lastTime = null;
 
 		if (destroySound) {
+			scrollFactor = FlxDestroyUtil.put(scrollFactor);
+
 			if (group != null) group.remove(this);
 
 			if (_channel != null) {
@@ -348,15 +358,24 @@ class FlxSound extends FlxBasic {
 
 		_amplitudeUpdate = true;
 
-		// Distance-based volume control (TODO for Ralty: REDO THIS)
+		// Distance-based volume control
 		if (target != null) {
-			var targetPosition = target.getPosition();
-			var radialMultiplier = targetPosition.distanceTo(FlxPoint.weak(x, y)) / radius;
-			targetPosition.put();
-			radialMultiplier = 1 - FlxMath.bound(radialMultiplier, 0, 1);
+			var targetPosition = target.getPosition(), position = getPosition();
+			var camera = camera;
+			if (camera != null) {
+				targetPosition.subtract(camera.scroll.x * target.scrollFactor.x, camera.scroll.y * target.scrollFactor.y);
+				if (scrollFactor != null) position.subtract(camera.scroll.x * scrollFactor.x, camera.scroll.y * scrollFactor.y);
+				else position.subtract(camera.scroll.x, camera.scroll.y);
+			}
 
-			_volumeAdjust = radialMultiplier;
-			if (proximityPan) _panAdjust = (x - target.x) / radius;
+			var radialMultiplier = targetPosition.distanceTo(position) / radius;
+
+			// Make it so it affects the 3d position of the source and not just the panning?
+			_volumeAdjust = 1 - FlxMath.bound(radialMultiplier, 0, 1);
+			if (proximityPan) _panAdjust = (position.x - targetPosition.x) / radius;
+
+			targetPosition.put();
+			position.put();
 		}
 		else
 			_volumeAdjust = 1.0;
@@ -536,12 +555,15 @@ class FlxSound extends FlxBasic {
 	 * @param	Pan			Whether panning should be used in addition to the volume changes.
 	 * @return	This FlxSound instance (nice for chaining stuff together, if you're into that).
 	 */
-	public function proximity(x = 0.0, y = 0.0, ?targetObject:FlxObject, ?radius:Float, pan = true):FlxSound {
+	public function proximity(x = 0.0, y = 0.0, ?targetObject:FlxObject, ?radius:Float, pan = true, ?scrollFactor:FlxPoint):FlxSound {
 		setPosition(x, y);
 		if (targetObject != null) this.target = targetObject;
 		if (radius != null) this.radius = radius;
 		proximityPan = pan;
 
+		if (this.scrollFactor == null) this.scrollFactor = FlxPoint.get(1, 1);
+		if (scrollFactor != null) this.scrollFactor.copyFrom(scrollFactor);
+
 		return this;
 	}
 
@@ -549,14 +571,28 @@ class FlxSound extends FlxBasic {
 	 * Helper function to set the coordinates of this object.
 	 * Sound positioning is used in conjunction with proximity/panning.
 	 *
-	 * @param        x        The new x position
-	 * @param        y        The new y position
+	 * @param  x  The new x position
+	 * @param  y  The new y position
 	 */
-	public inline function setPosition(x = 0.0, y = 0.0):Void {
+	public function setPosition(x = 0.0, y = 0.0):Void {
 		this.x = x;
 		this.y = y;
 	}
 
+	/**
+	 * Returns the world position of this object.
+	 * 
+	 * @param   result  Optional arg for the returning point.
+	 * @return  The world position of this object.
+	 * @since   raltyMod
+	 */
+	public function getPosition(?result:FlxPoint):FlxPoint {
+		if (result == null)
+			result = FlxPoint.get();
+
+		return result.set(x, y);
+	}
+
 	/**
 	 * Call this function to play the sound - also works on paused sounds.
 	 *
@@ -682,7 +718,7 @@ class FlxSound extends FlxBasic {
 		_paused = false;
 		_time = startTime;
 		_lastTime = FlxG.game.getTicks();
-		if (_channel == null || !_channel.__isValid || _source == null #if lime_cffi || _source.__backend.disposed || _source.__backend.handle == null #end)
+		if (_channel == null || !_channel.__isValid || _source == null #if lime_cffi || _source.__backend.disposed #end)
 			makeChannel();
 
 		if (_channel != null) {
@@ -733,7 +769,8 @@ class FlxSound extends FlxBasic {
 			_lastTime = FlxG.game.getTicks();
 			_time = loopTime;
 		}
-		else _channel.loops = 999;
+		else if (_source != null)
+			_source.loops = 999;
 	}
 
 	/**
@@ -763,7 +800,7 @@ class FlxSound extends FlxBasic {
 	}
 
 	inline function get_playing():Bool @:privateAccess
-		return _channel != null && _channel.__isValid && _source.playing;
+		return _source != null && _source.playing;
 
 	inline function get_volume():Float
 		return _volume;
@@ -796,12 +833,12 @@ class FlxSound extends FlxBasic {
 	inline function get_buffer():AudioBuffer
 		@:privateAccess return _sound != null ? _sound.__buffer : null;
 
-	function update_amplitude():Void @:privateAccess {
-		if (_channel == null || !_channel.__updatePeaks(get_time()) || !_amplitudeUpdate) return;
-
-		_amplitudeUpdate = false;
-		_amplitudeLeft = _channel.__leftPeak;
-		_amplitudeRight = _channel.__rightPeak;
+	inline function update_amplitude():Void @:privateAccess {
+		if (_channel != null && _channel.__updatePeaks(get_time()) && _amplitudeUpdate) {
+			_amplitudeUpdate = false;
+			_amplitudeLeft = _channel.__leftPeak;
+			_amplitudeRight = _channel.__rightPeak;
+		}
 	}
 
 	inline function get_amplitudeLeft():Float {
@@ -829,30 +866,27 @@ class FlxSound extends FlxBasic {
 	inline function get_pitch():Float
 		return _pitch;
 
-	function set_pitch(v:Float):Float {
+	inline function set_pitch(v:Float):Float {
 		_realPitch = (_pitch = v) * _timeScaleAdjust;
-		if (_channel != null) _channel.pitch = _realPitch;
+		if (_source != null) _source.pitch = _realPitch;
 		return _pitch;
 	}
 	#end
 
 	function set_looped(v:Bool):Bool {
-		if (playing) {
-			if (v) _channel.loops = 999;
-			else _channel.loops = 0;
-		}
+		if (playing) _source.loops = v ? 999 : 0;
 		return looped = v;
 	}
 
 	function set_loopTime(v:Float):Float {
-		if (playing) _channel.loopTime = v;
+		if (playing) _source.loopTime = v;
 		return loopTime = v;
 	}
 
 	function set_endTime(v:Null<Float>):Null<Float> {
 		if (playing) {
-			if (v != null && v > 0 && v < _length) _channel.endTime = v;
-			else _channel.endTime = null;
+			if (v != null && v > 0 && v < _length) _source.length = v;
+			else _source.length = null;
 		}
 		return endTime = v;
 	}
@@ -864,7 +898,7 @@ class FlxSound extends FlxBasic {
 			return _time;
 	}
 	function get_time():Float {
-		if (_channel == null || @:privateAccess !_channel.__isValid || /*AudioManager.context == null*/funkin.backend.system.Main.audioDisconnected) return _time;
+		if (_source == null || /*AudioManager.context == null*/funkin.backend.system.Main.audioDisconnected) return _time;
 
 		final sourceTime = _source.currentTime - _source.offset - _offset;
 		if (!_source.playing || _realPitch <= 0) {
@@ -903,24 +937,21 @@ class FlxSound extends FlxBasic {
 		return _time = time;
 	}
 
-	inline function get_offset():Float return _offset;
-	inline function set_offset(offset:Float):Float {
+	function get_offset():Float return _offset;
+	function set_offset(offset:Float):Float {
 		if (_offset == (_offset = offset)) return offset;
 		//time = time + _offset;
 		return offset;
 	}
 
-	inline function get_length():Float return _length - _offset;
+	function get_length():Float return _length - _offset;
 
-	/*function get_latency():Float {
-		if (_channel != null) return _source.latency;
-		return 0;
-	}*/
+	//function get_latency():Float return _source != null ? _source.latency : 0;
 
 	override function toString():String {
 		return FlxStringUtil.getDebugString([
 			LabelValuePair.weak("playing", playing),
-			LabelValuePair.weak("time", _time),
+			LabelValuePair.weak("time", time),
 			LabelValuePair.weak("length", length),
 			LabelValuePair.weak("volume", volume),
 			LabelValuePair.weak("pitch", pitch)

source/funkin/backend/FlxAnimate.hx

@@ -1,92 +0,0 @@
-package funkin.backend;
-
-import flixel.graphics.frames.FlxFrame;
-import flixel.math.FlxAngle;
-import flixel.math.FlxMatrix;
-import openfl.display.BlendMode;
-import openfl.geom.ColorTransform;
-
-class FlxAnimate extends flxanimate.FlxAnimate {
-	static var rMatrix = new FlxMatrix();
-
-	override function drawLimb(limb:FlxFrame, _rMatrix:FlxMatrix, ?colorTransform:ColorTransform, ?blendMode:BlendMode)
-	{
-		if (alpha == 0 || colorTransform != null && (colorTransform.alphaMultiplier == 0 || colorTransform.alphaOffset == -255) || limb == null || limb.type == EMPTY)
-			return;
-
-		if (blendMode == null)
-			blendMode = BlendMode.NORMAL;
-
-		for (camera in cameras)
-		{
-			rMatrix.identity();
-			limb.prepareMatrix(rMatrix, FlxFrameAngle.ANGLE_0, _checkFlipX() != camera.flipX, _checkFlipY() != camera.flipY);
-			rMatrix.concat(_rMatrix);
-			if (!camera.visible || !camera.exists || !limbOnScreen(limb, _rMatrix, camera))
-				return;
-
-			getScreenPosition(_point, camera).subtractPoint(offset);
-			rMatrix.translate(-origin.x, -origin.y);
-			if (limb != _pivot) {
-				if (frameOffsetAngle != null && frameOffsetAngle != angle)
-				{
-					var angleOff = (frameOffsetAngle - angle) * FlxAngle.TO_RAD;
-					var cos = Math.cos(angleOff);
-					var sin = Math.sin(angleOff);
-					// cos doesn't need to be negated
-					rMatrix.rotateWithTrig(cos, -sin);
-					rMatrix.translate(-frameOffset.x, -frameOffset.y);
-					rMatrix.rotateWithTrig(cos, sin);
-				}
-				else
-				{
-					rMatrix.translate(-frameOffset.x, -frameOffset.y);
-				}
-				rMatrix.scale(scale.x, scale.y);
-
-				if (!matrixExposed && bakedRotationAngle <= 0)
-				{
-					updateTrig();
-
-					if (angle != 0)
-						rMatrix.rotateWithTrig(_cosAngle, _sinAngle);
-				}
-			}
-			else
-				rMatrix.a = rMatrix.d = 0.7 / camera.zoom;
-
-			if (matrixExposed)
-			{
-				rMatrix.concat(transformMatrix);
-			}
-			else
-			{
-				rMatrix.concat(@:privateAccess flxanimate.FlxAnimate._skewMatrix);
-			}
-
-			_point.addPoint(origin);
-			if (isPixelPerfectRender(camera))
-			{
-				_point.floor();
-			}
-
-			rMatrix.translate(_point.x, _point.y);
-			camera.drawPixels(limb, null, rMatrix, colorTransform, blendMode, antialiasing, shaderEnabled ? shader : null);
-			#if FLX_DEBUG
-			FlxBasic.visibleCount++;
-			#end
-		}
-
-		// doesn't work, needs to be remade
-		// #if FLX_DEBUG
-		// if (FlxG.debugger.drawDebug)
-		// 	drawDebug();
-		// #end
-	}
-
-	override function limbOnScreen(limb:FlxFrame, m:FlxMatrix, ?Camera:FlxCamera)
-	{
-		// TODO: ACTUAL OPTIMIZATION
-		return true;
-	}
-}

source/funkin/backend/FunkinSprite.hx

@@ -1,5 +1,7 @@
 package funkin.backend;
 
+import animate.FlxAnimate;
+import animate.FlxAnimateController.FlxAnimateAnimation;
 import flixel.addons.effects.FlxSkewedSprite;
 import flixel.animation.FlxAnimation;
 import flixel.math.FlxMatrix;
@@ -7,7 +9,6 @@ import flixel.math.FlxPoint;
 import flixel.math.FlxRect;
 import flixel.system.FlxAssets.FlxGraphicAsset;
 import flixel.util.typeLimit.OneOfTwo;
-import flxanimate.animate.FlxAnim.FlxSymbolAnimation;
 import funkin.backend.scripting.events.sprite.PlayAnimContext;
 import funkin.backend.system.interfaces.IBeatReceiver;
 import funkin.backend.system.interfaces.IOffsetCompatible;
@@ -15,6 +16,10 @@ import funkin.backend.utils.XMLUtil.AnimData;
 import funkin.backend.utils.XMLUtil.BeatAnim;
 import funkin.backend.utils.XMLUtil.IXMLEvents;
 import haxe.io.Path;
+import flixel.graphics.frames.FlxFrame;
+import flixel.math.FlxAngle;
+import animate.internal.RenderTexture;
+import animate.FlxAnimateFrames;
 
 enum abstract XMLAnimType(Int)
 {
@@ -43,7 +48,7 @@ enum abstract XMLAnimType(Int)
 	}
 }
 
-class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements IOffsetCompatible implements IXMLEvents
+class FunkinSprite extends FlxAnimate implements IBeatReceiver implements IOffsetCompatible implements IXMLEvents
 {
 	public var extra:Map<String, Dynamic> = [];
 
@@ -56,6 +61,9 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 	public var animEnabled:Bool = true;
 	public var zoomFactorEnabled:Bool = true;
 
+	//Backwards compatibility
+	public var animateAtlas(get, never):FunkinSprite;
+
 	public var globalCurFrame(get, set):Int;
 
 	/**
@@ -66,9 +74,9 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 	public var beatOffset:Int = 0;
 	public var skipNegativeBeats:Bool = false;
 
-	public var animateAtlas:FlxAnimate;
-	@:noCompletion public var atlasPlayingAnim:String;
-	@:noCompletion public var atlasPath:String;
+	public var animateSettings:FlxAnimateSettings = {};
+
+	var _rect2:FlxRect;
 
 	public function new(?X:Float = 0, ?Y:Float = 0, ?SimpleGraphic:FlxGraphicAsset)
 	{
@@ -83,6 +91,7 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 		}
 
 		moves = false;
+		applyStageMatrix = true;
 	}
 
 	/**
@@ -98,8 +107,6 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 		@:privateAccess {
 			spr.setPosition(source.x, source.y);
 			spr.frames = source.frames;
-			if (casted != null && casted.animateAtlas != null && casted.atlasPath != null)
-				spr.loadSprite(casted.atlasPath);
 			spr.animation.copyFrom(source.animation);
 			spr.visible = source.visible;
 			spr.alpha = source.alpha;
@@ -109,9 +116,8 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 
 			if (casted != null) {
 				spr.skew.set(casted.skew.x, casted.skew.y);
-				spr.transformMatrix = casted.transformMatrix;
-				spr.matrixExposed = casted.matrixExposed;
 				spr.animOffsets = casted.animOffsets.copy();
+				spr.zoomFactor = casted.zoomFactor;
 			}
 		}
 		return spr;
@@ -120,8 +126,6 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 	public override function update(elapsed:Float)
 	{
 		super.update(elapsed);
-		if (animateAtlas != null)
-			animateAtlas.update(elapsed);
 
 		// hate how it looks like but hey at least its optimized and fast  - Nex
 		if (!debugMode && isAnimFinished()) {
@@ -131,18 +135,15 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 		}
 	}
 
+	override function initVars() {
+		super.initVars();
+		_rect2 = FlxRect.get();
+	}
+
 	public function loadSprite(path:String, Unique:Bool = false, Key:String = null)
 	{
 		var noExt = Path.withoutExtension(path);
-		if (Assets.exists('$noExt/Animation.json'))
-		{
-			atlasPath = noExt;
-			animateAtlas = new FlxAnimate(x, y, noExt);
-		}
-		else
-		{
-			frames = Paths.getFrames(path, true);
-		}
+		frames = Paths.getFrames(path, true, null, null, animateSettings);
 		return this;
 	}
 
@@ -172,50 +173,22 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 	{
 	}
 
-	// ANIMATE ATLAS DRAWING
-	#if REGION
-	public override function draw()
-	{
-		if (animateAtlas != null)
-		{
-			copyAtlasValues();
-			animateAtlas.draw();
-		}
-		else
-		{
-			super.draw();
-		}
+	public override function draw() {
+		// re-implementing the `onDraw` functionality from `FlxSprite` since `FlxAnimate` didn't have this, so we have to add it back in ourselves
+	    if (this.isAnimate && this.__drawOverrided) {
+	        this.__drawOverrided = false;
+	        this.onDraw(this);
+	        this.__drawOverrided = true;
+			return;
+	    }
+	    super.draw();
 	}
 
-	public function copyAtlasValues()
-	{
-		@:privateAccess {
-			animateAtlas.cameras = cameras; // investigate if we can use _cameras
-			animateAtlas.scrollFactor = scrollFactor;
-			animateAtlas.scale = scale;
-			animateAtlas.offset = offset;
-			animateAtlas.frameOffset = frameOffset;
-			animateAtlas.x = x;
-			animateAtlas.y = y;
-			animateAtlas.angle = angle;
-			animateAtlas.alpha = alpha;
-			animateAtlas.visible = visible;
-			animateAtlas.flipX = flipX;
-			animateAtlas.flipY = flipY;
-			animateAtlas.shader = shader;
-			animateAtlas.shaderEnabled = shaderEnabled;
-			animateAtlas.antialiasing = antialiasing;
-			animateAtlas.skew = skew;
-			animateAtlas.transformMatrix = transformMatrix;
-			animateAtlas.matrixExposed = matrixExposed;
-			animateAtlas.colorTransform = colorTransform;
-		}
-	}
+	// ANIMATE ATLAS DRAWING
+	#if REGION
 
 	public override function destroy()
 	{
-		animateAtlas = FlxDestroyUtil.destroy(animateAtlas);
-
 		if (animOffsets != null) {
 			for (key in animOffsets.keys()) {
 				final point = animOffsets[key];
@@ -226,6 +199,8 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 			animOffsets = null;
 		}
 		super.destroy();
+
+		_rect2 = FlxDestroyUtil.put(_rect2);
 	}
 	#end
 
@@ -233,27 +208,21 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 	private inline function __shouldDoZoomFactor()
 		return zoomFactorEnabled && zoomFactor != 1;
 
-	public override function getScreenBounds(?newRect:FlxRect, ?camera:FlxCamera):FlxRect
-	{
-		if (camera == null)
-			camera = FlxG.camera;
-
-		var r = super.getScreenBounds(newRect, camera);
-
-		if(__shouldDoZoomFactor()) {
-			r.x -= camera.width / 2;
-			r.y -= camera.height / 2;
-
-			var ratio = (camera.zoom > 0 ? Math.max : Math.min)(0, FlxMath.lerp(1 / camera.zoom, 1, zoomFactor));
-			r.x *= ratio;
-			r.y *= ratio;
-			r.width *= ratio;
-			r.height *= ratio;
-
-			r.x += camera.width / 2;
-			r.y += camera.height / 2;
-		}
-		return r;
+	private inline function __prepareZoomFactor(?rect:FlxRect, camera:FlxCamera):FlxRect {
+		if (Flags.USE_LEGACY_ZOOM_FACTOR)
+			return (rect ?? FlxRect.get()).set(
+				camera.width * 0.5,
+				camera.height * 0.5,
+				(camera.scaleX > 0 ? Math.max : Math.min)(0, FlxMath.lerp(1 / camera.scaleX, 1, zoomFactor)),
+				(camera.scaleY > 0 ? Math.max : Math.min)(0, FlxMath.lerp(1 / camera.scaleY, 1, zoomFactor))
+			);
+		else
+			return (rect ?? FlxRect.get()).set(
+				camera.width * 0.5 + camera.scroll.x * scrollFactor.x,
+				camera.height * 0.5 + camera.scroll.y * scrollFactor.y,
+				(camera.scaleX > 0 ? Math.max : Math.min)(0, FlxMath.lerp(1 / camera.scaleX, 1, zoomFactor)),
+				(camera.scaleY > 0 ? Math.max : Math.min)(0, FlxMath.lerp(1 / camera.scaleY, 1, zoomFactor))
+			);
 	}
 
 	override public function isOnScreen(?camera:FlxCamera):Bool
@@ -270,20 +239,6 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 		return camera.containsRect(bounds);
 	}
 
-	// ZOOM FACTOR RENDERING
-	public override function doAdditionalMatrixStuff(matrix:FlxMatrix, camera:FlxCamera)
-	{
-		super.doAdditionalMatrixStuff(matrix, camera);
-		if(__shouldDoZoomFactor()) {
-			matrix.translate(-camera.width / 2, -camera.height / 2);
-
-			var requestedZoom = (camera.zoom >= 0 ? Math.max : Math.min)(FlxMath.lerp(1, camera.zoom, zoomFactor), 0);
-			var diff = requestedZoom / camera.zoom;
-			matrix.scale(diff, diff);
-			matrix.translate(camera.width / 2, camera.height / 2);
-		}
-	}
-
 	// OFFSETTING
 	#if REGION
 	public var animOffsets:Map<String, FlxPoint> = new Map<String, FlxPoint>();
@@ -315,13 +270,7 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 			Force = anim != null && anim.forced;
 		}
 
-		if (animateAtlas != null)
-		{
-			@:privateAccess
-			animateAtlas.anim.play(AnimName, Force, Reversed, Frame);
-			atlasPlayingAnim = AnimName;
-		}
-		else animation.play(AnimName, Force, Reversed, Frame);
+		animation.play(AnimName, Force, Reversed, Frame);
 
 		var daOffset = getAnimOffset(AnimName);
 		frameOffset.set(daOffset.x, daOffset.y);
@@ -330,7 +279,7 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 		lastAnimContext = Context;
 	}
 
-	public inline function addAnim(name:String, prefix:String, frameRate:Float = 24, ?looped:Bool, ?forced:Bool, ?indices:Array<Int>, x:Float = 0, y:Float = 0, animType:XMLAnimType = NONE)
+	public inline function addAnim(name:String, prefix:String, frameRate:Float = 24, ?looped:Bool, ?forced:Bool, ?indices:Array<Int>, x:Float = 0, y:Float = 0, animType:XMLAnimType = NONE, animateAtlasLabel:Bool = false)
 	{
 		return XMLUtil.addAnimToSprite(this, {
 			name: name,
@@ -341,22 +290,16 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 			x: x,
 			y: y,
 			indices: indices,
-			forced: forced
+			forced: forced,
+			label: animateAtlasLabel
 		});
 	}
 
-	public inline function removeAnim(name:String)
-	{
-		if (animateAtlas != null)
-			@:privateAccess animateAtlas.anim.animsMap.remove(name);
-		else
-			animation.remove(name);
+	public inline function removeAnim(name:String) {
+		animation.remove(name);
 	}
 
-	public function getAnim(name:String):OneOfTwo<FlxAnimation, FlxSymbolAnimation>
-	{
-		if(animateAtlas != null)
-			return animateAtlas.anim.getByName(name);
+	public function getAnim(name:String):OneOfTwo<FlxAnimation, FlxAnimateAnimation> {
 		return animation.getByName(name);
 	}
 
@@ -367,40 +310,26 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 		return FlxPoint.weak(0, 0);
 	}
 
-	public inline function hasAnim(AnimName:String):Bool @:privateAccess
-		return animateAtlas != null ? (animateAtlas.anim.animsMap.exists(AnimName)
-			|| animateAtlas.anim.symbolDictionary.exists(AnimName)) : animation.exists(AnimName);
+	public inline function hasAnim(AnimName:String):Bool
+		return animation.exists(AnimName);
 
-	public inline function getAnimName() {
-		return (animateAtlas != null) ? atlasPlayingAnim : animation.name;
-	}
+	public inline function getAnimName()
+		return animation.name;
 
-	public inline function isAnimReversed():Bool {
-		return animateAtlas != null ? animateAtlas.anim.reversed : animation.curAnim != null ? animation.curAnim.reversed : false;
-	}
+	public inline function isAnimReversed():Bool
+		return animation.curAnim?.reversed ?? false;
 
-	public inline function getNameList():Array<String> {
-		if (animateAtlas != null)
-			return [for (name in @:privateAccess animateAtlas.anim.animsMap.keys()) name];
-		else
-			return animation.getNameList();
-	}
+	public inline function getNameList():Array<String>
+		return animation.getNameList();
 
 	public inline function stopAnim()
-	{
-		if (animateAtlas != null)
-			animateAtlas.anim.pause();
-		else
-			animation.stop();
-	}
+		animation.stop();
 
-	public inline function isAnimFinished() {
-		return animateAtlas != null ? animateAtlas.anim.finished : (animation.curAnim != null ? animation.curAnim.finished : true);
-	}
+	public inline function isAnimFinished()
+		return animation.curAnim?.finished ?? true;
 
-	public inline function isAnimAtEnd() {
-		return animateAtlas != null ? animateAtlas.anim.isAtEnd : (animation.curAnim != null ? animation.curAnim.isAtEnd : false);
-	}
+	public inline function isAnimAtEnd()
+		return animation.curAnim?.isAtEnd ?? false;
 
 	override function updateAnimation(elapsed:Float) {
 		if (animEnabled)
@@ -422,10 +351,38 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 		return beatInterval = v;
 	}
 
-	@:noCompletion private inline function get_globalCurFrame() {
-		return animateAtlas != null ? (animateAtlas.anim.curFrame) : (animation.curAnim != null ? animation.curAnim.curFrame : 0);
-	}
+	@:noCompletion
+	@:deprecated("`FunkinSprite.animateAtlas` is deprecated, just use `FunkinSprite` instead")
+	public function get_animateAtlas():FunkinSprite
+    	return isAnimate ? this : null;
+
+	@:noCompletion private inline function get_globalCurFrame()
+		return animation.curAnim?.curFrame ?? 0;
+
 	@:noCompletion private inline function set_globalCurFrame(val:Int) {
-		return animateAtlas != null ? (animateAtlas.anim.curFrame = val) : (animation.curAnim != null ? animation.curAnim.curFrame = val : val);
+		if (animation.curAnim != null)
+			animation.curAnim.curFrame = val;
+		return val;
+	}
+
+	override function prepareDrawMatrix(matrix:FlxMatrix, camera:FlxCamera):Void {
+		super.prepareDrawMatrix(matrix, camera);
+
+		if (__shouldDoZoomFactor()) {
+			__prepareZoomFactor(_rect2, camera);
+			matrix.setTo(
+				matrix.a * _rect2.width, matrix.b * _rect2.height,
+				matrix.c * _rect2.width, matrix.d * _rect2.height,
+				(matrix.tx - _rect2.x) * _rect2.width + _rect2.x,
+				(matrix.ty - _rect2.y) * _rect2.height + _rect2.y,
+			);
+		}
+	}
+
+	override function checkFlipX() {
+		return super.checkFlipX() != camera.flipX;
+	}
+	override function checkFlipY() {
+		return super.checkFlipY() != camera.flipY;
 	}
 }

source/funkin/backend/MusicBeatSubstate.hx

@@ -236,6 +236,12 @@ class MusicBeatSubstate extends FlxSubState implements IBeatCancellableReceiver
 			super.openSubState(e.substate is FlxSubState ? cast e.substate : subState);
 	}
 
+	public override function closeSubState() {
+		var e = event("onCloseSubState", EventManager.get(StateEvent).recycle(subState));
+		if (!e.cancelled)
+			super.closeSubState();
+	}
+
 	public override function onResize(w:Int, h:Int) {
 		super.onResize(w, h);
 		event("onResize", EventManager.get(ResizeEvent).recycle(w, h, null, null));

source/funkin/backend/MusicBeatTransition.hx

@@ -114,12 +114,8 @@ class MusicBeatTransition extends MusicBeatSubstate {
 		}
 
 		if (transitionSprite != null) {
-			if (transitionSprite.animateAtlas == null) {
-				transitionSprite.setGraphicSize(transitionCamera.width, transitionCamera.height);
-				transitionSprite.updateHitbox();
-			} else {
-				transitionSprite.screenCenter();
-			}
+			transitionSprite.setGraphicSize(transitionCamera.width, transitionCamera.height);
+			transitionSprite.updateHitbox();
 		}
 	}
 

source/funkin/backend/assets/AssetsLibraryList.hx

@@ -5,9 +5,22 @@ import funkin.backend.assets.TranslatedAssetLibrary;
 #end
 import funkin.backend.assets.IModsAssetLibrary;
 import lime.utils.AssetLibrary;
+import haxe.ds.Map;
 
 class AssetsLibraryList extends AssetLibrary {
+
 	public var libraries:Array<AssetLibrary> = [];
+	public var cleanLibraries(get, never):Array<AssetLibrary>;
+	function get_cleanLibraries():Array<AssetLibrary> {
+		return [for (l in libraries) getCleanLibrary(l)];
+	}
+	
+	// is true if any library in `libraries` contains some kind of compressed library. 
+	public var hasCompressedLibrary(get, never):Bool;
+	function get_hasCompressedLibrary():Bool {
+		for (l in libraries) if (getCleanLibrary(l).isCompressed) return true;
+		return false;
+	}
 
 	@:allow(funkin.backend.system.Main)
 	@:allow(funkin.backend.system.MainState)
@@ -141,6 +154,16 @@ class AssetsLibraryList extends AssetLibrary {
 	public override inline function getAsset(id:String, type:String):Dynamic
 		return getSpecificAsset(id, type, BOTH);
 
+	public override function list(type:String):Array<String> {
+		// idk if there's a more efficient way tbh, correct if u find better
+		var files:Map<String, Bool> = [];
+		for(k=>l in libraries) {
+			for(f in l.list(type))
+				files.set(f, false);
+		}
+		return [for(k=>e in files) k];
+	}
+
 	public override function isLocal(id:String, type:String) {
 		return true;
 	}

source/funkin/backend/assets/ModsFolder.hx

@@ -83,10 +83,11 @@ class ModsFolder {
 	 */
 	public static function loadModLib(path:String, force:Bool = false, ?modName:String) {
 		#if MOD_SUPPORT
-		if (FileSystem.exists('$path.zip'))
-			return loadLibraryFromZip('$path'.toLowerCase(), '$path.zip', force, modName);
-		else
-			return loadLibraryFromFolder('$path'.toLowerCase(), '$path', force, modName);
+		for (ext in Flags.ALLOWED_ZIP_EXTENSIONS) {
+			if (!FileSystem.exists('$path.$ext')) continue;
+			return loadLibraryFromZip('$path'.toLowerCase(), '$path.$ext', force, modName);
+		}
+		return loadLibraryFromFolder('$path'.toLowerCase(), '$path', force, modName);
 
 		#else
 		return null;
@@ -96,27 +97,16 @@ class ModsFolder {
 	public static function getModsList():Array<String> {
 		var mods:Array<String> = [];
 		#if MOD_SUPPORT
-		if (!FileSystem.exists(modsPath)) {
-			// Mods directory does not exist yet, create it
-			FileSystem.createDirectory(modsPath);
-		}
+		// Mods directory does not exist yet, create it
+		if (!FileSystem.exists(modsPath)) FileSystem.createDirectory(modsPath);
 		
 		final modsList:Array<String> = FileSystem.readDirectory(modsPath);
 
-		if (modsList == null || modsList.length <= 0)
-			return mods;
+		if (modsList == null || modsList.length <= 0) return mods;
 
 		for (modFolder in modsList) {
-			if (FileSystem.isDirectory(modsPath + modFolder)) {
-				mods.push(modFolder);
-			} else {
-				var ext = Path.extension(modFolder).toLowerCase();
-				switch(ext) {
-					case 'zip':
-						// is a zip mod!!
-						mods.push(Path.withoutExtension(modFolder));
-				}
-			}
+			if (FileSystem.isDirectory(modsPath + modFolder)) mods.push(modFolder);
+			else if (Flags.ALLOWED_ZIP_EXTENSIONS.contains(Path.extension(modFolder))) mods.push(Path.withoutExtension(modFolder));
 		}
 		#end
 		return mods;
@@ -128,7 +118,9 @@ class ModsFolder {
 			#if TRANSLATIONS_SUPPORT
 			if(skipTranslated && (l is TranslatedAssetLibrary)) continue;
 			#end
-			if (l is ScriptedAssetLibrary || l is IModsAssetLibrary) libs.push(cast(l, IModsAssetLibrary));
+			// No need to check for it being a `ScriptedAssetLibrary`, if `ScriptedAssetLibrary` extends ModsFolderLibrary, which implements `IModsAssetLibrary`
+			// If you have to revert this change then uhhhhh wasn't me, trust 🙏
+			if (/*l is ScriptedAssetLibrary ||*/ l is IModsAssetLibrary) libs.push(cast(l, IModsAssetLibrary));
 		}
 		return libs;
 	}

source/funkin/backend/assets/ModsFolderLibrary.hx

@@ -149,6 +149,22 @@ class ModsFolderLibrary extends AssetLibrary implements IModsAssetLibrary {
 		}
 		return true;
 	}
+
+	public override function list(type:String):Array<String> {
+		var result = [];
+		__listAppend(result, '');
+		return result;
+	}
+
+	function __listAppend(arr:Array<String>, folder:String) {
+		for(file in FileSystem.readDirectory('$basePath/$folder')) {
+			var fullPath = '$basePath/$folder/$file';
+			if (FileSystem.isDirectory(fullPath))
+				__listAppend(arr, '$folder$file/');
+			else
+				arr.push('$prefix$folder$file');
+		}
+	}
 	#end
 
 	// Backwards compat

source/funkin/backend/assets/Paths.hx

@@ -8,6 +8,7 @@ import funkin.backend.scripting.Script;
 import haxe.io.Path;
 import lime.utils.AssetLibrary;
 import openfl.utils.Assets as OpenFlAssets;
+import animate.FlxAnimateFrames;
 
 using StringTools;
 
@@ -174,6 +175,9 @@ class Paths
 	inline static public function getSparrowAtlas(key:String, ?library:String, ?ext:String)
 		return FlxAtlasFrames.fromSparrow(image(key, library, ext), file('images/$key.xml', library));
 
+	inline static public function getAnimateAtlasAlt(key:String, ?settings:FlxAnimateSettings)
+		return FlxAnimateFrames.fromAnimate(key, null, null, null, false, settings);
+
 	inline static public function getSparrowAtlasAlt(key:String, ?ext:String)
 		return FlxAtlasFrames.fromSparrow('$key.${ext != null ? ext : Flags.IMAGE_EXT}', '$key.xml');
 
@@ -197,7 +201,7 @@ class Paths
 	 * @param key Path to the frames
 	 * @param library (Additional) library to load the frames from.
 	 */
-	public static function getFrames(key:String, assetsPath:Bool = false, ?library:String, ?ext:String = null) {
+	public static function getFrames(key:String, assetsPath:Bool = false, ?library:String, ?ext:String = null, ?animateSettings:FlxAnimateSettings) {
 		if (tempFramesCache.exists(key)) {
 			var frames = tempFramesCache[key];
 			if (frames != null && frames.parent != null && frames.parent.bitmap != null && frames.parent.bitmap.readable)
@@ -205,7 +209,7 @@ class Paths
 			else
 				tempFramesCache.remove(key);
 		}
-		return tempFramesCache[key] = loadFrames(assetsPath ? key : Paths.image(key, library, true, ext), false, null, false, ext);
+		return tempFramesCache[key] = loadFrames(assetsPath ? key : Paths.image(key, library, true, ext), false, null, false, ext, animateSettings);
 	}
 
 	/**
@@ -242,7 +246,7 @@ class Paths
 	 * @param Ext Extension of the image.
 	 * @return FlxFramesCollection Frames
 	 */
-	static function loadFrames(path:String, Unique:Bool = false, Key:String = null, SkipAtlasCheck:Bool = false, SkipMultiCheck:Bool = false, ?Ext:String = null):FlxFramesCollection {
+	static function loadFrames(path:String, Unique:Bool = false, Key:String = null, SkipAtlasCheck:Bool = false, SkipMultiCheck:Bool = false, ?Ext:String = null, ?animateSettings:FlxAnimateSettings):FlxFramesCollection {
 		var noExt = Path.withoutExtension(path);
 		var ext = Ext != null ? Ext : Flags.IMAGE_EXT;
 
@@ -263,6 +267,8 @@ class Paths
 				cur++;
 			}
 			return finalFrames;
+		} else if (Assets.exists('$noExt/Animation.json')) {
+			return Paths.getAnimateAtlasAlt(noExt, animateSettings);
 		} else if (Assets.exists('$noExt.xml')) {
 			return Paths.getSparrowAtlasAlt(noExt, ext);
 		} else if (Assets.exists('$noExt.txt')) {

source/funkin/backend/assets/TranslatedAssetLibrary.hx

@@ -108,6 +108,8 @@ class TranslatedAssetLibrary extends AssetLibrary implements IModsAssetLibrary {
 		return null;
 	}
 
+	// TODO: list support for TranslatedAssetLibrary (idk how it works)
+
 	#if MOD_SUPPORT
 	public var _parsedAsset:String = null;  // Theres no need to actually make this work  - Nex
 

source/funkin/backend/assets/ZipFolderLibrary.hx

@@ -1,11 +1,14 @@
 package funkin.backend.assets;
 
+import funkin.backend.system.Flags;
+
 import haxe.io.Path;
 import lime.graphics.Image;
 import lime.media.AudioBuffer;
 import lime.text.Font;
 import lime.utils.Bytes;
 import openfl.utils.AssetLibrary;
+import sys.io.File;
 
 #if MOD_SUPPORT
 import funkin.backend.utils.SysZip.SysZipEntry;
@@ -15,15 +18,16 @@ class ZipFolderLibrary extends AssetLibrary implements IModsAssetLibrary {
 	public var basePath:String;
 	public var modName:String;
 	public var libName:String;
-	public var useImageCache:Bool = false;
 	public var prefix = 'assets/';
-
+	
 	public var zip:SysZip;
 	public var assets:Map<String, SysZipEntry> = [];
 	public var lowerCaseAssets:Map<String, SysZipEntry> = [];
 	public var nameMap:Map<String, String> = [];
 
-	public function new(basePath:String, libName:String, ?modName:String) {
+	public var PRELOAD_VIDEOS:Bool = true;
+
+	public function new(basePath:String, libName:String, ?modName:String, ?preloadVideos:Bool = true) {
 		this.libName = libName;
 
 		this.basePath = basePath;
@@ -31,21 +35,59 @@ class ZipFolderLibrary extends AssetLibrary implements IModsAssetLibrary {
 		this.modName = (modName == null) ? libName : modName;
 
 		zip = SysZip.openFromFile(basePath);
-		zip.read();
 		for(entry in zip.entries) {
-			lowerCaseAssets[entry.fileName.toLowerCase()] = assets[entry.fileName.toLowerCase()] = assets[entry.fileName] = entry;
-			nameMap.set(entry.fileName.toLowerCase(), entry.fileName);
+			if (entry.fileName.length < 0 || entry.fileName.endsWith("/")) continue;
+
+			var name:String = entry.fileName.toLowerCase(); // calling .toLowerCase a million times is never the solution
+			lowerCaseAssets[name] = assets[name] = assets[entry.fileName] = entry;
+			nameMap.set(name, entry.fileName);
 		}
 
 		super();
+
+		isCompressed = true;
+		
+		// don't override default value of true if the file exists.
+		// by default `PRELOAD_VIDEOS` is true so you will never need to add this file, but in the case of it being false this is a backup method.
+		PRELOAD_VIDEOS = (!PRELOAD_VIDEOS) ? exists("assets/data/PRECACHE_VIDEOS", "TEXT") : PRELOAD_VIDEOS;
+
+		// if (PRELOAD_VIDEOS) precacheVideos(); // we do this in `MainState` now to handle for `Flags.VIDEO_EXT` :)
+	}
+
+	public function precacheVideos() {
+		_videoExtensions = [Flags.VIDEO_EXT];
+		
+		videoCacheRemap = [];
+		for (entry in zip.entries) {
+			var name = entry.fileName.toLowerCase();
+			if (_videoExtensions.contains(Path.extension(name))) getPath(prefix+name);
+		}
+
+		var count:Int = 0;
+        for (_ in videoCacheRemap.keys()) count++;
+		if (count <= 0) return;
+		trace('Precached $count video${(count == 1) ? "" : "s"}');
+	}
+
+	// Now we have supports for videos in ZIP!!
+	public var _videoExtensions:Array<String> = [Flags.VIDEO_EXT];
+	public var videoCacheRemap:Map<String, String> = [];
+	public function getVideoRemap(originalPath:String):String {
+		if (!_videoExtensions.contains(Path.extension(_parsedAsset))) return originalPath;
+		if (videoCacheRemap.exists(originalPath)) return videoCacheRemap.get(originalPath);
+
+		// We adding the length of the string to counteract folder in folder naming duplicates.
+		var newPath = './.temp/${_parsedAsset.length}-zipvideo-${_parsedAsset.split("/").pop()}';
+		File.saveBytes(newPath, unzip(assets[_parsedAsset]));
+		videoCacheRemap.set(originalPath, newPath);
+		return newPath;
 	}
 
 	function toString():String {
-		return '(ZipFolderLibrary: $libName/$modName)';
+		return '(ZipFolderLibrary: $libName/$modName | ${zip.entries.length} entries | Detected Video Extensions: ${_videoExtensions.join(", ")})';
 	}
 
 	public var _parsedAsset:String;
-
 	public override function getAudioBuffer(id:String):AudioBuffer {
 		__parseAsset(id);
 		return AudioBuffer.fromBytes(unzip(assets[_parsedAsset]));
@@ -68,15 +110,12 @@ class ZipFolderLibrary extends AssetLibrary implements IModsAssetLibrary {
 		return getAssetPath();
 	}
 
-
-
-	public inline function unzip(f:SysZipEntry)
-		return f == null ? null : zip.unzipEntry(f);
+	public inline function unzip(f:SysZipEntry) return (f == null) ? null : zip.unzipEntry(f);
 
 	public function __parseAsset(asset:String):Bool {
 		if (!asset.startsWith(prefix)) return false;
 		_parsedAsset = asset.substr(prefix.length);
-		if(ModsFolder.useLibFile) {
+		if (ModsFolder.useLibFile) {
 			var file = new haxe.io.Path(_parsedAsset);
 			if(file.file.startsWith("LIB_")) {
 				var library = file.file.substr(4);
@@ -87,8 +126,7 @@ class ZipFolderLibrary extends AssetLibrary implements IModsAssetLibrary {
 		}
 
 		_parsedAsset = _parsedAsset.toLowerCase();
-		if(nameMap.exists(_parsedAsset))
-			_parsedAsset = nameMap.get(_parsedAsset);
+		if (nameMap.exists(_parsedAsset)) _parsedAsset = nameMap.get(_parsedAsset);
 		return true;
 	}
 
@@ -103,9 +141,8 @@ class ZipFolderLibrary extends AssetLibrary implements IModsAssetLibrary {
 		return assets[_parsedAsset] != null;
 	}
 
-	private function getAssetPath() {
-		trace('[ZIP]$basePath/$_parsedAsset');
-		return '[ZIP]$basePath/$_parsedAsset';
+	private inline function getAssetPath() {
+		return getVideoRemap('$basePath/$_parsedAsset');
 	}
 
 	// TODO: rewrite this to 1 function, like ModsFolderLibrary
@@ -154,14 +191,6 @@ class ZipFolderLibrary extends AssetLibrary implements IModsAssetLibrary {
 		return content;
 	}
 
-	// Backwards compat
-
-	@:noCompletion public var zipPath(get, set):String;
-	@:noCompletion private inline function get_zipPath():String {
-		return basePath;
-	}
-	@:noCompletion private inline function set_zipPath(value:String):String {
-		return basePath = value;
-	}
+	public override function list(type:String):Array<String> { return [for(k=>e in nameMap) '$prefix$e']; }
 }
 #end

source/funkin/backend/chart/Chart.hx

@@ -278,9 +278,13 @@ class Chart {
 		var filteredChart = filterChartForSaving(chart, saveSettings.saveMetaInChart, saveSettings.saveLocalEvents, saveSettings.saveGlobalEvents && saveSettings.seperateGlobalEvents != true);
 
 		#if sys
-		var songPath = saveSettings.songFolder == null ? 'songs/${chart.meta.name}' : saveSettings.songFolder, variantSuffix = variant != null && variant != "" ? '-$variant' : "";
-		var metaPath = 'meta$variantSuffix.json', prettyPrint = saveSettings.prettyPrint == true ? Flags.JSON_PRETTY_PRINT : null, temp:String;
-		if ((temp = Paths.assetsTree.getPath('assets/$songPath/$metaPath')) != null) {
+		var songPath = saveSettings.songFolder == null ? 'songs/${chart.meta.name}' : saveSettings.songFolder, variantSuffix = variant != null && variant != "" ? '-$variant' : "", difficultySuffix = difficulty != null && difficulty != "" ? '-$difficulty' : "";
+		var metaPath = 'meta$variantSuffix.json', altMetaPath = 'meta${variantSuffix}${difficultySuffix}.json', prettyPrint = saveSettings.prettyPrint == true ? Flags.JSON_PRETTY_PRINT : null, temp:String;
+		if ((temp = Paths.assetsTree.getPath('assets/$songPath/$altMetaPath')) != null) { //check for difficulty specific
+			songPath = temp.substr(0, temp.length - altMetaPath.length - 1);
+			metaPath = temp;
+		}
+		else if ((temp = Paths.assetsTree.getPath('assets/$songPath/$metaPath')) != null) {
 			songPath = temp.substr(0, temp.length - metaPath.length - 1);
 			metaPath = temp;
 		}
@@ -300,6 +304,7 @@ class Chart {
 			var eventsPath = '$songPath/events$variantSuffix.json', events = filterEventsForSaving(chart.events, false, true);
 
 			if (events.length != 0) CoolUtil.safeSaveFile(eventsPath, Json.stringify({events: events}, null, prettyPrint));
+			else if (FileSystem.exists(eventsPath)) FileSystem.deleteFile(eventsPath); // If there's no events to save, then get rid of the file (if it exists already).
 		}
 		#end
 

source/funkin/backend/chart/EventsData.hx

@@ -75,7 +75,7 @@ class EventsData {
 				defValue: "In"
 			},
 			{name: "Mode", type: TDropDown(['direct', 'stage']), defValue: "direct"},
-			{name: "Multiplicative?", type: TBool, defValue: true}
+			{name: "Multiplicative?", type: TBool, defValue: false}
 		],
 		"Camera Modulo Change" => [
 			{name: "Modulo Interval", type: TInt(1, 9999999, 1), defValue: 4},
@@ -179,7 +179,8 @@ class EventsData {
 						finalParams.push({
 							name: paramData.name,
 							type: hscriptInterp.expr(hscriptParser.parseString(paramData.type)),
-							defValue: paramData.defaultValue
+							defValue: paramData.defaultValue,
+							saveIfDefault: paramData.saveIfDefault
 						});
 					} catch (e) {trace('Error parsing event param ${paramData.name} - ${eventName}: $e'); finalParams.push(null);}
 				}
@@ -196,6 +197,7 @@ typedef EventInfoFile = {
 		var name:String;
 		var type:String;
 		var defaultValue:Dynamic;
+		var ?saveIfDefault:Bool;
 	}>;
 }
 

source/funkin/backend/chart/PsychParser.hx

@@ -60,7 +60,7 @@ class PsychParser {
 						note.time, // TIME
 						note.id, // DATA
 						note.sLen, // SUSTAIN LENGTH
-						chart.noteTypes.getDefault([""])[note.type] // NOTE TYPE
+						chart.noteTypes.getDefault([""])[note.type - 1] // NOTE TYPE
 					];
 
 					if ((swagSection.mustHitSection && strumLine.type == OPPONENT) ||

source/funkin/backend/scripting/GlobalScript.hx

@@ -55,9 +55,6 @@ class GlobalScript {
 				reloading = false;
 				MusicBeatState.ALLOW_DEV_RELOAD = _lastAllow_Reload;
 			}
-
-			if (PlayerSettings.solo.controls.DEV_CONSOLE)
-				NativeAPI.allocConsole();
 		});
 		FlxG.signals.preDraw.add(function() {
 			call("preDraw");
@@ -109,12 +106,15 @@ class GlobalScript {
 	public static function onModSwitch(newMod:String) {
 		destroy();
 		scripts = new ScriptPack("GlobalScript");
-		for (i in funkin.backend.assets.ModsFolder.getLoadedMods()) {
-			var path = Paths.script('data/global/LIB_$i');
+		for (lib in funkin.backend.assets.ModsFolder.getLoadedModsLibs()) {
+			var modName = lib.modName;
+			var path = Paths.script('data/global/LIB_$modName');
 			var script = Script.create(path);
-			if (script is DummyScript)
-				continue;
-			script.remappedNames.set(script.fileName, '$i:${script.fileName}');
+			if (script is DummyScript) continue;
+			script.remappedNames.set(script.fileName, '$modName:${script.fileName}');
+			// so you can get the current mod's library in GloablScript :)
+			// you should not make this a static variable then all scripts will try to reference the 1 static variable, which will be overwritten :yoikes:
+			script.set("MOD_LIBRARY", lib);
 			scripts.add(script);
 			script.load();
 		}

source/funkin/backend/scripting/MultiThreadedScript.hx

@@ -1,14 +1,8 @@
 package funkin.backend.scripting;
 
-#if ALLOW_MULTITHREADING
-import sys.thread.Thread;
-#end
-
 import hscript.IHScriptCustomBehaviour;
 
 class MultiThreadedScript implements IFlxDestroyable implements IHScriptCustomBehaviour {
-	var thread:#if ALLOW_MULTITHREADING Thread #else Dynamic #end;
-
 	/**
 	 * Script being ran.
 	 */
@@ -46,13 +40,6 @@ class MultiThreadedScript implements IFlxDestroyable implements IHScriptCustomBe
 
 		script.load();
 
-		#if ALLOW_MULTITHREADING
-		thread = Thread.createWithEventLoop(function() {
-			// Prevent the thread from being auto deleted
-			Thread.current().events.promise();
-		});
-		#end
-
 		__variables = Type.getInstanceFields(Type.getClass(this));
 	}
 
@@ -69,7 +56,7 @@ class MultiThreadedScript implements IFlxDestroyable implements IHScriptCustomBe
 
 	public function call(func:String, args:Array<Dynamic>) {
 		#if ALLOW_MULTITHREADING
-		thread.events.run(function() {
+		funkin.backend.utils.ThreadUtil.execAsync(() -> {
 			callEnded = false;
 			returnValue = script.call(func, args);
 			callEnded = true;
@@ -85,13 +72,5 @@ class MultiThreadedScript implements IFlxDestroyable implements IHScriptCustomBe
 			script.call("destroy");
 			script.destroy();
 		}
-
-		#if ALLOW_MULTITHREADING
-		if (thread != null) {
-			thread.events.runPromised(function() {
-				// close the thing
-			});
-		}
-		#end
 	}
 }

source/funkin/backend/scripting/Script.hx

@@ -91,7 +91,7 @@ class Script extends FlxBasic implements IFlxDestroyable {
 			"FunkinShader"		=> funkin.backend.shaders.FunkinShader,
 			"CustomShader"		=> funkin.backend.shaders.CustomShader,
 			"FunkinText"		=> funkin.backend.FunkinText,
-			"FlxAnimate"		=> funkin.backend.FlxAnimate,
+			"FlxAnimate"		=> animate.FlxAnimate,
 			"FunkinSprite"		=> funkin.backend.FunkinSprite,
 			"Alphabet"			=> funkin.menus.ui.Alphabet,
 			"Flags"				=> funkin.backend.system.Flags,
@@ -102,6 +102,7 @@ class Script extends FlxBasic implements IFlxDestroyable {
 			#if sys "ZipUtil"	=> funkin.backend.utils.ZipUtil, #end
 			"MarkdownUtil"		=> funkin.backend.utils.MarkdownUtil,
 			"EngineUtil"		=> funkin.backend.utils.EngineUtil,
+			"ThreadUtil"		=> funkin.backend.utils.ThreadUtil,
 			"MemoryUtil"		=> funkin.backend.utils.MemoryUtil,
 			"BitmapUtil"		=> funkin.backend.utils.BitmapUtil,
 

source/funkin/backend/scripting/events/CancellableEvent.hx

@@ -4,7 +4,6 @@ import flixel.util.FlxDestroyUtil.IFlxDestroyable;
 
 @:allow(funkin.backend.scripting.ScriptPack)
 @:autoBuild(funkin.backend.system.macros.EventMacro.build())
-@:noCustomClass
 class CancellableEvent implements IFlxDestroyable {
 	@:dox(hide) public var cancelled:Bool = false;
 	@:dox(hide) private var __continueCalls:Bool = true;
@@ -54,4 +53,4 @@ class CancellableEvent implements IFlxDestroyable {
 	public function destroy() {
 		data = null;
 	}
-}
+}

source/funkin/backend/scripting/events/note/NoteHitEvent.hx

@@ -11,6 +11,7 @@ final class NoteHitEvent extends CancellableEvent {
 	@:dox(hide) public var unmuteVocals:Bool = true;
 	@:dox(hide) public var enableCamZooming:Bool = true;
 	@:dox(hide) public var autoHitLastSustain:Bool = true;
+	@:dox(hide) public var clipSustain:Bool = true;
 
 	/**
 	 * Whenever a miss should be added.
@@ -145,6 +146,13 @@ final class NoteHitEvent extends CancellableEvent {
 		deleteNote = true;
 	}
 
+	/**
+	 * Prevents the sustain from being cut. Only works if the note is a sustain.
+	 */
+	public function preventSustainClip() {
+		clipSustain = false;
+	}
+
 	/**
 	 * Prevents the vocals volume from being set to 1 after pressing the note.
 	 */

source/funkin/backend/shaders/ScriptableShader.hx

@@ -30,6 +30,8 @@ class ScriptableShader extends FlxBasic implements IHScriptCustomBehaviour {
 			if((shader is CustomShader)) scriptName = cast(shader, CustomShader).fileName;
 			else throw "Missing name for shader script, please provide a scriptName, or use CustomShader";
 
+		this.shader = shader;
+
 		script = Script.create(Paths.script('shaders/$scriptName'));
 		script.setParent(shader);
 		script.set("shader", shader);

source/funkin/backend/system/Controls.hx

@@ -25,6 +25,7 @@ enum Control
 	CHANGE_MODE;
 	//CHEAT;
 	SWITCHMOD;
+	FPS_COUNTER;
 
 	// Debugs
 	DEV_ACCESS;
@@ -161,6 +162,11 @@ class Controls extends FlxActionSet
 	@:pressed("switchmod") public var SWITCHMOD_HOLD(get, set): Bool;
 	@:justReleased("switchmod") public var SWITCHMOD_R(get, set): Bool;
 
+	@:gamepad([])
+	@:justPressed("fps-counter") public var FPS_COUNTER(get, set): Bool;
+	@:pressed("fps-counter") public var FPS_COUNTER_HOLD(get, set): Bool;
+	@:justReleased("fps-counter") public var FPS_COUNTER_R(get, set): Bool;
+
 	@:devModeOnly
 	@:gamepad([])
 	@:justPressed("dev-access") public var DEV_ACCESS(get, set): Bool;

source/funkin/backend/system/Flags.hx

@@ -15,14 +15,20 @@ import lime.utils.AssetType;
  */
 @:build(funkin.backend.system.macros.FlagMacro.build())
 class Flags {
+	public static var overridenFlags:Map<String, Bool> = [];
+
 	// -- Codename's Addon Config --
 	@:bypass public static var addonFlags:Map<String, Dynamic> = [];
+	public static var CURRENT_API_VERSION:Int = 2;
+
+	// -- Codename's ZipFolderLibrary Config --
+	public static var ALLOWED_ZIP_EXTENSIONS:Array<String> = ["zip"];
 
 	// -- Codename's Mod Config --
 	public static var MOD_NAME:String = "";
 	public static var MOD_DESCRIPTION:String = "";
 	public static var MOD_AUTHOR:String = "";
-	public static var MOD_API_VERSION:Int = 1;
+	@:lazy public static var MOD_API_VERSION:Null<Int> = null;
 	public static var MOD_DOWNLOAD_LINK:String  = "";
 	public static var MOD_DEPENDENCIES:Array<String> = [];
 
@@ -41,12 +47,11 @@ class Flags {
 	@:lazy public static var SAVE_PATH:String = haxe.macro.Compiler.getDefine("SAVE_PATH");
 	@:lazy public static var SAVE_NAME:String = haxe.macro.Compiler.getDefine("SAVE_NAME");
 
-	public static var CURRENT_API_VERSION:Int = 1;
 	public static var COMMIT_NUMBER:Int = GitCommitMacro.commitNumber;
 	public static var COMMIT_HASH:String = GitCommitMacro.commitHash;
 	public static var COMMIT_MESSAGE:String = 'Commit $COMMIT_NUMBER ($COMMIT_HASH)';
 
-	@:bypass public static var WINDOW_TITLE_USE_MOD_NAME:Bool = false;
+	@:lazy public static var WINDOW_TITLE_USE_MOD_NAME:Null<Bool> = null;
 	@:lazy public static var TITLE:String = Application.current.meta.get('name');
 	@:lazy public static var VERSION:String = Application.current.meta.get('version');
 
@@ -125,12 +130,16 @@ class Flags {
 	@:also(funkin.game.PlayState.opponentMode)
 	public static var DEFAULT_OPPONENT_MODE:Bool = false;
 
+	public static var USE_LEGACY_TIMING:Null<Bool> = null;
+
 	public static var DEFAULT_NOTE_MS_LIMIT:Float = 1500;
 	public static var DEFAULT_NOTE_SCALE:Float = 0.7;
 	#if MODCHARTING_FEATURES
 	public static var DEFAULT_MODCHART_HOLD_SUBDIVISIONS:Int = 4;
 	#end
 
+	public static var SUSTAINS_AS_ONE_NOTE:Null<Bool> = null;
+
 	@:also(funkin.game.Character.FALLBACK_DEAD_CHARACTER)
 	public static var DEFAULT_GAMEOVER_CHARACTER:String = "bf-dead";
 
@@ -148,10 +157,14 @@ class Flags {
 	public static var DEFAULT_HUD_ZOOM_MULT:Float = 0.03;
 	public static var DEFAULT_CAM_ZOOM_LERP:Float = 0.05;
 	public static var DEFAULT_HUD_ZOOM_LERP:Float = 0.05;
+
+	public static var USE_LEGACY_ZOOM_FACTOR:Null<Bool> = null;
 	
 	// Font configuration
 	public static var DEFAULT_FONT:String = "vcr.ttf";
 	public static var DEFAULT_FONT_SIZE:Int = 16;
+	
+	public static var DEFAULT_ALT_ANIM_SUFFIX:String = "-alt";
 
 	// to translate these you need to convert them into ids
 	// Resume -> pause.resume
@@ -277,8 +290,6 @@ class Flags {
 	@:bypass public static var customFlags:Map<String, String> = [];
 
 	public static function loadFromData(flags:Map<String, String>, data:String) {
-		WINDOW_TITLE_USE_MOD_NAME = false;
-
 		if (!(data.length > 0)) return;
 		var res = IniUtil.parseString(data);
 
@@ -295,28 +306,39 @@ class Flags {
 					else trace('Invalid section $name');
 			}
 		}
-
-		if (!flags.exists("WINDOW_TITLE_USE_MOD_NAME")) WINDOW_TITLE_USE_MOD_NAME = !flags.exists('TITLE') && flags.exists('MOD_NAME');
-		else WINDOW_TITLE_USE_MOD_NAME = parseBool(flags.get("WINDOW_TITLE_USE_MOD_NAME"));
-
-		flags.remove("WINDOW_TITLE_USE_MOD_NAME");
 	}
 
-	public static function loadFromDatas(datas:Array<String>) {
+	private static function loadPost() {
+		if (MOD_API_VERSION == null) MOD_API_VERSION = CURRENT_API_VERSION;
+		if (WINDOW_TITLE_USE_MOD_NAME == null) WINDOW_TITLE_USE_MOD_NAME = !overridenFlags.exists('TITLE') && overridenFlags.exists('MOD_NAME');
+		if (USE_LEGACY_TIMING == null) USE_LEGACY_TIMING = MOD_API_VERSION < 2;
+		if (USE_LEGACY_ZOOM_FACTOR == null) USE_LEGACY_ZOOM_FACTOR = MOD_API_VERSION < 2;
+		if (SUSTAINS_AS_ONE_NOTE == null) SUSTAINS_AS_ONE_NOTE = MOD_API_VERSION >= 2;
+	}
+
+	public static function loadFromDatas(datas:Array<String>):Map<String, String> {
 		var flags:Map<String, String> = [];
-		for(data in datas) {
-			if(data != null)
+		for (data in datas) {
+			if (data != null)
 				loadFromData(flags, data);
 		}
+		loadPost();
 		return flags;
 	}
 
 	public static function parseFlags(flags:Map<String, String>) {
-		for(name=>value in flags)
-			if(!parse(name, value))
-				customFlags.set(name, value);
-
+		var parsed:Bool;
+		for (name => value in flags) switch (name) {
+			case "MOD_API_VERSION":
+				var version = Std.parseInt(value) ?? CURRENT_API_VERSION;
+				if (version > MOD_API_VERSION || MOD_API_VERSION == null) MOD_API_VERSION = version;
+			default:
+				if (!(parsed = parse(name, value))) customFlags.set(name, value);
+				if (!overridenFlags.exists(name)) overridenFlags.set(name, parsed);
+		}
+		#if MODCHARTING_FEATURES
 		Options.modchartingHoldSubdivisions = DEFAULT_MODCHART_HOLD_SUBDIVISIONS;
+		#end
 	}
 
 	/**
@@ -365,5 +387,6 @@ class Flags {
 				parseFlags(flags);
 			}
 		}
+		loadPost();
 	}
-}
+}

source/funkin/backend/system/Main.hx

@@ -1,7 +1,5 @@
 package funkin.backend.system;
 
-import sys.io.File;
-import sys.FileSystem;
 import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond;
 import flixel.addons.transition.FlxTransitionableState;
 import flixel.addons.transition.TransitionData;
@@ -9,21 +7,22 @@ import flixel.graphics.FlxGraphic;
 import flixel.math.FlxPoint;
 import flixel.math.FlxRect;
 import flixel.system.ui.FlxSoundTray;
+import funkin.backend.assets.AssetSource;
 import funkin.backend.assets.AssetsLibraryList;
 import funkin.backend.assets.ModsFolder;
-import funkin.backend.assets.AssetSource;
+import funkin.backend.system.framerate.Framerate;
 import funkin.backend.system.framerate.SystemInfo;
 import funkin.backend.system.modules.*;
+import funkin.backend.utils.ThreadUtil;
 import funkin.editors.SaveWarning;
+import funkin.options.PlayerSettings;
 import openfl.Assets;
 import openfl.Lib;
 import openfl.display.Sprite;
 import openfl.text.TextFormat;
 import openfl.utils.AssetLibrary;
-
-#if ALLOW_MULTITHREADING
-import sys.thread.Thread;
-#end
+import sys.FileSystem;
+import sys.io.File;
 #if android
 import android.content.Context;
 import android.os.Build;
@@ -40,7 +39,7 @@ class Main extends Sprite
 
 	public static var scaleMode:FunkinRatioScaleMode;
 	#if !mobile
-	public static var framerateSprite:funkin.backend.system.framerate.Framerate;
+	public static var framerateSprite:Framerate;
 	#end
 
 	var gameWidth:Int = 1280; // Width of the game in pixels (might be less / more in actual pixels).
@@ -58,10 +57,6 @@ class Main extends Sprite
 
 	// You can pretty much ignore everything from here on - your code should go in your states.
 
-	#if ALLOW_MULTITHREADING
-	public static var gameThreads:Array<Thread> = [];
-	#end
-
 	public static function preInit() {
 		funkin.backend.utils.NativeAPI.registerAsDPICompatible();
 		funkin.backend.system.CommandLineHandler.parseCommandLine(Sys.args());
@@ -79,7 +74,7 @@ class Main extends Sprite
 		addChild(game = new FunkinGame(gameWidth, gameHeight, MainState, Options.framerate, Options.framerate, skipSplash, startFullscreen));
 
 		#if (!mobile && !web)
-		addChild(framerateSprite = new funkin.backend.system.framerate.Framerate());
+		addChild(framerateSprite = new Framerate());
 		SystemInfo.init();
 		#end
 	}
@@ -97,16 +92,8 @@ class Main extends Sprite
 		#end;
 	public static var startedFromSource:Bool = #if TEST_BUILD true #else false #end;
 
-
-	private static var __threadCycle:Int = 0;
-	public static function execAsync(func:Void->Void) {
-		#if ALLOW_MULTITHREADING
-		var thread = gameThreads[(__threadCycle++) % gameThreads.length];
-		thread.events.run(func);
-		#else
-		func();
-		#end
-	}
+	// DEPRECATED
+	@:dox(hide) public static function execAsync(func:Void->Void) ThreadUtil.execAsync(func);
 
 	private static function getTimer():Int {
 		return time = Lib.getTimer();
@@ -118,10 +105,6 @@ class Main extends Sprite
 		MemoryUtil.init();
 		@:privateAccess
 		FlxG.game.getTimer = getTimer;
-		#if ALLOW_MULTITHREADING
-		for(i in 0...4)
-			gameThreads.push(Thread.createWithEventLoop(function() {Thread.current().events.promise();}));
-		#end
 		FunkinCache.init();
 		Paths.assetsTree = new AssetsLibraryList();
 
@@ -156,6 +139,7 @@ class Main extends Sprite
 		FlxG.signals.focusGained.add(onFocus);
 		FlxG.signals.preStateSwitch.add(onStateSwitch);
 		FlxG.signals.postStateSwitch.add(onStateSwitchPost);
+		FlxG.signals.postUpdate.add(onUpdate);
 
 		FlxG.mouse.useSystemCursor = true;
 		#if DARK_MODE_WINDOW
@@ -210,6 +194,14 @@ class Main extends Sprite
 		scaleMode.resetSize();
 	}
 
+	public static function onUpdate() {
+		if (PlayerSettings.solo.controls.DEV_CONSOLE)
+			NativeAPI.allocConsole();
+
+		if (PlayerSettings.solo.controls.FPS_COUNTER)
+			Framerate.debugMode = (Framerate.debugMode + 1) % 3;
+	}
+
 	private static function onStateSwitchPost() {
 		// manual asset clearing since base openfl one does'nt clear lime one
 		// does'nt clear bitmaps since flixel fork does it auto

source/funkin/backend/system/MainState.hx

@@ -7,12 +7,14 @@ import flixel.FlxState;
 import funkin.backend.assets.AssetsLibraryList;
 import funkin.backend.assets.ModsFolder;
 import funkin.backend.assets.ModsFolderLibrary;
+import funkin.backend.assets.ZipFolderLibrary;
 import funkin.backend.chart.EventsData;
 import funkin.backend.system.framerate.Framerate;
 import funkin.editors.ModConfigWarning;
 import funkin.menus.TitleState;
 import haxe.io.Path;
 
+
 @dox(hide)
 typedef AddonInfo = {
 	var name:String;
@@ -57,12 +59,32 @@ class MainState extends FlxState {
 		var _highPriorityAddons:Array<AddonInfo> = [];
 		var _noPriorityAddons:Array<AddonInfo> = [];
 
+		var quick_modsPath = ModsFolder.modsPath + ModsFolder.currentModFolder;
+
+		// handing if the loading mod (before it's properly loaded) is a compressed mod
+		// we just need to use `Paths.assetsTree.hasCompressedLibrary` to complete valid checks for actual loaded compressed mods
+		var isZipMod = false;
+		
+		// If we know it's a compressed mod, then we can check if it's using the `cnemod` folder path.
+		// All it is really is a folder with the mod's name, then a compressed file called "cnemod.[zip|7z|rar|etc]"
+		var isCneMod = false;
+
+		// We are doing it like this because think about it: it's 1 for loop lol
+		// We just need to know if any of these values is true, so if only one is true and we are not close to being done in the loop, that's fine.
+		// 
+		for (ext in Flags.ALLOWED_ZIP_EXTENSIONS) {
+			if (FileSystem.exists(quick_modsPath+"."+ext)) isZipMod = true;
+			if (FileSystem.exists(quick_modsPath+"/cnemod."+ext)) isCneMod = true;
+			if (isZipMod && isCneMod) break;
+		}
+		
+		// We get the addons folder from relative space (`./`) and then our mod's addons.
 		var addonPaths = [
 			ModsFolder.addonsPath,
-			(
-				ModsFolder.currentModFolder != null ?
-					ModsFolder.modsPath + ModsFolder.currentModFolder + "/addons/" :
-					null
+			// So to check the mod's addons folder, we need to decompress it. Which is impossible* in this stage of the loading library process.
+			// TODO: Write a function when the library is loaded to decompress the contents and then load the libraries :)
+			( (ModsFolder.currentModFolder != null && !isZipMod) ?
+				quick_modsPath + "/addons/" : null
 			)
 		];
 
@@ -72,12 +94,8 @@ class MainState extends FlxState {
 
 			for (addon in FileSystem.readDirectory(path)) {
 				if (!FileSystem.isDirectory(path + addon)) {
-					switch(Path.extension(addon).toLowerCase()) {
-						case 'zip':
-							addon = Path.withoutExtension(addon);
-						default:
-							continue;
-					}
+					if (Flags.ALLOWED_ZIP_EXTENSIONS.contains(Path.extension(addon))) addon = Path.withoutExtension(addon);
+					else continue;
 				}
 
 				var data:AddonInfo = {
@@ -100,9 +118,14 @@ class MainState extends FlxState {
 		#if MOD_SUPPORT
 		for (addon in _lowPriorityAddons)
 			loadLib(addon.path, ltrim(addon.name, "[LOW]"));
-
-		if (ModsFolder.currentModFolder != null)
-			loadLib(ModsFolder.modsPath + ModsFolder.currentModFolder, ModsFolder.currentModFolder);
+		
+		if (ModsFolder.currentModFolder != null) {
+			// isCneMod is a guarentee to be a zip mod because we just checked for it, so this will always load as a CompressedLibrary
+			if (isCneMod)
+				loadLib(quick_modsPath + "/cnemod", ModsFolder.currentModFolder);
+			else
+				loadLib(quick_modsPath, ModsFolder.currentModFolder);
+		}
 
 		for (addon in _noPriorityAddons)
 			loadLib(addon.path, addon.name);
@@ -134,9 +157,15 @@ class MainState extends FlxState {
 		CoolUtil.safeAddAttributes('./.temp/', NativeAPI.FileAttribute.HIDDEN);
 		#end
 
+		for (lib in ModsFolder.getLoadedModsLibs()) {
+			if (!(lib is ZipFolderLibrary)) continue;
+			if (cast(lib, ZipFolderLibrary).PRELOAD_VIDEOS) cast(lib, ZipFolderLibrary).precacheVideos();
+		}
+
 		var startState:Class<FlxState> = Flags.DISABLE_WARNING_SCREEN ? TitleState : funkin.menus.WarningState;
 
-		if (Options.devMode && Options.allowConfigWarning) {
+		// In this case if the mod we just loaded a compressed modpack, we can't edit or modify files without decompressing it.
+		if (Options.devMode && Options.allowConfigWarning && !isZipMod) {
 			var lib:ModsFolderLibrary;
 			for (e in Paths.assetsTree.libraries) if ((lib = cast AssetsLibraryList.getCleanLibrary(e)) is ModsFolderLibrary
 				&& lib.modName == ModsFolder.currentModFolder)

source/funkin/backend/system/framerate/AssetTreeInfo.hx

@@ -8,12 +8,20 @@ import funkin.backend.assets.IModsAssetLibrary;
 import funkin.backend.assets.ScriptedAssetLibrary;
 
 class AssetTreeInfo extends FramerateCategory {
+	private var lastUpdateTime:Float = 1;
+
 	public function new() {
 		super("Asset Libraries Tree Info");
 	}
 
 	public override function __enterFrame(t:Int) {
 		if (alpha <= 0.05) return;
+
+		if ((lastUpdateTime += FlxG.rawElapsed) < 1)
+			return;
+
+		lastUpdateTime = 0;
+
 		var text = 'Not initialized yet\n';
 		if (Paths.assetsTree != null){
 			text = "";

source/funkin/backend/system/framerate/CodenameBuildField.hx

@@ -13,8 +13,13 @@ class CodenameBuildField extends TextField {
 	}
 
 	public function reload() {
+		#if COMPILE_EXPERIMENTAL
+		text = '${Flags.VERSION_MESSAGE} (Experimental Build)';
+		#else
 		text = '${Flags.VERSION_MESSAGE}';
-		#if debug
+		#end
+
+		#if (debug || COMPILE_EXPERIMENTAL)
 		text += '\n${Flags.COMMIT_MESSAGE}';
 		#end
 	}

source/funkin/backend/system/framerate/Framerate.hx

@@ -53,13 +53,6 @@ class Framerate extends Sprite {
 		x = 10;
 		y = 2;
 
-		FlxG.stage.addEventListener(KeyboardEvent.KEY_UP, function(e:KeyboardEvent) {
-			switch(e.keyCode) {
-				case #if web Keyboard.NUMBER_3 #else Keyboard.F3 #end: // 3 on web or F3 on windows, linux and other things that runs code
-					debugMode = (debugMode + 1) % 3;
-			}
-		});
-
 		if (__bitmap == null)
 			__bitmap = new BitmapData(1, 1, 0xFF000000);
 

source/funkin/backend/system/framerate/FramerateCounter.hx

@@ -9,6 +9,13 @@ class FramerateCounter extends Sprite {
 	public var fpsLabel:TextField;
 	public var lastFPS:Float = 0;
 
+	private var frameCount:Int = 0;
+
+	private var accumulatedTime:Float = openfl.Lib.getTimer();
+
+	private final updateInterval:Float = 1 / 15;
+	private var lastUpdateTime:Float = 0;
+
 	public function new() {
 		super();
 
@@ -27,15 +34,40 @@ class FramerateCounter extends Sprite {
 		}
 	}
 
-	public function reload() {}
+	public function reload() {
+		lastUpdateTime = 0;
+	}
 
 	public override function __enterFrame(t:Int) {
 		if (alpha <= 0.05) return;
+
 		super.__enterFrame(t);
 
-		lastFPS = CoolUtil.fpsLerp(lastFPS, FlxG.rawElapsed == 0 ? 0 : (1 / FlxG.rawElapsed), 0.25);
-		fpsNum.text = Std.string(Math.floor(lastFPS));
+		frameCount++;
+
+		if ((lastUpdateTime += FlxG.rawElapsed) < updateInterval)
+		{
+			updateLabelPosition();
+			return;
+		}
+
+		final timer = openfl.Lib.getTimer();
+
+		final time = timer - accumulatedTime;
+
+		accumulatedTime = timer;
+
+		lastFPS = FlxMath.lerp(lastFPS, time <= 0 ? 0 : (1000 / time * frameCount), 1.0 - Math.pow(0.75, time * 0.06));
+
+		fpsNum.text = Std.string(Math.round(lastFPS));
+		lastUpdateTime = frameCount = 0;
+
+		updateLabelPosition();
+	}
+
+	private inline function updateLabelPosition():Void
+	{
 		fpsLabel.x = fpsNum.x + fpsNum.width;
 		fpsLabel.y = (fpsNum.y + fpsNum.height) - fpsLabel.height;
 	}
-}
+}

source/funkin/backend/system/framerate/MemoryCounter.hx

@@ -36,11 +36,21 @@ class MemoryCounter extends Sprite {
 		if (alpha <= 0.05) return;
 		super.__enterFrame(t);
 
-		memory = MemoryUtil.currentMemUsage();
+		final mem = MemoryUtil.currentMemUsage();
+
+		if (mem == memory) {
+			updateLabelPosition();
+			return;
+		}
+
+		memory = mem;
 		if (memoryPeak < memory) memoryPeak = memory;
 		memoryText.text = CoolUtil.getSizeString(memory);
 		memoryPeakText.text = ' / ${CoolUtil.getSizeString(memoryPeak)}';
 
-		memoryPeakText.x = memoryText.x + memoryText.width;
+		updateLabelPosition();
 	}
+
+	private inline function updateLabelPosition():Void
+		memoryPeakText.x = memoryText.x + memoryText.width;
 }

source/funkin/backend/system/framerate/SystemInfo.hx

@@ -53,25 +53,6 @@ class SystemInfo extends FramerateCategory {
 			if (osName != "")
 				osInfo = '${osName} ${osVersion}'.trim();
 		}
-		#elseif windows
-		var windowsCurrentVersionPath = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion";
-		var buildNumber = Std.parseInt(RegistryUtil.get(HKEY_LOCAL_MACHINE, windowsCurrentVersionPath, "CurrentBuildNumber"));
-		var edition = RegistryUtil.get(HKEY_LOCAL_MACHINE, windowsCurrentVersionPath, "ProductName");
-
-		var lcuKey = "WinREVersion"; // Last Cumulative Update Key On Older Windows Versions
-		if (buildNumber >= 22000) { // Windows 11 Initial Release Build Number
-			edition = edition.replace("Windows 10", "Windows 11");
-			lcuKey = "LCUVer"; // Last Cumulative Update Key On Windows 11
-		}
-
-		var lcuVersion = RegistryUtil.get(HKEY_LOCAL_MACHINE, windowsCurrentVersionPath, lcuKey);
-
-		osInfo = edition;
-
-		if (lcuVersion != null && lcuVersion != "")
-			osInfo += ' ${lcuVersion}';
-		else if (lime.system.System.platformVersion != null && lime.system.System.platformVersion != "")
-			osInfo += ' ${lime.system.System.platformVersion}';
 		#else
 		if (lime.system.System.platformLabel != null && lime.system.System.platformLabel != "" && lime.system.System.platformVersion != null && lime.system.System.platformVersion != "")
 			osInfo = '${lime.system.System.platformLabel.replace(lime.system.System.platformVersion, "").trim()} ${lime.system.System.platformVersion}';
@@ -81,7 +62,10 @@ class SystemInfo extends FramerateCategory {
 
 		try {
 			#if windows
-			cpuName = RegistryUtil.get(HKEY_LOCAL_MACHINE, "HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0", "ProcessorNameString");
+			var process = new HiddenProcess("wmic", ["cpu", "get", "name"]);
+			if (process.exitCode() != 0) throw 'Could not fetch CPU information';
+
+			cpuName = process.stdout.readAll().toString().trim().split("\n")[1].trim();
 			#elseif mac
 			var process = new HiddenProcess("sysctl -a | grep brand_string"); // Somehow this isn't able to use the args but it still works
 			if (process.exitCode() != 0) throw 'Could not fetch CPU information';
@@ -115,8 +99,7 @@ class SystemInfo extends FramerateCategory {
 					if (vRAMBytes == 1000 || vRAMBytes == 1 || vRAMBytes <= 0)
 						Logs.trace('Unable to grab GPU VRAM', ERROR, RED);
 					else {
-						var vRAMBytesFloat:#if cpp Float64 #else Float #end = vRAMBytes*1024;
-						vRAM = CoolUtil.getSizeString64(vRAMBytesFloat);
+						vRAM = getSizeString(vRAMBytes / 1024);
 					}
 				}
 			} else
@@ -155,6 +138,17 @@ class SystemInfo extends FramerateCategory {
 		if (totalMem != "Unknown" && memType != "Unknown") __formattedSysText += '\nTotal MEM: $totalMem $memType';
 	}
 
+	static function getSizeString(size:Float):String {
+		if (size < 1024)
+			return Std.int(size) + " MB";
+		else if (size < 1024 * 1024)
+			return Std.int(size / 1024) + " GB";
+		else {
+			var tb = size / (1024 * 1024);
+			return Std.int(tb) + "." + CoolUtil.addZeros(Std.string(Std.int((tb % 1) * 100)), 2) + " TB";
+		}
+	}
+
 	public function new() {
 		super("System Info");
 	}

source/funkin/backend/system/macros/AliasMacro.hx

@@ -0,0 +1,134 @@
+package funkin.backend.system.macros;
+
+#if macro
+import sys.io.File;
+import haxe.macro.ComplexTypeTools;
+import haxe.macro.Printer;
+import haxe.macro.Expr.Position;
+import haxe.macro.Context;
+import haxe.macro.Expr.Field;
+import haxe.macro.Expr;
+
+class AliasMacro {
+    public static var aliasMetadata:Metadata = [{
+        name: ":keep",
+        pos: Context.currentPos()
+    },{
+        name: ":dox",
+        pos: Context.currentPos(),
+        params: [
+            {
+                expr: EConst(CIdent("hide")),
+                pos: Context.currentPos()
+            }
+        ]
+    }];
+
+    public static function build():Array<Field> {
+        #if display
+        return Context.getBuildFields();
+        #end
+        
+        var fields = Context.getBuildFields();
+        var ogFieldCount = fields.length;
+
+        for(i in 0...ogFieldCount) {
+            var field = fields[i];
+            if (field.meta == null) continue;
+
+            var previousAliases:Array<{name:String, pos:Position}> = [];
+            for(meta in field.meta) {
+                if (meta.name == ":alias" && meta.params != null) {
+                    for(p in meta.params) {
+                        switch(p.expr) {
+                            case EConst(CString(s, kind)):
+                                previousAliases.push({
+                                    name: s,
+                                    pos: p.pos
+                                });
+                            default:
+                        }
+                    }
+                }
+            }
+
+            if (previousAliases.length == 0) continue;
+
+            var ghostAccess = field.access.copy();
+            ghostAccess.remove(AOverride);
+            ghostAccess.remove(APublic);
+
+            for(alias in previousAliases) {
+                var ghostField:Field = {
+                    name: alias.name,
+                    pos: alias.pos,
+                    kind: null,
+                    access: ghostAccess,
+                    meta: aliasMetadata
+                };
+
+                switch(field.kind) {
+                    case FFun(f):
+                        var args:Array<Expr> = [for(a in f.args) {
+                            expr: EConst(CIdent(a.name)),
+                            pos: Context.currentPos()
+                        }];
+
+                        ghostField.kind = FFun({
+                            args: f.args,
+                            params: f.params,
+                            ret: f.ret,
+                            expr: macro return $i{field.name}($a{args})
+                        });
+
+                    default:
+                        var type = null;
+                        switch(field.kind) {
+                            case FVar(t, e):
+                                type = t;
+                            case FProp(get, set, t, e):
+                                type = t;
+                            default:
+                        }
+                        ghostField.kind = FProp("get", "set", type, null);
+
+                        fields.push({
+                            name: 'get_${alias.name}',
+                            kind: FFun({
+                                args: [],
+                                expr: macro return $i{field.name},
+                                ret: type
+                            }),
+                            pos: alias.pos,
+                            meta: aliasMetadata
+                        });
+                        fields.push({
+                            name: 'set_${alias.name}',
+                            kind: FFun({
+                                args: [{
+                                    name: '_${field.name}',
+                                    type: type
+                                }],
+                                expr: macro return ($i{field.name} = $i{'_${field.name}'}),
+                                ret: type
+                            }),
+                            pos: alias.pos,
+                            meta: aliasMetadata
+                        });
+                }
+
+                fields.push(ghostField);
+            }
+
+            var docFooter = '_Aliases: ${[for(alias in previousAliases) '`${alias.name}`'].join(", ")}_';
+            if (field.doc != null)
+                field.doc += '\n\n$docFooter'; 
+            else
+                field.doc = docFooter;
+        }
+		trace(fields);
+
+        return fields;
+    }
+}
+#end

source/funkin/backend/system/macros/Macros.hx

@@ -23,7 +23,7 @@ class Macros {
 			#if VIDEO_CUTSCENES "hxvlc.flixel", "hxvlc.openfl", #end
 			#if NAPE_ENABLED "nape", "flixel.addons.nape", #end
 			// BASE HAXE
-			"DateTools", "EReg", "Lambda", "StringBuf", "haxe.crypto", "haxe.display", "haxe.exceptions", "haxe.extern", "scripting"
+			"DateTools", "EReg", "Lambda", "StringBuf", "haxe.crypto", "haxe.display", "haxe.exceptions", "haxe.extern", "scripting", "animate"
 		])
 			Compiler.include(inc);
 
@@ -58,12 +58,18 @@ class Macros {
 
 		final macroPath = 'funkin.backend.system.macros.Macros';
 		Compiler.addMetadata('@:build($macroPath.buildLimeAssetLibrary())', 'lime.utils.AssetLibrary');
+
+		//Adds Compat for #if hscript blocks when you have hscript improved
+		if (Context.defined("hscript_improved") && !Context.defined("hscript")) {
+			Compiler.define('hscript');
+		}
 	}
 
 	public static function buildLimeAssetLibrary():Array<Field> {
 		final fields:Array<Field> = Context.getBuildFields(), pos:Position = Context.currentPos();
 
 		fields.push({name: 'tag', access: [APublic], pos: pos, kind: FVar(macro :funkin.backend.assets.AssetSource)});
+		fields.push({name: 'isCompressed', access: [APublic], pos: pos, kind: FVar(macro :Bool, macro false)});
 
 		return fields;
 	}

source/funkin/backend/system/updating/UpdateUtil.hx

@@ -2,22 +2,30 @@ package funkin.backend.system.updating;
 
 import funkin.backend.system.github.GitHub;
 import funkin.backend.system.github.GitHubRelease;
+#if ALLOW_MULTITHREADING
+import funkin.backend.utils.ThreadUtil;
+#end
 
 import lime.app.Application;
 
-import sys.thread.Mutex;
-import sys.thread.Thread;
 import sys.FileSystem;
 
 import haxe.io.Path;
 
+#if (target.threaded)
+import sys.thread.Thread;
+import sys.thread.Mutex;
+#end
+
 using funkin.backend.system.github.GitHub;
 
 class UpdateUtil {
 	public static var lastUpdateCheck:Null<UpdateCheckCallback>;
 
+	#if (target.threaded)
 	private static var __waitCallbacks:Array<UpdateCheckCallback->Void>;
 	private static var __mutex:Mutex;
+	#end
 
 	public static function init() {
 		// deletes old bak file if it exists
@@ -26,26 +34,34 @@ class UpdateUtil {
 		if (FileSystem.exists(bakPath)) FileSystem.deleteFile(bakPath);
 		#end
 
+		#if (target.threaded)
 		__waitCallbacks = [];
 		__mutex = new Mutex();
-		Thread.create(checkForUpdates.bind(true, false));
+
+		#if ALLOW_MULTITHREADING ThreadUtil.execAsync #else Thread.create #end(checkForUpdates.bind(true, false));
+		#end
 	}
 
 	public static function waitForUpdates(force = false, callback:UpdateCheckCallback->Void, lazy = false) {
+		#if (target.threaded)
 		if (__mutex.tryAcquire()) {
 			__mutex.release();
 			if (__shouldCheck(lazy) || force) {
 				__waitCallbacks.push(callback);
-				Thread.create(checkForUpdates.bind(force, false));
+				#if ALLOW_MULTITHREADING ThreadUtil.execAsync #else Thread.create #end(checkForUpdates.bind(force, false));
 			}
 			else
 				callback(lastUpdateCheck);
 		}
 		else
 			__waitCallbacks.push(callback);
+		#else
+		callback(checkForUpdates(true, false));
+		#end
 	}
 
 	public static function checkForUpdates(force = false, lazy = false):UpdateCheckCallback {
+		#if (target.threaded)
 		var wasAcquired = !__mutex.tryAcquire();
 		if (wasAcquired) __mutex.acquire();
 
@@ -60,8 +76,19 @@ class UpdateUtil {
 		FlxG.signals.preUpdate.addOnce(__callWaitCallbacks);
 
 		return lastUpdateCheck;
+		#else
+		if (!__shouldCheck(lazy)) return lastUpdateCheck;
+		return lastUpdateCheck = __checkForUpdates();
+		#end
 	}
 
+	#if (target.threaded)
+	static function __callWaitCallbacks() {
+		for (callback in __waitCallbacks) callback(lastUpdateCheck);
+		__waitCallbacks.resize(0);
+	}
+	#end
+
 	static function __checkForUpdates():UpdateCheckCallback {
 		var curTag = 'v' + (Flags.VERSION == null ? Application.current.meta.get('version') : Flags.VERSION), error = false;
 		var newUpdates = __doReleaseFiltering(GitHub.getReleases(Flags.REPO_OWNER, Flags.REPO_NAME, (e) -> {
@@ -82,11 +109,6 @@ class UpdateUtil {
 	static function __shouldCheck(lazy:Bool):Bool
 		return lastUpdateCheck == null || !lazy && (!lastUpdateCheck.newUpdate || Date.now().getTime() - lastUpdateCheck.date.getTime() > 1800000);
 
-	static function __callWaitCallbacks() {
-		for (callback in __waitCallbacks) callback(lastUpdateCheck);
-		__waitCallbacks.resize(0);
-	}
-
 	static function __doReleaseFiltering(releases:Array<GitHubRelease>, currentVersionTag:String) {
 		releases = releases.filterReleases(Options.betaUpdates, false);
 		if (releases.length <= 0)

source/funkin/backend/utils/AudioAnalyzer.hx

@@ -20,8 +20,7 @@ typedef AudioAnalyzerCallback = Int->Int->Void;
  * An utility that analyze FlxSounds,
  * can be used to make waveform or real-time audio visualizer.
  * 
- * FlxSound.amplitude does work in CNE so if any case if your only checking for peak of current
- * time, use that instead.
+ * FlxSound.amplitude works so if any case if your only checking for peak of current time, use that instead.
  */
 final class AudioAnalyzer {
 	/**
@@ -96,9 +95,9 @@ final class AudioAnalyzer {
 	static var __twiddleImags:Array<Array<Float>> = [];
 	static var __freqReals:Array<Array<Float>> = [];
 	static var __freqImags:Array<Array<Float>> = [];
+	static var __freqCalculating:Int = 0;
 	#if (target.threaded)
 	static var __mutex:Mutex = new Mutex();
-	static var __freqCalculating:Int = 0;
 	#end
 
 	/**
@@ -296,7 +295,7 @@ final class AudioAnalyzer {
 		__check();
 	}
 
-	function __check() if (sound.buffer != buffer) {
+	function __check() if (sound != null && sound.buffer != buffer) {
 		byteSize = 1 << ((buffer = sound.buffer).bitsPerSample - 1);
 
 		#if (lime_cffi && lime_vorbis)
@@ -324,7 +323,7 @@ final class AudioAnalyzer {
 	 * @param maxFreq The maximum frequency to cap (Optional, default 22000.0, Above 23000.0 is not recommended).
 	 * @return Output of levels/bars that ranges from 0 to 1.
 	 */
-	public function getLevels(startPos:Float, ?volume:Float, barCount:Int, ?levels:Array<Float>, ?ratio:Float, ?minDb:Float, ?maxDb:Float, ?minFreq:Float, ?maxFreq:Float):Array<Float>
+	public function getLevels(?startPos:Float, ?volume:Float, barCount:Int, ?levels:Array<Float>, ?ratio:Float, ?minDb:Float, ?maxDb:Float, ?minFreq:Float, ?maxFreq:Float):Array<Float>
 		return inline getLevelsFromFrequencies(__frequencies = getFrequencies(startPos, volume, __frequencies), buffer.sampleRate, barCount, levels, ratio, minDb, maxDb, minFreq, maxFreq);
 
 	/**
@@ -334,8 +333,8 @@ final class AudioAnalyzer {
 	 * @param frequencies The output for getting the frequencies, to avoid memory leaks (Optional).
 	 * @return Output of frequencies.
 	 */
-	public function getFrequencies(startPos:Float, ?volume:Float, ?frequencies:Array<Float>):Array<Float>
-		return inline getFrequenciesFromSamples(__freqSamples = getSamples(startPos, fftN, true, -1, volume, __freqSamples), fftN, useWindowingFFT, frequencies);
+	public function getFrequencies(?startPos:Float, ?volume:Float, ?frequencies:Array<Float>):Array<Float>
+		return inline getFrequenciesFromSamples(__freqSamples = getSamples(startPos != null ? startPos : sound.time, fftN, true, -1, volume, __freqSamples), fftN, useWindowingFFT, frequencies);
 
 	/**
 	 * Analyzes an attached FlxSound from startPos to endPos in milliseconds to get the amplitudes.
@@ -467,36 +466,37 @@ final class AudioAnalyzer {
 		@:privateAccess return sound._source != null && sound._source.__backend != null && sound._source.__backend.playing;
 
 	inline function __readStream(startPos:Float, endPos:Float, callback:AudioAnalyzerCallback):Float @:privateAccess {
-		var backend = sound._source.__backend;
-		var i = backend.bufferSizes.length - backend.queuedBuffers;
-		var time = backend.bufferTimes[i] * 1000;
+		final backend = sound._source.__backend;
 
+		// TODO: Wrap it with try until i figured it out an effective way to do this...
+		// So... sometimes it just uses the decoder even if it looks good?? please help
 		var n = Math.floor((endPos - startPos) * __toBits);
-		if (startPos >= time && startPos < backend.bufferTimes[backend.bufferSizes.length - 1] * 1000) {
-			var pos = Math.floor((startPos - time) * __toBits), buf = backend.bufferDatas[i].buffer, size = backend.bufferSizes[i], c = 0;
+		var i = backend.bufferLengths.length - backend.requestBuffers - 1, time:Float;
+		while (++i < backend.bufferLengths.length) if (startPos >= (time = backend.bufferTimes[i] * 1000)) {
+			var pos = Math.floor((startPos - time) * __toBits), buf = backend.bufferDatas[i].buffer, size = backend.bufferLengths[i], c = 0;
 			while (pos >= size) {
-				if (++i >= backend.bufferSizes.length) {
-					n = 0;
-					break;
-				}
+				if (++i >= backend.bufferLengths.length) break;
 				pos -= size;
 				buf = backend.bufferDatas[i].buffer;
-				size = backend.bufferSizes[i];
+				size = backend.bufferLengths[i];
 			}
-			pos -= pos % __sampleSize;
+			if (i >= backend.bufferLengths.length) break;
+			if ((pos -= pos % __sampleSize) < 0) pos = 0;
 			n -= pos % __sampleSize;
 
 			while (n > 0) {
 				callback(getByte(buf, pos, __wordSize), c);
 				if (++c > buffer.channels) c = 0;
 				if ((pos += __wordSize) >= size) {
-					if (++i >= backend.bufferSizes.length) break;
+					if (++i >= backend.bufferLengths.length) break;
 					pos = 0;
 					buf = backend.bufferDatas[i].buffer;
-					size = backend.bufferSizes[i];
+					size = backend.bufferLengths[i];
 				}
 				n -= __wordSize;
 			}
+
+			break;
 		}
 
 		return endPos - (n / __toBits);

source/funkin/backend/utils/CoolUtil.hx

@@ -21,7 +21,6 @@ import flixel.util.FlxAxes;
 import flixel.util.FlxColor;
 import flixel.util.typeLimit.OneOfThree;
 import flixel.util.typeLimit.OneOfTwo;
-import flxanimate.data.AnimationData.AnimAtlas;
 import funkin.backend.system.Conductor;
 import funkin.backend.utils.XMLUtil.TextFormat;
 import haxe.CallStack;
@@ -34,6 +33,8 @@ import haxe.xml.Access;
 import lime.utils.Assets;
 import openfl.display.BitmapData;
 import openfl.geom.ColorTransform;
+import animate.FlxAnimateJson;
+import flixel.animation.FlxAnimationController;
 
 using StringTools;
 
@@ -439,11 +440,9 @@ final class CoolUtil
 	 * @param fadeIn
 	 */
 	@:noUsing public static function playMenuSong(fadeIn:Bool = false) {
-		if (FlxG.sound.music == null || !FlxG.sound.music.playing)
-		{
+		if (FlxG.sound.music == null || !FlxG.sound.music.playing) {
 			playMusic(Paths.music(Flags.DEFAULT_MENU_MUSIC), true, fadeIn ? 0 : 1, true, 102);
-			if (fadeIn)
-				FlxG.sound.music.fadeIn(4, 0, 0.7);
+			if (fadeIn) FlxG.sound.music.fadeIn(4, 0, 1);
 		}
 	}
 
@@ -574,6 +573,29 @@ final class CoolUtil
 		anim2.frames = old;
 	}
 
+	/**
+	 * Swaps two animations on an animation controller.
+	 * @param animation Animation controller
+	 * @param anim1 First animation
+	 * @param anim2 Second animation
+	 */
+	public static function swapAnims(animation:FlxAnimationController, anim1:String, anim2:String) @:privateAccess {
+		var flxAnim1 = animation.getByName(anim1);
+		animation._animations.remove(anim1);
+
+		var flxAnim2 = animation.getByName(anim2);
+		animation._animations.remove(anim2);
+
+		if (flxAnim1 != null) {
+			flxAnim1.name = anim2;
+			animation._animations.set(anim2, flxAnim1);
+		}
+		if (flxAnim2 != null) {
+			flxAnim2.name = anim1;
+			animation._animations.set(anim1, flxAnim2);
+		}
+	}
+
 	/**
 	 * Allows you to set a graphic size (ex: 150x150), with proper hitbox without a stretched sprite.
 	 * @param sprite Sprite to apply the new graphic size to
@@ -856,7 +878,7 @@ final class CoolUtil
 	 */
 	public static inline function browsePath(path:String) {
 		var formattedPath:String = Path.normalize(path);
-		
+
 		#if windows
 		formattedPath = formattedPath.replace("/", "\\");
 		Sys.command("explorer", [formattedPath]);
@@ -1003,6 +1025,20 @@ final class CoolUtil
 		return result;
 	}
 
+	/**
+	 * Returns if the mouse is overlapping the sprite on a given camera, taking the camera's position, scroll and zoom into account.
+	 *
+	 * @param   sprite  Any `FlxObject`
+	 * @param   camera  The camera you want to check overlap on. Uses the sprite's camera by default.
+	 * @return  Bool
+	 */
+	public static function mouseOverlaps(sprite:FlxObject, ?camera:FlxCamera) {
+		var camToCheck:FlxCamera = camera ?? sprite.camera;
+		var posthing:FlxPoint = FlxG.mouse.getWorldPosition(camToCheck);
+
+		return posthing != null && FlxMath.inBounds(posthing.x, sprite.x, sprite.x + sprite.width) && FlxMath.inBounds(posthing.y, sprite.y, sprite.y + sprite.height);
+	}
+
 	/**
 	 * Sorts an array alphabetically.
 	 * @param array Array to sort
@@ -1053,7 +1089,7 @@ final class CoolUtil
 			r.add(str);
 		return r.toString();
 	}
-	
+
 	public static inline function bound(Value:Float, Min:Float, Max:Float):Float {
 		#if cpp
 		var _hx_tmp1:Float = Value;
@@ -1200,8 +1236,8 @@ final class CoolUtil
 
 	/**
 	 * ! REQUIRES FULL PATH!!!
-	 * @param path 
-	 * @return Bool 
+	 * @param path
+	 * @return Bool
 	 */
 	public static function imageHasFrameData(path:String):String {
 		if (FileSystem.exists(Path.withExtension(path, "xml"))) return "xml";
@@ -1252,23 +1288,20 @@ final class CoolUtil
 		return animsList;
 	}
 
-	public static function getAnimsListFromAtlas(atlas:AnimAtlas):Array<String> {
+	public static function getAnimsListFromAtlas(atlas:AnimationJson):Array<String> {
 		if (atlas == null) return [];
 
 		var animsList:Array<String> = [];
 		if (atlas.AN.SN != null) animsList.push(atlas.AN.SN);
 		if (atlas.SD != null)
-			for (symbol in atlas.SD.S)
+			for (symbol in atlas.SD)
 				if (symbol.SN != null) animsList.push(symbol.SN);
 
 		return animsList;
 	}
 
 	public static function getAnimsListFromSprite(spr:FunkinSprite):Array<String> {
-		if (spr.animateAtlas != null) {
-			return [for (symbol => timeline in spr.animateAtlas.anim.symbolDictionary) symbol];
-		} else 
-			return getAnimsListFromFrames(spr.frames);
+		return getAnimsListFromFrames(spr.frames);
 	}
 
 	// TODO: check this for bugs
@@ -1421,6 +1454,7 @@ final class CoolUtil
 
 		return toProperty.setValue(fromProperty.getValue());
 	}
+
 }
 
 class PropertyInfo {

source/funkin/backend/utils/FunkinParentDisabler.hx

@@ -38,7 +38,7 @@ class FunkinParentDisabler extends FlxBasic {
 			for(c in __cameras) c.paused = true;
 
 			// sounds
-			__sounds = [for(s in FlxG.sound.list) if (s.playing) s];
+			__sounds = [for(s in FlxG.sound.list) if (s.playing && !s.persist) s];
 			for(s in __sounds) s.pause();
 		}
 	}
@@ -71,4 +71,4 @@ class FunkinParentDisabler extends FlxBasic {
 			for(s in __sounds) s.play();
 		}
 	}
-}
+}

source/funkin/backend/utils/MathUtil.hx

@@ -3,200 +3,220 @@ package funkin.backend.utils;
 import haxe.macro.Expr;
 
 final class MathUtil {
-	/**
-	 * Returns the maximum value in the arguments.
-	 * @param args Array of values
-	 *
-	 * @return The maximum value
-	**/
-	public static function maxInt(...args:Int):Int {
-		var max = args[0];
-		for(i in 1...args.length) {
-			var arg = args[i];
-			if(arg > max)
-				max = arg;
-		}
-		return max;
-	}
+        public static inline var EULER:Float = 2.718281828459;
 
-	/**
-	 * Returns the minimum value in the arguments.
-	 * @param args Array of values
-	 *
-	 * @return The minimum value
-	**/
-	public static function minInt(...args:Int):Int {
-		var min = args[0];
-		for(i in 1...args.length) {
-			var arg = args[i];
-			if(arg < min)
-				min = arg;
-		}
-		return min;
-	}
+        /**
+         * Returns the maximum value in the arguments.
+         * @param args Array of values
+         *
+         * @return The maximum value
+        **/
+        public static function maxInt(...args:Int):Int {
+                var max = args[0];
+                for(i in 1...args.length) {
+                        var arg = args[i];
+                        if(arg > max)
+                                max = arg;
+                }
+                return max;
+        }
 
-	/**
-	 * Returns the maximum value in the arguments.
-	 *
-	 * NOTE: If you are using this in compile time, you should use `MathUtil.maxSmart` instead of this for better performance.
-	 *
-	 * @param args Array of values
-	 *
-	 * @return The maximum value
-	**/
-	public static function max(...args:Float):Float {
-		var max = args[0];
-		for(i in 1...args.length) {
-			var arg = args[i];
-			if(arg > max)
-				max = arg;
-		}
-		return max;
-	}
+        /**
+         * Returns the minimum value in the arguments.
+         * @param args Array of values
+         *
+         * @return The minimum value
+        **/
+        public static function minInt(...args:Int):Int {
+                var min = args[0];
+                for(i in 1...args.length) {
+                        var arg = args[i];
+                        if(arg < min)
+                                min = arg;
+                }
+                return min;
+        }
 
-	/**
-	 * Returns the minimum value in the arguments.
-	 *
-	 * NOTE: If you are using this in compile time, you should use `MathUtil.minSmart` instead of this for better performance.
-	 *
-	 * @param args Array of values
-	 *
-	 * @return The minimum value
-	**/
-	public static function min(...args:Float):Float {
-		var min = args[0];
-		for(i in 1...args.length) {
-			var arg = args[i];
-			if(arg < min)
-				min = arg;
-		}
-		return min;
-	}
+        /**
+         * Returns the maximum value in the arguments.
+         *
+         * NOTE: If you are using this in compile time, you should use `MathUtil.maxSmart` instead of this for better performance.
+         *
+         * @param args Array of values
+         *
+         * @return The maximum value
+        **/
+        public static function max(...args:Float):Float {
+                var max = args[0];
+                for(i in 1...args.length) {
+                        var arg = args[i];
+                        if(arg > max)
+                                max = arg;
+                }
+                return max;
+        }
 
-	/**
-	 * Checks if a is less than b with considering a margin of error.
-	 * 
-	 * @param a Float
-	 * @param b Float
-	 * @param margin Float (Default: EPSILON)
-	 * 
-	 * @return Bool
-	**/
-	public static function lessThan(a:Float, b:Float, margin:Float = 0.0000001):Bool {
-		return a < b - margin;
-	}
+        /**
+         * Returns the minimum value in the arguments.
+         *
+         * NOTE: If you are using this in compile time, you should use `MathUtil.minSmart` instead of this for better performance.
+         *
+         * @param args Array of values
+         *
+         * @return The minimum value
+        **/
+        public static function min(...args:Float):Float {
+                var min = args[0];
+                for(i in 1...args.length) {
+                        var arg = args[i];
+                        if(arg < min)
+                                min = arg;
+                }
+                return min;
+        }
 
-	/**
-	 * Checks if a is less than or equally b with considering a margin of error.
-	 * 
-	 * @param a Float
-	 * @param b Float
-	 * @param margin Float (Default: EPSILON)
-	 * 
-	 * @return Bool
-	**/
-	public static function lessThanEqual(a:Float, b:Float, margin:Float = 0.0000001):Bool {
-		return a <= b - margin;
-	}
+        /**
+         * Checks if a is less than b with considering a margin of error.
+         * * @param a Float
+         * @param b Float
+         * @param margin Float (Default: EPSILON)
+         * * @return Bool
+        **/
+        public static function lessThan(a:Float, b:Float, margin:Float = 0.0000001):Bool {
+                return a < b - margin;
+        }
 
-	/**
-	 * Checks if a is greater than b with considering a margin of error.
-	 * 
-	 * @param a Float
-	 * @param b Float
-	 * @param margin Float (Default: EPSILON)
-	 * 
-	 * @return Bool
-	**/
-	public static function greaterThan(a:Float, b:Float, margin:Float = 0.0000001):Bool {
-		return a > b + margin;
-	}
+        /**
+         * Checks if a is less than or equally b with considering a margin of error.
+         * * @param a Float
+         * @param b Float
+         * @param margin Float (Default: EPSILON)
+         * * @return Bool
+        **/
+        public static function lessThanEqual(a:Float, b:Float, margin:Float = 0.0000001):Bool {
+                return a <= b - margin;
+        }
 
-	/**
-	 * Checks if a is greater than or equally b with considering a margin of error.
-	 * 
-	 * @param a Float
-	 * @param b Float
-	 * @param margin Float (Default: EPSILON)
-	 * 
-	 * @return Bool
-	**/
-	public static function greaterThanEqual(a:Float, b:Float, margin:Float = 0.0000001):Bool {
-		return a >= b + margin;
-	}
+        /**
+         * Checks if a is greater than b with considering a margin of error.
+         * * @param a Float
+         * @param b Float
+         * @param margin Float (Default: EPSILON)
+         * * @return Bool
+        **/
+        public static function greaterThan(a:Float, b:Float, margin:Float = 0.0000001):Bool {
+                return a > b + margin;
+        }
 
-	/**
-	 * Checks if a is approximately equal to b.
-	 * 
-	 * @param a Float
-	 * @param b Float
-	 * @param margin Float (Default: EPSILON)
-	 * 
-	 * @return Bool
-	**/
-	public static function equal(a:Float, b:Float, margin:Float = 0.0000001):Bool {
-		return Math.abs(a - b) <= margin;
-	}
+        /**
+         * Checks if a is greater than or equally b with considering a margin of error.
+         * * @param a Float
+         * @param b Float
+         * @param margin Float (Default: EPSILON)
+         * * @return Bool
+        **/
+        public static function greaterThanEqual(a:Float, b:Float, margin:Float = 0.0000001):Bool {
+                return a >= b + margin;
+        }
 
-	/**
-	 * Checks if a are not approximately equal to b.
-	 * 
-	 * @param a Float
-	 * @param b Float
-	 * @param margin Float (Default: EPSILON)
-	 * 
-	 * @return Bool
-	**/
-	public static function notEqual(a:Float, b:Float, margin:Float = 0.0000001):Bool {
-		return Math.abs(a - b) > margin;
-	}
+        /**
+         * Checks if a is approximately equal to b.
+         * * @param a Float
+         * @param b Float
+         * @param margin Float (Default: EPSILON)
+         * * @return Bool
+        **/
+        public static function equal(a:Float, b:Float, margin:Float = 0.0000001):Bool {
+                return Math.abs(a - b) <= margin;
+        }
 
-	/**
-	 * Shortcut to `Math.max` but with infinite amount of arguments
-	 *
-	 * Might not preserve the order of arguments, please test this.
-	 *
-	 * Dont use this in hscript, it doesnt work, it only works on compile time
-	**/
-	@:dox(hide) public static macro function maxSmart(..._args:Expr):Expr {
-		return genericMinMaxSmart(_args.toArray(), "Math.max");
-	}
+        /**
+         * Checks if a are not approximately equal to b.
+         * * @param a Float
+         * @param b Float
+         * @param margin Float (Default: EPSILON)
+         * * @return Bool
+        **/
+        public static function notEqual(a:Float, b:Float, margin:Float = 0.0000001):Bool {
+                return Math.abs(a - b) > margin;
+        }
 
-	/**
-	 * Shortcut to `Math.min` but with infinite amount of arguments
-	 *
-	 * Might not preserve the order of arguments, please test this.
-	 *
-	 * Dont use this in hscript, it doesnt work, it only works on compile time
-	**/
-	@:dox(hide) public static macro function minSmart(..._args:Expr):Expr {
-		return genericMinMaxSmart(_args.toArray(), "Math.min");
-	}
+        /**
+         * @param edge0 Float
+         * @param edge1 Float
+         * @param x Float
+         * @return Float
+        **/
+        public static function smoothStep(edge0:Float, edge1:Float, x:Float):Float {
+                var t = (x - edge0) / (edge1 - edge0);
+                var clamped = t < 0.0 ? 0.0 : (t > 1.0 ? 1.0 : t);
+                return clamped * clamped * (3.0 - 2.0 * clamped);
+        }
 
-	#if macro
-	@:dox(hide) private static function genericMinMaxSmart(_args:Array<Expr>, funcPath:String):Expr {
-		var args = _args.copy();
-		if (args.length == 0) return macro 0;
+        /**
+         * @param a Float
+         * @param b Float
+         * @param v Float
+         * @return Float
+        **/
+        public static function inverseLerp(a:Float, b:Float, v:Float):Float {
+                return (v - a) / (b - a);
+        }
 
-		var func = funcPath.split(".");
+        /**
+         * @param v Float
+         * @return Float
+        **/
+        public static function fract(v:Float):Float {
+                return v - Math.floor(v);
+        }
 
-		function nested(lst:Array<Expr>):Expr {
-			if (lst.length == 1) {
-				return macro ${lst[0]};
-			} else if (lst.length == 2) {
-				return macro $p{func}(${lst[0]}, ${lst[1]});
-			} else {
-				var mid = Std.int(lst.length / 2);
-				return macro $p{func}(${nested(lst.slice(0, mid))}, ${nested(lst.slice(mid, lst.length))});
-			}
-		}
+        /**
+         * Shortcut to `Math.max` but with infinite amount of arguments
+         *
+         * Might not preserve the order of arguments, please test this.
+         *
+         * Dont use this in hscript, it doesnt work, it only works on compile time
+        **/
+        @:dox(hide) public static macro function maxSmart(..._args:Expr):Expr {
+                return genericMinMaxSmart(_args.toArray(), "Math.max");
+        }
 
-		var expr = nested(args);
+        /**
+         * Shortcut to `Math.min` but with infinite amount of arguments
+         *
+         * Might not preserve the order of arguments, please test this.
+         *
+         * Dont use this in hscript, it doesnt work, it only works on compile time
+        **/
+        @:dox(hide) public static macro function minSmart(..._args:Expr):Expr {
+                return genericMinMaxSmart(_args.toArray(), "Math.min");
+        }
 
-		//var printer = new haxe.macro.Printer();
-		//trace(printer.printExpr(expr));
+        #if macro
+        @:dox(hide) private static function genericMinMaxSmart(_args:Array<Expr>, funcPath:String):Expr {
+                var args = _args.copy();
+                if (args.length == 0) return macro 0;
 
-		return macro $expr;
-	}
-	#end
-}
+                var func = funcPath.split(".");
+
+                function nested(lst:Array<Expr>):Expr {
+                        if (lst.length == 1) {
+                                return macro ${lst[0]};
+                        } else if (lst.length == 2) {
+                                return macro $p{func}(${lst[0]}, ${lst[1]});
+                        } else {
+                                var mid = Std.int(lst.length / 2);
+                                return macro $p{func}(${nested(lst.slice(0, mid))}, ${nested(lst.slice(mid, lst.length))});
+                        }
+                }
+
+                var expr = nested(args);
+
+                //var printer = new haxe.macro.Printer();
+                //trace(printer.printExpr(expr));
+
+                return macro $expr;
+        }
+        #end
+}

source/funkin/backend/utils/MatrixUtil.hx

@@ -34,151 +34,23 @@ final class MatrixUtil {
 		//if(_height == -1) _height = sprite.height;
 		if(camera == null) camera = sprite.camera;
 		if(points is FlxBasePoint) points = [points];
-		var isFunkinSprite = sprite is FunkinSprite;
-		var funkinSprite:FunkinSprite = null;
-		if(isFunkinSprite) funkinSprite = cast sprite;
-		var isAnimateAtlas = isFunkinSprite && funkinSprite.animateAtlas != null;
 
-		var nc:FakeCamera = isAnimateAtlas ? FakeCallCamera.instance : FakeCamera.instance;
+		var nc:FakeCamera = FakeCamera.instance;
 		nc.zoom = camera.zoom;
 		nc.scroll.set(camera.scroll.x, camera.scroll.y);
 		nc.pixelPerfectRender = camera.pixelPerfectRender;
 
 		var points:Array<FlxPoint> = cast points;
 
-		if(isAnimateAtlas) {
-			var cnc = FakeCallCamera.instance;
-			var sprite = funkinSprite;
-			var oldOnDraw = cnc.onDraw;
-
-			// TODO: fix rotation
-			// TODO: fix skew
-
-			var boundsTopLeft = new FlxPoint(Math.POSITIVE_INFINITY, Math.POSITIVE_INFINITY);
-			var boundsTopRight = new FlxPoint(Math.NEGATIVE_INFINITY, Math.POSITIVE_INFINITY);
-			var boundsBottomLeft = new FlxPoint(Math.POSITIVE_INFINITY, Math.NEGATIVE_INFINITY);
-			var boundsBottomRight = new FlxPoint(Math.NEGATIVE_INFINITY, Math.NEGATIVE_INFINITY);
-
-			cnc.onDraw = function(?frame:FlxFrame, ?pixels:BitmapData, matrix:FlxMatrix, ?transform:ColorTransform, ?blend:BlendMode, ?smoothing:Bool = false, ?shader:FlxShader) {
-				// cnc is already perfect rn
-				// so we need to manually process the limb
-				var points = [
-					// corners
-					FlxPoint.get(0, 0),
-					FlxPoint.get(1, 0),
-					FlxPoint.get(0, 1),
-					FlxPoint.get(1, 1)
-				];
-
-				rawTransformPoints(points, matrix, frame.sourceSize.x, frame.sourceSize.y);
-
-				// sort the points, incase like they were transformed with a scale -1 matrix
-
-				var topLeft:FlxPoint = points[0];
-				var topRight:FlxPoint = points[1];
-				var bottomLeft:FlxPoint = points[2];
-				var bottomRight:FlxPoint = points[3];
-
-				if (points[0].y > points[1].y) {
-					topLeft = points[1];
-					topRight = points[0];
-				}
-				if (points[2].y > points[3].y) {
-					bottomLeft = points[3];
-					bottomRight = points[2];
-				}
-
-				if (topLeft.x > topRight.x) {
-					var temp = topLeft;
-					topLeft = topRight;
-					topRight = temp;
-				}
-
-				if (bottomLeft.x > bottomRight.x) {
-					var temp = bottomLeft;
-					bottomLeft = bottomRight;
-					bottomRight = temp;
-				}
-
-				// points should now contain the corners of the limb
-
-				// trace("Corners of limb: " + points);
-
-				// set the max bounds of each corner of the limb
-				if(topLeft.x < boundsTopLeft.x) boundsTopLeft.x = topLeft.x;
-				if(topLeft.y < boundsTopLeft.y) boundsTopLeft.y = topLeft.y;
-				if(topRight.x > boundsTopRight.x) boundsTopRight.x = topRight.x;
-				if(topRight.y < boundsTopRight.y) boundsTopRight.y = topRight.y;
-				if(bottomLeft.x < boundsBottomLeft.x) boundsBottomLeft.x = bottomLeft.x;
-				if(bottomLeft.y > boundsBottomLeft.y) boundsBottomLeft.y = bottomLeft.y;
-				if(bottomRight.x > boundsBottomRight.x) boundsBottomRight.x = bottomRight.x;
-				if(bottomRight.y > boundsBottomRight.y) boundsBottomRight.y = bottomRight.y;
-
-				// recycle the points
-				for(point in points) point.put();
-			}
-			var cameras = sprite._cameras;
-			var oldVisible = cnc.visible;
-			cnc.visible = true;
-			sprite._cameras = [cnc];
-			sprite.draw();
-			sprite._cameras = cameras;
-			cnc.visible = oldVisible;
-			cnc.onDraw = oldOnDraw;
-
-			// fake transform
-
-			//trace("");
-			//trace("topLeft: " + boundsTopLeft);
-			//trace("topRight: " + boundsTopRight);
-			//trace("bottomLeft: " + boundsBottomLeft);
-			//trace("bottomRight: " + boundsBottomRight);
-			//trace("Before transform");
-			//trace(points);
-
-			for(point in points) {
-				//var x = matrix.__transformX(point.x * _width, point.y * _height);
-				//var y = matrix.__transformY(point.x * _width, point.y * _height);
-				// apply using boundsTopLeft, boundsTopRight, boundsBottomLeft, boundsBottomRight
-				// matrix doesnt work for this
-				var x = FlxMath.lerp(
-					FlxMath.lerp(boundsTopLeft.x, boundsTopRight.x, point.x),
-					FlxMath.lerp(boundsBottomLeft.x, boundsBottomRight.x, point.x),
-					point.y
-				);
-				var y = FlxMath.lerp(
-					FlxMath.lerp(boundsTopLeft.y, boundsTopRight.y, point.x),
-					FlxMath.lerp(boundsBottomLeft.y, boundsBottomRight.y, point.x),
-					point.y
-				);
-
-				//trace("(" + point.x + ", " + point.y + ") -> (" + x + ", " + y + ")");
-
-				// reset to ingame coords
-				x += camera.scroll.x;
-				y += camera.scroll.y;
-
-				if(isFunkinSprite) {
-					var ratio = 1 - FlxMath.lerp(1 / camera.zoom, 1, funkinSprite.zoomFactor);
-					x += camera.width / 2 * ratio;
-					y += camera.height / 2 * ratio;
-				}
-				point.set(x, y);
-			}
-
-			//trace("After transform");
-			//trace(points);
+		if(sprite is IPrePostDraw) {
+			var postDraw = cast(sprite, IPrePostDraw);
+			postDraw.preDraw();
+			sprite.drawComplex(nc);
+			postDraw.postDraw();
 		} else {
-			if(sprite is IPrePostDraw) {
-				var postDraw = cast(sprite, IPrePostDraw);
-				postDraw.preDraw();
-				sprite.drawComplex(nc);
-				postDraw.postDraw();
-			} else {
-				sprite.drawComplex(nc);
-			}
-			transformPoints(sprite, points, sprite._matrix, camera, _width, _height);
+			sprite.drawComplex(nc);
 		}
+		transformPoints(sprite, points, sprite._matrix, camera, _width, _height);
 
 		return points;
 	}

source/funkin/backend/utils/MemoryUtil.hx

@@ -127,7 +127,7 @@ final class MemoryUtil {
 	public static function getMemType():String {
 		#if windows
 		var memoryMap:Map<Int, String> = [
-			0 => null,
+			0 => "Unknown",
 			1 => "Other",
 			2 => "DRAM",
 			3 => "Synchronous DRAM",
@@ -152,23 +152,13 @@ final class MemoryUtil {
 			22 => "DDR2 FB-DIMM",
 			24 => "DDR3",
 			25 => "FBD2",
-			26 => "DDR4",
-			27 => "LPDDR",
-			28 => "LPDDR2",
-			29 => "LPDDR3",
-			30 => "LPDDR4",
-			31 => "Logical Non-volatile device",
-			32 => "HBM",
-			33 => "HBM2",
-			34 => "DDR5",
-			35 => "LPDDR5",
-			36 => "HBM3",
+			26 => "DDR4"
 		];
 		var memoryOutput:Int = -1;
 
-		var process = new HiddenProcess("powershell", ["-Command", "Get-CimInstance Win32_PhysicalMemory | Select-Object -ExpandProperty SMBIOSMemoryType" ]);
+		var process = new HiddenProcess("wmic", ["memorychip", "get", "SMBIOSMemoryType"]);
 		if (process.exitCode() == 0) memoryOutput = Std.int(Std.parseFloat(process.stdout.readAll().toString().trim().split("\n")[1]));
-		if (memoryOutput != -1) return memoryMap[memoryOutput] == null ? 'Unknown ($memoryOutput)' : memoryMap[memoryOutput];
+		if (memoryOutput != -1) return memoryMap[memoryOutput];
 		#elseif mac
 		var process = new HiddenProcess("system_profiler", ["SPMemoryDataType"]);
 		var reg = ~/Type: (.+)/;

source/funkin/backend/utils/RegistryUtil.hx

@@ -1,120 +0,0 @@
-package funkin.backend.utils;
-
-enum abstract RegistryHive(Int) {
-	var HKEY_CLASSES_ROOT = 0x80000000;
-	var HKEY_CURRENT_USER = 0x80000001;
-	var HKEY_LOCAL_MACHINE = 0x80000002;
-	var HKEY_USERS = 0x80000003;
-	var HKEY_CURRENT_CONFIG = 0x80000005;
-}
-#if windows
-@:cppFileCode('
-#include <windows.h>
-#include <tchar.h>
-#include <string>
-#include <vector>
-')
-#end
-class RegistryUtil {
-	#if windows
-	@:functionCode('
-		HKEY hKey;
-		LONG result;
-		DWORD dataSize = 0;
-		DWORD dataType = 0;
-
-		std::wstring subkey = std::wstring(key.wchar_str());
-		std::wstring valname = std::wstring(string.wchar_str());
-
-		result = RegOpenKeyExW((HKEY)reinterpret_cast<HKEY>(static_cast<uintptr_t>(hive)), subkey.c_str(), 0, KEY_READ, &hKey);
-		if (result != ERROR_SUCCESS) return null();
-
-		result = RegQueryValueExW(hKey, valname.c_str(), NULL, &dataType, NULL, &dataSize);
-		if (result != ERROR_SUCCESS || dataSize == 0) {
-			RegCloseKey(hKey);
-			return null();
-		}
-
-		std::vector<wchar_t> buffer(dataSize / sizeof(wchar_t));
-		result = RegQueryValueExW(hKey, valname.c_str(), NULL, NULL, (LPBYTE)buffer.data(), &dataSize);
-		RegCloseKey(hKey);
-
-		if (result == ERROR_SUCCESS) {
-			return ::String(buffer.data());
-		}
-		return null();
-	')
-	#end
-	public static function get(hive:RegistryHive, key:String, string:String):Null<String>
-	{
-		return null;
-	}
-
-	#if windows
-	@:functionCode('
-		HKEY hKey;
-		LONG result;
-
-		std::wstring subkey = std::wstring(key.wchar_str());
-		std::wstring valname = std::wstring(string.wchar_str());
-		std::wstring data = std::wstring(value.wchar_str());
-
-		result = RegCreateKeyExW((HKEY)reinterpret_cast<HKEY>(static_cast<uintptr_t>(hive)), subkey.c_str(), 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL);
-		if (result != ERROR_SUCCESS) return false;
-
-		result = RegSetValueExW(hKey, valname.c_str(), 0, REG_SZ, (const BYTE*)data.c_str(), (DWORD)((data.length() + 1) * sizeof(wchar_t)));
-		RegCloseKey(hKey);
-
-		return result == ERROR_SUCCESS;
-	')
-	#end
-	public static function set(hive:RegistryHive, key:String, string:String, value:String):Bool
-	{
-		return false;
-	}
-
-	#if windows
-	@:functionCode('
-		HKEY hKey;
-		LONG result;
-
-		std::wstring subkey = std::wstring(key.wchar_str());
-		std::wstring valname = std::wstring(string.wchar_str());
-
-		result = RegOpenKeyExW((HKEY)reinterpret_cast<HKEY>(static_cast<uintptr_t>(hive)), subkey.c_str(), 0, KEY_READ, &hKey);
-		if (result != ERROR_SUCCESS) return false;
-
-		DWORD dataType = 0;
-		result = RegQueryValueExW(hKey, valname.c_str(), NULL, &dataType, NULL, NULL);
-
-		RegCloseKey(hKey);
-
-		return result == ERROR_SUCCESS;
-	')
-	#end
-	public static function exists(hive:RegistryHive, key:String, string:String):Bool
-	{
-		return false;
-	}
-
-	#if windows
-	@:functionCode('
-		HKEY hKey;
-		LONG result;
-
-		std::wstring subkey = std::wstring(key.wchar_str());
-		std::wstring valname = std::wstring(string.wchar_str());
-
-		result = RegOpenKeyExW((HKEY)reinterpret_cast<HKEY>(static_cast<uintptr_t>(hive)), subkey.c_str(), 0, KEY_SET_VALUE, &hKey);
-		if (result != ERROR_SUCCESS) return false;
-
-		result = RegDeleteValueW(hKey, valname.c_str());
-		RegCloseKey(hKey);
-
-		return result == ERROR_SUCCESS;
-	')
-	#end
-	public static function delete(hive:RegistryHive, key:String, string:String):Bool {
-		return false;
-	}
-}

source/funkin/backend/utils/SysZip.hx

@@ -2,157 +2,143 @@ package funkin.backend.utils;
 
 #if sys
 import haxe.io.Input;
-import haxe.zip.Entry;
-import haxe.zip.InflateImpl;
 import haxe.zip.Reader;
 import sys.io.File;
 import sys.io.FileInput;
 
+import haxe.io.Bytes;
+
 /**
  * Class that extends Reader allowing you to load ZIP entries without blowing your RAM up!!
- * Half of the code is taken from haxe libraries btw
+ * ~~Half of the code is taken from haxe libraries btw~~ Reworked by ItsLJcool to actually work for zip files.
  */
-class SysZip extends Reader {
-	var input:Input;
+class SysZip {
 	var fileInput:FileInput;
+	var filePath:String;
 
-	public var entries:List<SysZipEntry>;
+	public var entries:List<SysZipEntry> = new List();
 
 	/**
 	 * Opens a zip from a specified path.
-	 * @param path Path to the zip file.
+	 * @param path Path to the zip file. (With the extension)
 	 */
-	public static function openFromFile(path:String) {
-
-		return new SysZip(File.read(path, true));
-	}
+	public static function openFromFile(path:String) { return new SysZip(path); } // keeping for compatibility.
 
 	/**
-	 * Creates a new SysZip from a specified file input.
-	 * @param input File input.
+	 * Creates a new SysZip from a specified path.
+	 * @param path Path to the zip file. (With the extension)
 	 */
-	public function new(input:FileInput) {
-		super(input);
-		fileInput = input;
-	}
+	public function new(path:String) {
+		this.filePath = path;
+		fileInput = File.read(path, true);
 
-	/**
-	 * Reads all the data present in a specified entry.
-	 * NOTE: If the entry is compressed, the data won't be decompressed. For decompression, use `unzipEntry`.
-	 * @param e Entry
-	 */
-	public function readEntryData(e:SysZipEntry) {
-		var bytes:haxe.io.Bytes = null;
-		var buf = null;
-		var tmp = null;
-
-		fileInput.seek(e.seekPos, SeekBegin);
-		if (e.crc32 == null) {
-			if (e.compressed) {
-				#if neko
-				// enter progressive mode : we use a different input which has
-				// a temporary buffer, this is necessary since we have to uncompress
-				// progressively, and after that we might have pending read data
-				// that needs to be processed
-				var bufSize = 65536;
-				if (buf == null) {
-					buf = new haxe.io.BufferInput(i, haxe.io.Bytes.alloc(bufSize));
-					tmp = haxe.io.Bytes.alloc(bufSize);
-					i = buf;
-				}
-				var out = new haxe.io.BytesBuffer();
-				var z = new neko.zip.Uncompress(-15);
-				z.setFlushMode(neko.zip.Flush.SYNC);
-				while (true) {
-					if (buf.available == 0)
-						buf.refill();
-					var p = bufSize - buf.available;
-					if (p != buf.pos) {
-						// because of lack of "srcLen" in zip api, we need to always be stuck to the buffer end
-						buf.buf.blit(p, buf.buf, buf.pos, buf.available);
-						buf.pos = p;
-					}
-					var r = z.execute(buf.buf, buf.pos, tmp, 0);
-					out.addBytes(tmp, 0, r.write);
-					buf.pos += r.read;
-					buf.available -= r.read;
-					if (r.done)
-						break;
-				}
-				bytes = out.getBytes();
-				#else
-				var bufSize = 65536;
-				if (tmp == null)
-					tmp = haxe.io.Bytes.alloc(bufSize);
-				var out = new haxe.io.BytesBuffer();
-				var z = new InflateImpl(i, false, false);
-				while (true) {
-					var n = z.readBytes(tmp, 0, bufSize);
-					out.addBytes(tmp, 0, n);
-					if (n < bufSize)
-						break;
-				}
-				bytes = out.getBytes();
-				#end
-			} else
-				bytes = i.read(e.dataSize);
-			e.crc32 = i.readInt32();
-			if (e.crc32 == 0x08074b50)
-				e.crc32 = i.readInt32();
-			e.dataSize = i.readInt32();
-			e.fileSize = i.readInt32();
-			// set data to uncompressed
-			e.dataSize = e.fileSize;
-			e.compressed = false;
-		} else
-			bytes = i.read(e.dataSize);
-		return bytes;
+		updateEntries(); // automatic but if you feel like you don't want it to be automatic, you can remove this.
 	}
 
 	/**
 	 * Unzips and returns all of the data present in an entry.
 	 * @param f Entry to read from.
 	 */
-	public function unzipEntry(f:SysZipEntry) {
-		var data = readEntryData(f);
+	public function unzipEntry(f:SysZipEntry):Bytes {
+		if (f.fileSize <= 0) return Bytes.alloc(0);
+		
+		fileInput.seek(f.seekPos, SeekBegin);
+		var data = fileInput.read(f.compressedSize);
+		
+		if (!f.compressed) return data;
 
-		if (!f.compressed)
-			return data;
 		var c = new haxe.zip.Uncompress(-15);
-		var s = haxe.io.Bytes.alloc(f.fileSize);
+		var s = Bytes.alloc(f.fileSize);
 		var r = c.execute(data, 0, s, 0);
 		c.close();
-		if (!r.done || r.read != data.length || r.write != f.fileSize)
-			throw "Invalid compressed data for " + f.fileName;
-		data = s;
-		return data;
+
+		if (!r.done || r.read != data.length || r.write != f.fileSize) throw 'Invalid compressed data for ${f.fileName} | ${f.compressedSize} -> ${f.fileSize}';
+		return s;
 	}
 
-	public override function read():List<Entry> {
-		if (entries != null)
-			return entries;
-		entries = new List();
+	/**
+	 * Updates the `entries` list with the current contents of the zip file.
+	 * This is done when the zip is read from SysZip the first time, but if you REALLY need to re-update the entries, you can call this again.
+	 * 
+	 * Note: Calling this function will hold up the game as it has to read the ENTIRE zip, so if it's large like 1GiB or more, it might take a second or more.
+	 */
+	public function updateEntries() {
+		if (entries.length > 0) {
+			entries.clear();
+			entries = new List();
+		}
+		
+		// --- locate End of Central Directory (EOCD) ---
+		var fileSize:Int = sys.FileSystem.stat(this.filePath).size; // probably need a better way to check the size of the file.
+		var scanSize:Int = (65535 < fileSize) ? 65535 : fileSize;
+		
+		// It seems this usually ends up being 0 anyways, but for cases where it might not be?? I'd just make sure. but Someone do some digging I don't know if this required.
+		fileInput.seek(fileSize - scanSize, SeekBegin);
+		
+		var buf = fileInput.read(scanSize);
+		var b = new haxe.io.BytesInput(buf);
+		// I LOVE USING MAGIC NUMBERS AND FORGETTING WHAT THEY DO 🔥🔥🔥🔥🔥🔥
+		b.position = (buf.length - 22) + 16; // offset to start of central directory
+
+		// --- read central directory ---
+		fileInput.seek(b.readInt32(), SeekBegin);
 		while (true) {
-			var e = readEntryHeader();
-			if (e == null)
-				break;
+			if (fileInput.readInt32() != 0x02014b50) break; // central dir file header signature
+
+			fileInput.seek(6, SeekCur); // version/flags
+			var compression_method = fileInput.readUInt16();
+			fileInput.seek(8, SeekCur); // time/date + CRC32 (4, 4)
+			var compressed_size = fileInput.readInt32();
+			var uncompressed_size = fileInput.readInt32();
+			var nameLen = fileInput.readUInt16();
+			var extraLen = fileInput.readUInt16();
+			var commentLen = fileInput.readUInt16();
+			fileInput.seek(8, SeekCur); // skip disk number/start attrs
+			var localHeaderOffset = fileInput.readInt32();
+
+			var name = fileInput.read(nameLen).toString();
+
+			// skip central directory extra/comment
+			fileInput.seek(extraLen + commentLen, SeekCur);
+
+			// --- compute correct seekPos using local header ---
+			var curPos = fileInput.tell();
+			// I also forgor what the `+ 26` is for, so uh my b chat
+			fileInput.seek(localHeaderOffset + 26, SeekBegin);
+			var localNameLen = fileInput.readUInt16();
+			var localExtraLen = fileInput.readUInt16();
+			fileInput.seek(curPos, SeekBegin);
+
+			// I completely forgot that we don't really need to log the FOLDER of the content because we only care about where the contents are.
+			// the folders are labled as 0 bytes anyways so this will save on storing non-required data.
+			if (name.endsWith("/")) continue;
 
-			var zipEntry:SysZipEntry = cast e;
-			zipEntry.seekPos = fileInput.tell();
+			var zipEntry:SysZipEntry = {
+				fileName: name,
+				fileSize: uncompressed_size,
+				// I don't remember what the `+ 30` is for, but probably to offset something
+				seekPos: (localHeaderOffset + 30 + localNameLen + localExtraLen),
+				compressedSize: compressed_size,
+				compressed: (compression_method == 8),
+			};
 			entries.add(zipEntry);
-			fileInput.seek(e.dataSize, SeekCur);
 		}
-		return entries;
 	}
 
+	/**
+	 * calling `dispose` doesn't actually kill the class, you can still access the entries.
+	 * disposing of SysZip will free the compressed file from being used by the engine.
+	 */
 	public function dispose() {
-		if (input != null)
-			input.close();
+		if (fileInput != null) fileInput.close();
 	}
 }
 
 typedef SysZipEntry = {
-	> Entry,
+	var fileName:String;
+	var fileSize:Int;
 	var seekPos:Int;
+	var compressedSize:Int;
+	var compressed:Bool;
 }
 #end

source/funkin/backend/utils/ThreadUtil.hx

@@ -1,32 +1,97 @@
 package funkin.backend.utils;
 
-#if ALLOW_MULTITHREADING
+#if (target.threaded)
+import sys.thread.Deque;
+import sys.thread.Thread;
+import sys.thread.Mutex;
+#else
+private typedef Thread = Dynamic;
+#end
+
+#if !macro
+import funkin.backend.system.Logs;
+#end
+
 final class ThreadUtil {
+	inline static function error(text:String) {
+		#if macro
+		trace(text);
+		#else
+		FlxG.signals.preUpdate.addOnce(Logs.error.bind(text));
+		#end
+	}
+
 	/**
 	 * Creates a new Thread with an error handler.
 	 * @param func Function to execute
 	 * @param autoRestart Whenever the thread should auto restart itself after crashing.
 	 */
-	public static function createSafe(func:Void->Void, autoRestart:Bool = false) {
-		if (autoRestart) {
-			return sys.thread.Thread.create(function() {
-				while(true) {
-					try {
-						func();
-					} catch(e) {
-						trace(e.details());
-					}
-				}
-			});
-		} else {
-			return sys.thread.Thread.create(function() {
-				try {
+	public static function createSafe(func:Void->Void, autoRestart:Bool = false):Thread {
+		#if (target.threaded)
+		try {
+			return if (autoRestart) Thread.create(() -> {
+				var restart = true;
+				while (restart) try {
 					func();
-				} catch(e) {
-					trace(e.details());
+					restart = false;
 				}
+				catch (e) error(e.details());
+			})
+			else Thread.create(() -> {
+				try {func();}
+				catch (e) error(e.details());
 			});
 		}
+		catch (e) error("Failed to safely create a thread: " + e.details());
+		#end
+		return null;
 	}
-}
-#end
+
+	#if ALLOW_MULTITHREADING
+	public static var maxThreads:Int = 4;
+
+	static var __threads:Array<Thread> = [];
+	static var __pendingExecs:Deque<Void->Void> = new Deque();
+	static var __threadMutex:Mutex = new Mutex();
+	static var __threadUsed:Int = 0;
+
+	static function __threadExecAsync() {
+		var callback:Void->Void;
+		while ((callback = __pendingExecs.pop(true)) != null) {
+			__threadMutex.acquire();
+			__threadUsed++;
+			__threadMutex.release();
+
+			callback();
+
+			__threadMutex.acquire();
+			__threadUsed--;
+			__threadMutex.release();
+		}
+		__threadMutex.acquire();
+		__threads.remove(Thread.current());
+		__threadMutex.release();
+	}
+	#end
+
+	public static function execAsync(func:Void->Void) {
+		if (func == null) return;
+
+		#if (ALLOW_MULTITHREADING && !macro)
+		__pendingExecs.add(func);
+		if (__threadUsed >= __threads.length) {
+			if (__threads.length == maxThreads) return;
+
+			__threadMutex.acquire();
+			try {
+				var thread = Thread.create(__threadExecAsync);
+				__threads.push(thread);
+			}
+			catch (e) Logs.warn(e.details());
+			__threadMutex.release();
+		}
+		#else
+		func();
+		#end
+	}
+}

source/funkin/backend/utils/XMLUtil.hx

@@ -14,6 +14,7 @@ import funkin.backend.scripting.ScriptPack;
 import flixel.util.typeLimit.OneOfTwo;
 import funkin.backend.system.interfaces.IOffsetCompatible;
 import haxe.xml.Access;
+import animate.FlxAnimateFrames;
 
 using StringTools;
 
@@ -127,6 +128,9 @@ final class XMLUtil {
 			spr.spriteAnimType = XMLAnimType.fromString(node.att.type, spr.spriteAnimType);
 		}
 
+		if (node.has.applyStageMatrix) spr.applyStageMatrix = node.att.applyStageMatrix == "true";
+		if (node.has.useRenderTexture) spr.useRenderTexture = node.att.useRenderTexture == "true";
+		
 		if(node.has.x) {
 			var x:Null<Float> = Std.parseFloat(node.att.x);
 			if (x.isNotNull()) spr.x = x;
@@ -225,7 +229,8 @@ final class XMLUtil {
 				animType: spr.spriteAnimType,
 				x: 0,
 				y: 0,
-				indices: [for(i in 0...spr.frames.frames.length) i]
+				indices: [for(i in 0...spr.frames.frames.length) i],
+				label: false
 			});
 		}
 
@@ -261,7 +266,8 @@ final class XMLUtil {
 			animType: animType,
 			x: 0,
 			y: 0,
-			indices: []
+			indices: [],
+			label: false
 		};
 
 		if (anim.has.name) animData.name = anim.att.name;
@@ -273,6 +279,7 @@ final class XMLUtil {
 		if (anim.has.loop) animData.loop = anim.att.loop == "true";
 		if (anim.has.forced) animData.forced = anim.att.forced == "true";
 		if (anim.has.indices) animData.indices = CoolUtil.parseNumberRange(anim.att.indices);
+		if (anim.has.label) animData.label = anim.att.label == "true";
 
 		return animData;
 	}
@@ -299,15 +306,23 @@ final class XMLUtil {
 		if (animData.name != null) {
 			if (animData.fps <= 0 #if web || animData.fps == null #end) animData.fps = 24;
 
-			if (sprite is FunkinSprite && cast(sprite, FunkinSprite).animateAtlas != null) {
-				var animateAnim = cast(sprite, FunkinSprite).animateAtlas.anim;
+			if (sprite.frames is FlxAnimateFrames) {
 				if(animData.anim == null)
 					return MISSING_PROPERTY;
 
-				if (animData.indices != null && animData.indices.length > 0)
-					animateAnim.addBySymbolIndices(animData.name, animData.anim, animData.indices, animData.fps, animData.loop);
-				else
-					animateAnim.addBySymbol(animData.name, animData.anim, animData.fps, animData.loop);
+				var animateAnim = cast(sprite, FunkinSprite).anim;
+
+				if (animData.label) {
+					if (animData.indices != null && animData.indices.length > 0)
+						animateAnim.addByFrameLabelIndices(animData.name, animData.anim, animData.indices, animData.fps, animData.loop);
+					else
+						animateAnim.addByFrameLabel(animData.name, animData.anim, animData.fps, animData.loop);
+				} else {
+					if (animData.indices != null && animData.indices.length > 0)
+						animateAnim.addBySymbolIndices(animData.name, animData.anim, animData.indices, animData.fps, animData.loop);
+					else
+						animateAnim.addBySymbol(animData.name, animData.anim, animData.fps, animData.loop);
+				}
 			} else {
 				if (animData.indices != null && animData.indices.length > 0) {
 					if (animData.anim == null)
@@ -463,6 +478,7 @@ typedef AnimData = {
 	var y:Float;
 	var indices:Array<Int>;
 	var animType:XMLAnimType;
+	var label:Bool;
 	var ?forced:Bool;
 }
 

source/funkin/backend/utils/native/Windows.hx

@@ -204,6 +204,9 @@ final class Windows {
 	freopen("CONIN$", "r", stdin);
 	freopen("CONOUT$", "w", stdout);
 	freopen("CONOUT$", "w", stderr);
+
+	SetConsoleOutputCP(65001);
+	SetConsoleCP(65001);
 	')
 	public static function allocConsole() {
 	}

source/funkin/backend/week/Week.hx

@@ -41,7 +41,8 @@ class Week {
 				weekObj.songs.push({
 					name: name,
 					hide: song.getAtt('hide').getDefault('false') == "true",
-					displayName: song.getAtt('displayName')
+					displayName: song.getAtt('displayName'),
+                    variation: song.getAtt('variation')
 				});
 			} catch(e) {
 				Logs.trace('Song at index ${k} in week $weekName cannot contain any other XML nodes in its name.', WARNING);