Merge changes from main (#892 )

* repair ScriptableShader.shader = null (#877) * optimize updateInput (#878) * optimize updateInput * resize optimize * __notePerStrum optimize * Update StrumLine.hx * NoteGroup optimize (#881) * NoteGroup optimize * CoolUtil.bound faster * makes commit with github desktop W FRAKITS * Use fastSinCos for notes (#889) * Update Strum.hx * Update Strum.hx --------- Co-authored-by: HEIHUAa <112499486+HEIHUAa@users.noreply.github.com> Co-authored-by: Frakits <90983918+Frakits@users.noreply.github.com>
Merge branch 'flixel-animate' of https://www.github.com/CodenameCrew/CodenameEngine into flixel-animate
2026-01-28 14:21:21 +00:00 · 2026-01-28 13:17:19 +01:00 · 2026-01-28 13:16:57 +01:00 · 2026-01-26 23:40:15 +01:00 · 2026-01-26 23:37:58 +01:00 · 2026-01-25 22:55:25 +01:00
148 changed files with 15137 additions and 148167 deletions
@@ -33,4 +33,11 @@ f8b20774e3f035eeddb9211a28a391b20db74456

 # Revert a revert (empty script)
 392416e00cbd82e1c49e82a9fafdcf2e069a654e
-159467de832a172681200c463d244a46e295c3c8
+159467de832a172681200c463d244a46e295c3c8
+
+# Revert a revert (scripted cutscene path)
+d73f86d26ec2dbf031c01f588ba4be11842db09c
+fe0ab0aa454f4ae12ced9502db8a01e7bca3e04c
+
+# Forgot the # in the commit message
+484bbcb22aa8f28b62912abb6d8c89fb58e63889
@@ -1,22 +1,23 @@
+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
      - name: Setting up Haxe
-        uses: krdlab/setup-haxe@v1
+        uses: krdlab/setup-haxe@v2
        with:
-          haxe-version: 4.2.5
+          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 +25,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
@@ -67,7 +68,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 +76,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/
@@ -1,22 +1,23 @@
+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
      - name: Setting up Haxe
-        uses: krdlab/setup-haxe@v1
+        uses: krdlab/setup-haxe@v2
        with:
-          haxe-version: 4.2.5
+          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 +25,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
      - name: Tar files
        run: tar -zcvf CodenameEngine.tar.gz -C export/release/macos/bin .
      - name: Uploading artifact (executable)
@@ -64,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-mac
@@ -72,5 +73,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/
@@ -0,0 +1,197 @@
+name: Create Release Builds
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: "Release name (e.g. v1.0.5 or v1.2-rc1)"
+        required: true
+      prerelease:
+        description: "Is this a prerelease?"
+        required: true
+        type: boolean
+      custom_message:
+        description: "Optional pre-changelog message"
+        required: false
+
+jobs:
+  collect-release:
+    name: Release ${{ github.event.inputs.tag_name }} Builds
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Download Windows Full Build
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: windows.yml
+          name: Codename Engine
+          path: artifacts/windows/full_build
+          allow_forks: false
+
+      - name: Download Windows Executable
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: windows.yml
+          name: Codename Engine (Executable Only)
+          path: artifacts/windows/executable
+          allow_forks: false
+
+      - name: Download Mac OS Full Build
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: macos.yml
+          name: Codename Engine
+          path: artifacts/macos/full_build
+          allow_forks: false
+
+      - name: Download Mac OS Executable
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: macos.yml
+          name: Codename Engine (Executable Only)
+          path: artifacts/macos/executable
+          allow_forks: false
+
+      - name: Download Linux Full Build
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: linux.yml
+          name: Codename Engine
+          path: artifacts/linux/full_build
+          allow_forks: false
+
+      - name: Download Linux Executable
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: linux.yml
+          name: Codename Engine (Executable Only)
+          path: artifacts/linux/executable
+          allow_forks: false
+
+      - name: Prepare artifacts
+        run: |
+          mkdir -p renamed
+
+          # Windows
+          mv artifacts/windows/executable/CodenameEngine.exe renamed/update-windows.exe
+          cd artifacts/windows/full_build
+          zip -r ../../../renamed/"Codename Engine-Windows.zip" *
+          cd -
+
+          # Mac OS
+          mv artifacts/macos/executable/CodenameEngine renamed/update-mac
+          cd artifacts/macos/full_build
+          if [ -f CodenameEngine.tar.gz ]; then
+            # Keep tar.gz as-is
+            cp CodenameEngine.tar.gz ../../../renamed/"Codename Engine-Mac.tar.gz"
+          else
+            # Zip contents at root
+            zip -r ../../../renamed/"Codename Engine-Mac.zip" *
+          fi
+          cd -
+
+          # Linux
+          mv artifacts/linux/executable/CodenameEngine renamed/update-linux
+          cd artifacts/linux/full_build
+          zip -r ../../../renamed/"Codename Engine-Linux.zip" *
+          cd -
+
+      - name: Find Base Release
+        id: get_base_release
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "Looking for base release..."
+          PRERELEASE="${{ github.event.inputs.prerelease }}"
+
+          if [[ "$PRERELEASE" == "true" ]]; then
+            BASE=$(gh release list --repo ${{ github.repository }} --json tagName,isPrerelease,isDraft \
+              -L 50 -q '.[] | select(.isPrerelease==false and .isDraft==false) | .tagName' | head -n 1)
+
+            if [ -z "$BASE" ]; then
+              echo "No stable release found, resorting to prereleases."
+              BASE=$(gh release list --repo ${{ github.repository }} --json tagName,isDraft \
+                -L 1 -q '.[] | select(.isDraft==false) | .tagName')
+            fi
+          else
+            BASE=$(gh release list --repo ${{ github.repository }} --json tagName,isPrerelease,isDraft \
+              -L 50 -q '.[] | select(.isPrerelease==false and .isDraft==false) | .tagName' | head -n 1)
+          fi
+
+          if [ -z "$BASE" ]; then
+            echo "No older release found; please make sure to have at least one older release containing the 'update-assets.zip' file in order to generate the differences."
+            exit 1
+          else
+            echo "Base release: $BASE"
+            echo "base_release=$BASE" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Prepare update-assets.zip
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "Looking for 'update-assets.zip' from release '${{ steps.get_base_release.outputs.base_release }}'"
+          ASSETS=$(gh release view "${{ steps.get_base_release.outputs.base_release }}" \
+            --repo "${{ github.repository }}" \
+            --json assets \
+            | jq -r '.assets[].name')
+
+          if echo "$ASSETS" | grep -xq "update-assets.zip"; then
+            mkdir -p update_assets_temp renamed
+            echo "Downloading assets from release '${{ steps.get_base_release.outputs.base_release }}'"
+            gh release download "${{ steps.get_base_release.outputs.base_release }}" \
+              --repo ${{ github.repository }} \
+              --pattern "update-assets.zip" \
+              -D update_assets_temp
+
+            unzip -q update_assets_temp/update-assets.zip -d update_assets_temp
+            cd update_assets_temp
+            zip -r ../renamed/update-assets.zip . -i assets
+          else
+            echo "No 'update-assets.zip' file found in release '${{ steps.get_base_release.outputs.base_release }}'; please make sure to have this file in that older release in order to generate the differences."
+            exit 1
+          fi
+
+      - name: Prepare pre-changelog message
+        id: pre_changelog_message
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "Preparing a pre-changelog message..."
+
+          BODY="If you would like to download the full builds of the engine from this release, please ignore the files starting with 'update-' as they're needed for the engine's internal autoupdater.\n\n"
+
+          if [ -n "${{ github.event.inputs.custom_message }}" ]; then
+            BODY="${{ github.event.inputs.custom_message }}\n${BODY}"
+          fi
+
+          {
+            echo "body<<EOF"
+            echo -e "$BODY"
+            echo "EOF"
+          } >> $GITHUB_OUTPUT
+          echo -e "Final pre-changelog message:\n\n$BODY"
+
+      - name: Create GitHub Release with Assets
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.event.inputs.tag_name }}
+          name: Release ${{ github.event.inputs.tag_name }}
+          draft: true
+          prerelease: ${{ github.event.inputs.prerelease }}
+          body: ${{ steps.build_body.outputs.body }}
+          generate_release_notes: true
+          files: |
+            renamed/Codename Engine-Windows.zip
+            renamed/Codename Engine-Mac.zip
+            renamed/Codename Engine-Mac.tar.gz
+            renamed/Codename Engine-Linux.zip
+            renamed/update-assets.zip
+            renamed/update-windows.exe
+            renamed/update-mac
+            renamed/update-linux
@@ -1,8 +1,9 @@
+name: Windows Builds

-name: Windows Build
 on:
  push:
  workflow_dispatch:
+
 jobs:
  build:
    name: Windows Build
@@ -10,13 +11,13 @@ jobs:
    runs-on: windows-latest
    steps:
      - name: Pulling the new commit
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      - name: Setting up Haxe
-        uses: krdlab/setup-haxe@v1
+        uses: krdlab/setup-haxe@v2
        with:
-          haxe-version: 4.2.5
+          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,8 +25,8 @@ 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
@@ -62,7 +63,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 +71,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/
@@ -26,6 +26,7 @@ This changelog lists every change that has been added since the last update (inc
 		- `--fast` for quickly downloading git libraries, but requires you to reinstall it fully when updates happen
 - Alphabet now allows multiple lines in the text ([d519db0](https://github.com/CodenameCrew/CodenameEngine/commit/d519db011a14aac0ddfc052089836c6b445f7f44))
 - Allow importing mod root level modules in hscript, instead of only source/ ([7e66ee8](https://github.com/CodenameCrew/CodenameEngine/commit/7e66ee81e24204cd152de20046fa1500bb9d204b))
+- Made the substate have the possibility to open automatically transitions ([d31454c](https://github.com/CodenameCrew/CodenameEngine/commit/d31454c7ddf4cbf6a681cc8b32cd3f9480f8eacd))
 - Added a way to force animations in the `Play Animation` event ([d7b6fbe](https://github.com/CodenameCrew/CodenameEngine/commit/d7b6fbe510edeb832112ab5adc8ab19dfe97d77f))
 - Adde unused boyfriend animations ([be55696](https://github.com/CodenameCrew/CodenameEngine/commit/be55696bbefe537f06ad6550b039278ffcbcfb2f))
 - Made it display the keybind for the mod menu in main menu ([1ac2e7f](https://github.com/CodenameCrew/CodenameEngine/commit/1ac2e7f53390a9e92aa2a1fea94d147ed50d3694))
@@ -197,9 +198,4 @@ This changelog lists every change that has been added since the last update (inc
 - Cleaned up the controls code ([c3580cf](https://github.com/CodenameCrew/CodenameEngine/commit/c3580cf1413f90386dd52763042e11b20d21ce2d), [c1123b9](https://github.com/CodenameCrew/CodenameEngine/commit/c1123b9e3c3c1887888744e0c62827231abc48be))
 - Cleaned up unused variables in TitleState ([2779ef3](https://github.com/CodenameCrew/CodenameEngine/commit/2779ef3314471558e371b3ec2f17f8d4df48943a))
 - Restructured the events folder ([77b7eeb](https://github.com/CodenameCrew/CodenameEngine/commit/77b7eebed1ea077516ff884902528c0ff3d01872))
- Reduced the amount of data thats stored for the Github Contributors savefile ([2abc45a](https://github.com/CodenameCrew/CodenameEngine/commit/2abc45a9e416a1c5dd2bd0a5297c664e60c6f1d8))
-
-
-## Unsorted list
-
- @NexIsDumb Please document this i still dont understand it ([d31454c](https://github.com/CodenameCrew/CodenameEngine/commit/d31454c7ddf4cbf6a681cc8b32cd3f9480f8eacd))
+- Reduced the amount of data thats stored for the Github Contributors savefile ([2abc45a](https://github.com/CodenameCrew/CodenameEngine/commit/2abc45a9e416a1c5dd2bd0a5297c664e60c6f1d8))
@@ -1,5 +1,5 @@
 # Codename Engine features
-This markdown file contains every single feature Codename has, separated into multiple categories. List may be incomplete.
+This markdown file contains most of the main features Codename has, separated into multiple categories.

 _**QOL = Quality of Life**_

@@ -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!
@@ -1,91 +1,104 @@
-# Friday Night Funkin' - Codename Engine (WIP)
+# Friday Night Funkin' - Codename Engine

-## PLEASE NOTE - THIS IS STILL IN A BETA STATE
-### Mods created with beta versions of Codename may not be compatible with the release version
-Known issues in the beta:
- Some options are missing
+![Animated-Banner](https://github.com/user-attachments/assets/5830221d-d954-4be3-afe8-caae364a5881)

-Build instructions are below. Press TAB on the main menu to switch mods.
+Codename Engine is a cross platform [Friday Night Funkin'](https://github.com/FunkinCrew/Funkin) Engine aimed at simplifying modding focusing on softcoding, along with extensiblity and ease of use.<br>
+It is the the official successor of the previously well known [Yoshi Engine](https://github.com/CodenameCrew/YoshiCrafterEngine).

-Also, the command `.\cne test` uses the source assets folder instead of the export one for easier development (Although you can still use `lime test windows` normally).
+The engine uses [HaxeFlixel](https://haxeflixel.com/) and it mainly features:
+- A full scripting system with an optimized fork of [Hscript](https://lib.haxe.org/p/hscript/) (its name is [Hscript Improved](https://github.com/CodenameCrew/hscript-improved))
+- Uses forks of popular libraries tailored specifically for the engine for the goal of better optimization.
+- Modding system and softcoding is as capable as source coding.
+- Focuses heavily on optimization, and encourages its users to also take on optimization practices.
+- Many modding tools without changing the core gameplay and the base to mod on.
+- Allows modularity using addons and mods that apply on top of the core mod.
+- Advanced editors which allows for possibly better experience and easiness when creating the mod.
+- Much more can be read [HERE](FEATURES.md)

-## Codename Engine
+> [!NOTE]
+> Please keep in mind that, despite these differences, we do not consider our engine to be any better or worse than the others.

-Codename Engine is a new Friday Night Funkin' Engine aimed at simplifying modding, along with extensiblity and ease of use.<br>
-### Before making issues or need help with something, check our website [HERE](https://codename-engine.com/) (it contains a wiki of how to mod with EXAMPLES, an api, lists of mods made with Codename Engine and more)!!!
-#### The Engine includes many new features, as seen [here](FEATURES.md)<br>
-#### Wanna see the new features added in the most recent update? Click [here](PATCHNOTES.md)<br>
+---

-## How to download
+> [!CAUTION]
+> Want to use this project's code for different purposes or something similar? Check out the ***Usage Info*** part below first, it basically explains what you can do or not do!<br>
+> We love open source but we also love proper credits for having respect of all the people who worked hard on this project!!

-Latest builds for the engine can be found in the [Actions](https://github.com/CodenameCrew/CodenameEngine/actions) tab.<br>
-In the future (when the engine won't be a WIP anymore) we're gonna also publish the engine on platforms like Gamebanana; stay tuned!
+> [!WARNING]
+> Before making issues or if you need help with something, check our website [HERE](https://codename-engine.com/).<br>
+> It contains a wiki of how to mod with EXAMPLES, an api, lists of mods made with Codename Engine and more!

-If you don't have a github account please go onto https://codename-engine.com/ and click the download button for the respective operating system.
+> [!TIP]
+> Want to stay updated with this project?<br>
+> Check out our [patch notes](PATCHNOTES.md)!
+
+---
+
+<img width="1080" height="146" alt="immagine" src="https://github.com/user-attachments/assets/93604082-6bac-4ffc-99b0-5393b1e340a4" />
+
+<br><br>
+
+<img width="1280" height="720" alt="immagine" src="https://github.com/user-attachments/assets/4106f77a-40f8-4159-9f4e-b601cc79e1d0" />
+<img width="1280" height="720" alt="immagine" src="https://github.com/user-attachments/assets/2c06f5ea-3462-459b-982e-bf4eddf3d099" />
+<img width="1280" height="720" alt="immagine" src="https://github.com/user-attachments/assets/4979e256-6b99-4857-8a2a-96abd94f9c4e" />
+<img width="1280" height="720" alt="immagine" src="https://github.com/user-attachments/assets/55a5a710-55b9-4988-bdcc-0977ba1de97a" />
+<img width="1280" height="720" alt="immagine" src="https://github.com/user-attachments/assets/4676b035-bec7-445b-a303-78e66f11c479" />
+
+---
+
+> [!NOTE]
+> Codename Engine as for now supports **Windows x64**, **Mac OS x64** and **Linux x64**.<br>
+> More platforms will soon come, stay tuned!<br>
+> - [ ] **Web (HTML5) Support**
+> - [ ] **Mobile Support**

 <details>
-  <summary><h2>How to build</h2></summary>
+  <summary><h2>How to download</h2></summary>

-> **Open the instructions for your platform**
-<details>
-    <summary>Windows</summary>
+  - Stable builds of the engine can be found on our [GameBanana](https://gamebanana.com/mods/598553) or our [itch.io](https://nex-isdumb.itch.io/codename-engine) pages.
+  - Latest *EXPERIMENTAL* builds of the engine can be found in the [Actions](https://github.com/CodenameCrew/CodenameEngine/actions) tab. **REQUIRES A GITHUB ACCOUNT!!**

-##### Tested on Windows 10 21H2
-1. Install [version 4.2.5 of Haxe](https://haxe.org/download/version/4.2.5/).
-2. Download and install [`git-scm`](https://git-scm.com/download/win).
-    - Leave all installation options as default.
-3. Run `update.bat` using cmd or double-clicking it, and wait for the libraries to install.
-4. Once the libraries are installed, run `haxelib run lime test windows` to compile and launch the game (may take a long time)
-    - ℹ You can run `haxelib run lime setup` to make the lime command global, allowing you to execute `lime test windows` directly.
-</details>
-<details>
-    <summary>Linux</summary>
-
-##### Requires testing
-1. Install [version 4.2.5 of Haxe](https://haxe.org/download/version/4.2.5/).
-2. Install `g++`, if not present already.
-3. Download and install [`git-scm`](https://git-scm.com/download/linux).
-4. Open a terminal in the Codename Engine source folder, and run `update.sh`.
-5. Once the libraries are installed, run `haxelib run lime test linux` to compile and launch the game (may take a long time)
-    - ℹ You can run `haxelib run lime setup` to make the lime command global, allowing you to execute `lime test linux` directly.
-</details>
-<details>
-    <summary>MacOS</summary>
-
-##### Requires testing
-1. Install [version 4.2.5 of Haxe](https://haxe.org/download/version/4.2.5/).
-2. Install `Xcode` to allow C++ app building.
-3. Download and install [`git-scm`](https://git-scm.com/download/mac).
-4. Open a terminal in the Codename Engine source folder, and run `update.sh`.
-5. Once the libraries are installed, run `haxelib run lime test mac` to compile and launch the game (may take a long time)
-    - ℹ You can run `haxelib run lime setup` to make the lime command global, allowing you to execute `lime test mac` directly.
-</details>
+  If you don't have a GitHub account to download experimental builds, you can also go onto our [official website](https://codename-engine.com/) and click the download button for the respective operating system under the **Experimental** section.
 </details>

 <details>
-  <summary><h2>What can you do or not do</h2></summary>
+  <summary><h2>How to mod</h2></summary>

-  ### You can:
+  Check out our wiki [HERE](https://codename-engine.com/wiki/)
+</details>
+
+<details>
+  <summary><h2>How to setup and build the engine and its documentation</h2></summary>
+
+  Check out our guide [HERE](building/README.md)
+</details>
+
+<details>
+  <summary><h2>Usage Info</h2></summary>
+
+  ### Feel free to:
  - Download and play the engine with its mods and modpacks
  - Mod and fork the engine (without using it for illicit purposes)
-  - Contribute to the engine (for example through *Pull Requests*, *Issues*, etc)
+  - Contribute to the engine (for example through *Pull Requests*, *Issues*, etc.)
  - Create a sub engine with Codename Engine as **TEMPLATE** with **CREDITS** (for example leaving the *credits menu submenu with the GitHub contributors* and putting the *[main devs](https://github.com/CodenameCrew)* in a *README* specifying that it's a *sub engine from Codename Engine*)
-  - Release excutable mods that use Codename Engine as source (Specifing that uses Codename Engine by for example the same way written above this)
-  - Release modpacks
+  - Release excutable mods that use Codename Engine as source (specifing that uses Codename Engine by for example the same way written above this)
+  - Release Codename Engine modpacks

-  ### You can't:
+  ### Please do not:
  - Create a *side/new/etc* engine (or mod that doesn't use Codename Engine) using Codename Engine's code
  - Steal code from Codename Engine for another different project that is not Codename Engine related (Codename Engine mods excluded) without properly crediting
-  - Release the entire Codename Engine on platforms (Mods that use Codename Engine as source are fine, if it's specified even better)
+  - Release the entirety of Codename Engine on platforms (mods that use Codename Engine as source are fine)

-  #### *If you need more info or feel like asking to do something which is not listed here, ask us directly on our discord (linked on the website)!*
+  #### *If you need more info or feel like asking to do something which is not listed here, ask us directly on our [discord server](https://discord.com/servers/codename-engine-860561967383445535)!*
 </details>

 <details>
  <summary><h2>Credits</h2></summary>

+- All main Credits can be seen inside the Engine and specifically [HERE](https://github.com/CodenameCrew/CodenameEngine/graphs/contributors)
 - Credits to the [FlxAnimate](https://github.com/Dot-Stuff/flxanimate) team for the Animate Atlas support
 - Credits to Smokey555 for the backup Animate Atlas to spritesheet code
 - Credits to MAJigsaw77 for [hxvlc](https://github.com/MAJigsaw77/hxvlc) (video cutscene/mp4 support) and [hxdiscord_rpc](https://github.com/MAJigsaw77/hxdiscord_rpc) (discord rpc integration)
 - Credits to [TheoDev](https://github.com/TheoDevelops) for [FunkinModchart](https://lib.haxe.org/p/funkin-modchart/). ***(library used for modcharting features)***
+- Credits to [Ninjamuffin99](https://github.com/ninjamuffin99) and the [Funkin Crew](https://github.com/FunkinCrew) for the base game Friday Night Funkin'
 </details>
@@ -1,61 +0,0 @@
-# Codename Engine Todo List
-
-## `v1.0.0` - Initial release
-
- [x] Remove Herobrine
- [ ] Chart Editor
-	- [x] Place & Delete notes
-	- [x] Ctrl+Z & Ctrl+Y
-	- [x] Selection box & dragging
-	- [x] Scroll bar at the right + Song info
-	- [x] Fix the strumlines bar when zooming out
-	- [x] Algorithm to make note placements faster & sorted out
-	- [x] Play here working
-	- [x] Cap zoom in & out
-	- [x] Events (including Camera Movement)
-	- [x] Metadata Editing
-	- [ ] Custom Notetypes
-	- [ ] Reorderable Strumlines
-	- [ ] Step based zooming
-	- [ ] Add Undo to more actions
-	- [ ] New Chart Button
-	- [ ] Bug fixes
-		- [ ] Zooming in causing notes to disappear
-		- [ ] Holds disappear too early
-		- [ ] Time signature fixes
-		- [ ] BPM Changes Events
- [ ] Character Editor
-	- [x] Animation Editing
-	- [x] Animation Deletion/Creation
-	- [x] Character Info Editing
-	- [x] Character Saving
-	- [x] Add Undos to Actions
-	- [ ] Change Stage
-	- [ ] New Character Button
- [ ] Port Videos to a more stable video lib
- [ ] Optimization to Editors
- [ ] Fix Ratings Lag
- [x] Re-export gf-christmas, gf-car and gf-tankmen with padding
- [x] Re-add shader camera stuff
- [x] Make update.bat use libs.xml instead of hmm.json
- [ ] New Switch Mod menu
- [x] Port shader camera stuff over to new flixel fork
- [ ] Add note offset
- [x] Dialogue
- [ ] Finish Base Game port
- [x] Add credits
- [x] Verbose mode (`--verbose`)
- [ ] Tooltips
- [ ] Fix bugs
-
-## `v1.1.0`
- [ ] Charter Waveforms (maybe in v1.1.0, don't wanna slow shit down)
- [ ] Custom classes
-	- [ ] Proper super overrides (FlxText_HSX doesn't allow overrides for update because of this)
-	- [ ] Custom Class extending Custom Classes
-	- [ ] Statics on Custom Classes
-	- [ ] Fix Bugs
- [ ] Full 3D support via stages files
- [ ] Multithread sprites and assets loading (for faster load times) ?
- [ ] Stage Editor
- [ ] Optimize flxanimate isOnScreen
@@ -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.
@@ -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
@@ -47,10 +47,18 @@
 	<anim char="8">character-eight</anim>
 	<anim char="9">character-nine</anim>

+	<composite char="ã">
+		<component anim="character-a0" x="0" y="0"/>
+		<component anim="diacritic-tilde-fill" x="11" y="73" outline="diacritic-tilde-outline" outlineX="-1" hasOutline="true"/>
+	</composite>
 	<composite char="ẽ">
 		<component anim="character-e0" x="0" y="0"/>
 		<component anim="diacritic-tilde-fill" x="3" y="73" outline="diacritic-tilde-outline" outlineX="-1" hasOutline="true"/>
 	</composite>
+	<composite char="õ">
+		<component anim="character-o0" x="0" y="0"/>
+		<component anim="diacritic-tilde-fill" x="8" y="73" outline="diacritic-tilde-outline" outlineX="-1" hasOutline="true"/>
+	</composite>
 	<composite char="ñ">
 		<component anim="character-n0" x="0" y="0"/>
 		<component anim="diacritic-tilde-fill" x="3" y="73" outline="diacritic-tilde-outline" outlineX="-1" hasOutline="true"/>
@@ -75,6 +83,22 @@
 		<component anim="character-u0" x="0" y="0"/>
 		<component anim="diacritic-acute-fill" x="15" y="60" outline="diacritic-acute-outline" outlineX="-1" hasOutline="true"/>
 	</composite>
+	<composite char="â">
+		<component anim="character-a0" x="0" y="0"/>
+		<component anim="diacritic-circumflex-fill" x="13" y="70" outline="diacritic-circumflex-outline" outlineX="-1" hasOutline="true"/>
+	</composite>
+	<composite char="ê">
+		<component anim="character-e0" x="0" y="0"/>
+		<component anim="diacritic-circumflex-fill" x="6" y="70" outline="diacritic-circumflex-outline" outlineX="-1" hasOutline="true"/>
+	</composite>
+	<composite char="ô">
+		<component anim="character-o0" x="0" y="0"/>
+		<component anim="diacritic-circumflex-fill" x="11" y="70" outline="diacritic-circumflex-outline" outlineX="-1" hasOutline="true"/>
+	</composite>
+	<composite char="à">
+		<component anim="character-a0" x="0" y="0"/>
+		<component anim="diacritic-acute-fill" x="16" y="70"  outline="diacritic-acute-outline" outlineX="1" hasOutline="true" flipX="true"/>
+	</composite>
 	<composite char="ą">
 		<component anim="character-a0" x="0" y="0"/>
 		<component anim="diacritic-ogonek-fill" x="34" y="-12" outline="diacritic-ogonek-outline" outlineX="2" outlineY="-2" hasOutline="true"/>
@@ -83,6 +107,10 @@
 		<component anim="character-e0" x="0" y="0"/>
 		<component anim="diacritic-ogonek-fill" x="23" y="-14" outline="diacritic-ogonek-outline" outlineX="2" outlineY="-2" hasOutline="true"/>
 	</composite>
+	<composite char="ç">
+		<component anim="character-c0" x="0" y="0"/>
+		<component anim="diacritic-cadilla-fill" x="20" y="-15" outline="diacritic-cadilla-outline" outlineX="3" outlineY="-1" hasOutline="true"/>
+	</composite>
 	<composite char="ć">
 		<component anim="character-c0" x="0" y="0"/>
 		<component anim="diacritic-acute-fill" x="18" y="73" outline="diacritic-acute-outline" outlineX="-1" hasOutline="true"/>
@@ -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>
@@ -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>
@@ -8,7 +8,7 @@ function onDiscordPresenceUpdate(e) {
 	var data = e.presence;

 	if(data.button1Label == null)
-		data.button1Label = "meow"; // "Codename Engine Discord"
+		data.button1Label = "Codename Engine Discord";
 	if(data.button1Url == null)
 		data.button1Url = "https://discord.gg/2NTCdsQvx4";
 }
@@ -33,8 +33,8 @@ function onEditorTreeLoaded(name:String) {
 			DiscordUtil.changePresenceSince("Choosing a Character", null);
 		case "Chart Editor":
 			DiscordUtil.changePresenceSince("Choosing a Chart", null);
-		//case "Stage Editor": // secret for now
-		//	DiscordUtil.changePresenceSince("Choosing a Stage", null);
+		case "Stage Editor": // secret for now
+			DiscordUtil.changePresenceSince("Choosing a Stage", null);
 	}
 }

@@ -44,7 +44,7 @@ function onEditorLoaded(name:String, editingThing:String) {
 			DiscordUtil.changePresenceSince("Editing a Character", editingThing);
 		case "Chart Editor":
 			DiscordUtil.changePresenceSince("Editing a Chart", editingThing);
-		//case "Stage Editor":
-		//	DiscordUtil.changePresenceSince("Editing a Stage", editingThing);
+		case "Stage Editor":
+			DiscordUtil.changePresenceSince("Editing a Stage", editingThing);
 	}
-}
+}
@@ -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"/>

@@ -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"
 }
+}
@@ -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"
 }
+}
@@ -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"
 }
+}
@@ -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"
 }
+}
@@ -16,5 +16,5 @@ version="version based on the English config.ini version"

 4. Translate the texts in the copied xml files. The {0} and {1}, and so on are placeholders are used for variables, and should be left as is.

-5. Make a pull request with your changes.
+5. **If you wanna help us with the language(s) you added in the engine**: Make a pull request with your changes.
 Make sure the pull request is labeled as `[LANG] Add <language name>` or `[LANG] Update <language name>` or `[LANG] Fix typo in <language name>`, generally anything is allowed but it has to contain the language name.
@@ -433,6 +433,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.">
@@ -488,6 +490,7 @@
 					<str id="newGlyph">New Glyph</str>
 					<str id="editGlyph">Edit Glyph</str>
 					<str id="deleteGlyph">Delete Glyph</str>
+					<str id="deleteCurGlyph">Delete Current Glyph</str>
 				</group>

 				<str id="topBar.offset">Offsets</str>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -0,0 +1,686 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<language>
+	<group name="General Editor Translations" prefix="editor.">
+		<str id="autosavingIn">Guardando automáticamente em {0} segundos{1}</str>
+		<str id="autosavingCanceledSuffix">(Cancelado)!</str>
+
+		<str id="ok">Ok</str>
+		<str id="cancel">Cancelar</str>
+		<str id="save">Guardar</str>
+		<str id="saveClose">Guardar e Fechar</str>
+		<str id="close">Fechar</str>
+		<str id="notNow">Agora Não</str>
+		<str id="yes">Sim</str>
+	</group>
+
+	<group name="UIImageExplorer" prefix="uiImageExplorer.">
+		<str id="symbol">Simbolo</str>
+		<str id="animation">Animação</str>
+		<str id="atlas">Atlas</str>
+		<str id="spritemap">Mapa de Sprites</str>
+
+		<str id="directory">Diretório ({0}/)</str>
+		<str id="found">{0} {1} Encontrado</str>
+		<str id="foundplural">{0} {1} Encontrado</str>
+		<str id="notFound">#{0}s NÃO Encontrado#</str>
+		<str id="foundAtlas">{0} Mapa de Sprites Encontrado</str>
+		<str id="foundAtlasplural">{0} Mapas de Sprites Encontrados</str>
+
+		<str id="fileAlreadyExists">Os seguintes ficheiros já existem: \n\n{0}\n\nIMPORTANTE: SUBSTITUIR NÃO PODE SER DESFEITO!</str>
+		<str id="override">Substituir Ficheiros</str>
+		<str id="useExisting">Usar Existentes</str>
+	</group>
+
+	<group name="EditorPicker" prefix="editor.">
+		<str id="alphabet.name">Editor de Alfabetos</str>
+		<str id="chart.name">Editor de Mapas</str>
+		<str id="character.name">Editor de Personagens</str>
+		<str id="stage.name">Editor de Cenários</str>
+		<str id="uiDebug.name">Interface de Depuração</str>
+		<str id="wiki.name">Wiki</str>
+		<str id="debugOptions.name">Opções de Depuração</str>
+	</group>
+
+	<group name="ChartEditor">
+		<group name="CharterSelection" prefix="charterSelection.">
+			<str id="desc">Selecione uma canção para modificar os seus mapas.</str>
+			<str id="acceptSong">Carregue em ACEITAR para escolher uma dificuldade para editar.</str>
+			<str id="acceptVariation">Carregue em ACEITAR para escolher uma variação para editar.</str>
+			<str id="acceptDifficulty">Carregue em ACEITAR para editar o mapa para a dificuldade selecionada.</str>
+			<str id="selectDifficulty">Selecione uma dificuldade para continuar.</str>
+			<str id="newDifficulty">Nova Dificuldade</str>
+			<str id="newDifficultyDesc">Carregue em ACEITAR para criar uma dificuldade nova.</str>
+			<str id="newSong">Nova Canção</str>
+			<str id="newSongDesc">Carregue em ACEITAR para criar uma canção nova.</str>
+			<str id="newVariation">Nova Variação</str>
+			<str id="newSongDesc">Carregue em ACEITAR para criar uma variação nova.</str>
+		</group>
+
+		<group name="ChartCreationScreen" prefix="chartCreation.">
+			<str id="title">A Criar um Mapa Novo</str>
+			<str id="info">Info. do Mapa</str>
+			<str id="diffName">Nome da Dificuldade</str>
+			<str id="stage">Cenário</str>
+			<str id="scrollSpeed">Velocidade das Notas</str>
+
+			<str id="strumLineList">Pistas $* Pelo menos 1 Pista Necessária$</str>
+			<str id="strumLine.format">Pistas - #{0}</str>
+
+			<group name="Warnings" prefix="warnings.">
+				<str id="song-exists-title">Criação de Canção: Erro!</str>
+				<str id="song-exists-body">A canção que está a tentar criar já existe, se a quiser substituir apague a canção primeiro!</str>
+				<str id="chart-exists-title">Criação de Mapa: Erro!</str>
+				<str id="chart-exists-body">O mapa que está a tentar criar já existe, se o quiser substituir apague o mapa primeiro!</str>
+			</group>
+		</group>
+
+		<group name="ChartDataScreen" prefix="chartDataScreen.">
+			<str id="title">Propriedades do Mapa</str>
+			<str id="editChartData">Editar Dados do Mapa</str>
+			<str id="stage">Cenário</str>
+			<str id="scrollSpeed">Velocidade das Notas</str>
+		</group>
+
+		<group name="SongPosInfo" prefix="songPosInfo.">
+			<str id="step">Passo: {0}</str>
+			<str id="beat">Batida: {0}</str>
+			<str id="measure">Medida: {0}</str>
+			<str id="bpm">BPM: {0}</str>
+			<str id="timeSignature">Compasso: {0}/{1}</str>
+		</group>
+
+		<group name="CharterEventScreen" prefix="charterEventScreen.">
+			<str id="title-creating">Criar Grupo de Eventos</str>
+			<str id="title-editing">Editar Grupo de Eventos</str>
+
+			<str id="noEvent">Sem Eventos</str>
+
+			<str id="strumLine.format">Pista #{0} ({1})</str>
+		</group>
+
+		<group name="CharterEventTypeSelection" prefix="charterEventTypeSelection.">
+			<str id="title">Escolha um tipo de evento...</str>
+		</group>
+
+		<group name="CharterMetaDataScreen" prefix="charterMetaDataScreen.">
+			<str id="title">Editar Metadados</str>
+
+			<str id="songData">Dados da Canção</str>
+			<str id="songName">Nome da Canção</str>
+			<str id="variation">Variação da Canção</str>
+			<str id="bpm">BPM</str>
+			<str id="timeSignature">Compasso</str>
+			<str id="menusData">Dados dos Menus (Jogo Livre/História)</str>
+			<str id="displayName">Nome Exibido</str>
+			<str id="icon">Ícone</str>
+			<str id="modesAllowed">Modos Permitidos</str>
+			<str id="color">Cor</str>
+			<str id="difficulties">Dificuldades</str>
+			<str id="customValues">Valores Especiais (Avançado)</str>
+			<str id="needsVoices">Necessita Vozes</str>
+
+			<str id="opponentMode">Modo Oponente</str>
+			<str id="coopAllowed">Modo Cooperativo</str>
+		</group>
+
+		<group name="CharterNoteTypesList" prefix="charterNoteTypesList.">
+			<str id="title">Editor da Lista de Tipos de Nota</str>
+
+			<str id="editNoteTypes">Editar Tipos de Nota</str>
+			<str id="editType">Tipo de Nota {0}</str>
+		</group>
+
+		<group name="CharterStrumlineScreen" prefix="charterStrumlineScreen.">
+			<str id="win-title-creating">A Criar a pista {0}</str>
+			<str id="win-title-editing">A Editar as propriedades da pista {0}</str>
+
+			<str id="title-creating">Criar Nova Pista</str>
+			<str id="title-editing">Editar Propriedades da Pista</str>
+		</group>
+
+		<group name="SongCreationScreen" prefix="songCreationScreen.">
+			<str id="win-title">A Criar Nova Canção</str>
+			<str id="win-title-importing">A Importar Canção</str>
+			<str id="title">Info. da Canção</str>
+
+			<str id="instAudio">Ficheiro do Instrumental $* Obrigatório*$</str>
+			<str id="voicesAudio">Ficheiro das Vozes</str>
+
+			<str id="importFrom">Importar de...</str>
+			<str id="importSource">Fonte de Importação:</str>
+			<str id="legacyOrPsych">Psych/Legacy FNF</str>
+			<str id="vslice">V-Slice</str>
+			<str id="vsliceProject">Projeto V-Slice (.fnfc)</str>
+			<str id="importChartFormat">Formato de Mapa</str>
+			<str id="importAudios">Adicionar Audios</str>
+			<str id="songFileName">Nome da canção $* Obrigatório$</str>
+			<str id="songDataFile">Ficheiro Dados/Mapa $* Obrigatório$</str>
+			<str id="songMetaFile">Ficheiro dos Metadados $* Obrigatório$</str>
+
+			<str id="back">Atrás</str>
+			<str id="next">Seguinte</str>
+		</group>
+
+		<group name="StrumlineOptions" prefix="charterStrumLine.">
+			<str id="characters">Personagens</str>
+			<str id="newChar">Nova Personagem</str>
+			<str id="type">Tipo</str>
+			<str id="scrollSpeed">Velocidade das Notas</str>
+			<str id="stagePos">Posição no Cenário</str>
+			<str id="scale">Tamanho</str>
+			<str id="spacing">Espaço</str>
+			<str id="hudPos">Posição HUD (X [Rácio 0-1],Y)</str>
+			<str id="visible">Visível?</str>
+			<str id="useChartScrollSpeed">Usa velocidade global?</str>
+			<str id="vocalSuffix">Sufixo Vocal</str>
+			<str id="keyCount">Número de Teclas</str>
+		</group>
+
+		<group name="ChartEditor" prefix="charter.">
+			<!-- Charter.hx -->
+			<group name="TopBar">
+				<str id="topBar.file">Ficheiro</str>
+				<group name="FileMenu" prefix="file.">
+					<str id="new">Novo</str>
+					<str id="save">Guardar</str>
+					<str id="saveAs">Guardar Como...</str>
+					<str id="saveGlobalEvents">Guardar Eventos Globais</str>
+					<str id="saveGlobalEventsAs">Guardar Eventos Globais Como...</str>
+					<str id="saveNoLocalEvents">Guardar Mapa sem Eventos Locais</str>
+					<str id="saveNoLocalEventsAs">Guardar Mapa sem Eventos Locais Como...</str>
+					<str id="saveMeta">Guardar Metadados</str>
+					<str id="saveMetaAs">Guardar Metadados Como...</str>
+					<str id="exportFnfLegacy">Exportar Para FNF Legacy...</str>
+					<str id="exportPsych">Exportar Para Psych Engine...</str>
+					<str id="exit">Sair</str>
+				</group>
+
+				<str id="topBar.edit">Editar</str>
+				<group name="EditMenu" prefix="edit.">
+					<str id="undo">Desfazer</str>
+					<str id="redo">Refazer</str>
+					<str id="copy">Copiar</str>
+					<str id="paste">Colar</str>
+					<str id="cut">Cortar</str>
+					<str id="delete">Apagar</str>
+				</group>
+
+				<str id="topBar.chart">Mapa</str>
+				<group name="ChartMenu" prefix="chart.">
+					<str id="playtest">Testar</str>
+					<str id="playtestHere">Testar aqui</str>
+					<str id="playtestOpponent">Testar como oponente</str>
+					<str id="playtestOpponentHere">Testar como oponente aqui</str>
+					<str id="enableScripts">Ativar scripts durante teste</str>
+					<str id="editChartData">Editar dados do mapa</str>
+					<str id="editMetadata">Editar info. dos metadados</str>
+				</group>
+
+				<str id="topBar.view">Vista</str>
+				<group name="ViewMenu" prefix="view.">
+					<str id="zoomIn">Ampliar</str>
+					<str id="zoomOut">Diminuir</str>
+					<str id="resetZoom">Zoom Padrão</str>
+					<str id="showSectionsSeparator">Mostrar Separador de Secções</str>
+					<str id="showBeatsSeparator">Mostrar Separador de Batidas</str>
+					<str id="rainbowWaveforms">Ondas Arcoíris</str>
+					<str id="lowDetailWaveforms">Ondas de Baixo Detalhe</str>
+					<str id="scrollLeft">Deslocar à Esquerda</str>
+					<str id="scrollRight">Deslocar à Direita</str>
+					<str id="scrollReset">Repor Deslocamento</str>
+				</group>
+
+				<str id="topBar.song">Canção</str>
+				<group name="SongMenu" prefix="song.">
+					<str id="goStart">Voltar ao início</str>
+					<str id="goEnd">Avançar até o fim</str>
+					<str id="addOpponentCamera">Adicionar camera no Oponente</str>
+					<str id="addPlayerCamera">Adicionar camera no Jogador</str>
+					<str id="muteInst">Silenciar instrumental</str>
+					<str id="muteVoices">Silenciar vozes</str>
+				</group>
+
+				<group name="BookmarkMenu" prefix="bookmarks.">
+					<str id="addBookmarkHere">Adicionar Marcador Aqui</str>
+					<str id="editBookmarkList">Editar Lista de Marcadores</str>
+					<str id="goTo">Ir para "{0}"</str>
+					<str id="createBookmarkTitle">A Criar Marcador Novo...</str>
+					<str id="createBookmarkName">Nome do Marcador:</str>
+					<str id="createBookmarkColor">Cor do Marcador:</str>
+					<str id="editBookmarkListTitle">Lista de Marcadores</str>
+					<str id="editBookmarksTitle">Editar Marcador</str>
+					<str id="newBookmarkName">Novo Marcador</str>
+				</group>
+
+				<str id="topBar.note">Notas</str>
+				<group name="NoteMenu" prefix="note.">
+					<str id="addSustainLength">Alargar Nota</str>
+					<str id="subtractSustainLength">Encurtar Nota</str>
+					<str id="selectAll">Selecionar tudo</str>
+					<str id="selectMeasure">Selecionar medida</str>
+					<str id="editNoteTypesList">Editar Lista de Tipos de Nota</str>
+				</group>
+				<str id="topBar.snap">Ajustes</str>
+				<group name="SnapMenu" prefix="snap.">
+					<str id="increaseSnap">↑ Ajuste de Casa</str>
+					<str id="resetSnap">Repor Ajuste de Casa</str>
+					<str id="decreaseSnap">↓ Ajuste de Casa</str>
+
+					<str id="snap">Ajuste de Casa {0}x</str>
+				</group>
+
+				<str id="topBar.playback">Reprodução</str>
+				<group name="PlaybackMenu" prefix="playback.">
+					<str id="play">Tocar/Pausar</str>
+					<str id="speedRaise">↑ Velocidade {0}%</str>
+					<str id="speedReset">Repor Velocidade</str>
+					<str id="speedLower">↓ Velocidade {0}%</str>
+					<str id="sectionBack">Voltar uma secção</str>
+					<str id="sectionForward">Avançar uma secção</str>
+					<str id="sectionStart">Voltar ao ínicio da secção</str>
+					<str id="backStep">Voltar um passo</str>
+					<str id="forwardStep">Avançar um passo</str>
+					<str id="metronome">Metrónomo</str>
+					<str id="visualMetronome">Metrónomo visual</str>
+				</group>
+			</group>
+
+			<group name="NoteTypes" prefix="noteTypes.">
+				<str id="default">Nota Normal</str>
+			</group>
+
+			<group name="EventTypes" prefix="events.">
+				<!-- You can add your custom event types here! -->
+				<!-- Just need to do some conversion from the raw name to the id -->
+				<!-- Example: HScript Call -> hscriptCall -->
+				<!-- Example: Change Character -> changeCharacter -->
+				<str id="hscriptCall">Chamar HScript</str>
+				<str id="cameraMovement">Mover Câmara</str>
+				<str id="cameraPosition">Posição da Câmara</str>
+				<str id="addCameraZoom">Adicionar Zoom</str>
+				<str id="cameraModuloChange">Mudar Pulso da Câmara</str>
+				<str id="cameraFlash">Flash da Câmara</str>
+				<str id="bpmChange">Mudar BPM</str>
+				<str id="continuousBpmChange">Mudança contínua de BPM</str>
+				<str id="timeSignatureChange">Mudar Compasso</str>
+				<str id="scrollSpeedChange">Mudança de Velocidade das Notas</str>
+				<str id="altAnimationToggle">Animações Alternativas</str>
+				<str id="playAnimation">Reproduzir Animação</str>
+			</group>
+
+			<group name="StrumlineOptions" prefix="strumLine.">
+				<str id="button-name">Opções ↓</str>
+
+				<str id="hitsounds">Som ao Bater</str>
+				<str id="muteVocals">Silenciar Voz</str>
+				<str id="edit">Editar</str>
+				<str id="delete">Apagar</str>
+
+				<str id="noWaveform">Sem onda</str>
+			</group>
+
+			<str id="createNew">Criar Nova</str>
+			<str id="lock-unlock">Trancar/\nDestrancar</str>
+
+			<str id="info.localEvents">Eventos Locais\n(Apenas Esta Dificuldade)</str>
+			<str id="info.globalEvents">Eventos Globais\n(Todas as Dificuldades)</str>
+			<str id="eventType-local">Evento Local</str>
+			<str id="eventType-global">Evento Global</str>
+
+			<!-- CharterEventAdd.hx -->
+			<str id="addEvent">Adicionar Evento</str>
+			<str id="editEvent">Editar Evento</str>
+			<str id="deleteEvent">Apagar Evento</str>
+
+			<group name="Notifications" prefix="popup.">
+				<str id="savedChartAt">Mapa Guardado em {0}!</str>
+			</group>
+		</group>
+	</group>
+
+	<group name="CharacterEditor">
+		<group name="CharacterSelection" prefix="characterSelection.">
+			<str id="acceptFolder">Carregue em ACEITAR para editar esta pasta.</str>
+			<str id="acceptCharacter">Carregue em ACEITAR para editar esta personagem.</str>
+			<str id="newCharacter">Nova Personagem</str>
+			<str id="newCharacterDesc">Carregue em ACEITAR para criar uma personagem nova.</str>
+			<str id="desc">Selecione uma personagem para editar</str>
+			<str id="desc-folder">Selecione uma personagem para editar em {0}</str>
+		</group>
+
+		<group name="CharacterInfoScreen" prefix="characterInfoScreen.">
+			<str id="win-title">A Editar Personagem</str>
+			<str id="title">Editar Info. da Personagem</str>
+			<str id="icon">Ícone</str>
+			<str id="iconColor">Cor do Ícone</str>
+			<str id="singDuration">Duração de Canto</str>
+			<str id="useSingDuration">Usar Duração de Canto?</str>
+			<str id="customValues">Valores Especiais (Avançado)</str>
+		</group>
+
+		<group name="CharacterEditor" prefix="characterEditor.">
+			<group name="TopBar">
+				<str id="topBar.file">Ficheiro</str>
+				<group name="FileMenu" prefix="file.">
+					<str id="new">Novo</str>
+					<str id="save">Guardar</str>
+					<str id="saveAs">Guardar Como...</str>
+					<str id="exit">Sair</str>
+				</group>
+
+				<str id="topBar.edit">Editar</str>
+				<group name="EditMenu" prefix="edit.">
+					<str id="copyOffset">Copiar Posição</str>
+					<str id="pasteOffset">Colar Posição</str>
+					<str id="undo">Desfazer</str>
+					<str id="redo">Refazer</str>
+					<str id="editInfo">Editar informação</str>
+					<str id="editSprite">Editar imagem fonte</str>
+				</group>
+
+				<str id="topBar.offset">Posição</str>
+				<group name="OffsetsMenu" prefix="offset.">
+					<str id="moveLeft">Mover Para a Esquerda</str>
+					<str id="moveUp">Mover Para Cima</str>
+					<str id="moveDown">Mover Para Baixo</str>
+					<str id="moveRight">Mover Para a Direita</str>
+					<str id="moveExtraLeft">Mover Mais Para a Esquerda</str>
+					<str id="moveExtraUp">Mover Mais Para Cima</str>
+					<str id="moveExtraDown">Mover Mais Para Baixo</str>
+					<str id="moveExtraRight">Mover Mais Para a Direita</str>
+					<str id="dragOffsetsMouse">Arrastar Posição Com o Rato?</str>
+					<str id="clearOffsets">Limpar Posições</str>
+				</group>
+
+				<str id="topBar.stage">Cenário</str>
+				<group name="StageMenu" prefix="stage.">
+					<str id="useStage">Usar "{0}"</str>
+					<str id="useNone">Não Usar Cenário</str>
+				</group>
+
+				<str id="topBar.view">Vista</str>
+				<group name="ViewMenu" prefix="view.">
+					<str id="zoomIn">Ampliar</str>
+					<str id="zoomOut">Diminuir</str>
+					<str id="resetZoom">Zoom Padrão</str>
+					<str id="charHitbox">"Hitbox" da Personagem?</str>
+					<str id="charCam">Câmara da Personagem?</str>
+					<str id="axis">Eixo XY?</str>
+				</group>
+
+				<str id="topBar.animation">Animação</str>
+				<group name="AnimationMenu" prefix="animation.">
+					<str id="playAnim">Reproduzir Animação</str>
+					<str id="stopAnim">Parar Animação</str>
+					<str id="changeAnimUp">Mudar Animação ↑</str>
+					<str id="changeAnimDown">Mudar Animação ↓</str>
+					<str id="playAnimOnOffset">Reproduzir Animação Reposicionada?</str>
+				</group>
+
+				<group name="CharacterPropertiesWindow" prefix="characterProperties.">
+					<str id="position">Posição (X, Y)</str>
+					<str id="scale">Tamanho</str>
+					<str id="editInfo">Editar Info.</str>
+					<str id="editSprite">Editar Imagem</str>
+					<str id="camPosition">Posição da Câmara (X, Y)</str>
+					<str id="charFlipped">Espelhado?</str>
+					<str id="antialiased">Suavizado?</str>
+					<str id="testCharAs">Testar Como...</str>
+					<str id="charDesign">Desenhada Como...</str>
+				</group>
+
+				<group name="CharacterAnimButton" prefix="characterAnim.">
+					<str id="defaultAnimName">Nova Animação</str>
+					<str id="name">Nome</str>
+					<str id="anim">Animação</str>
+					<str id="position">Posição (X, Y)</str>
+					<str id="fps">FPS</str>
+					<str id="indices">Índices (Frames)</str>
+				</group>
+
+				<group name="CharacterSpriteScreen" prefix="characterSpriteScreen.">
+					<str id="win-title">Editar imagem da personagem</str>
+					<str id="charImageFile">Imagem da personagem $* Obrigatório$</str>
+				</group>
+			</group>
+		</group>
+
+		<group name="CharacterCreationScreen" prefix="characterCreationScreen.">
+			<str id="win-title">A Criar uma Personagem Nova</str>
+			<str id="charName">Nome da Personagem $* Required$</str>
+			<str id="charImgName">Imagem $* Obrigatória$</str>
+
+			<group name="Warnings" prefix="warnings.">
+				<str id="char-exists-title">Criação da Personagem: Erro!</str>
+				<str id="char-exists-body">A personagem que está a tentar criar já existe, se quiser substituir apague a personagem primeiro!</str>
+			</group>
+		</group>
+	</group>
+
+	<group name="AlphabetEditor" prefix="editor.alphabet.">
+		<group name="AlphabetSelection" prefix="selection.">
+			<str id="acceptTypeface">Carregue em ACEITAR para editar este tipo de letra.</str>
+			<str id="newTypeface">Novo Tipo de Letra</str>
+			<str id="newTypefaceDesc">Carregue em ACEITAR para criar um tipo de letra novo.</str>
+			<str id="desc">Selecione um tipo de letra para editar</str>
+
+			<group name="Warnings" prefix="warnings.">
+				<str id="notImplemented-title">Novo Tipo de Letra: Função Não Implementada!</str>
+				<str id="notImplemented-body">Esta função ainda não foi implementada. Por favor espere por mais atualizações até ser implementada.\n\n\n- Codename Crew (Equipa Codename)</str>
+			</group>
+		</group>
+
+		<group name="AlphabetEditor">
+			<group name="TopBar">
+				<str id="topBar.file">Ficheiro</str>
+				<group name="FileMenu" prefix="file.">
+					<str id="new">Novo</str>
+					<str id="save">Guardar</str>
+					<str id="saveAs">Guardar Como...</str>
+					<str id="exit">Sair</str>
+				</group>
+
+				<str id="topBar.edit">Editar</str>
+				<group name="EditMenu" prefix="edit.">
+					<str id="undo">Desfazer</str>
+					<str id="redo">Refazer</str>
+				</group>
+
+				<str id="topBar.glyph">Glifo</str>
+				<group name="GlyphMenu" prefix="glyph.">
+					<str id="newGlyph">Novo Glifo</str>
+					<str id="editGlyph">Editar Glifo</str>
+					<str id="deleteGlyph">Apagar Glifo</str>
+					<str id="deleteCurGlyph">Apagar Glifo Atual</str>
+				</group>
+
+				<str id="topBar.offset">Posição</str>
+				<group name="OffsetsMenu" prefix="offset.">
+					<str id="moveLeft">Mover Para a Esquerda</str>
+					<str id="moveUp">Mover Para Cima</str>
+					<str id="moveDown">Mover Para Baixo</str>
+					<str id="moveRight">Mover Para a Direita</str>
+					<str id="moveExtraLeft">Mover Mais Para a Esquerda</str>
+					<str id="moveExtraUp">Mover Mais Para Cima</str>
+					<str id="moveExtraDown">Mover Mais Para Baixo</str>
+					<str id="moveExtraRight">Mover Mais Para a Direita</str>
+					<str id="clearOffsets">Limpar Posições</str>
+				</group>
+
+				<str id="topBar.view">Vista</str>
+				<group name="ViewMenu" prefix="view.">
+					<str id="zoomIn">Ampliar</str>
+					<str id="zoomOut">Diminuir</str>
+					<str id="resetZoom">Zoom Padrão</str>
+				</group>
+			</group>
+		</group>
+	</group>
+
+	<group name="StageEditor">
+		<group name="StageSelection" prefix="stageSelection.">
+			<str id="desc">Selecione um cenário para editar. Cenários HSCRIPT PURO não são suportadas.</str>
+			<str id="acceptStage">Carregue em ACEITAR para editar este cenário.</str>
+			<str id="newStage">Novo Cenário</str>
+			<str id="acceptNewStage">Carregue em ACEITAR para criar um cenário novo.</str>
+		</group>
+
+		<group name="StageEditor" prefix="stageEditor.">
+			<group name="TopBar">
+				<str id="topBar.file">Ficheiro</str>
+				<group name="FileMenu" prefix="file.">
+					<str id="save">Guardar</str>
+					<str id="saveAs">Guardar Como...</str>
+					<str id="exit">Sair</str>
+				</group>
+
+				<str id="topBar.edit">Editar</str>
+				<group name="EditMenu" prefix="edit.">
+					<str id="undo">Desfazer</str>
+					<str id="redo">Refazer</str>
+					<str id="editStageInfo">Editar Info. do Cenário</str>
+				</group>
+
+				<str id="topBar.select">Seleção</str>
+				<group name="SelectionMenu" prefix="select.">
+					<str id="all">Selecionar Tudo</str>
+					<str id="deselect">Desselecionar</str>
+					<str id="inverse">Inverter Seleção</str>
+				</group>
+
+				<str id="topBar.view">Vista</str>
+				<group name="ViewMenu" prefix="view.">
+					<str id="zoomIn">Ampliar</str>
+					<str id="zoomOut">Diminuir</str>
+					<str id="zoomReset">Zoom Padrão</str>
+					<str id="focusDad">Focar no Oponente</str>
+					<str id="focusGF">Focar em GF</str>
+					<str id="focusBF">Focar em BF</str>
+				</group>
+
+				<str id="topBar.editor">Editor</str>
+				<group name="EditorMenu" prefix="editor.">
+					<str id="showCharacters">Mostrar Personagens</str>
+				</group>
+
+				<group name="StageSpriteScreen" prefix="stageSpriteScreen.">
+					<str id="win-title">Editar imagem do cenário </str>
+					<str id="stageImageFile">Imagem do Cenário $* Obrigatória$</str>
+				</group>
+			</group>
+		</group>
+
+		<group name="StageCreationScreen" prefix="stageCreationScreen.">
+			<str id="win-title">A Criar um Cenário Novo</str>
+			<str id="title">Info. do Cenário</str>
+			<str id="stageName">Nome do Cenário</str>
+			<str id="stagePath">Caminho do Cenário</str>
+
+			<group name="Warnings" prefix="warnings.">
+				<str id="stage-exists-title">Criação de Cenário: Erro!</str>
+				<str id="stage-exists-body">O cenário que está a tentar criar já existe, se quiser substituir apague o cenário primeiro!</str>
+			</group>
+		</group>
+
+		<group name="StageInfoScreen" prefix="stageInfoScreen">
+			<str id="win-title">A Editar Info. do Cenário: "{0}"</str>
+			<str id="title">Info. do Cenário</str>
+			<str id="stageName">Nome do Cenário</str>
+			<str id="spritePath">Caminho do Sprite\n(Requer Recarregamento)</str>
+			<str id="startCamPos">Posição inicial da Câmara (X, Y)</str>
+			<str id="zoom">Zoom</str>
+			<str id="customAttributes">Atributos Especiais</str>
+		</group>
+
+		<group name="StageElementEditScreen" prefix="stageElementEditScreen.">
+			<str id="win-character-title">A Editar Personagem: "{0}"</str>
+			<str id="win-sprite-title">A Editar Sprite: "{0}"</str>
+			<str id="win-title">A Editar XML &lt;{0} /&gt;</str>
+
+			<str id="character-title">Dados da Personagem</str>
+			<str id="sprite-title">Dados do Sprite</str>
+			<str id="title">Dados do XML</str>
+
+			<str id="elementName">Nome do Elemento</str>
+			<str id="nameID">Nome Identificador</str>
+			<str id="imageFile">Imagem (WIP: precisa recarregar)\nEm (${stage.spritesParentFolder})</str>
+			<str id="scroll">Scroll {0}</str> <!-- it's "scroll" here because "deslocamento" is too big -->
+			<str id="scale">Tamanho {0}</str>
+			<str id="camera">Câmara {0}</str>
+			<str id="spacing">Espaçamento (X, Y)</str>
+			<str id="skew">Incline {0}</str>
+			<str id="alpha">Opacidade</str>
+			<str id="angle">Angulo</str>
+			<str id="zoomFactor">Fator de Zoom</str> <!-- same as for scroll, "fator de ampliação" took too much space -->
+			<str id="positionName">Nome de Posição</str>
+			<str id="flipX">Espelhar X</str>
+			<str id="antialiasing">"Antialiasing"</str>
+			<str id="highMemory">Alta Memória</str>
+			<str id="lowMemory">Baixa Memória</str>
+			<str id="attributes">Atributos</str>
+			<str id="transformPreview">Pré-visualização:</str>
+			<str id="animations">Animações</str>
+
+			<str id="animType">Tipo de Animação</str>
+			<group name="AnimTypeDropdown" prefix="animType.">
+				<str id="none">NENHUM</str>
+				<str id="beat">EM BATIDA</str>
+				<str id="loop">REPETIR</str>
+			</group>
+			<str id="tipCustomProperties">Dica: Para aceder a mais dados,\nSegure em Shift quando Editar</str>
+		</group>
+
+		<group name="StageXMLEditScreen" prefix="stageXMLEditScreen.">
+			<str id="win-title">A Editar XML de {0}</str>
+			<str id="title">Dados do XML</str>
+			<str id="attributes">Atributos</str>
+		</group>
+
+		<str id="stageCharacters.requiredPosition">Esta posição é necessária em cenários!</str>
+		<str id="stageCharacters.noDeleteGirlfriend">Não pode apagar a Girlfriend</str>
+
+		<group name="StageElement" prefix="stageElement.">
+			<str id="scale">Tamanho: {0}, {1}</str>
+			<str id="scroll">Deslocamento: {0}, {1}</str>
+		</group>
+
+		<group name="StageSprites" prefix="stageSprites.">
+			<str id="win-title">Sprites do Cenário</str>
+			<str id="sprite">Sprite</str>
+			<str id="box">Caixa</str>
+			<str id="character">Personagem</str>
+			<str id="warnings.not-implemented">Criar caixas ainda não foi implementado!</str>
+		</group>
+	</group>
+
+	<group name="PlayTesting" prefix="playtesting.">
+		<str id="chartPlaytesting" notrim="true"> (Teste de mapa)</str>
+		<str id="exitGame">Sair do Jogo</str>
+		<str id="exitToMenu">Sair Para Menu</str>
+		<str id="saveAndExitGame">Guardar e Sair do Jogo</str>
+		<str id="saveAndExitToMenu">Guardar e Sair Para Menu</str>
+		<str id="cancel">Cancelar</str>
+
+		<str id="warningTitle">MUDANÇAS NÃO GUARDADAS!</str>
+		<str id="warningDesc">Quaisquer mudanças serão *perdidas* se não as guardar. (Não serão recuperáveis)\n\n\nGostaria de Cancelar?</str>
+	</group>
+
+	<group name="SaveWarning" prefix="saveWarning.">
+		<str id="warningTitle">Mudanças não guardadas!</str>
+		<str id="warningDesc">Quaisquer mudanças serão perdidas se não as guardar. (Não serão recuperáveis)\n\n\nGostaria de Cancelar?</str>
+
+		<str id="exitGame">Sair do Jogo</str>
+		<str id="exitToMenu">Sair Para Menu</str>
+		<str id="saveAndExitGame">Guardar e Sair do Jogo</str>
+		<str id="saveAndExitToMenu">Guardar e Sair Para Menu</str>
+		<str id="cancel">Cancelar</str>
+	</group>
+
+	<group name="ModConfigWarning" prefix="modConfigWarning.">
+		<str id="warningTitle">Configuração da pasta do mod em falta!</str>
+		<str id="warningDesc">Está a faltar um ficheiro de configurações ao seu mod!\n\nGostaria de criar um automaticamente?\n\n(PS: Se este mod não for seu, por favor desative o Modo de desenvolvedor para fazer esta notificação parar de aparecer.)</str>
+
+		<str id="createdTitle">Config. de mod criada!</str>
+		<str id="createdDesc">As configurações do seu mod foram criadas em {0}!</str>
+	</group>
+</language>
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<language>
+	<group name="PlayState">
+		<str id="game.score">Pontos:{0}</str>
+		<str id="game.misses">Erros:{0}</str>
+		<str id="game.comboBreaks">Quebras de Combo:{0}</str>
+		<str id="game.accuracy">Precisão:{0} - {1}</str>
+		<str id="game.combo">Combo:{0}</str>
+
+		<str id="game.rating.[N/A]">[N/A]</str>
+		<str id="game.rating.F">F</str>
+		<str id="game.rating.E">E</str>
+		<str id="game.rating.D">D</str>
+		<str id="game.rating.C">C</str>
+		<str id="game.rating.B">B</str>
+		<str id="game.rating.A">A</str>
+		<str id="game.rating.S">S</str>
+		<str id="game.rating.S++">S++</str>
+	</group>
+
+	<group name="StoryMenu">
+		<str id="story.score">PONTUAÇÃO DA SEMANA:{0}</str>
+		<str id="story.tracks">FAIXAS</str>
+	</group>
+
+	<group name="Freeplay">
+		<str id="freeplay.score">RECORDE PESSOAL:{0}</str>
+		<str id="freeplay.solo">Solo</str>
+		<str id="freeplay.opponentMode">Modo Oponente</str>
+		<str id="freeplay.coopMode">Modo Co-Op</str>
+		<str id="freeplay.coopModeSwitched">Modo Co-Op (Trocado)</str>
+	</group>
+
+	<group name="Pause">
+		<group name="PauseOptions">
+			<str id="pause.resume">Continuar</str>
+			<str id="pause.restartSong">Recomeçar Canção</str>
+			<str id="pause.changeControls">Mudar Controlos</str>
+			<str id="pause.changeOptions">Opções</str>
+			<str id="pause.exitToMenu">Sair para menu</str>
+			<str id="pause.exitToCharter">Sair para editor</str>
+			<str id="pause.resumeCutscene">Resumir Cena</str>
+			<str id="pause.skipCutscene">Saltar Cena</str>
+			<str id="pause.restartCutscene">Recomeçar Cena</str>
+		</group>
+
+		<str id="pause.deathCounter">Tomates azuis: {0}</str>
+		<str id="pause.coopMode">MODO CO-OP</str>
+		<str id="pause.opponentMode">MODO OPONENTE </str>
+	</group>
+
+	<group name="Credits">
+		<group name="CreditsCodename">
+			<str id="credits.mainDev" notrim="true"> *- Membro público dos Desenvolvedores!*</str>
+			<str id="credits.totalContributions">Contribuições Totais: ~{0}~ / *{1}* (~{2}%~) - Selecione para abrir a sua conta GitHub</str>
+			<str id="credits.downloadingList">A Descarregar Lista...</str>
+			<str id="credits.allContributors">Todos os contribuidores! Carregue em REINICIAR para atualizar a lista (Uma vez a cada 2 minutos).</str>
+		</group>
+		<group name="CreditsMain">
+			<str id="credits.name">Créditos</str>
+			<str id="credits.madePossible">As pessoas que fizeram isto possível!</str>
+			<str id="credits.selectCodename">Selecione isto para ver todos os contribuidores de Codename Engine!</str>
+			<str id="credits.selectBase">Selecione isto para abrir a página itch.io do jogo original para doar!</str>
+		</group>
+	</group>
+
+	<group name="Mods">
+		<str id="mods.disableMods">Desativar Mods</str>
+	</group>
+
+	<group name="MainMenu">
+		<str id="mainMenu.commit">Commit: {0} ({1})</str>
+		<str id="mainMenu.openMods">[{0}] Abrir menu de mods</str>
+	</group>
+
+	<group name="Updater">
+		<group name="UpdateAvailable">
+			<str id="updateAvailable.title">NOVA ATUALIZAÇÃO</str>
+			<str id="updateAvailable.install">INSTALAR</str>
+			<str id="updateAvailable.skip">SALTAR</str>
+		</group>
+		<group name="UpdateScreen">
+			<str id="updateScreen.general-1">A Preparar a instalação...</str>
+			<str id="updateScreen.part-1">A Criar a pasta de instalação e a limpar ficheiros antigos...</str>
+
+			<str id="updateScreen.general-2">A Transferir ficheiros...</str>
+			<str id="updateScreen.part-2">A Transferir ficheiro {0}</str>
+
+			<str id="updateScreen.general-3">A transferir executável novo...</str>
+			<str id="updateScreen.part-3">A Transferir {0}</str>
+
+			<str id="updateScreen.general-4">A instalar ficheiros novos...</str>
+			<str id="updateScreen.part-4">A Instalar {0}</str>
+		</group>
+	</group>
+
+	<group name="Difficulties">
+		<str id="diff.easy">Fácil</str>
+		<str id="diff.normal">Normal</str>
+		<str id="diff.hard">Difícil</str>
+		<str id="diff.erect">Ereto</str>
+		<str id="diff.nightmare">Pesadelo</str>
+	</group>
+</language>
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<language>
+	<str id="optionsMenu.desc-missing">Sem descrição</str>
+
+	<group name="OptionsMenu">
+		<str id="optionsMenu.advanced">Avançado</str>
+		<str id="optionsMenu.header.title">Opções</str>
+		<str id="optionsMenu.header.desc">Selecione uma categoria para continuar.</str>
+
+		<str id="optionsTree.controls-name">Controlos</str>
+		<str id="optionsTree.controls-desc">Mude os Controlos para Jogador 1 e Jogador 2!</str>
+
+		<str id="optionsTree.gameplay-name">Jogo</str>
+		<str id="optionsTree.gameplay-desc">Mude as opções como "Downscroll", Velocidade das notas, Indecência...</str>
+		<str id="optionsTree.gameplay.advanced-desc">Mude as opções mais avançadas como Transmissão de áudio...</str>
+
+		<str id="optionsTree.appearance-name">Aparência</str>
+		<str id="optionsTree.appearance-desc">Mude as opções de aparência como Luzes intermitentes...</str>
+		<str id="optionsTree.appearance.advanced-desc">Mude as opções mais avançadas como Sprites apenas em VRAM, "Antialiasing", "Shaders"</str>
+
+		<str id="optionsTree.language-name">Idioma</str>
+		<str id="optionsTree.language-desc">Mude o idioma que o jogo usa.</str>
+
+		<str id="optionsTree.miscellaneous-name">Outras</str>
+		<str id="optionsTree.miscellaneous-desc">Use este menu para apagar dados ou definições.</str>
+
+		<str id="optionsTree.debug-name">Opções de Depuração</str>
+		<str id="optionsTree.debug-desc">Opções de Depuração para o Modo de Desenvolvedor.</str>
+	</group>
+
+	<group name="KeybindOptions" prefix="KeybindsOptions.">
+		<str id="left">Esquerda</str>
+		<str id="down">Baixo</str>
+		<str id="up">Cima</str>
+		<str id="right">Direita</str>
+
+		<str id="category.notes">Notas</str>
+
+		<str id="category.ui">Interface</str>
+		<group name="ui" prefix="ui.">
+			<str id="accept">Aceitar</str>
+			<str id="back">Cancelar</str>
+			<str id="reset">Reiniciar</str>
+			<str id="pause">Pausa</str>
+			<str id="changeMode">Mudar Modo</str>
+		</group>
+
+		<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>
+		<str id="volume.up">Subir</str>
+		<str id="volume.down">Baixar</str>
+		<str id="volume.mute">Silenciar</str>
+
+		<str id="category.developer">Desenvolvedor</str>
+		<group name="developer" prefix="developer.">
+			<str id="devMenus">Menus Dev.</str>
+			<str id="openConsole">Consola</str>
+			<str id="reloadState">Recarregar</str>
+		</group>
+	</group>
+
+	<group name="AppearanceOptions" prefix="AppearanceOptions.">
+		<str id="framerate-name">FPS</str>
+		<str id="framerate-desc">Quadros Por Segundo, se quiser. Explica-se a sí próprio, certo?</str>
+
+		<str id="flashingMenu-name">Luzes Intermitentes</str>
+		<str id="flashingMenu-desc">Se desmarcado, irá desativar as luzes intermitentes quando seleciona algo no Menu Principal, e outras serão abrandadas.</str>
+
+		<str id="colorHealthBar-name">Barra de Vida Colorida</str>
+		<str id="colorHealthBar-desc">Se desmarcado, o jogo irá usar a barra vermelha/verde de versões FNF pré-semana 7.</str>
+
+		<str id="week6PixelPerfect-name">Efeito "Pixel Perfect"</str>
+		<str id="week6PixelPerfect-desc">se marcado, a Semana 6 ou outros cenários "pixel" terão um efeito "pixel perfect", alinhando todos os pixeis ao ecrã.</str>
+
+		<group name="AppearanceOptionsAdvanced" prefix="Advanced.">
+			<str id="quality-name">Qualidade</str>
+			<str id="quality-desc">Modos de qualidade para escolher, "BAIXA" = Desativa todos os efeitos visuais pesados para um jogo mais suave, "ALTA" = Ativa todos os efeitos visuais, ao custo do desempenho, "CUSTOMIZADA" = Permite opções especiais, disponíveis em "Advançado".</str>
+			<str id="quality-low">BAIXA</str>
+			<str id="quality-high">ALTA</str>
+			<str id="quality-custom">CUSTOMIZADA</str>
+
+			<str id="antialiasing-name">"Antialiasing"</str>
+			<str id="antialiasing-desc">Se desmarcado, irá remover "antialiasing" a todos os sprites. Poderá aumentar o desempenho ao custo de sprites menos suaves.</str>
+
+			<str id="lowMemoryMode-name">Memória baixa</str>
+			<str id="lowMemoryMode-desc">Se marcado, irá remover certos elementos de fundo para reduzir o uso de memória.</str>
+
+			<str id="gameplayShaders-name">"Shaders"</str>
+			<str id="gameplayShaders-desc">If desmarcado, "Shaders" (efeitos visuais como a Aberração cromática de "Thorns") não serão carregadas; poderá ser útil em dispositivos fracos.</str>
+
+			<str id="gpuOnlyBitmaps-name">Sprites só em VRAM</str>
+			<str id="gpuOnlyBitmaps-desc">Se marcado, irá apenas guardar os bitmaps na GPU, libertando IMENSA memória (EXPERIMENTAL). Desmarcar isto irá consumir muita memória, especialmente em sprites maiores. Se não tiver a certeza, deixe isto marcado.</str>
+		</group>
+	</group>
+
+	<group name="GameplayOptions" prefix="GameplayOptions.">
+		<str id="downscroll-name">"Downscroll"</str>
+		<str id="downscroll-desc">Se marcado, notas irão de cima para baixo em vez de baixo para cima, como se estivessem a cair.</str>
+
+		<str id="ghostTapping-name">Toques Fantasma</str>
+		<str id="ghostTapping-desc">Se desmarcado, bater em teclas que não tem uma nota conta como erro.</str>
+
+		<str id="naughtyness-name">Indecência</str>
+		<str id="naughtyness-desc">Se desmarcado, irá censurar as cenas da Semana 7, ou mais.</str>
+
+		<str id="camZoomOnBeat-name">Zoom na Batida</str>
+		<str id="camZoomOnBeat-desc">Se desmarcado. irá parar a câmara de ampliar a cada 4 batidas.</str>
+
+		<str id="autoPause-name">Auto Pausa</str>
+		<str id="autoPause-desc">Se marcado, mudar de janela pausará o jogo.</str>
+
+		<str id="volumeMusic-name">Volume da Música</str>
+		<str id="volumeMusic-desc">Muda apenas o volume da música em vez de tudo.</str>
+
+		<str id="volumeSFX-name">Volume dos SFX</str>
+		<str id="volumeSFX-desc">Muda apenas o volume dos efeitos sonoros em vez de tudo.</str>
+
+		<str id="songOffset-name">Atraso da Música</str>
+		<str id="songOffset-desc">Muda a posição da música relativamente às notas.</str>
+
+		<group name="GameplayOptionsAdvanced" prefix="Advanced.">
+			<str id="windowSize-name">Tamanho da Janela</str>
+			<str id="windowSize-desc">...</str>
+
+			<str id="streamedMusic-name">Transmissão de Música</str>
+			<str id="streamedMusic-desc">Se marcado, músicas serão transmitidas enquanto tocam, libertando IMENSA memória com o custo de maior uso de CPU se mais sons estiverem a ser transmitidos ao mesmo tempo (EXPERIMENTAL). Desmarcar isto irá consumir muita memória, especialmente em músicas maiores. Se não tiver a certeza, deixe marcado.</str>
+
+			<str id="streamedVocals-name">Transmissão de Vozes</str>
+			<str id="streamedVocals-desc">Se marcado, vozes também serão transmitidas enquanto tocam se "Transmissão de Música" estiver ativada. Irá impactar o desempenho se a canção usar muitas vozes (EXPERIMENTAL). Se não tiver a certeza, deixe marcado.</str>
+		</group>
+	</group>
+
+	<group name="LanguageOptions" prefix="LanguageOptions.">
+		<str id="language-name">Idioma</str>
+		<str id="language-desc">Idioma por {0} (Versão: {1})</str>
+	</group>
+
+	<group name="MiscOptions" prefix="MiscOptions.">
+		<str id="forceCrash-name">Forçar "Crash"</str>
+		<str id="forceCrash-desc">Selecione esta opção para forçar o jogo a encravar e travar.</str>
+
+		<str id="betaUpdates-name">Atualizações "Nightly"</str>
+		<str id="betaUpdates-desc">Se marcado, também irá incluir versões "nightly" (a versão mais recente disponível no repositório de GitHub) na verificação de atualizações.</str>
+
+		<str id="checkForUpdates-name">Verificar Atualizações</str>
+		<str id="checkForUpdates-desc">Selecione esta opção para verificar se existem atualizações novas.</str>
+		<str id="checkForUpdates-noUpdateFound">Nenhuma atualização encontrada.</str>
+
+		<str id="devMode-name">Modo Desenvolvedor</str>
+		<str id="devMode-desc">Se marcado, irá poder aceder funções de desenvolvedor como certas teclas, editores, opções de desenvolvedor, recarregamento de estados, consola e mais.</str>
+
+		<str id="allowConfigWarning-name">Aviso de Modpacks</str>
+		<str id="allowConfigWarning-desc">Se marcado, um aviso no início do jogo aparecerá se houver problemas com o modpack, como configurações em falta, versões incompatíveis e mais.</str>
+
+		<str id="resetSaveData-name">Apagar Dados</str>
+		<str id="resetSaveData-desc">Selecione esta opção para apagar todos os dados. Isto irá remover todos os seus recordes.</str>
+	</group>
+
+	<group name="DebugOptions" prefix="DebugOptions.">
+		<str id="title">Opções de Depuração</str>
+		<str id="desc">Use este menu para ativar ou desativar opções de depuração.</str>
+
+		<str id="showConsole-name">Mostrar Consola</str>
+		<str id="showConsole-desc">Selecione isto para mostrar a consola, que contém registos acerca do jogo.</str>
+
+		<str id="editorsResizable-name">Editores Adaptáveis</str>
+		<str id="editorsResizable-desc">Se marcado, irá permitir que os editores utilizem resoluções acima da base 1280x720 de FNF (permitindo mais detalhe e espaço...)</str>
+
+		<str id="bypassEditorsResize-name">Sem Tamanho Mínimo</str>
+		<str id="bypassEditorsResize-desc">Desativa o limite de resolução minimo dos editores (Requer que "Editores Adaptáveis" esteja marcado).</str>
+
+		<str id="editorSFX-name">Sons de Editor</str>
+		<str id="editorSFX-desc">Se marcado, tocará efeitos sonoros nos editores (ex: ao carregar em caixas...)</str>
+
+		<str id="editorCharterPrettyPrint-name">Mapas Legíveis</str>
+		<str id="editorCharterPrettyPrint-desc">Se marcado, os ficheiros guardados no editor de mapas serão formatados para serem fácilmente legíveis.</str>
+
+		<str id="editorCharacterPrettyPrint-name">Personagens Legíveis</str>
+		<str id="editorCharacterPrettyPrint-desc">Se marcado, os ficheiros guardados no editor de personagens serão formatados para serem fácilmente legíveis.</str>
+
+		<str id="editorStagePrettyPrint-name">Cenários Legíveis</str>
+		<str id="editorStagePrettyPrint-desc">Se marcado, os ficheiros guardados no editor de cenários serão formatados para serem fácilmente legíveis.</str>
+
+		<str id="intensiveBlur-name">Desfoque Intensivo</str>
+		<str id="intensiveBlur-desc">Se marcado, irá usar um desfoque mais intensivo. Parece melhor, mas poderá ser mais lento.</str>
+
+		<str id="charterAutoSaves-name">Gravação Automática</str>
+		<str id="charterAutoSaves-desc">Se marcado, irá guardar ficheiros de editor automáticamente, com as definições listadas abaixo.</str>
+
+		<str id="charterAutoSaveTime-name">Tempo de Gravação</str>
+		<str id="charterAutoSaveTime-desc">Isto controla com que frequência o editor gravará o ficheiro (em segundos...)</str>
+
+		<str id="charterAutoSaveWarningTime-name">Tempo de Aviso</str>
+		<str id="charterAutoSaveWarningTime-desc">Isto controla com que antecedência o editor irá avisá-lo antes de guardar (em segundos..., 0 para desativar)</str>
+
+		<str id="charterAutoSavesSeparateFolder-name">Pasta de Gravações</str>
+		<str id="charterAutoSavesSeparateFolder-desc">Se marcado, irá guardar os ficheiros numa pasta separada com a data em vez de substituir o ficheiro atual. (song/autosaves/)</str>
+
+		<str id="songOffsetAffectEditors-name">Atraso no Mapeador</str>
+		<str id="songOffsetAffectEditors-desc">Se marcado, irá ativar o Atraso da Música no Editor de Mapas, também.</str>
+	</group>
+
+</language>
@@ -0,0 +1,3 @@
+name="Português"
+credits="Bitto1070"
+version="1.0.0"
@@ -1,19 +1,15 @@
 import flixel.FlxSprite;

-var tankmanRun:Array<TankmenBG> = [];
-var grpTankmanRun:FlxTypedGroup<FlxSprite> = [];
-
 var spawnTimes = []; // [[time, direction]]
-var tankmanPool = [];
-
-function recycleTankman() {
-	if(tankmanPool.length == 0) {
-		return new TankmenBG();
-	} else {
-		return tankmanPool.shift(); // can be pop but it causes it to be less random
-	}
+var tankmanGroup:TankmenGroup = {
+	run: [],
+	pool: [],
+	group: new FlxTypedGroup<FlxSprite>()
 }

+function recycleTankman()
+	return tankmanGroup.pool.length == 0 ? new TankmenBG(tankmanGroup) : tankmanGroup.pool.shift(); // can be pop but it causes it to be less random
+
 function getTankman(data:Array<Float>) {
 	var tankman:TankmenBG = recycleTankman();
 	tankman.strumTime = data[0];
@@ -22,9 +18,8 @@ function getTankman(data:Array<Float>) {
 }

 function postCreate() {
-	grpTankmanRun = new FlxTypedGroup();
-	insert(members.indexOf(gf) - 1, grpTankmanRun);
-	if(inCutscene) grpTankmanRun.visible = false;
+	insert(members.indexOf(gf) - 1, tankmanGroup.group);
+	if (inCutscene) tankmanGroup.group.visible = false;

 	/*var tempTankman:TankmenBG = recycleTankman();
 	tempTankman.strumTime = 10;
@@ -42,9 +37,8 @@ function postCreate() {
 	//spawnTimes.reverse(); // no need to reverse it since the notes are already reversed
 }

-function onStartCountdown() {
-	if(PlayState.instance.seenCutscene) grpTankmanRun.visible = true;
-}
+function onStartCountdown()
+	if (PlayState.instance.seenCutscene) tankmanGroup.group.visible = true;

 function spawnTankmen() {
 	var time = Conductor.songPosition;
@@ -54,50 +48,46 @@ function spawnTankmen() {

 		//trace("Spawning Tankman", tankmen.sprite.offset, tankmen.goingRight);

-		tankmanRun.push(tankmen);
-		grpTankmanRun.add(tankmen.sprite);
+		tankmanGroup.run.push(tankmen);
+		tankmanGroup.group.add(tankmen.sprite);
 	}
 }

 function update(elapsed) {
 	spawnTankmen();

-	var length = tankmanRun.length;
-	for(i in 0...length) {
+	var length = tankmanGroup.run.length;
+	for (i in 0...length) {
 		var reverseIndex = length - i - 1;
-		var tankmen = tankmanRun[reverseIndex];
+		var tankmen = tankmanGroup.run[reverseIndex];
 		tankmen.update(elapsed);
 	}
 }

 class TankmenBG {
+	public var sprite:FlxSprite;
+
 	var strumTime = 0;
 	var goingRight = false;
 	var tankSpeed = 0.7;
-
-	var endingOffset = null;
-	var sprite = null;
-
+	var endingOffset:Float;
 	var killed = false;
+	var grp:TankmenGroup; // The reference to the current pool

-	function new() {
-		this.sprite = new FlxSprite();
-		var sprite = this.sprite;
+	function new(grp:TankmenGroup) {
+		this.grp = grp;

+		sprite = new FlxSprite();
 		sprite.frames = Paths.getSparrowAtlas('stages/tank/tankmanKilled1');
 		sprite.antialiasing = true;
 		sprite.animation.addByPrefix('run', 'tankman running', 24, true);
-
 		sprite.animation.play('run');
-
 		sprite.updateHitbox();
-
 		sprite.setGraphicSize(Std.int(sprite.width * 0.8));
 		sprite.updateHitbox();
 	}

-	function resetShit(x, y, isGoingRight) {
-		var sprite = this.sprite;
+	function resetShit(x:Float, y:Float, isGoingRight:Bool) {
 		sprite.revive();
 		sprite.setPosition(x, y);
 		sprite.offset.set(0, 0);
@@ -114,7 +104,6 @@ class TankmenBG {
 	}

 	function update(elapsed) {
-		var sprite = this.sprite;
 		sprite.visible = !(sprite.x >= FlxG.width * 1.5 || sprite.x <= FlxG.width * -0.5);

 		if (sprite.animation.curAnim.name == 'run')
@@ -124,8 +113,7 @@ class TankmenBG {
 			if (goingRight) {
 				endDirection = (FlxG.width * 0.02) - endingOffset;
 				sprite.x = (endDirection + (Conductor.songPosition - strumTime) * tankSpeed);
-			}
-			else sprite.x = (endDirection - (Conductor.songPosition - strumTime) * tankSpeed);
+			} else sprite.x = (endDirection - (Conductor.songPosition - strumTime) * tankSpeed);
 		}

 		if (Conductor.songPosition > strumTime)
@@ -133,10 +121,10 @@ class TankmenBG {
 			sprite.animation.play('shot');
 			sprite.animation.finishCallback = function(_) {
 				killed = true;
-				grpTankmanRun.remove(sprite, true);
+				grp.group.remove(sprite, true);
 				sprite.kill();
-				tankmanPool.push(this);
-				tankmanRun.remove(this);
+				grp.pool.push(this);
+				grp.run.remove(this);
 			}

 			if (goingRight)
@@ -146,4 +134,4 @@ class TankmenBG {
 			}
 		}
 	}
-}
+}
@@ -0,0 +1,59 @@
+# 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>
+
+1. Install [version 4.3.7 of Haxe](https://haxe.org/download/version/4.3.7/).
+2. Download and install [`git-scm`](https://git-scm.com/download/win).
+    - Leave all installation options as default.
+3. Run `setup-windows.bat` using cmd or double-clicking it and wait for the libraries to install.
+4. Once the libraries are installed, run `haxelib run lime test windows` to compile and launch the game (may take a long time)
+    - ℹ You can run `haxelib run lime setup` to make the lime command global, allowing you to execute `lime test windows` directly.
+</details>
+<details>
+    <summary>Linux</summary>
+
+1. Install [version 4.3.7 of Haxe](https://haxe.org/download/version/4.3.7/).
+2. Install `libvlc` if not present already.
+    - ℹ On certain Arch based distros installing `vlc-plugins-all` might solve if `libvlc` alone doesn't work.
+3. Install `g++`, if not present already.
+4. Download and install [`git-scm`](https://git-scm.com/download/linux) if not present already.
+5. Run `setup-unix.sh` using the terminal or double-clicking it and wait for the libraries to install.
+6. Once the libraries are installed, run `haxelib run lime test linux` to compile and launch the game (may take a long time)
+    - ℹ You can run `haxelib run lime setup` to make the lime command global, allowing you to execute `lime test linux` directly.
+</details>
+<details>
+    <summary>MacOS</summary>
+
+1. Install [version 4.3.7 of Haxe](https://haxe.org/download/version/4.3.7/).
+2. Install `Xcode` to allow C++ app building.
+3. Download and install [`git-scm`](https://git-scm.com/download/mac).
+4. Run `setup-unix.sh` using the terminal and wait for the libraries to install.
+5. Once the libraries are installed, run `haxelib run lime test mac` to compile and launch the game (may take a long time)
+    - ℹ You can run `haxelib run lime setup` to make the lime command global, allowing you to execute `lime test mac` directly.
+</details>
+
+> [!TIP]
+> 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.
@@ -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
@@ -1 +1,3 @@
+#!/usr/bin/env sh
+cd "$(dirname "$0")/.."
 haxe -cp commandline -D analyzer-optimize --run Main $@
@@ -1 +1,2 @@
+cd /d "%~dp0.."
@haxe -cp commandline -D analyzer-optimize --run Main %*
@@ -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."
@@ -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.
@@ -4,7 +4,7 @@
 		<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 -->

@@ -14,9 +14,8 @@

 		<!-- 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" />
+		<lib name="funkin-modchart" version="1.2.4" skipDeps="true" />
 		<lib name="hxvlc" version="1.9.3" skipDeps="true" />

 		<!-- Documentation and other features -->
@@ -32,6 +31,8 @@
 		<lib global="true" name="format" /> <lib name="format" />

 		<git name="hxcpp" url="https://github.com/CodenameCrew/cne-hxcpp" />
+
+		<git name="flixel-animate" url="https://github.com/MaybeMaru/flixel-animate/" skipDeps="true"/>
 	</if>

 	<!-- Hxcpp Building -->
@@ -1,2 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env sh
+cd "$(dirname "$0")/.."
 haxe -cp commandline -D analyzer-optimize --run Main setup
@@ -1 +1,2 @@
+cd /d "%~dp0.."
@haxe -cp commandline -D analyzer-optimize --run Main setup
@@ -16,7 +16,7 @@ class Main {
 				dDoc: [
 					"Usage: setup",
 					"",
-					"This command runs through all libraries in libs.xml, and install them.",
+					"This command runs through all libraries in building/libs.xml, and install them.",
 					"If they're already installed, they will be updated.",
 					"",
 					"--all : Reinstall all libraries.",
@@ -173,6 +173,7 @@ class Main {
 		Sys.println("Codename Engine Command Line utility");
 		Sys.println('Available commands (${commands.length}):\n');
 		for(line in commands) {
+			if(line.names.contains(null)) line.names.remove(null);
 			Sys.println('${line.names.join(", ")} - ${line.doc}');
 		}
 	}
@@ -55,7 +55,7 @@ class Setup {
 			FileSystem.createDirectory('.haxelib');
 		}

-		var libFile = "./libs.xml";
+		var libFile = "./building/libs.xml";
 		if(args.existsOption("lib")) {
 			libFile = args.getOption("lib");
 			if(libFile == null) {
@@ -252,32 +252,32 @@ class Setup {

 			// check for outdated haxe
 			final curHaxeVer = [for(v in haxeVer.split(".")) Std.parseInt(v)];
-			final minumumVersion = [4, 2, 5];
+			final minumumVersion = [4, 3, 7];
 			for(i in 0...minumumVersion.length) {
 				if (curHaxeVer[i] > minumumVersion[i]) break;
 				if (curHaxeVer[i] < minumumVersion[i]) {
 					prettyPrint([
 						"!! WARNING !!",
 						"Your current Haxe version is outdated.",
-						'You\'re using ${haxeVer}, whilst the required version is 4.2.5 or newer.',
+						'You\'re using ${haxeVer}, whilst the required version is 4.3.7 or newer.',
 						'The engine may not compile with your current version of Haxe.',
-						'We recommend upgrading to 4.2.5 or newer'
+						'We recommend upgrading to 4.3.7 or newer'
 					].join("\n"));
 					break;
 				}
 			}
 		}

-		// vswhere.exe its used to find any visual studio related installations on the system, including full visual studio ide installations, visual studio build tools installations, and other related components  - Nex
-		if (CHECK_VSTUDIO && Compiler.getBuildTarget().toLowerCase() == "windows" && new Process('"C:/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -property catalog_productDisplayVersion').exitCode(true) == 1) {
+		// vswhere.exe is used to find any visual studio related installations on the system, including full visual studio ide installations, visual studio build tools installations, and other related components  - Nex
+		if (CHECK_VSTUDIO && Compiler.getBuildTarget().toLowerCase() == "windows" && new Process('"C:/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -requires Microsoft.VisualStudio.Component.Windows10SDK.19041 -property installationPath').exitCode(true) != 0) {
 			prettyPrint("Installing Microsoft Visual Studio Community (Dependency)");

 			// thanks to @crowplexus for these two lines!  - Nex
 			command("curl -# -O https://download.visualstudio.microsoft.com/download/pr/3105fcfe-e771-41d6-9a1c-fc971e7d03a7/8eb13958dc429a6e6f7e0d6704d43a55f18d02a253608351b6bf6723ffdaf24e/vs_Community.exe");
 			command("vs_Community.exe --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK.19041 -p");
-
 			FileSystem.deleteFile("vs_Community.exe");
-			prettyPrint('If it didn\'t say it before: Because of this component if you want to compile you have to restart the device.');
+
+			prettyPrint("Because of this component, if you want to compile, you need to restart the device.");
 			Sys.print("Do you wish to do it now [y/n]? ");
 			if(Sys.stdin().readLine().toLowerCase() == "y") command("shutdown /r /t 0 /f");
 		}
@@ -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">
@@ -130,7 +130,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" />
@@ -166,8 +166,8 @@

 	<!-- OpenAL config -->
 	<section if="desktop">
-		<assets path="alsoft.txt" rename="plugins/alsoft.ini" type="text" if="windows"/>
-		<assets path="alsoft.txt" rename="plugins/alsoft.conf" type="text" unless="windows"/>
+		<assets path="building/alsoft.txt" rename="plugins/alsoft.ini" type="text" if="windows"/>
+		<assets path="building/alsoft.txt" rename="plugins/alsoft.conf" type="text" unless="windows"/>
 	</section>

 	<!-- ______________________________ Haxedefines _____________________________ -->
@@ -189,6 +189,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)-->
@@ -0,0 +1,42 @@
+{ }:
+let
+  pkgs = import (builtins.fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs/archive/c407032be28ca2236f45c49cfb2b8b3885294f7f.tar.gz";
+  }) { };
+
+  libs =
+    with pkgs;
+    [
+      SDL2
+      pkg-config
+      openal
+      alsa-lib
+      libvlc
+      libpulseaudio
+      libGL
+    ]
+    ++ (with xorg; [
+      libX11
+      libXext
+      libXinerama
+      libXi
+      libXrandr
+    ]);
+in
+pkgs.mkShell {
+  name = "CodenameEngine";
+
+  packages = with pkgs; [
+    haxe
+    neko
+    libsForQt5.qttools
+  ];
+
+  buildInputs = libs;
+
+  LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libs;
+
+  shellHook = ''
+    source update.sh
+  '';
+}
@@ -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)
@@ -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;
-	}
-}
@@ -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,29 +126,24 @@ 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()) {
 			var name = getAnimName() + '-loop';
-			if (hasAnimation(name))
+			if (hasAnim(name))
 				playAnim(name, null, lastAnimContext);
 		}
 	}

+	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;
 	}

@@ -174,48 +175,9 @@ 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 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;
-		}
-	}

 	public override function destroy()
 	{
-		animateAtlas = FlxDestroyUtil.destroy(animateAtlas);
-
 		if (animOffsets != null) {
 			for (key in animOffsets.keys()) {
 				final point = animOffsets[key];
@@ -226,6 +188,8 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 			animOffsets = null;
 		}
 		super.destroy();
+
+		_rect2 = FlxDestroyUtil.put(_rect2);
 	}
 	#end

@@ -233,27 +197,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 +228,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>();
@@ -307,7 +251,7 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I

 	public function playAnim(AnimName:String, ?Force:Null<Bool>, Context:PlayAnimContext = NONE, Reversed:Bool = false, Frame:Int = 0):Void
 	{
-		if (AnimName == null)
+		if (AnimName == null || (!hasAnim(AnimName) && !debugMode))
 			return;

 		if (Force == null) {
@@ -315,19 +259,7 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 			Force = anim != null && anim.forced;
 		}

-		if (animateAtlas != null)
-		{
-			@:privateAccess
-			// if (!animateAtlas.anim.animsMap.exists(AnimName) && !animateAtlas.anim.symbolDictionary.exists(AnimName)) return;
-			animateAtlas.anim.play(AnimName, Force, Reversed, Frame);
-			atlasPlayingAnim = AnimName;
-		}
-		else
-		{
-			if (!animation.exists(AnimName) && !debugMode)
-				return;
-			animation.play(AnimName, Force, Reversed, Frame);
-		}
+		animation.play(AnimName, Force, Reversed, Frame);

 		var daOffset = getAnimOffset(AnimName);
 		frameOffset.set(daOffset.x, daOffset.y);
@@ -336,7 +268,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,
@@ -347,22 +279,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);
 	}

@@ -373,40 +299,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)
@@ -414,9 +326,9 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 	}

 	// Backwards compat (the names used to be all different and it sucked, please lets use the same format in the future)  - Nex
-	public inline function hasAnimation(AnimName:String) return hasAnim(AnimName);
-	public inline function removeAnimation(name:String) return removeAnim(name);
-	public inline function stopAnimation() return stopAnim();
+	@:dox(hide) public inline function hasAnimation(AnimName:String) return hasAnim(AnimName);
+	@:dox(hide) public inline function removeAnimation(name:String) return removeAnim(name);
+	@:dox(hide) public inline function stopAnimation() return stopAnim();
 	#end

 	// Getter / Setters
@@ -428,10 +340,55 @@ 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 {
+		matrix.translate(-origin.x, -origin.y);
+
+		if (frameOffsetAngle != null && frameOffsetAngle != angle)
+		{
+			var angleOff = (frameOffsetAngle - angle) * FlxAngle.TO_RAD;
+			var cos = Math.cos(angleOff);
+			var sin = Math.sin(angleOff);
+			// cos doesnt need to be negated
+			matrix.rotateWithTrig(cos, -sin);
+			matrix.translate(-frameOffset.x, -frameOffset.y);
+			matrix.rotateWithTrig(cos, sin);
+		}
+		else
+			matrix.translate(-frameOffset.x, -frameOffset.y);
+
+		matrix.translate(origin.x, origin.y);
+
+		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;
 	}
 }
@@ -2,11 +2,14 @@ package funkin.backend;

 import flixel.text.FlxText;
 import flixel.util.FlxColor;
+import funkin.backend.system.Flags;

 class FunkinText extends FlxText {
-	public function new(X:Float = 0, Y:Float = 0, FieldWidth:Float = 0, ?Text:String, Size:Int = 16, Border:Bool = true) {
+	public function new(X:Float = 0, Y:Float = 0, FieldWidth:Float = 0, ?Text:String, ?Size:Int, Border:Bool = true) {
+		if (Size == null) Size = Flags.DEFAULT_FONT_SIZE;
+
 		super(X, Y, FieldWidth, Text, Size);
-		setFormat(Paths.font("vcr.ttf"), Size, FlxColor.WHITE);
+		setFormat(Paths.font(Flags.DEFAULT_FONT), Size, FlxColor.WHITE);
 		if (Border) {
 			borderStyle = OUTLINE;
 			borderSize = 1;
@@ -275,6 +275,12 @@ class MusicBeatState extends FlxState implements IBeatCancellableReceiver
 		if (!e.cancelled)
 			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);
@@ -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));
@@ -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();
 		}
 	}

@@ -5,6 +5,7 @@ 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> = [];
@@ -141,6 +142,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;
 	}
@@ -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
@@ -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')) {
@@ -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

@@ -33,6 +33,9 @@ class ZipFolderLibrary extends AssetLibrary implements IModsAssetLibrary {
 		zip = SysZip.openFromFile(basePath);
 		zip.read();
 		for(entry in zip.entries) {
+			if (entry.fileName.length < 0 || entry.fileName.endsWith("/"))
+				continue;
+
 			lowerCaseAssets[entry.fileName.toLowerCase()] = assets[entry.fileName.toLowerCase()] = assets[entry.fileName] = entry;
 			nameMap.set(entry.fileName.toLowerCase(), entry.fileName);
 		}
@@ -154,6 +157,10 @@ class ZipFolderLibrary extends AssetLibrary implements IModsAssetLibrary {
 		return content;
 	}

+	public override function list(type:String):Array<String> {
+		return[for(k=>e in nameMap) '$prefix$e'];
+	}
+
 	// Backwards compat

 	@:noCompletion public var zipPath(get, set):String;
@@ -222,7 +222,7 @@ class Chart {
 		}
 		#end

-		var loadedMeta = loadChartMeta(songName, variant, base.fromMods, false);
+		var loadedMeta = loadChartMeta(songName, variant, difficulty, base.fromMods, false);
 		if (base.meta == null) base.meta = loadedMeta;
 		else {
 			for (field in Reflect.fields(base.meta)) {
@@ -300,6 +300,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

@@ -164,8 +164,10 @@ class EventsData {

 			if (fileTxt.trim() == "") continue;

-			eventsList.push(eventName);
-			eventsParams.set(eventName, []);
+			if (!eventsList.contains(eventName)) {
+				eventsList.push(eventName);
+				eventsParams.set(eventName, []);
+			}

 			try {
 				var data:EventInfoFile = cast Json.parse(fileTxt);
@@ -177,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);}
 				}
@@ -194,6 +197,7 @@ typedef EventInfoFile = {
 		var name:String;
 		var type:String;
 		var defaultValue:Dynamic;
+		var ?saveIfDefault:Bool;
 	}>;
 }

@@ -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) ||
@@ -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");
@@ -106,20 +103,8 @@ class GlobalScript {
 		});
 	}

-	public static function event<T:CancellableEvent>(name:String, event:T):T {
-		if (scripts != null)
-			scripts.event(name, event);
-		return event;
-	}
-
-	public static function call(name:String, ?args:Array<Dynamic>) {
-		if (scripts != null)
-			scripts.call(name, args);
-	}
-
 	public static function onModSwitch(newMod:String) {
-		call("destroy");
-		scripts = FlxDestroyUtil.destroy(scripts);
+		destroy();
 		scripts = new ScriptPack("GlobalScript");
 		for (i in funkin.backend.assets.ModsFolder.getLoadedMods()) {
 			var path = Paths.script('data/global/LIB_$i');
@@ -132,12 +117,24 @@ class GlobalScript {
 		}
 	}

-	public static function beatHit(curBeat:Int) {
-		call("beatHit", [curBeat]);
+	public static inline function event<T:CancellableEvent>(name:String, event:T):T {
+		if (scripts != null)
+			scripts.event(name, event);
+		return event;
 	}

-	public static function stepHit(curStep:Int) {
+	public static inline function call(name:String, ?args:Array<Dynamic>)
+		if (scripts != null) scripts.call(name, args);
+
+	public static inline function beatHit(curBeat:Int)
+		call("beatHit", [curBeat]);
+
+	public static inline function stepHit(curStep:Int)
 		call("stepHit", [curStep]);
+
+	public static inline function destroy() if (scripts != null) {
+		call("destroy");
+		scripts = FlxDestroyUtil.destroy(scripts);
 	}
 }
 #end
@@ -34,6 +34,7 @@ class HScript extends Script {
 		__importedPaths = [path];

 		interp.errorHandler = _errorHandler;
+		interp.warnHandler = _warnHandler;
 		interp.importFailedCallback = importFailedCallback;
 		interp.staticVariables = Script.staticVariables;
 		interp.allowStaticVariables = interp.allowPublicVariables = true;
@@ -63,7 +64,7 @@ class HScript extends Script {
 		return this;
 	}

-	private function importFailedCallback(cl:Array<String>):Bool {
+	private function importFailedCallback(cl:Array<String>, ?asName:String):Bool {
 		if(_importFailedCallback(cl, "source/") || _importFailedCallback(cl, "")) {
 			return true;
 		}
@@ -117,6 +118,24 @@ class HScript extends Script {
 		], ERROR);
 	}

+	private function _warnHandler(error:Error) {
+		var fileName = error.origin;
+		var oldfn = '$fileName:${error.line}: ';
+		if(remappedNames.exists(fileName))
+			fileName = remappedNames.get(fileName);
+		var fn = '$fileName:${error.line}: ';
+		var err = error.toString();
+		while(err.startsWith(oldfn) || err.startsWith(fn)) {
+			if (err.startsWith(oldfn)) err = err.substr(oldfn.length);
+			if (err.startsWith(fn)) err = err.substr(fn.length);
+		}
+
+		Logs.traceColored([
+			Logs.logText(fn, GREEN),
+			Logs.logText(err, YELLOW)
+		], WARNING);
+	}
+
 	public override function setParent(parent:Dynamic) {
 		interp.scriptObject = parent;
 	}
@@ -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
 	}
 }
@@ -28,6 +28,11 @@ class Script extends FlxBasic implements IFlxDestroyable {
 			"Reflect"			=> Reflect,
 			"StringTools"		=> StringTools,
 			"Json"				=> haxe.Json,
+			"Xml"				=> Xml,
+			"Type"				=> Type,
+			"Date"				=> Date,
+			"Lambda"			=> Lambda,
+			#if sys "Sys"		=> Sys, #end

 			// OpenFL & Lime related stuff
 			"Assets"			=> openfl.utils.Assets,
@@ -86,9 +91,10 @@ 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,

 			"CoolUtil"			=> funkin.backend.utils.CoolUtil,
 			"IniUtil"			=> funkin.backend.utils.IniUtil,
@@ -96,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,

@@ -395,4 +402,4 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 * Called when the script is loaded.
 	 */
 	public function onLoad() {}
-}
+}
@@ -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.
 	 */
@@ -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);
@@ -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;
@@ -15,14 +15,18 @@ 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 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 +45,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 +128,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";

@@ -149,6 +156,12 @@ class Flags {
 	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;
+
 	// to translate these you need to convert them into ids
 	// Resume -> pause.resume
 	// Restart Song -> pause.restart
@@ -169,6 +182,7 @@ class Flags {
 	public static var DEFAULT_HEALTH:Null<Float> = null;//DEFAULT_MAX_HEALTH / 2.0;
 	public static var DEFAULT_ICONBOP:Bool = true;
 	public static var BOP_ICON_SCALE:Float = 1.2;
+	public static var ICON_DEFAULT_SCALE:Float = 1;
 	public static var ICON_OFFSET:Float = 26;
 	public static var ICON_LERP:Float = 0.33;

@@ -272,8 +286,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);

@@ -290,28 +302,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
 	}

 	/**
@@ -360,5 +383,6 @@ class Flags {
 				parseFlags(flags);
 			}
 		}
+		loadPost();
 	}
-}
+}
@@ -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
@@ -66,12 +66,12 @@ class MainState extends FlxState {
 			)
 		];

-		for(path in addonPaths) {
+		for (path in addonPaths) {
 			if (path == null) continue;
 			if (!isDirectory(path)) continue;

-			for(addon in FileSystem.readDirectory(path)) {
-				if(!FileSystem.isDirectory(path + addon)) {
+			for (addon in FileSystem.readDirectory(path)) {
+				if (!FileSystem.isDirectory(path + addon)) {
 					switch(Path.extension(addon).toLowerCase()) {
 						case 'zip':
 							addon = Path.withoutExtension(addon);
@@ -90,7 +90,14 @@ class MainState extends FlxState {
 				else _noPriorityAddons.insert(0, data);
 			}
 		}
+		#end

+		#if GLOBAL_SCRIPT
+		funkin.backend.scripting.GlobalScript.destroy();
+		#end
+		funkin.backend.scripting.Script.staticVariables.clear();
+
+		#if MOD_SUPPORT
 		for (addon in _lowPriorityAddons)
 			loadLib(addon.path, ltrim(addon.name, "[LOW]"));

@@ -143,4 +150,4 @@ class MainState extends FlxState {

 		FlxG.switchState(cast Type.createInstance(startState, []));
 	}
-}
+}
@@ -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 = "";
@@ -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);

@@ -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;
 	}
-}
+}
@@ -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;
 }
@@ -115,8 +115,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 +154,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");
 	}
@@ -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
@@ -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,6 +58,11 @@ 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> {
@@ -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)
@@ -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);
@@ -3,31 +3,15 @@ package funkin.backend.utils;
 #if cpp
 import cpp.Float64;
 #end
-import flxanimate.data.AnimationData.AnimAtlas;
-import flixel.graphics.FlxGraphic;
-import openfl.display.BitmapData;
-import flixel.graphics.frames.FlxAtlasFrames;
-import flixel.graphics.frames.FlxFramesCollection;
 #if sys
 import sys.FileSystem;
 #end
-import flixel.text.FlxText;
-import funkin.backend.utils.XMLUtil.TextFormat;
-import flixel.util.typeLimit.OneOfTwo;
-import flixel.util.typeLimit.OneOfThree;
-import flixel.tweens.FlxTween;
-import flixel.system.frontEnds.SoundFrontEnd;
-import flixel.sound.FlxSound;
-import funkin.backend.system.Conductor;
-import flixel.sound.FlxSoundGroup;
-import haxe.Json;
-import haxe.io.Path;
-import haxe.io.Bytes;
-import haxe.xml.Access;
-import flixel.input.keyboard.FlxKey;
-import lime.utils.Assets;
 import flixel.animation.FlxAnimation;
+import flixel.graphics.FlxGraphic;
+import flixel.graphics.frames.FlxAtlasFrames;
+import flixel.graphics.frames.FlxFramesCollection;
 import flixel.input.keyboard.FlxKey;
+import flixel.math.FlxPoint;
 import flixel.sound.FlxSound;
 import flixel.sound.FlxSoundGroup;
 import flixel.system.frontEnds.SoundFrontEnd;
@@ -35,19 +19,22 @@ import flixel.text.FlxText;
 import flixel.tweens.FlxTween;
 import flixel.util.FlxAxes;
 import flixel.util.FlxColor;
+import flixel.util.typeLimit.OneOfThree;
 import flixel.util.typeLimit.OneOfTwo;
 import funkin.backend.system.Conductor;
 import funkin.backend.utils.XMLUtil.TextFormat;
 import haxe.CallStack;
+import haxe.Constraints.IMap;
+import haxe.EnumTools.EnumValueTools;
 import haxe.Json;
 import haxe.io.Bytes;
 import haxe.io.Path;
 import haxe.xml.Access;
 import lime.utils.Assets;
+import openfl.display.BitmapData;
 import openfl.geom.ColorTransform;
-import flixel.math.FlxPoint;
-import haxe.Constraints.IMap;
-import haxe.EnumTools.EnumValueTools;
+import animate.FlxAnimateJson;
+import flixel.animation.FlxAnimationController;

 using StringTools;

@@ -588,6 +575,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
@@ -1266,23 +1276,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
@@ -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();
 		}
 	}
-}
+}
@@ -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;
 	}
@@ -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
+	}
+}
@@ -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;
 }

@@ -185,6 +185,16 @@ final class Windows {
 	')
 	public static function setWindowTitleColor(title:String, color:Array<Int>) {}

+	@:functionCode('
+	HWND window = GetConsoleWindow();
+	HICON smallIcon = (HICON) LoadImage(NULL, path, IMAGE_ICON, 16, 16, LR_LOADFROMFILE);
+	HICON icon = (HICON) LoadImage(NULL, path, IMAGE_ICON, 0, 0, LR_LOADFROMFILE | LR_DEFAULTSIZE);
+	SendMessage(window, WM_SETICON, ICON_SMALL, (LPARAM)smallIcon);
+	SendMessage(window, WM_SETICON, ICON_BIG, (LPARAM)icon);    
+	')
+	public static function setWindowIcon(path:String) {}
+
+
 	@:functionCode('
 	// https://stackoverflow.com/questions/15543571/allocconsole-not-displaying-cout

@@ -194,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() {
 	}
--- a/Show More
+++ b/Show More