single player + theme update

* Add Input Profiles.

* Add capability of setting custom profiles.

* Remove leftover early return.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,45 +0,0 @@
----
-name: Bug report
-about: Report a bug in the project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-## Do not report issues with mods on this page. Please report them on the repo for the mods themselves.
-
-## If you have a crash on startup, please make sure your graphics drivers are up to date before submitting a bug report.
-
-**What is your GPU driver version? Old drivers, particularly on Nvidia, are known to cause crashes on boot. If you are on Nvidia and the game is crashing on boot, please update to a recent driver version before opening an issue.**
-
-**Have you checked whether this issue is vanilla behavior? In other words, does it occur on original hardware?**
-
-**Were you playing with intended mechanics, or using glitches? If it's the latter, which glitches?**
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. etc.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-Please attach a screenshot of the bug.
-
-**Desktop (please complete the following information):**
- - OS: [Windows 10, Windows 11, Linux distro]
- - Version: [e.g. 1.0.0]
- - CPU: [e.g. Intel Core ..., AMD Ryzen ..., etc.]
- - GPU: [e.g. NVIDIA GeForce .../Radeon RX .../Intel UHD .../etc.]
- - GPU driver: [e.g Nvidia driver 545.XX, AMD driver 24.X.X, etc]
-
-**Mods Installed**
-List the mods you had installed and enabled when you encountered the error.
-
-**Additional context**
-Add any other context about the problem here.

.github/linux/BanjoRecompiled.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=BanjoRecompiled
-Type=Application
-Terminal=false
-Icon=BanjoRecompiled
-Exec=BanjoRecompiled
-GenericName=BanjoRecompiled
-Categories=Game;
-

.github/macos/Info.plist.in

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>CFBundleName</key>
-    <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
-    <key>CFBundleIdentifier</key>
-    <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
-    <key>CFBundleVersion</key>
-    <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-    <key>CFBundleShortVersionString</key>
-    <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-    <key>CFBundleExecutable</key>
-    <string>BanjoRecompiled</string>
-    <key>CFBundleIconFile</key>
-    <string>${MACOSX_BUNDLE_ICON_FILE}</string>
-    <key>LSApplicationCategoryType</key>
-    <string>public.app-category.games</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>LSMinimumSystemVersion</key>
-    <string>11</string>
-    <key>GCSupportsGameMode</key>
-    <true/>
-</dict>
-</plist>

.github/macos/apple_bundle.cmake

@@ -1,87 +0,0 @@
-# Define the path to the entitlements file
-set(ENTITLEMENTS_FILE ${CMAKE_SOURCE_DIR}/.github/macos/entitlements.plist)
-
-# Set bundle properties
-set_target_properties(BanjoRecompiled PROPERTIES
-        MACOSX_BUNDLE TRUE
-        MACOSX_BUNDLE_BUNDLE_NAME "BanjoRecompiled"
-        MACOSX_BUNDLE_GUI_IDENTIFIER "com.github.Banjorecompiled"
-        MACOSX_BUNDLE_BUNDLE_VERSION "1.0"
-        MACOSX_BUNDLE_SHORT_VERSION_STRING "1.0"
-        MACOSX_BUNDLE_ICON_FILE "AppIcon.icns"
-        MACOSX_BUNDLE_INFO_PLIST ${CMAKE_BINARY_DIR}/Info.plist
-        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-"
-        XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${ENTITLEMENTS_FILE}
-)
-
-# Create icon files for macOS bundle
-set(ICON_SOURCE ${CMAKE_SOURCE_DIR}/icons/app.png)
-set(ICONSET_DIR ${CMAKE_BINARY_DIR}/AppIcon.iconset)
-set(ICNS_FILE ${CMAKE_BINARY_DIR}/resources/AppIcon.icns)
-
-# Create iconset directory and add PNG file
-add_custom_command(
-        OUTPUT ${ICONSET_DIR}
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${ICONSET_DIR}
-        COMMAND ${CMAKE_COMMAND} -E copy ${ICON_SOURCE} ${ICONSET_DIR}/icon_512x512.png
-        COMMAND ${CMAKE_COMMAND} -E copy ${ICON_SOURCE} ${ICONSET_DIR}/icon_512x512@2x.png
-        COMMAND touch ${ICONSET_DIR}
-        COMMENT "Creating iconset directory and copying PNG file"
-)
-
-# Convert iconset to icns
-add_custom_command(
-        OUTPUT ${ICNS_FILE}
-        DEPENDS ${ICONSET_DIR}
-        COMMAND iconutil -c icns ${ICONSET_DIR} -o ${ICNS_FILE}
-        COMMENT "Converting iconset to icns"
-)
-
-# Custom target to ensure icns creation
-add_custom_target(create_icns ALL DEPENDS ${ICNS_FILE})
-
-# Set source file properties for the resulting icns file
-set_source_files_properties(${ICNS_FILE} PROPERTIES
-        MACOSX_PACKAGE_LOCATION "Resources"
-)
-
-# Add the icns file to the executable target
-target_sources(BanjoRecompiled PRIVATE ${ICNS_FILE})
-
-# Ensure BanjoRecompiled depends on create_icns
-add_dependencies(BanjoRecompiled create_icns)
-
-# Configure Info.plist
-configure_file(${CMAKE_SOURCE_DIR}/.github/macos/Info.plist.in ${CMAKE_BINARY_DIR}/Info.plist @ONLY)
-
-# Install the app bundle
-install(TARGETS BanjoRecompiled BUNDLE DESTINATION .)
-
-# Ensure the entitlements file exists
-if(NOT EXISTS ${ENTITLEMENTS_FILE})
-    message(FATAL_ERROR "Entitlements file not found at ${ENTITLEMENTS_FILE}")
-endif()
-
-# Post-build steps for macOS bundle
-add_custom_command(TARGET BanjoRecompiled POST_BUILD
-    # Copy and fix frameworks first
-    COMMAND ${CMAKE_COMMAND} -D CMAKE_BUILD_TYPE=$<CONFIG> -D CMAKE_GENERATOR=${CMAKE_GENERATOR} -P ${CMAKE_SOURCE_DIR}/.github/macos/fixup_bundle.cmake
-
-    # Copy all resources
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/assets ${CMAKE_BINARY_DIR}/temp_assets
-    COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/temp_assets/scss
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_BINARY_DIR}/temp_assets $<TARGET_BUNDLE_DIR:BanjoRecompiled>/Contents/Resources/assets
-    COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/temp_assets
-
-    # Copy controller database
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/recompcontrollerdb.txt $<TARGET_BUNDLE_DIR:BanjoRecompiled>/Contents/Resources/
-
-    # Set RPATH
-    COMMAND install_name_tool -add_rpath "@executable_path/../Frameworks/" $<TARGET_BUNDLE_DIR:BanjoRecompiled>/Contents/MacOS/BanjoRecompiled
-
-    # Sign the bundle
-    COMMAND codesign --verbose=4 --options=runtime --no-strict --sign - --entitlements ${ENTITLEMENTS_FILE} --deep --force $<TARGET_BUNDLE_DIR:BanjoRecompiled>
-
-    COMMENT "Performing post-build steps for macOS bundle"
-    VERBATIM
-)

.github/macos/entitlements.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.cs.allow-jit</key>
-	<true/>
-	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-	<true/>
-	<key>com.apple.security.cs.disable-executable-page-protection</key>
-	<true/>
-	<key>com.apple.security.cs.disable-library-validation</key>
-	<true/>
-</dict>
-</plist>

.github/macos/fixup_bundle.cmake

@@ -1,44 +0,0 @@
-include(BundleUtilities)
-
-# Check for pkgx installation
-find_program(PKGX_EXECUTABLE pkgx)
-
-# Xcode generator puts the build type in the build directory
-set(BUILD_PREFIX "")
-if (CMAKE_GENERATOR STREQUAL "Xcode")
-    set(BUILD_PREFIX "${CMAKE_BUILD_TYPE}/")
-endif()
-
-# Use generator expressions to get the absolute path to the bundle
-set(APPS "${BUILD_PREFIX}BanjoRecompiled.app/Contents/MacOS/BanjoRecompiled")
-
-# Set up framework search paths
-set(DIRS "${BUILD_PREFIX}BanjoRecompiled.app/Contents/Frameworks")
-
-# Detect if we're using pkgx
-if(PKGX_EXECUTABLE)
-    message(STATUS "pkgx detected, adding pkgx directories to framework search path")
-    list(APPEND DIRS "$ENV{HOME}/.pkgx/")
-endif()
-
-# Convert all paths to absolute paths
-file(REAL_PATH ${APPS} APPS)
-
-set(RESOLVED_DIRS "")
-foreach(DIR IN LISTS DIRS)
-    # Handle home directory expansion
-    string(REPLACE "~" "$ENV{HOME}" DIR "${DIR}")
-    # Convert to absolute path, but don't fail if directory doesn't exist
-    if(EXISTS "${DIR}")
-        file(REAL_PATH "${DIR}" RESOLVED_DIR)
-        list(APPEND RESOLVED_DIRS "${RESOLVED_DIR}")
-    endif()
-endforeach()
-
-# Debug output
-message(STATUS "Bundle fixup paths:")
-message(STATUS "  App: ${APPS}")
-message(STATUS "  Search dirs: ${RESOLVED_DIRS}")
-
-# Fix up the bundle
-fixup_bundle("${APPS}" "" "${RESOLVED_DIRS}")

.github/macos/ld64

@@ -1,73 +0,0 @@
-#!/usr/bin/python3
-"""
-Custom ld64 wrapper for macOS
-
-This script wraps the standard macOS linker (/usr/bin/ld) to modify executable memory
-protection flags in the resulting Mach-O binary. It works in three stages:
-
-1. First, it passes through all arguments to the regular macOS linker to create the binary
-2. Then, it parses command line arguments to identify output file and segment protection flags
-3. Finally, it modifies the output binary's Mach-O headers to ensure segments (particularly __TEXT)
-   have the maximum protection flags (rwx) we specify, even if the default macOS linker would restrict them
-
-This is necessary because macOS restricts writable+executable memory by default,
-but certain applications need this capability for dynamic code generation or JIT compilation.
-
-Usage: Same as the standard ld64 linker, with the added benefit that -segprot options
-will have their max_prot values properly preserved in the output binary.
-"""
-
-import sys
-import subprocess
-from itertools import takewhile
-from macholib import MachO, ptypes
-
-def parse_rwx(text):
-    return ('r' in text and 1) | ('w' in text and 2) | ('x' in text and 4)
-
-def apply_maxprots(path, maxprots):
-    mach = MachO.MachO(path)
-    header = mach.headers[0]
-    offset = ptypes.sizeof(header.mach_header)
-
-    for cload, ccmd, cdata in header.commands:
-        if not hasattr(ccmd, 'segname'):
-            break
-
-        if hasattr(ccmd.segname, 'to_str'):
-            segname = ccmd.segname.to_str().decode('utf-8').strip('\0')
-        else:
-            segname = ccmd.segname.decode('utf-8').strip('\0')
-
-        if segname in maxprots and ccmd.maxprot != maxprots[segname]:
-            fields = list(takewhile(lambda field: field[0] != 'maxprot', cload._fields_ + ccmd._fields_))
-            index = offset + sum(ptypes.sizeof(typ) for _, typ in fields)
-
-            with open(path, 'r+b') as fh:
-                fh.seek(index)
-                fh.write(bytes([maxprots[segname]]))
-
-        offset += cload.cmdsize
-
-try:
-    subprocess.check_call(['/usr/bin/ld'] + sys.argv[1:])
-except subprocess.CalledProcessError as ex:
-    sys.exit(ex.returncode)
-
-output_file = 'a.out'
-segprots = {'__TEXT': parse_rwx('rwx')}  # maxprot = rwx
-
-i = 1
-while i < len(sys.argv):
-    if sys.argv[i] == '-o' and i + 1 < len(sys.argv):
-        output_file = sys.argv[i + 1]
-        i += 2
-    elif sys.argv[i] == '-segprot' and i + 3 < len(sys.argv):
-        segment = sys.argv[i + 1]
-        maxprot = sys.argv[i + 2]
-        segprots[segment] = parse_rwx(maxprot)
-        i += 4
-    else:
-        i += 1
-
-apply_maxprots(output_file, segprots)

.github/macos/macports.yaml

@@ -1,16 +0,0 @@
-version: '2.10.6'
-prefix: '/opt/local'
-variants:
-  select:
-    - aqua
-    - metal
-  deselect: x11
-ports:
-  - name: libiconv
-    select: universal
-  - name: libsdl2
-    select: universal
-  - name: freetype
-    select: universal
-  - name: clang-18
-  - name: llvm-18

.github/workflows/update-pr-artifacts.yml

@@ -1,64 +0,0 @@
-name: update-pr-artifacts
-on:
-  workflow_run:
-    workflows: [validate-external, validate-internal]
-    types:
-      - completed
-jobs:
-  update-pr-artifacts:
-    runs-on: ubuntu-latest
-    if: (github.event.workflow_run.event == 'pull_request' || github.event.workflow_run.event == 'pull_request_target') && github.event.workflow_run.conclusion == 'success'
-    name: Update PR Artifacts
-    steps:
-      - name: Get PR Number
-        id: pr-number
-        uses: actions/github-script@v6
-        with:
-          result-encoding: string
-          script: |
-            const { owner, repo } = context.repo;
-            
-            const findPRNumber = async () => {
-              const pulls = await github.rest.pulls.list({ owner, repo });
-              for await (const { data } of github.paginate.iterator(pulls)) {
-                for (const pull of data) {
-                  if (pull.head.sha === '${{ github.event.workflow_run.head_sha }}' && pull.user.id === ${{ github.event.sender.id }}) {
-                    return pull.number;
-                  }
-                }
-              }
-
-              return null;
-            };
-
-            const prNumber = await findPRNumber();
-            if (!prNumber) {
-              core.error(`No matching pull request found`);
-            } else {
-              return prNumber;
-            }
-      - name: Create Artifacts Content
-        id: artifacts-content
-        uses: actions/github-script@v6
-        with:
-          result-encoding: string
-          script: |
-            const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              run_id: context.payload.workflow_run.id,
-            });
-            
-            const nightlyLinks = artifacts.data.artifacts.reduce((acc, item) => {
-              acc += `- [${item.name}.zip](https://nightly.link/${context.repo.owner}/${context.repo.repo}/actions/artifacts/${item.id}.zip)\n`;
-              return acc;
-            }, '### Build Artifacts\n');
-      
-            return nightlyLinks;
-      - name: Update PR Description
-        uses: garrettjoecox/pr-section@3.1.0
-        with:
-            section-name: 'artifacts'
-            repo-token: '${{ secrets.GITHUB_TOKEN }}'
-            pr-number: ${{ steps.pr-number.outputs.result }}
-            section-value: '${{ steps.artifacts-content.outputs.result }}'

.github/workflows/validate-external.yml

@@ -1,19 +0,0 @@
-name: validate-external
-on:
-  pull_request_target:
-    types: [opened, synchronize]
-jobs:
-  authorize:
-    if: github.repository != github.event.pull_request.head.repo.full_name
-    environment:
-      ${{ github.event_name == 'pull_request_target' &&
-      github.event.pull_request.head.repo.full_name != github.repository &&
-      'external' || 'internal' }}
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo ✓
-  build:
-    needs: authorize
-    uses: ./.github/workflows/validate.yml
-    secrets:
-      ZRE_REPO_WITH_PAT: ${{ secrets.ZRE_REPO_WITH_PAT }}

.github/workflows/validate-internal.yml

@@ -1,12 +0,0 @@
-name: validate-internal
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    types: [opened, synchronize]
-jobs:
-  build:
-    if: github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name
-    uses: ./.github/workflows/validate.yml
-    secrets: inherit

.github/workflows/validate.yml

@@ -1,414 +0,0 @@
-name: validate
-on:
-  workflow_call:
-    inputs:
-      SDL2_VERSION:
-        type: string
-        required: false
-        default: '2.30.3'
-      N64RECOMP_COMMIT:
-        type: string
-        required: false
-        default: '2b6f05688de2abc7d86da5b4a89b84c2c6acbabe'
-    secrets:
-      SECRET_NAME:
-        required: true
-      SECRET_TOKEN:
-        required: true
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-jobs:
-  build-linux:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        type: [ Debug, Release ]
-        os: [ ubuntu-22.04 ]
-    name: ubuntu-22.04 (x64, ${{ matrix.type }}, Native)
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-          submodules: recursive
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ matrix.os }}-banjo-ccache-${{ matrix.type }}-x64-${{ inputs.N64RECOMP_COMMIT }}
-      - name: Get extra dependencies
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ secrets.SECRET_NAME }}
-          token: ${{ secrets.SECRET_TOKEN }}
-          path: extra
-      - name: Install Linux Dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ninja-build libgtk-3-dev lld llvm clang-15 libfuse2
-          
-          # Install SDL2
-          echo ::group::install SDL2
-
-          # Enable ccache
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-
-          wget https://github.com/libsdl-org/SDL/releases/download/release-${{ inputs.SDL2_VERSION }}/SDL2-${{ inputs.SDL2_VERSION }}.tar.gz
-          tar -xzf SDL2-${{ inputs.SDL2_VERSION }}.tar.gz
-          cd SDL2-${{ inputs.SDL2_VERSION }}
-          ./configure
-          make -j 10
-          sudo make install
-          sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
-          echo ::endgroup::
-      - name: Build N64Recomp & RSPRecomp
-        run: |
-          git clone https://github.com/Mr-Wiseguy/N64Recomp.git --recurse-submodules N64RecompSource
-          cd N64RecompSource
-          git checkout ${{ inputs.N64RECOMP_COMMIT }}
-          git submodule update --init --recursive
-          
-          # enable ccache
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          
-          # Build N64Recomp & RSPRecomp
-          cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
-          cmake --build cmake-build --config Release --target N64RecompCLI -j $(nproc)
-          cmake --build cmake-build --config Release --target RSPRecomp -j $(nproc)
-          
-          # Copy N64Recomp & RSPRecomp to root directory
-          cp cmake-build/N64Recomp ..
-          cp cmake-build/RSPRecomp ..
-      - name: Run N64Recomp & RSPRecomp
-        run: |
-          # Copy extra dependencies to root directory
-          cp extra/* .
-          
-          ./N64Recomp banjo.us.rev0.toml
-          ./RSPRecomp n_aspMain.us.rev0.toml
-      - name: Build BanjoRecomp
-        run: |-
-          # enable ccache
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          
-          cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang++-15 -DCMAKE_C_COMPILER=clang-15 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build -DPATCHES_C_COMPILER=clang-15 -DPATCHES_LD=ld.lld-15
-          cmake --build cmake-build --config ${{ matrix.type }} --target BanjoRecompiled -j $(nproc)
-      - name: Prepare Archive
-        run: |
-          mv cmake-build/BanjoRecompiled BanjoRecompiled
-          rm -rf assets/scss
-          tar -czf BanjoRecompiled.tar.gz BanjoRecompiled assets/ recompcontrollerdb.txt
-      - name: Archive BanjoRecomp
-        uses: actions/upload-artifact@v4
-        with:
-          name: BanjoRecompiled-${{ runner.os }}-X64-${{ matrix.type }}
-          path: BanjoRecompiled.tar.gz
-  build-linux-arm64:
-    runs-on: ubuntu-22.04-arm
-    strategy:
-      matrix:
-        type: [ Debug, Release ]
-        os: [ ubuntu-22.04 ]
-    name: ${{ matrix.os }} (arm64, ${{ matrix.type }}, Native)
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-          submodules: recursive
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ matrix.os }}-banjo-ccache-${{ matrix.type }}-arm64-${{ inputs.N64RECOMP_COMMIT }}
-      - name: Install Linux Dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ninja-build libgtk-3-dev lld llvm clang-15 libfuse2
-          
-          # Install SDL2
-          echo ::group::install SDL2
-
-          # Enable ccache
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-
-          wget https://github.com/libsdl-org/SDL/releases/download/release-${{ inputs.SDL2_VERSION }}/SDL2-${{ inputs.SDL2_VERSION }}.tar.gz
-          tar -xzf SDL2-${{ inputs.SDL2_VERSION }}.tar.gz
-          cd SDL2-${{ inputs.SDL2_VERSION }}
-          ./configure
-          make -j 10
-          sudo make install
-          sudo cp -av /usr/local/lib/libSDL* /lib/aarch64-linux-gnu/
-          echo ::endgroup::
-      - name: Get extra dependencies
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ secrets.SECRET_NAME }}
-          token: ${{ secrets.SECRET_TOKEN }}
-          path: extra
-      - name: Build N64Recomp & RSPRecomp
-        run: |
-          git clone https://github.com/Mr-Wiseguy/N64Recomp.git --recurse-submodules N64RecompSource
-          cd N64RecompSource
-          git checkout ${{ inputs.N64RECOMP_COMMIT }}
-          git submodule update --init --recursive
-          
-          # enable ccache
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          
-          # Build N64Recomp & RSPRecomp
-          cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
-          cmake --build cmake-build --config Release --target N64RecompCLI -j $(nproc)
-          cmake --build cmake-build --config Release --target RSPRecomp -j $(nproc)
-          
-          # Copy N64Recomp & RSPRecomp to root directory
-          cp cmake-build/N64Recomp ..
-          cp cmake-build/RSPRecomp ..
-      - name: Run N64Recomp & RSPRecomp
-        run: |
-          # Copy extra dependencies to root directory
-          cp extra/* .
-          
-          ./N64Recomp banjo.us.rev0.toml
-          ./RSPRecomp n_aspMain.us.rev0.toml
-      - name: Build BanjoRecomp
-        run: |-
-          # enable ccache
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          
-          cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang++-15 -DCMAKE_C_COMPILER=clang-15 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
-          cmake --build cmake-build --config ${{ matrix.type }} --target BanjoRecompiled -j $(nproc)
-      - name: Prepare Archive
-        run: |
-          mv cmake-build/BanjoRecompiled BanjoRecompiled
-          rm -rf assets/scss
-          tar -czf BanjoRecompiled.tar.gz BanjoRecompiled assets/ recompcontrollerdb.txt
-      - name: Archive BanjoRecomp
-        uses: actions/upload-artifact@v4
-        with:
-          name: BanjoRecompiled-${{ runner.os }}-ARM64-${{ matrix.type }}
-          path: BanjoRecompiled.tar.gz
-  build-linux-flatpak:
-    runs-on: ubuntu-latest
-    env:
-      FLATPAK_ID: io.github.banjorecomp.banjorecomp
-      FREEDESKTOP_VERSION: 25.08
-      LLVM_VERSION: 20
-    strategy:
-      matrix:
-        type: [ Debug, Release ]
-        os: [ ubuntu-latest ]
-    name: ${{ matrix.os }} (x64, ${{ matrix.type }}, Flatpak)
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-          submodules: recursive
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ matrix.os }}-banjo-ccache-${{ matrix.type }}-x64-${{ inputs.N64RECOMP_COMMIT }}
-      - name: Install Linux Dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y flatpak-builder ccache lld
-
-      - name: Get extra dependencies
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ secrets.SECRET_NAME }}
-          token: ${{ secrets.SECRET_TOKEN }}
-          path: extra
-
-      - name: Prepare Flatpak
-        run: |
-          flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          flatpak --user install -y flathub org.freedesktop.Sdk//${{ env.FREEDESKTOP_VERSION }}
-          flatpak --user install -y flathub org.freedesktop.Sdk.Extension.llvm${{ env.LLVM_VERSION }}//${{ env.FREEDESKTOP_VERSION }}
-
-      - name: Build BanjoRecomp
-        run: |-
-          cp extra/* .
-          export CCACHE_DIR=/tmp/ccache
-          git config --global protocol.file.allow always
-          make -C patches CC=clang LD=ld.lld
-          flatpak-builder --user --force-clean --install-deps-from=flathub --repo=repo --ccache builddir ./flatpak/${{ env.FLATPAK_ID }}.json
-          flatpak build-bundle repo ./${{ env.FLATPAK_ID }}.flatpak ${{ env.FLATPAK_ID }} --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: BanjoRecompiled-Flatpak-X64-${{ matrix.type }}
-          path: ./${{ env.FLATPAK_ID }}.flatpak
-  build-windows:
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        type: [ Debug, RelWithDebInfo ]
-    name: windows (${{ matrix.type }})
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-          submodules: recursive
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ runner.os }}-banjo-ccache-${{ matrix.type }}
-      - name: Install Windows Dependencies
-        run: |
-          choco install ninja
-          Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force -ErrorAction SilentlyContinue
-      - name: Download portable LLVM
-        run: |
-          $ProgressPreference = 'SilentlyContinue'
-          Invoke-WebRequest -Uri "https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.3/LLVM-19.1.3-Windows-X64.tar.xz" -OutFile "LLVM.tar.xz"
-          New-Item -ItemType Directory -Path portable-llvm > $null
-          7z x LLVM.tar.xz
-          7z x LLVM.tar -oportable-llvm
-      - name: Configure Developer Command Prompt
-        uses: ilammy/msvc-dev-cmd@v1
-      - name: Get extra dependencies
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ secrets.SECRET_NAME }}
-          token: ${{ secrets.SECRET_TOKEN }}
-          path: extra
-      - name: Build N64Recomp & RSPRecomp
-        run: |
-          git clone https://github.com/Mr-Wiseguy/N64Recomp.git --recurse-submodules N64RecompSource
-          cd N64RecompSource
-          git checkout ${{ inputs.N64RECOMP_COMMIT }}
-          git submodule update --init --recursive
-
-          # enable ccache
-          set $env:PATH="$env:USERPROFILE/.cargo/bin;$env:PATH"
-          $cpuCores = (Get-CimInstance -ClassName Win32_Processor).NumberOfLogicalProcessors
-
-          cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
-          cmake --build cmake-build --config Release --target N64RecompCLI -j $cpuCores
-          cmake --build cmake-build --config Release --target RSPRecomp -j $cpuCores
-
-          # Copy N64Recomp & RSPRecomp to root directory
-          cp cmake-build/N64Recomp.exe ..
-          cp cmake-build/RSPRecomp.exe ..
-      - name: Run N64Recomp & RSPRecomp
-        run: |
-          # Copy extra dependencies to root directory
-          cp extra/* .
-
-          ./N64Recomp banjo.us.rev0.toml
-          ./RSPRecomp n_aspMain.us.rev0.toml
-      - name: Build BanjoRecomp
-        run: |-
-          # enable ccache
-          set $env:PATH="$env:USERPROFILE/.cargo/bin;$env:PATH"
-          $cpuCores = (Get-CimInstance -ClassName Win32_Processor).NumberOfLogicalProcessors
-
-          # remove LLVM from PATH so it doesn't overshadow the one provided by VS
-          $env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' }) -join ';'
-
-          cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_MAKE_PROGRAM=ninja -DPATCHES_C_COMPILER="..\portable-llvm\LLVM-19.1.3-Windows-X64\bin\clang" -DPATCHES_LD="..\portable-llvm\LLVM-19.1.3-Windows-X64\bin\ld.lld" -G Ninja -S . -B cmake-build -DCMAKE_CXX_FLAGS="-Xclang -fexceptions -Xclang -fcxx-exceptions"
-          cmake --build cmake-build --config ${{ matrix.type }} --target BanjoRecompiled -j $cpuCores
-        env:
-          SDL2_VERSION: ${{ inputs.SDL2_VERSION }}
-      - name: Prepare Archive
-        run: |
-          Move-Item -Path "cmake-build/BanjoRecompiled.exe" -Destination "BanjoRecompiled.exe"
-          Move-Item -Path "cmake-build/dxcompiler.dll" -Destination "dxcompiler.dll"
-          Move-Item -Path "cmake-build/dxil.dll" -Destination "dxil.dll"
-          Move-Item -Path "cmake-build/SDL2.dll" -Destination "SDL2.dll"
-          Move-Item -Path "cmake-build/BanjoRecompiled.pdb" -Destination "BanjoRecompiled.pdb"
-          Remove-Item -Path "assets/scss" -Recurse -Force
-      - name: Archive BanjoRecomp
-        uses: actions/upload-artifact@v4
-        with:
-          name: BanjoRecompiled-${{ runner.os }}-${{ matrix.type }}
-          path: |
-            BanjoRecompiled.exe
-            dxcompiler.dll
-            dxil.dll
-            SDL2.dll
-            assets/
-            recompcontrollerdb.txt
-      - name: Archive Debug Files
-        uses: actions/upload-artifact@v4
-        with:
-          name: BanjoRecompiled-PDB-${{ matrix.type }}
-          path: |
-            BanjoRecompiled.pdb
-  build-macos:
-    runs-on: macos-14
-    strategy:
-      matrix:
-        type: [ Debug, Release ]
-    name: macos (x64, arm64, ${{ matrix.type }})
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-          submodules: recursive
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ runner.os }}-banjo-ccache-${{ matrix.type }}
-      - name: Homebrew Setup
-        run: |
-          brew install ninja
-          brew uninstall --ignore-dependencies libpng freetype
-      - name: MacPorts Setup
-        uses: melusina-org/setup-macports@v1
-        id: 'macports'
-        with:
-          parameters: '.github/macos/macports.yaml'
-      - name: Get extra dependencies
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ secrets.SECRET_NAME }}
-          token: ${{ secrets.SECRET_TOKEN }}
-          path: extra
-      - name: Build N64Recomp & RSPRecomp
-        run: |
-          git clone https://github.com/Mr-Wiseguy/N64Recomp.git --recurse-submodules N64RecompSource
-          cd N64RecompSource
-          git checkout ${{ inputs.N64RECOMP_COMMIT }}
-          git submodule update --init --recursive
-          
-          # enable ccache
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          
-          # Build N64Recomp & RSPRecomp
-          cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
-          cmake --build cmake-build --config Release --target N64Recomp -j $(sysctl -n hw.ncpu)
-          cmake --build cmake-build --config Release --target RSPRecomp -j $(sysctl -n hw.ncpu)
-          
-          # Copy N64Recomp & RSPRecomp to root directory
-          cp cmake-build/N64Recomp ..
-          cp cmake-build/RSPRecomp ..
-      - name: Run N64Recomp & RSPRecomp
-        run: |
-          # Copy extra dependencies to root directory
-          cp extra/* .
-          
-          ./N64Recomp banjo.us.rev0.toml
-          ./RSPRecomp n_aspMain.us.rev0.toml
-      - name: Build BanjoRecomp
-        run: |-
-          # enable ccache
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          
-          cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build \
-          -DPATCHES_LD=/opt/local/bin/ld.lld-mp-18 -DCMAKE_AR=/opt/local/bin/llvm-ar-mp-18 -DPATCHES_C_COMPILER=/opt/local/bin/clang-mp-18 \
-          -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
-          cmake --build cmake-build --config ${{ matrix.type }} --target BanjoRecompiled -j $(sysctl -n hw.ncpu)
-      - name: Prepare Archive
-        run: |
-          mv cmake-build/BanjoRecompiled.app BanjoRecompiled.app
-          zip -r -y BanjoRecompiled.zip BanjoRecompiled.app
-      - name: Archive BanjoRecomp
-        uses: actions/upload-artifact@v4
-        with:
-          name: BanjoRecompiled-${{ runner.os }}-${{ matrix.type }}
-          path: BanjoRecompiled.zip

.gitignore

@@ -13,12 +13,8 @@ RecompiledPatches/
 
 # Linux build output
 build/
-build-cmake/
 *.o
 
-# Flatpak build process
-repo/
-
 # Windows build output
 *.exe
 *.dll

.gitmodules

@@ -1,15 +1,24 @@
 [submodule "lib/N64ModernRuntime"]
 	path = lib/N64ModernRuntime
 	url = https://github.com/N64Recomp/N64ModernRuntime
+[submodule "lib/RmlUi"]
+	path = lib/RmlUi
+	url = https://github.com/mikke89/RmlUi
+[submodule "lib/freetype-windows-binaries"]
+	path = lib/freetype-windows-binaries
+	url = https://github.com/ubawurinna/freetype-windows-binaries/
+[submodule "lib/lunasvg"]
+	path = lib/lunasvg
+	url = https://github.com/sammycage/lunasvg
 [submodule "lib/rt64"]
 	path = lib/rt64
 	url = https://github.com/rt64/rt64
+[submodule "lib/slot_map"]
+	path = lib/slot_map
+	url = https://github.com/SergeyMakeev/slot_map
 [submodule "lib/bk-decomp"]
 	path = lib/bk-decomp
 	url = https://gitlab.com/banjo.decomp/banjo-kazooie
 [submodule "BanjoRecompSyms"]
 	path = BanjoRecompSyms
 	url = https://github.com/BanjoRecomp/BanjoRecompSyms
-[submodule "lib/RecompFrontend"]
-	path = lib/RecompFrontend
-	url = https://github.com/N64Recomp/RecompFrontend

BUILDING.md

@@ -1,74 +0,0 @@
-# Building Guide
-
-This guide will help you build the project on your local machine. The process will require you to provide a decompressed ROM of the US version of the game.
-
-These steps cover: decompressing the ROM, running the recompiler and finally building the project.
-
-## 1. Clone the BanjoRecomp Repository
-This project makes use of submodules so you will need to clone the repository with the `--recurse-submodules` flag.
-
-```bash
-git clone --recurse-submodules
-# if you forgot to clone with --recurse-submodules
-# cd /path/to/cloned/repo && git submodule update --init --recursive
-```
-
-## 2. Install Dependencies
-
-### Linux
-For Linux the instructions for Ubuntu are provided, but you can find the equivalent packages for your preferred distro.
-
-```bash
-# For Ubuntu, simply run:
-sudo apt-get install cmake ninja-build libsdl2-dev libgtk-3-dev lld llvm clang
-```
-
-### Windows
-You will need to install [Visual Studio 2022](https://visualstudio.microsoft.com/downloads/).
-In the setup process you'll need to select the following options and tools for installation:
-- Desktop development with C++
-- C++ Clang Compiler for Windows
-- C++ CMake tools for Windows
-
-The other tool necessary will be `make` which can be installe via [Chocolatey](https://chocolatey.org/):
-```bash
-choco install make
-```
-
-## 3. Decompressing the target ROM
-You will need to decompress the NTSC-U 1.0 N64 Banjo-Kazooie ROM (sha1: d6133ace5afaa0882cf214cf88daba39e266c078) before running the recompiler.
-
-The most straightforward way to do this is to set up the [Banjo-Kazooie decompilation](https://gitlab.com/banjo.decomp/banjo-kazooie), which will decompress the ROM when building. Alternatively, you can run the [bk_rom_compressor tool](https://github.com/MittenzHugg/bk_rom_compressor) directly, which is what the decompilation uses to decompress the ROM.
-
-Regardless of which method you use, copy the decompressed ROM to the root of the BanjoRecomp repository with this filename:
-- `banjo.us.v10.decompressed.z64`
-
-## 4. Generating the C code
-
-Now that you have the required files, you must build [N64Recomp](https://github.com/N64Recomp/N64Recomp) and run it to generate the C code to be compiled. The building instructions can be found [here](https://github.com/N64Recomp/N64Recomp?tab=readme-ov-file#building). That will build the executables: `N64Recomp` and `RSPRecomp` which you should copy to the root of the BanjoRecomp repository.
-
-After that, go back to the repository root, and run the following commands:
-```bash
-./N64Recomp banjo.us.rev0.toml
-./RSPRecomp n_aspMain.us.rev0.toml
-```
-
-## 5. Building the Project
-
-Finally, you can build the project! :rocket:
-
-On Windows, you can open the repository folder with Visual Studio, and you'll be able to `[build / run / debug]` the project from there.
-
-If you prefer the command line or you're on a Unix platform you can build the project using CMake:
-
-```bash
-cmake -S . -B build-cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -G Ninja -DCMAKE_BUILD_TYPE=Release # or Debug if you want to debug
-cmake --build build-cmake --target BanjoRecompiled -j$(nproc) --config Release # or Debug
-```
-
-## 6. Success
-
-Voilà! You should now have a `BanjoRecompiled` executable in the build directory! If you used Visual Studio this will be `out/build/x64-[Configuration]` and if you used the provided CMake commands then this will be `build-cmake`. You will need to run the executable out of the root folder of this project or copy the assets folder to the build folder to run it.
-
-> [!IMPORTANT]
-> In the game itself, you should be using a standard ROM, not the decompressed one.

CMakeLists.txt

@@ -51,9 +51,18 @@ endif()
 
 add_subdirectory(${CMAKE_SOURCE_DIR}/lib/rt64 ${CMAKE_BINARY_DIR}/rt64)
 
+# set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
 set(BUILD_SHARED_LIBS OFF)
+SET(LUNASVG_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+add_subdirectory(${CMAKE_SOURCE_DIR}/lib/lunasvg)
+# set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")
+SET(RMLUI_SVG_PLUGIN ON CACHE BOOL "" FORCE)
+SET(RMLUI_TESTS_ENABLED OFF CACHE BOOL "" FORCE)
+add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RmlUi)
+target_compile_definitions(rmlui_core PRIVATE LUNASVG_BUILD_STATIC)
 
 add_subdirectory(${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime)
+add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RecompFrontend)
 
 target_include_directories(rt64 PRIVATE ${CMAKE_BINARY_DIR}/rt64/src)
 
@@ -140,7 +149,6 @@ add_custom_command(OUTPUT
 add_executable(BanjoRecompiled)
 
 set (SOURCES
-    ${CMAKE_SOURCE_DIR}/src/main/launcher_animation.cpp
     ${CMAKE_SOURCE_DIR}/src/main/main.cpp
     ${CMAKE_SOURCE_DIR}/src/main/register_overlays.cpp
     ${CMAKE_SOURCE_DIR}/src/main/register_patches.cpp
@@ -149,16 +157,22 @@ set (SOURCES
     ${CMAKE_SOURCE_DIR}/src/game/config.cpp
     ${CMAKE_SOURCE_DIR}/src/game/debug.cpp
     ${CMAKE_SOURCE_DIR}/src/game/recomp_api.cpp
-    ${CMAKE_SOURCE_DIR}/src/game/recomp_extension_api.cpp
+    ${CMAKE_SOURCE_DIR}/src/game/recomp_actor_api.cpp
     ${CMAKE_SOURCE_DIR}/src/game/recomp_data_api.cpp
     ${CMAKE_SOURCE_DIR}/src/game/rom_decompression.cpp
 
     ${CMAKE_SOURCE_DIR}/rsp/n_aspMain.cpp
+
+    ${CMAKE_SOURCE_DIR}/lib/RmlUi/Backends/RmlUi_Platform_SDL.cpp
 )
 
 target_include_directories(BanjoRecompiled PRIVATE
     ${CMAKE_SOURCE_DIR}/include
     ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/N64Recomp/include
+    ${CMAKE_SOURCE_DIR}/lib/concurrentqueue
+    ${CMAKE_SOURCE_DIR}/lib/GamepadMotionHelpers
+    ${CMAKE_SOURCE_DIR}/lib/RmlUi/Include
+    ${CMAKE_SOURCE_DIR}/lib/RmlUi/Backends
     ${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib
     ${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/hlslpp/include
     ${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/dxc/inc
@@ -168,19 +182,13 @@ target_include_directories(BanjoRecompiled PRIVATE
     ${CMAKE_SOURCE_DIR}/lib/RecompFrontend/recompinput/include
     ${CMAKE_SOURCE_DIR}/lib/RecompFrontend/recompui/include
     ${CMAKE_SOURCE_DIR}/lib/RecompFrontend/recompui/src
+    ${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/include
     ${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/nativefiledialog-extended/src/include
-    ${CMAKE_SOURCE_DIR}/lib/SlotMap
+    ${CMAKE_SOURCE_DIR}/lib/slot_map/slot_map
+    ${CMAKE_BINARY_DIR}/shaders
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-# Generate icon_bytes.c from the app icon PNG.
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.c ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.h
-    COMMAND file_to_c ${CMAKE_SOURCE_DIR}/icons/app.png icon_bytes ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.c ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.h
-    DEPENDS ${CMAKE_SOURCE_DIR}/icons/app.png
-)
-
-target_sources(BanjoRecompiled PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.c)
-
 if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
     target_compile_options(BanjoRecompiled PRIVATE
         -march=nehalem
@@ -240,12 +248,12 @@ if (WIN32)
         PROPERTIES
             LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE"
             LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup"
-            LINK_FLAGS_RELWITHDEBINFO  "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup"
+            LINK_FLAGS_RELWITHDEBINFO  "/SUBSYSTEM:CONSOLE" # "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup"
             LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup"
     )
 
-    target_sources(BanjoRecompiled PRIVATE ${CMAKE_SOURCE_DIR}/icons/app.rc)
-    target_link_libraries(BanjoRecompiled PRIVATE SDL2 Winmm.lib)
+    # target_sources(BanjoRecompiled PRIVATE ${CMAKE_SOURCE_DIR}/icons/app.rc)
+    target_link_libraries(BanjoRecompiled PRIVATE SDL2)
 endif()
 
 if (APPLE)
@@ -265,9 +273,15 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
     find_package(SDL2 REQUIRED)
     find_package(X11 REQUIRED)
 
-    add_compile_definitions("PLUME_SDL_VULKAN_ENABLED")
     add_compile_definitions("RT64_SDL_WINDOW_VULKAN")
 
+    # Generate icon_bytes.c from the app icon PNG.
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.c ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.h
+        COMMAND file_to_c ${CMAKE_SOURCE_DIR}/icons/512.png icon_bytes ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.c ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.h
+        DEPENDS ${CMAKE_SOURCE_DIR}/icons/512.png
+    )
+    target_sources(BanjoRecompiled PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.c)
+
     message(STATUS "SDL2_FOUND = ${SDL2_FOUND}")
     message(STATUS "SDL2_INCLUDE_DIRS = ${SDL2_INCLUDE_DIRS}")
 
@@ -297,6 +311,20 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
     target_link_libraries(BanjoRecompiled PRIVATE "-latomic -static-libstdc++" ${CMAKE_DL_LIBS} Threads::Threads)
 endif()
 
+target_link_libraries(BanjoRecompiled PRIVATE
+    PatchesLib
+    RecompiledFuncs
+    librecomp
+    ultramodern
+    rt64
+    RmlUi::Core
+    RmlUi::Debugger
+    recompinput
+    recompui
+    nfd
+    lunasvg
+)
+
 # TODO fix the rt64 CMake script so that this doesn't need to be duplicated here
 # For DXC
 set (DXC_COMMON_OPTS "-I${PROJECT_SOURCE_DIR}/src")
@@ -329,21 +357,8 @@ else()
     endif()
 endif()
 
-set(RECOMP_FRONTEND_N64MODERNRUNTIME_PATH ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime)
-set(RECOMP_FRONTEND_RT64_PATH ${CMAKE_SOURCE_DIR}/lib/rt64)
-
-add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RecompFrontend)
-
-target_link_libraries(BanjoRecompiled PRIVATE
-    PatchesLib
-    RecompiledFuncs
-    recompui
-    recompinput
-    librecomp
-    ultramodern
-    rt64
-    nfd
-)
+build_vertex_shader(BanjoRecompiled "shaders/InterfaceVS.hlsl" "shaders/InterfaceVS.hlsl")
+build_pixel_shader(BanjoRecompiled "shaders/InterfacePS.hlsl" "shaders/InterfacePS.hlsl")
 
 # Embed all .nrm files in the "mods" directory
 file(GLOB NRM_FILES "${CMAKE_SOURCE_DIR}/mods/*.nrm")

README.md

@@ -1,131 +0,0 @@
-# Banjo: Recompiled
-Banjo: Recompiled is a project that uses [N64: Recompiled](https://github.com/N64Recomp/N64Recomp) to **statically recompile** Banjo-Kazooie into a native port with many new features, enhancements, and extensive mod support. This project uses [RT64](https://github.com/rt64/rt64) as the rendering engine to provide graphical enhancements.
-
-### [Check out the latest release here](https://github.com/BanjoRecomp/BanjoRecomp/releases/latest).
-
-Join the [N64: Recompiled Community Discord](https://discord.gg/AWZThJ4dPf) to discuss this and other N64: Recompiled projects!
-
-[![Discord Invitation](https://discordapp.com/api/guilds/1374083583739826328/widget.png?style=banner2 'N64 Recomp')](https://discord.gg/AWZThJ4dPf)
-
-### **This repository and its releases do not contain game assets. The original game is required to build or run this project.**
-
-## Table of Contents
-* [System Requirements](#system-requirements)
-* [Features](#features)
-  * [Plug and Play](#plug-and-play)
-  * [Fully Intact N64 Effects](#fully-intact-n64-effects)
-  * [Faithful Audio](#faithful-audio)
-  * [Easy-to-Use Menus](#easy-to-use-menus)
-  * [High Framerate Support](#high-framerate-support)
-  * [Widescreen and Ultrawide Support](#widescreen-and-ultrawide-support)
-  * [Mod Support](#mod-support)
-  * [Dual Analog Camera](#dual-analog-camera)
-  * [Note Saving](#note-saving)
-  * [Low Input Lag](#low-input-lag)
-  * [Instant Load Times](#instant-load-times)
-  * [Linux and Steam Deck Support](#linux-and-steam-deck-support)
-* [Planned Features](#planned-features)
-* [FAQ](#faq)
-* [Known Issues](#known-issues)
-* [Building](#building)
-* [Libraries Used and Projects Referenced](#libraries-used-and-projects-referenced)
-
-## System Requirements
-A GPU supporting Direct3D 12.0 (Shader Model 6), Vulkan 1.2, or Metal Argument Buffers Tier 2 support is required to run this project. The oldest GPUs that should be supported for each vendor are:
-* GeForce GT 630
-* Radeon HD 7750 (the one from 2012, not to be confused with the RX 7000 series) and newer
-* Intel HD 510 (Skylake)
-* A Mac with Apple Silicon or an Intel 7th Gen CPU with MacOS 13.0+
-
-On x86-64 PCs, a CPU supporting the SSE4.1 instruction set is also required (Intel Core 2 Penryn series or AMD Bulldozer and newer). ARM64 builds will work on any ARM64 CPU.
-
-If you have issues with crashes on startup, make sure your graphics drivers are fully up to date. 
-
-## Features
-
-#### Plug and Play
-Simply provide your copy of the North American 1.0 version of the game in the main menu and start playing! This project will automatically load assets from the provided copy, so there is no need to go through a separate extraction step or build the game yourself.
-
-#### Fully Intact N64 Effects
-All advanced graphical effects, such as the jigsaw puzzle screen transition and Bottles' Moving Picture Game are fully intact and have been adapted for widescreen and high framerates. Fine details such as the game's original mipmapping preserved with a high degree of accuracy.
-
-#### Faithful Audio
-Music and sounds are perfectly faithful to the original N64 version of game, with all audio processing intact and no popping or stuttering. Scenes that synchronize audio to visuals have their timings corrected to ensure they remain synchronized as they did on original hardware.
-
-#### Easy-to-Use Menus
-Gameplay settings, graphics settings, input mappings, and audio settings can all be configured with the in-game config menu. The menus can all be used with mouse, controller, or keyboard for maximum convenience.
-
-#### High Framerate Support
-Play at any framerate you want thanks to functionality provided by RT64! Game objects and terrain, texture scrolling, screen effects, and all HUD elements are all rendered at high framerates. By default, this project is configured to run at your monitor's refresh rate. You can also play at the original framerate of the game if you prefer. **Changing framerate has no effect on gameplay.**
-
-**Note**: External framerate limiters (such as the NVIDIA Control Panel) are known to potentially cause problems, so if you notice any stuttering then turn them off and use the manual framerate slider in the in-game graphics menu instead.
-
-#### Widescreen and Ultrawide Support
-Any aspect ratio is supported, with all effects modded to work correctly in widescreen. The HUD can also be positioned at 16:9 when using ultrawide aspect ratios if preferred. Game models have been extended where necessary to ensure cutscenes work correctly in 16:9 aspect ratio. Cutscenes can also be optionally pillarboxed to 16:9 or the game's original aspect ratio to hide any details that weren't meant to be visible.
-
-#### Mod Support
-Install community made mods and texture packs! Mods can change any part of the game, including adding completely new features and content. You can install mods by simply dragging the mod files onto the game window before starting the game or by clicking the **Install Mods** button in the mod menu. Mods can be toggled in the mod menu, and some mods can be configured there as well.
-
-A Thunderstore mod hosting page is currently being set up for this project. In the meantime, you can find the mods showcased in the release trailer here:
-
-* [BK Jiggies of Time](https://github.com/Mr-Wiseguy/JiggiesOfTimeRecomp/releases/latest)
-* [BK Nostalgia 64](https://github.com/Mr-Wiseguy/Nostalgia64Recomp/releases/latest)
-* [BK Reloaded Texture Pack](https://evilgames.eu/texture-packs/bk-reloaded.htm)
-
-If you're interested in making mods for this project, check out [the mod template](https://github.com/BanjoRecomp/BKRecompModTemplate) and [the modding documentation](https://hackmd.io/fMDiGEJ9TBSjomuZZOgzNg). If you're interested in making texture packs, check out [the RT64 documentation](https://github.com/rt64/rt64/blob/main/TEXTURE-PACKS.md). You can also join the [N64: Recompiled Modding Discord server](https://discord.gg/Z8Nbm455D4).
-
-#### Dual Analog Camera
-Play with a dual analog control for finer camera control! When this option is enabled, the right analog stick will control the camera. Buttons mapped to the right analog stick will still work while crouching, so you can keep the C-buttons mapped to it even when this setting is enabled.
-
-#### Note Saving
-Keep your notes when leaving a level or dying like in later releases of the game!
-
-This setting can be turned off to restore the N64 version's note score mechanic. Changing this setting will only take effect when returning to Grunty's Lair or restarting the game.
-
-#### Low Input Lag
-This project has been optimized to have as little input lag as possible, making the game feel more responsive than ever!
-
-#### Instant Load Times
-Saving and loading files, going from place to place, and pausing all happen in the blink of an eye thanks to the game running natively on modern hardware.
-
-#### Linux and Steam Deck Support
-A Linux binary as well as a Flatpak is available for playing on most up-to-date distros, including on the Steam Deck.
-
-To play on Steam Deck, extract the Linux build onto your deck. Then, in desktop mode, right click the BanjoRecompiled executable file and select "Add to Steam". From there, you can return to Gaming mode and configure the controls as needed.
-
-## Planned Features
-* Ray Tracing via RT64
-
-## FAQ
-
-#### What is static recompilation?
-Static recompilation is the process of automatically translating an application from one platform to another. For more details, check out the full description of how this project's recompilation works here: [N64: Recompiled](https://github.com/Mr-Wiseguy/N64Recomp).
-
-#### How is this related to the decompilation project?
-Unlike N64 ports in the past, this project is not based on the source code provided by a decompilation of the game. This is because static recompilation bypasses the need for decompiled source code when making a port, allowing ports to be made **without source code**. However, the reverse engineering work done by the decompilation team was invaluable for providing some of the enhancements featured in this project. For this reason, the project uses headers and some functions from the decompilation project in order to make modifications to the game. Many thanks to the decompilation team for all of the hard work they've done.
-
-#### Where is the savefile stored?
-- Windows: `%LOCALAPPDATA%\BanjoRecompiled\saves`
-- Linux: `~/.config/BanjoRecompiled/saves`
-- macOS: `~/Library/Application Support/BanjoRecompiled/saves`
-
-#### How do I choose a different ROM?
-**You don't.** This project is **only** a port of Banjo-Kazooie, and it will only accept one specific ROM: the US 1.0 version of the N64 release of Banjo-Kazooie. ROMs in formats other than .z64 will be automatically converted, as long as it is the correct ROM. **This is not an emulator, and it cannot run any arbitrary ROM.**
-
-Instead, you can change the game by installing mods. See the [mod support](#mod-support) section for details.
-
-#### Can you run this project as a portable application?
-Yes, if you place a file named `portable.txt` in the same folder as the executable then this project will run in portable mode. In portable mode, the save files, config files, and mods are placed in the same folder as the executable.
-
-## Known Issues
-* Overlays such as MSI Afterburner and other software such as Wallpaper Engine can cause performance issues with this project that prevent the game from rendering correctly. Disabling such software is recommended.
-
-## Building
-Building is not required to play this project, as prebuilt binaries (which do not contain game assets) can be found in the [Releases](https://github.com/BanjoRecomp/BanjoRecomp/releases) section. Instructions on how to build this project can be found in the [BUILDING.md](BUILDING.md) file.
-
-## Libraries Used and Projects Referenced
-* [N64Recomp](https://github.com/N64Recomp/N64Recomp) for statically recompiling the game's code to run natively
-* [RT64](https://github.com/rt64/rt64) for the project's rendering engine
-* [N64ModernRuntime](https://github.com/N64Recomp/N64ModernRuntime) for replacing the original N64 runtime libraries and providing mod support
-* [RecompFrontend](https://github.com/N64Recomp/RecompFrontend) for menus and input handling
-* [Banjo-Kazooie Decompilation](https://gitlab.com/banjo.decomp/banjo-kazooie) for headers and some function definitions, used for making patches or some enhancements

assets/Banjo.svg

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 649 622" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-367,-304)">
-        <g transform="matrix(0.946016,0,0,0.946016,29.4118,58.1121)">
-            <g id="Banjo" transform="matrix(19.8117,0,0,19.8117,336.522,82.7412)">
-                <g>
-                    <g>
-                        <path d="M15.411,23.721L16.802,21.264L15.038,16.771C14.44,13.215 16.372,8.93 20.504,9.189C28.893,10.832 37.74,18.394 35.195,32.829C34.692,35.685 31.138,37.414 29.053,36.96" style="fill:rgb(111,36,6);"/>
-                        <path d="M15.038,35.777C15.056,39.159 17.023,42.13 19.725,42.13C26.084,42.13 30.194,36.258 31.12,34.02C32.045,31.782 33.531,27.026 31.12,24.615C29.348,22.843 25.753,21.06 19.991,23.173" style="fill:rgb(255,206,140);"/>
-                        <path d="M28.506,13.481C30.336,11.364 31.158,10.191 33.077,12.435C34.465,14.058 34.168,15.414 31.874,17.788" style="fill:rgb(111,36,6);"/>
-                        <g transform="matrix(0.74875,0,0,0.727217,7.57778,3.95431)">
-                            <path d="M28.941,12.931C30.707,10.695 31.557,9.588 33.539,12.106C34.861,13.784 34.44,15.653 31.992,17.508C31.479,15.668 30.044,14.066 28.941,12.931Z" style="fill:rgb(255,206,140);"/>
-                        </g>
-                        <path d="M16.108,35.523C16.325,39.271 20.035,39.854 22.515,38.056C24.764,36.425 25.913,32.747 24.171,29.342" style="fill:rgb(186,87,87);"/>
-                        <clipPath id="_clip1">
-                            <path d="M16.108,35.523C16.325,39.271 20.035,39.854 22.515,38.056C24.764,36.425 25.913,32.747 24.171,29.342"/>
-                        </clipPath>
-                        <g clip-path="url(#_clip1)">
-                            <path d="M17.337,37.397C19.65,34.474 22.629,33.498 24.081,35.425L23.994,39.036L16.623,39.792L17.337,37.397Z" style="fill:rgb(225,151,151);"/>
-                            <path d="M16.709,35.345C16.811,37.082 17.425,37.886 18.875,38.022C21.324,38.253 24.213,36.316 25.008,33.12C28.305,38.592 25.787,40.96 18.875,40.981C15.876,39.827 14.338,38.095 15.374,35.345" style="fill:white;"/>
-                        </g>
-                        <g>
-                            <path d="M19.427,17.547C18.324,14.059 15.417,15.606 14.776,17.152C14.267,18.381 14.228,20.129 14.776,21.21C15.506,22.65 17.747,24.305 19.427,21.279C19.865,20.49 19.735,18.522 19.427,17.547Z" style="fill:white;"/>
-                            <path d="M23.5,14.989C20.518,14.838 18.529,17.828 19.101,20.275C19.38,21.474 20.275,22.542 21.968,23.047C26.221,24.314 28.194,15.65 23.5,14.989" style="fill:white;"/>
-                            <g transform="matrix(1.05952,0.153499,-0.15249,1.05255,1.44489,-4.37471)">
-                                <clipPath id="_clip2">
-                                    <path d="M22.982,15.046C20.205,15.306 18.767,18.357 19.623,20.557C20.042,21.635 21.012,22.509 22.645,22.75C26.746,23.356 27.41,15.027 22.982,15.046"/>
-                                </clipPath>
-                                <g clip-path="url(#_clip2)">
-                                    <path d="M23.062,17.048C24.572,17.048 25.088,18.282 25.088,19.802C25.088,21.322 24.441,22.556 23.062,22.556C21.552,22.556 21.037,21.322 21.037,19.802C21.037,18.282 21.755,17.048 23.062,17.048Z" style="fill:rgb(65,175,239);"/>
-                                    <clipPath id="_clip3">
-                                        <path d="M23.062,17.048C24.572,17.048 25.088,18.282 25.088,19.802C25.088,21.322 24.441,22.556 23.062,22.556C21.552,22.556 21.037,21.322 21.037,19.802C21.037,18.282 21.755,17.048 23.062,17.048Z"/>
-                                    </clipPath>
-                                    <g clip-path="url(#_clip3)">
-                                        <g transform="matrix(1,0,0,1,0.368837,-1.57879)">
-                                            <path d="M23.062,17.048C24.572,17.048 25.088,18.282 25.088,19.802C25.088,21.322 24.441,22.556 23.062,22.556C21.552,22.556 21.044,21.376 21.044,19.856C21.044,18.336 21.755,17.048 23.062,17.048Z" style="fill:rgb(7,121,188);"/>
-                                        </g>
-                                        <g transform="matrix(0.53744,1.64783e-17,-1.64783e-17,0.53744,11.0687,9.25602)">
-                                            <clipPath id="_clip4">
-                                                <path d="M22.982,15.046C20.205,15.306 18.767,18.357 19.623,20.557C20.042,21.635 21.012,22.509 22.645,22.75C26.746,23.356 27.41,15.027 22.982,15.046"/>
-                                            </clipPath>
-                                            <g clip-path="url(#_clip4)">
-                                                <path d="M23.062,17.048C24.572,17.048 25.088,18.282 25.088,19.802C25.088,21.322 24.441,22.556 23.062,22.556C21.552,22.556 21.037,21.322 21.037,19.802C21.037,18.282 21.755,17.048 23.062,17.048Z"/>
-                                            </g>
-                                        </g>
-                                        <g transform="matrix(0.264491,0.0301672,-0.0297719,0.264491,17.1628,13.1906)">
-                                            <clipPath id="_clip5">
-                                                <path d="M22.982,15.046C20.205,15.306 18.767,18.357 19.623,20.557C20.042,21.635 21.012,22.509 22.645,22.75C26.746,23.356 27.41,15.027 22.982,15.046"/>
-                                            </clipPath>
-                                            <g clip-path="url(#_clip5)">
-                                                <path d="M23.062,17.048C24.572,17.048 25.088,18.282 25.088,19.802C25.088,21.322 24.441,22.556 23.062,22.556C21.552,22.556 21.037,21.322 21.037,19.802C21.037,18.282 21.755,17.048 23.062,17.048Z" style="fill:white;"/>
-                                            </g>
-                                        </g>
-                                    </g>
-                                    <path d="M25.086,19.953C25.086,19.962 25.085,19.97 25.085,19.978C25.067,20.476 24.984,20.868 24.875,21.175C25.011,20.789 25.073,20.363 25.086,19.953ZM24.325,22.071C24.007,22.377 23.588,22.556 23.062,22.556C21.552,22.556 21.037,21.322 21.037,19.802C21.037,18.282 21.755,17.048 23.062,17.048C24.498,17.048 25.035,18.164 25.084,19.58C25.07,19.213 25.019,18.875 24.95,18.61C24.561,17.118 23.478,17.07 23.062,17.067L23.062,17.299C23.062,17.306 22.531,17.235 22.045,17.628C21.357,18.183 21.1,19.281 21.19,20.41C21.316,21.985 22.134,22.536 23.157,22.522C23.751,22.515 24.131,22.252 24.325,22.071ZM24.875,21.175C24.87,21.188 24.865,21.202 24.861,21.215C24.773,21.452 24.66,21.665 24.522,21.848C24.638,21.694 24.769,21.476 24.875,21.175Z" style="fill:rgb(7,121,188);"/>
-                                </g>
-                            </g>
-                            <g transform="matrix(0.976398,-0.00871671,0.0091843,1.02877,-5.67531,-0.415767)">
-                                <path d="M23.062,17.048C24.664,17.048 25.088,18.282 25.088,19.802C25.088,21.322 24.416,22.556 23.062,22.556C21.461,22.556 21.11,21.416 21.11,19.896C21.11,18.375 21.869,17.048 23.062,17.048Z" style="fill:rgb(65,175,239);"/>
-                                <clipPath id="_clip6">
-                                    <path d="M23.062,17.048C24.664,17.048 25.088,18.282 25.088,19.802C25.088,21.322 24.416,22.556 23.062,22.556C21.461,22.556 21.11,21.416 21.11,19.896C21.11,18.375 21.869,17.048 23.062,17.048Z"/>
-                                </clipPath>
-                                <g clip-path="url(#_clip6)">
-                                    <g transform="matrix(1,0,0,1,0.661429,-1.55465)">
-                                        <path d="M23.062,17.048C24.664,17.048 25.088,18.282 25.088,19.802C25.088,21.322 24.416,22.556 23.062,22.556C21.461,22.556 20.622,20.935 21.017,19.398C21.396,17.921 21.869,17.048 23.062,17.048Z" style="fill:rgb(7,121,188);"/>
-                                    </g>
-                                    <g transform="matrix(0.53744,-2.16183e-18,-2.27597e-17,0.53744,11.0608,9.33321)">
-                                        <clipPath id="_clip7">
-                                            <path d="M25.328,17.462C23.752,13.788 20.732,15.77 19.87,17.392C17.949,21.006 21.567,25.434 25.638,21.482C25.656,21.464 25.675,21.446 25.694,21.428"/>
-                                        </clipPath>
-                                        <g clip-path="url(#_clip7)">
-                                            <path d="M23.062,17.048C24.664,17.048 25.088,18.282 25.088,19.802C25.088,21.322 24.416,22.556 23.062,22.556C21.461,22.556 21.037,21.322 21.037,19.802C21.037,18.282 21.869,17.048 23.062,17.048Z"/>
-                                        </g>
-                                    </g>
-                                    <g transform="matrix(0.280835,0.0606888,-0.0622655,0.25954,17.4675,12.6085)">
-                                        <clipPath id="_clip8">
-                                            <path d="M25.328,17.462C23.752,13.788 20.732,15.77 19.87,17.392C17.949,21.006 21.567,25.434 25.638,21.482C25.656,21.464 25.675,21.446 25.694,21.428"/>
-                                        </clipPath>
-                                        <g clip-path="url(#_clip8)">
-                                            <path d="M23.062,17.048C24.664,17.048 25.088,18.282 25.088,19.802C25.088,21.322 24.416,22.556 23.062,22.556C21.461,22.556 21.037,21.322 21.037,19.802C21.037,18.282 21.869,17.048 23.062,17.048Z" style="fill:white;"/>
-                                        </g>
-                                    </g>
-                                </g>
-                                <path d="M25.052,20.39C25.052,20.391 25.052,20.391 25.052,20.391C25.025,20.607 24.983,20.813 24.925,21.007C25.031,20.648 25.084,20.249 25.088,19.832C25.088,19.855 25.087,19.878 25.087,19.9C25.083,20.058 25.073,20.225 25.052,20.39ZM23.948,22.34C23.695,22.479 23.4,22.556 23.062,22.556C21.461,22.556 21.11,21.416 21.11,19.896C21.11,18.376 21.869,17.048 23.062,17.048L23.062,17.307C22.89,17.304 22.333,17.294 21.83,17.998C21.555,18.383 21.285,19.033 21.255,19.896C21.197,21.55 21.606,22.497 23.078,22.532C23.508,22.542 23.818,22.414 23.99,22.317C23.98,22.323 23.971,22.328 23.961,22.333C23.956,22.336 23.952,22.339 23.948,22.34ZM24.302,22.082C24.251,22.13 24.198,22.174 24.143,22.216C24.216,22.161 24.285,22.101 24.349,22.036C24.333,22.052 24.318,22.067 24.302,22.082ZM24.349,22.036C24.502,21.879 24.672,21.651 24.811,21.325C24.72,21.54 24.607,21.733 24.471,21.9C24.432,21.947 24.392,21.992 24.349,22.036ZM23.062,17.048C24.589,17.048 25.045,18.168 25.085,19.589C25.08,19.443 25.07,19.296 25.054,19.147C24.985,18.494 24.805,17.971 24.482,17.613C24.003,17.084 23.343,17.07 23.062,17.068L23.062,17.048Z" style="fill:rgb(7,121,188);"/>
-                            </g>
-                            <g transform="matrix(0.260875,0.114682,-0.0945952,0.215183,19.9731,15.1626)">
-                                <clipPath id="_clip9">
-                                    <path d="M22.982,15.046C20.205,15.306 18.767,18.357 19.623,20.557C20.042,21.635 21.012,22.509 22.645,22.75C26.746,23.356 27.41,15.027 22.982,15.046"/>
-                                </clipPath>
-                                <g clip-path="url(#_clip9)">
-                                    <path d="M23.062,17.048C24.572,17.048 25.088,18.282 25.088,19.802C25.088,21.322 24.441,22.556 23.062,22.556C21.552,22.556 21.037,21.322 21.037,19.802C21.037,18.282 21.755,17.048 23.062,17.048Z" style="fill:white;"/>
-                                </g>
-                            </g>
-                            <g transform="matrix(0.27972,0.0291679,-0.0255573,0.245094,12.2906,16.2888)">
-                                <clipPath id="_clip10">
-                                    <path d="M25.328,17.462C23.752,13.788 20.732,15.77 19.87,17.392C17.949,21.006 21.567,25.434 25.638,21.482C25.656,21.464 25.675,21.446 25.694,21.428"/>
-                                </clipPath>
-                                <g clip-path="url(#_clip10)">
-                                    <path d="M23.062,17.048C24.664,17.048 25.088,18.282 25.088,19.802C25.088,21.322 24.416,22.556 23.062,22.556C21.461,22.556 21.037,21.322 21.037,19.802C21.037,18.282 21.869,17.048 23.062,17.048Z" style="fill:white;"/>
-                                </g>
-                            </g>
-                        </g>
-                        <path d="M22.021,9.551C17.546,8.366 12.927,8.618 10.575,14.496C13.332,15.58 16.969,14.792 20.963,12.389" style="fill:rgb(111,36,6);"/>
-                        <g transform="matrix(0.99548,-0.0949726,0.0949726,0.99548,-0.729626,2.03017)">
-                            <path d="M20.504,9.189C16.028,8.005 12.927,8.618 10.575,14.496C13.332,15.58 16.969,14.792 20.963,12.389" style="fill:rgb(111,36,6);"/>
-                        </g>
-                        <g transform="matrix(0.932428,-0.164274,0.175814,0.997929,-0.109592,3.46156)">
-                            <path d="M20.504,9.189C16.028,8.005 12.927,8.618 10.575,14.496C13.332,15.58 16.969,14.792 20.963,12.389" style="fill:rgb(111,36,6);"/>
-                        </g>
-                        <path d="M21.228,22.768C17.758,23.429 15.151,21.035 12.225,20.129C8.051,18.838 3.034,23.309 2.945,24.615C2.399,32.669 6.556,35.739 11.337,36.053C16.118,36.366 23.547,33.798 24.983,26.952" style="fill:rgb(255,206,140);"/>
-                        <clipPath id="_clip11">
-                            <path d="M21.228,22.768C17.758,23.429 15.151,21.035 12.225,20.129C8.051,18.838 3.034,23.309 2.945,24.615C2.399,32.669 6.556,35.739 11.337,36.053C16.118,36.366 23.547,33.798 24.983,26.952"/>
-                        </clipPath>
-                        <g clip-path="url(#_clip11)">
-                            <path d="M14.98,35.788C13.095,36.183 9.808,35.962 7.43,33.8C4.424,31.068 4.608,26.832 4.776,25.035C4.786,24.927 4.861,24.866 4.874,24.856C4.901,24.835 4.932,24.818 4.964,24.808C5.072,24.777 5.155,24.823 5.17,24.831C5.265,24.883 5.291,24.972 5.296,24.988C5.306,25.021 5.305,25.057 5.306,25.092C5.307,25.149 5.082,26.554 5.219,28.18C5.782,34.87 11.575,36.34 14.934,35.795L14.98,35.788Z" style="fill:rgb(180,138,80);"/>
-                        </g>
-                    </g>
-                    <path d="M5.583,25.051C3.978,25 2.552,24.013 1.936,22.53C1.188,20.728 0.716,18.644 1.413,16.951C2.107,15.266 4.098,14.029 6.544,13.982C8.55,13.943 11.204,15.606 11.897,17.253C12.608,18.94 12.621,21.373 10.011,23.906C9.283,24.611 8.32,25.02 7.307,25.056C6.781,25.074 6.209,25.071 5.583,25.051Z" style="fill:rgb(49,49,49);"/>
-                    <path d="M5.291,19.898C5.039,19.32 4.979,18.579 5.104,18.052C5.24,17.478 8.438,17.548 8.072,18.561C7.976,18.828 7.077,19.806 7.077,19.806C7.785,18.616 7.609,18.466 7.395,18.461C6.487,18.437 5.784,18.913 5.291,19.898Z"/>
-                    <g transform="matrix(-0.540336,-0.220184,-0.310328,0.761552,11.9366,5.53434)">
-                        <path d="M5.291,19.898C5.039,19.32 4.979,18.579 5.104,18.052C5.24,17.478 8.438,17.548 8.072,18.561C7.976,18.828 7.077,19.806 7.077,19.806C7.785,18.616 7.609,18.466 7.395,18.461C6.487,18.437 5.784,18.913 5.291,19.898Z"/>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

assets/Cloud1.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 461 154" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-104,-128)">
-        <path id="Cloud1" d="M541.776,256.714C556.651,258.998 565,261.564 565,264.275C565,273.809 461.716,281.55 334.5,281.55C207.284,281.55 104,273.809 104,264.275C104,260.866 117.201,257.687 139.978,255.009C136.85,250.725 135,245.429 135,239.7C135,225.461 146.426,213.9 160.5,213.9C166.004,213.9 171.103,215.668 175.272,218.673C177.641,197.762 195.214,181.5 216.512,181.5C231.842,181.5 245.242,189.926 252.431,202.446C257.117,190.196 268.878,181.5 282.631,181.5C290.836,181.5 298.332,184.596 304.04,189.694C304.013,188.966 304,188.235 304,187.5C304,154.661 330.661,128 363.5,128C380.444,128 395.742,135.098 406.583,146.479C410.731,137.908 419.439,132 429.5,132C441.276,132 451.198,140.093 454.124,151.077C457.505,150.371 461.007,150 464.593,150C492.936,150 515.972,173.174 516.185,201.801C516.786,201.767 517.391,201.75 518,201.75C535.865,201.75 550.369,216.425 550.369,234.5C550.369,243.07 547.109,250.875 541.776,256.714Z" style="fill:white;"/>
-    </g>
-</svg>

assets/Cloud2.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 461 167" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-659,-115)">
-        <g id="Cloud2" transform="matrix(1,0,0,1,555,0)">
-            <path d="M542.735,256.863C557.009,259.11 565,261.623 565,264.275C565,273.809 461.716,281.55 334.5,281.55C207.284,281.55 104,273.809 104,264.275C104,261.041 115.882,258.014 136.55,255.424C133.075,251.144 130.988,245.666 130.988,239.7C130.988,226.013 141.972,214.9 155.5,214.9C160.086,214.9 164.379,216.177 168.051,218.398C168.017,217.769 168,217.137 168,216.5C168,197.459 183.279,182 202.099,182C209.626,182 216.587,184.473 222.23,188.659C226.718,160.251 251.339,138.5 281,138.5C288.882,138.5 296.409,140.036 303.296,142.825C317.767,126.151 339.111,115.6 362.9,115.6C391.852,115.6 417.183,131.228 430.91,154.501C435.157,152.885 439.757,152 444.56,152C465.981,152 483.372,169.596 483.372,191.269C483.372,192.715 483.295,194.143 483.144,195.548C487.017,193.597 491.383,192.5 496,192.5C511.956,192.5 524.91,205.606 524.91,221.75C524.91,223.717 524.718,225.638 524.351,227.496C526.498,226.534 528.873,226 531.371,226C540.958,226 548.741,233.875 548.741,243.575C548.741,248.88 546.413,253.64 542.735,256.863Z" style="fill:white;"/>
-        </g>
-    </g>
-</svg>

assets/Cloud3.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 295 167" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-1190,-115)">
-        <g id="Cloud3" transform="matrix(1,0,0,1,991.5,2.84217e-14)">
-            <path d="M211.793,257.103C203.71,250.792 198.5,240.894 198.5,229.775C198.5,210.734 213.779,195.275 232.599,195.275L232.611,195.275C234.309,170.098 255.297,150.174 280.901,150.174C287.974,150.174 294.694,151.694 300.753,154.426C311.82,131.462 335.322,115.6 362.5,115.6C391.518,115.6 416.345,133.682 426.32,159.183C430.023,156.91 434.367,155.6 439.012,155.6C452.54,155.6 463.523,166.713 463.523,180.4C463.523,182.645 463.228,184.821 462.674,186.89C479.579,191.132 492.124,206.599 492.124,225.006C492.124,237.763 486.099,249.107 476.773,256.282C487.456,258.673 493.5,261.392 493.5,264.275C493.5,273.809 427.407,281.55 346,281.55C264.593,281.55 198.5,273.809 198.5,264.275C198.5,261.717 203.258,259.288 211.793,257.103Z" style="fill:white;"/>
-        </g>
-    </g>
-</svg>

assets/Cloud4.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 301 293" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-446,-345)">
-        <path id="Cloud4" d="M507.232,547.816C501.885,550.184 495.97,551.5 489.75,551.5C465.88,551.5 446.5,532.12 446.5,508.25C446.5,484.38 465.88,465 489.75,465C496.442,465 502.78,466.523 508.438,469.241C508.211,467.861 508.092,466.444 508.092,465C508.092,456.045 512.646,448.144 519.562,443.49C516.331,439.168 514.417,433.806 514.417,428C514.417,413.701 526.026,402.092 540.325,402.092C544.387,402.092 548.232,403.029 551.656,404.698C558.101,398.629 566.782,394.908 576.325,394.908C578.586,394.908 580.798,395.117 582.943,395.516C582.325,392.678 582,389.731 582,386.709C582,363.919 600.502,345.417 623.291,345.417C645.367,345.417 663.42,362.779 664.529,384.581C666.116,384.142 667.782,383.908 669.5,383.908C680.262,383.908 689,393.094 689,404.408L688.998,404.729C692.46,401.423 697.058,399.408 702.099,399.408C708.585,399.408 714.336,402.744 717.882,407.873C719.085,407.628 720.328,407.5 721.599,407.5C732.361,407.5 741.099,416.686 741.099,428C741.099,432.836 739.502,437.284 736.833,440.791C739.534,445.046 741.099,450.092 741.099,455.5C741.099,470.678 728.777,483 713.599,483C707.252,483 701.405,480.845 696.749,477.228C695.363,487.436 688.367,495.872 678.972,499.323C678.991,499.879 679,500.439 679,501C679,507.623 677.683,513.941 675.297,519.706C676.122,521.635 676.733,523.677 677.1,525.803C685.992,530.361 692.083,539.62 692.083,550.291C692.083,550.59 692.078,550.888 692.069,551.184C695.81,551.993 699.161,553.931 701.787,556.643C706.24,553.716 711.501,552.024 717.135,552.024C733.148,552.024 746.147,565.691 746.147,582.524C746.147,589.606 743.847,596.127 739.989,601.306C741.31,604.095 742.049,607.212 742.049,610.5C742.049,622.38 732.404,632.024 720.524,632.024C715.35,632.024 710.599,630.194 706.885,627.147C701.859,633.741 693.923,638 685,638C669.822,638 657.5,625.678 657.5,610.5C657.5,607.508 657.979,604.626 658.864,601.929C649.258,601.088 641.62,592.914 641.036,582.753C640.047,582.915 639.033,583 638,583C631.267,583 625.326,579.405 621.822,573.942C618.019,576.272 613.811,578.004 609.33,579.006C606.616,586.84 599.485,592.451 591.111,592.5C591.691,594.787 592,597.182 592,599.648C592,615.654 579.006,628.648 563,628.648C555.88,628.648 549.356,626.077 544.307,621.813C541.916,622.913 539.275,623.524 536.5,623.524C525.738,623.524 517,614.339 517,603.024C517,597.125 519.376,591.804 523.175,588.063C519.493,585.907 517,581.774 517,577.033C517,574.591 517.661,572.31 518.806,570.377C511.821,567.258 506.917,559.976 506.917,551.5C506.917,550.242 507.025,549.011 507.232,547.816Z" style="fill:white;"/>
-    </g>
-</svg>

assets/JiggyColor.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 1054 1044" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-348,-18)">
-        <g transform="matrix(0.965901,0,0,0.965901,29.8367,18.4135)">
-            <rect x="330" y="0" width="1090" height="1080" style="fill:rgb(255,201,69);"/>
-        </g>
-    </g>
-</svg>

assets/JiggyHole.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 2180 2160" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(0.837799,0,0,0.823158,362.599,628.361)">
-        <path d="M2169.26,-763.354L2169.26,1860.69L-432.8,1860.69L-432.8,-763.354L2169.26,-763.354ZM576.269,847.984L660.512,1167.98L950.699,1088.84C912.269,1067.12 882.2,1030.18 869.936,983.6C845.93,892.416 899.177,798.549 988.767,774.117C1078.36,749.684 1170.58,803.878 1194.59,895.062C1206.85,941.647 1198.96,988.933 1176.35,1027.3L1466.53,948.162L1382.27,628.092C1360.47,662.883 1326.33,689.805 1284.12,701.316C1194.53,725.75 1102.3,671.558 1078.3,580.372C1054.29,489.188 1107.54,395.321 1197.13,370.888C1239.34,359.377 1282.13,365.317 1318.1,384.358L1250.56,127.805L960.463,206.919C983.019,168.569 990.892,121.33 978.639,74.789C954.634,-16.395 862.407,-70.589 772.817,-46.157C683.227,-21.724 629.98,72.143 653.985,163.327C666.238,209.868 696.263,246.771 734.637,268.505L444.539,347.619L512.06,604.091C476.111,585.098 433.361,579.18 391.193,590.679C301.6,615.113 248.356,708.979 272.362,800.163C296.368,891.349 388.591,945.541 478.184,921.108C520.352,909.608 554.468,882.73 576.269,847.984Z" style="fill:#1F63C2"/>
-    </g>
-</svg>

assets/JiggyShine.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 1275 1346" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-505,-288)">
-        <g transform="matrix(1,0,0,1,182,432)">
-            <g transform="matrix(1.60405,0.926099,-0.849835,1.47196,-1141.53,-1729.71)">
-                <path d="M1708.78,2.179L1708.78,916.607L1476.3,1062.88L1476.3,148.447L1708.78,2.179Z" style="fill:white;"/>
-            </g>
-        </g>
-    </g>
-</svg>

assets/Kazooie.svg

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 626 774" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(18.7432,0,0,18.7432,-523.058,-16.6354)">
-        <path d="M27.907,26.263C28.143,24.255 29.853,23.644 30.51,21.766C31.989,17.547 33.536,12.065 38.499,11.647C42.804,11.285 46.114,18.297 46.269,20.704" style="fill:rgb(255,8,0);"/>
-        <path d="M43.914,24.141L49.374,21.553L61.231,20.771C56.596,22.793 54.56,24.744 52.176,26.175C50.874,26.957 47.438,26.469 46.145,25.919" style="fill:rgb(147,73,55);"/>
-        <path d="M33.358,24.754L37.467,23.743L47.922,25.487C47.383,28.654 46.443,34.187 46.585,37.22C46.768,41.132 46.802,42.424 46.139,42.146C42.525,40.635 38.206,35.972 35.282,32.266" style="fill:rgb(255,247,82);"/>
-        <clipPath id="_clip1">
-            <path d="M33.358,24.754L37.467,23.743L47.922,25.487C47.383,28.654 46.443,34.187 46.585,37.22C46.768,41.132 46.802,42.424 46.139,42.146C42.525,40.635 38.206,35.972 35.282,32.266"/>
-        </clipPath>
-        <g clip-path="url(#_clip1)">
-            <path d="M43.6,21.343L43.875,30.283C46.057,30.917 47.599,29.129 49.287,27.789L50.722,20.771L43.6,21.343Z" style="fill:rgb(255,152,82);"/>
-        </g>
-        <path d="M37.467,26.47C35.161,26.605 40.2,34.968 43.039,38.061" style="fill:rgb(255,152,82);"/>
-        <path d="M37.467,26.47C39.247,33.527 42.035,37.894 45.617,40.282C45.691,34.495 45.504,29.033 46.702,26.47L37.467,26.47Z" style="fill:rgb(255,107,140);"/>
-        <g transform="matrix(1,0,0,1,0.34705,-0.563957)">
-            <g transform="matrix(1.0402,0,0,1.03343,2.01974,-0.750564)">
-                <path d="M38.377,15.224C40.611,15.039 41.442,17.13 41.442,19.136C41.442,21.141 40.627,21.872 38.76,21.872C37.848,21.872 36.545,20.671 36.545,18.665C36.545,16.66 37.384,15.306 38.377,15.224Z" style="fill:white;"/>
-            </g>
-            <g transform="matrix(1.0402,0,0,1.03343,-1.44414,-0.706384)">
-                <path d="M38.038,15.181C39.905,15.181 41.442,17.13 41.442,19.136C41.442,21.141 40.244,22.547 38.377,22.547C36.51,22.547 34.728,21.521 34.655,18.815C34.6,16.81 35.767,15.181 38.038,15.181Z" style="fill:white;"/>
-            </g>
-            <g transform="matrix(0.763712,0,0,0.933729,13.3761,0.911446)">
-                <path d="M38.239,17.388C39.269,17.373 40.106,18.427 40.106,19.707C40.106,20.987 39.27,22.027 38.239,22.027C37.209,22.027 36.373,20.987 36.373,19.707C36.373,18.427 36.826,17.407 38.239,17.388Z" style="fill:rgb(20,219,51);"/>
-                <clipPath id="_clip2">
-                    <path d="M38.239,17.388C39.269,17.373 40.106,18.427 40.106,19.707C40.106,20.987 39.27,22.027 38.239,22.027C37.209,22.027 36.373,20.987 36.373,19.707C36.373,18.427 36.826,17.407 38.239,17.388Z"/>
-                </clipPath>
-                <g clip-path="url(#_clip2)">
-                    <g transform="matrix(1.07989,0,0,0.943665,-2.82912,-0.546845)">
-                        <path d="M38.239,17.388C39.269,17.373 40.106,18.427 40.106,19.707C40.106,20.987 39.27,22.027 38.239,22.027C37.209,22.027 36.373,20.987 36.373,19.707C36.373,18.427 36.826,17.407 38.239,17.388Z" style="fill:rgb(12,133,22);"/>
-                    </g>
-                </g>
-            </g>
-            <g transform="matrix(0.763712,0,0,0.933729,13.3761,0.911446)">
-                <path d="M39.038,21.804C38.795,21.947 38.525,22.027 38.239,22.027C37.209,22.027 36.373,20.987 36.373,19.707C36.373,18.427 36.826,17.407 38.239,17.388C39.269,17.373 40.106,18.427 40.106,19.707C40.106,19.793 40.102,19.878 40.095,19.961C40.075,20.177 40.032,20.391 39.964,20.595C39.929,20.699 39.889,20.799 39.842,20.895C40.203,20.141 40.208,19.154 39.751,18.365C39.566,18.046 39.333,17.813 39.097,17.661C38.696,17.403 38.343,17.409 38.24,17.41L38.386,17.673C37.862,17.663 36.964,17.751 36.767,19.414C36.741,19.629 36.582,20.489 37.094,21.246C37.656,22.075 38.427,22.165 39.048,21.798C39.045,21.8 39.041,21.802 39.038,21.804ZM39.515,21.4C39.388,21.547 39.245,21.673 39.089,21.773C39.075,21.781 39.062,21.79 39.048,21.798C39.227,21.688 39.382,21.553 39.515,21.4Z" style="fill:rgb(12,133,22);"/>
-            </g>
-            <g transform="matrix(0.399715,0,0,0.412466,27.3537,11.0962)">
-                <path d="M38.239,17.388C39.269,17.373 40.106,18.427 40.106,19.707C40.106,20.987 39.27,22.027 38.239,22.027C37.209,22.027 36.373,20.987 36.373,19.707C36.373,18.427 36.826,17.407 38.239,17.388Z"/>
-            </g>
-            <g transform="matrix(0.240395,0.0616877,-0.0641565,0.250016,34.2748,11.2529)">
-                <path d="M38.239,17.388C39.269,17.373 40.106,18.427 40.106,19.707C40.106,20.987 39.27,22.027 38.239,22.027C37.209,22.027 36.373,20.987 36.373,19.707C36.373,18.427 36.826,17.407 38.239,17.388Z" style="fill:white;"/>
-            </g>
-            <g transform="matrix(0.944849,0,0,0.933729,1.79968,1.16243)">
-                <ellipse cx="38.239" cy="19.707" rx="1.867" ry="2.319" style="fill:rgb(20,219,51);"/>
-                <clipPath id="_clip3">
-                    <ellipse cx="38.239" cy="19.707" rx="1.867" ry="2.319"/>
-                </clipPath>
-                <g clip-path="url(#_clip3)">
-                    <g transform="matrix(0.942334,0,0,1,2.31274,-1.38757)">
-                        <ellipse cx="38.239" cy="19.707" rx="1.867" ry="2.319" style="fill:rgb(12,133,22);"/>
-                    </g>
-                </g>
-            </g>
-            <g transform="matrix(0.944849,0,0,0.933729,1.79968,1.16243)">
-                <path d="M39.028,21.81C39.021,21.814 39.013,21.818 39.004,21.823C39.071,21.785 39.12,21.752 39.148,21.733C39.109,21.761 39.069,21.786 39.028,21.81ZM38.239,17.388C38.343,17.388 38.444,17.398 38.543,17.418C38.568,17.424 38.594,17.43 38.62,17.437C38.503,17.407 38.376,17.389 38.239,17.388ZM39.004,21.823C38.771,21.954 38.512,22.027 38.239,22.027C37.209,22.027 36.373,20.987 36.373,19.707C36.373,18.427 37.209,17.388 38.239,17.388L38.24,17.673C37.454,17.643 37.06,18.287 36.829,18.962C36.365,20.317 36.923,21.898 38.18,21.998C38.598,22.031 38.906,21.878 39.004,21.823ZM38.62,17.437C38.652,17.445 38.683,17.454 38.714,17.464C38.872,17.515 39.021,17.592 39.16,17.69C38.966,17.553 38.776,17.478 38.62,17.437ZM39.376,17.868C39.47,17.958 39.557,18.058 39.636,18.169C39.687,18.24 39.735,18.316 39.778,18.395C39.71,18.272 39.579,18.063 39.376,17.868ZM40.091,19.409C40.101,19.507 40.106,19.606 40.106,19.707C40.106,19.733 40.106,19.759 40.105,19.785C40.1,19.962 40.078,20.138 40.041,20.309C40.104,20.017 40.121,19.711 40.091,19.409ZM40.041,20.309C39.998,20.508 39.934,20.702 39.849,20.882C39.822,20.939 39.793,20.995 39.762,21.048C39.89,20.823 39.984,20.572 40.041,20.309Z" style="fill:rgb(12,133,22);"/>
-            </g>
-            <g transform="matrix(0.455702,0,0,0.450339,20.5043,10.6887)">
-                <ellipse cx="38.239" cy="19.707" rx="1.867" ry="2.319"/>
-            </g>
-            <g transform="matrix(0.240395,0.0616877,-0.0714623,0.278486,29.3898,11.0009)">
-                <path d="M38.239,17.388C39.269,17.373 40.106,18.427 40.106,19.707C40.106,20.987 39.27,22.027 38.239,22.027C37.209,22.027 36.373,20.987 36.373,19.707C36.373,18.427 36.826,17.407 38.239,17.388Z" style="fill:white;"/>
-            </g>
-            <g transform="matrix(0.240395,0.0616877,-0.0641565,0.250016,35.9349,12.8745)">
-                <path d="M38.239,17.388C39.269,17.373 40.106,18.427 40.106,19.707C40.106,20.987 39.27,22.027 38.239,22.027C37.209,22.027 36.373,20.987 36.373,19.707C36.373,18.427 36.826,17.407 38.239,17.388Z" style="fill:white;"/>
-            </g>
-            <g transform="matrix(0.240395,0.0616877,-0.0714623,0.278486,31.4342,12.886)">
-                <path d="M38.239,17.388C39.269,17.373 40.106,18.427 40.106,19.707C40.106,20.987 39.27,22.027 38.239,22.027C37.209,22.027 36.373,20.987 36.373,19.707C36.373,18.427 36.826,17.407 38.239,17.388Z" style="fill:white;"/>
-            </g>
-        </g>
-        <path d="M34.949,26.47C45.991,30.923 49.398,22.609 61.231,20.771C56.331,18.491 47.094,19.43 40.335,20.771C34.477,21.934 29.498,23.59 28.13,25.595C26.823,27.513 31.911,30.95 36.88,32.959" style="fill:rgb(255,247,82);"/>
-        <clipPath id="_clip4">
-            <path d="M34.949,26.47C45.991,30.923 49.398,22.609 61.231,20.771C56.331,18.491 47.094,19.43 40.335,20.771C34.477,21.934 29.498,23.59 28.13,25.595C26.823,27.513 31.911,30.95 36.88,32.959"/>
-        </clipPath>
-        <g clip-path="url(#_clip4)">
-            <path d="M62.518,20.767L57.185,19.666C55.674,19.774 54.3,23.016 56.708,23.584" style="fill:rgb(247,132,16);"/>
-        </g>
-        <g>
-            <g transform="matrix(0.970003,-0.154382,0.15857,1.02858,0.0314522,6.52731)">
-                <path d="M36.982,11.628C36.695,7.2 36.995,2.859 40.066,0.878C40.807,0.628 41.65,0.686 42.38,0.969C39.087,3.153 39.139,8.22 39.064,11.626L38.091,11.715L37.004,11.962C37.001,11.913 36.997,11.864 36.994,11.814L36.97,11.817C36.973,11.754 36.977,11.691 36.982,11.628Z" style="fill:url(#_Radial5);"/>
-            </g>
-            <g transform="matrix(0.978973,0.0797037,-0.0925252,1.07184,2.61052,-2.90073)">
-                <path d="M36.982,11.628C36.695,7.2 36.995,2.859 40.066,0.878C40.915,0.615 41.659,0.75 42.38,0.969C39.087,3.153 39.139,8.22 39.064,11.626L38.091,11.715L37.004,11.962C37.001,11.913 36.997,11.864 36.994,11.814L36.97,11.817C36.973,11.754 36.977,11.691 36.982,11.628Z" style="fill:url(#_Radial6);"/>
-            </g>
-            <g transform="matrix(0.932256,0.309256,-0.344847,1.02284,7.32634,-11.0721)">
-                <path d="M36.982,11.628C36.695,7.2 36.995,2.859 40.066,0.878C40.558,0.663 41.699,0.839 42.424,1.166C39.132,3.351 39.139,8.22 39.064,11.626L38.091,11.715L37.004,11.962C37.001,11.913 36.997,11.864 36.994,11.814L36.97,11.817C36.973,11.754 36.977,11.691 36.982,11.628Z" style="fill:url(#_Radial7);"/>
-            </g>
-            <g transform="matrix(0.83251,0.521217,-0.556563,0.879409,13.5819,-17.463)">
-                <path d="M36.982,11.628C36.695,7.2 36.741,3.068 39.813,1.087C40.656,1.113 41.659,1.428 42.132,1.96C38.866,3.835 38.481,9.299 39.456,10.905L38.091,11.715L37.004,11.962C37.001,11.913 36.997,11.864 36.994,11.814L36.97,11.817C36.973,11.754 36.977,11.691 36.982,11.628Z" style="fill:url(#_Radial8);"/>
-            </g>
-        </g>
-    </g>
-    <defs>
-        <radialGradient id="_Radial5" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.36904,-9.3704,9.9501,4.16909,36.9827,11.4974)"><stop offset="0" style="stop-color:rgb(255,8,0);stop-opacity:1"/><stop offset="0.52" style="stop-color:rgb(249,29,0);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(231,99,0);stop-opacity:1"/></radialGradient>
-        <radialGradient id="_Radial6" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.36904,-9.3704,9.9501,4.16909,36.9827,11.4974)"><stop offset="0" style="stop-color:rgb(255,8,0);stop-opacity:1"/><stop offset="0.52" style="stop-color:rgb(249,29,0);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(231,99,0);stop-opacity:1"/></radialGradient>
-        <radialGradient id="_Radial7" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.36904,-9.3704,9.9501,4.16909,36.9827,11.4974)"><stop offset="0" style="stop-color:rgb(255,8,0);stop-opacity:1"/><stop offset="0.52" style="stop-color:rgb(249,29,0);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(231,99,0);stop-opacity:1"/></radialGradient>
-        <radialGradient id="_Radial8" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.36904,-9.3704,9.9501,4.16909,36.9827,11.4974)"><stop offset="0" style="stop-color:rgb(255,8,0);stop-opacity:1"/><stop offset="0.52" style="stop-color:rgb(249,29,0);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(231,99,0);stop-opacity:1"/></radialGradient>
-    </defs>
-</svg>

assets/banjkazoobg.svg

@@ -0,0 +1,37 @@
+<svg width="1920" height="1280" viewBox="0 0 1920 1280" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_540_3892)">
+<path d="M640.284 1159.76C639.797 1155.45 450.469 1282.17 509.25 1013.98C558.275 790.302 931.74 830.287 935.414 1080.11C934.13 1082.73 817.852 1271.15 640.284 1159.76Z" fill="#F7FAFA"/>
+<path d="M840.342 1153.98C848.276 1149.28 858.618 1146.39 863.738 1139.58C889.655 1105.09 876.419 1006.88 843.177 979.092C807.939 949.633 781.195 946.456 745.196 976.366C712.989 1003.12 687.729 1001.8 654.91 977.124C608.969 942.579 573.886 949.503 534.1 992.979C530.091 997.36 525.037 1000.78 515.791 1007.7C512.957 1009.82 509.73 1012.26 506.019 1015.17C523.951 896.876 489.547 810.372 389.215 748.43C440.937 733.701 492.005 709.847 544.513 706.085C665.308 697.43 786.953 700.842 904.341 736.144C944.472 748.212 981.097 771.589 1020.21 787.649C1029.63 791.52 1044.09 790.074 1053.65 785.575C1129.56 749.85 1163.71 762.009 1200.28 845.599C1203.26 890.116 1201.35 923.722 1159.61 946.421C1141.33 956.364 1131.25 983.91 1120.83 1005.12C1108.07 1031.07 1098.32 1058.55 1088.28 1085.75C1079.27 1110.16 1071.64 1135.09 1061.45 1161.61C1038.31 1177.6 1017.14 1191.77 993.45 1204.76C982.508 1198.92 974.59 1192.22 965.556 1189.93C923.594 1179.3 881.322 1169.89 839.497 1158.53C839.833 1157.02 840.342 1153.98 840.342 1153.98ZM663.696 811.922C614.42 828.006 559.256 829.022 510.459 870.041C535.005 881.377 554.123 888.103 570.95 898.525C590.764 910.798 603.621 907.893 621.516 892.344C646.88 870.307 676.37 852.559 705.603 835.571C731.945 820.262 760.316 808.444 787.791 795.087C787.396 792.979 787.001 790.871 786.606 788.763C747.539 795.752 708.472 802.74 663.696 811.922ZM1060.89 840.786C1071.07 865.99 1081.26 891.193 1092.28 918.453C1118.02 922.553 1146.64 917.172 1153.07 886.418C1157.78 863.91 1155.74 830.123 1141.84 815.877C1120.28 793.79 1090.16 809.888 1066.52 826.569C1063.74 828.534 1062.19 832.254 1060.89 840.786Z" fill="#62300F"/>
+<path d="M995.96 1205.93C1017.14 1191.77 1038.31 1177.6 1064.05 1162.62C1099.11 1159.53 1129.99 1159.44 1160.02 1154.32C1186.05 1149.89 1211.11 1139.75 1239.34 1132.84C1279.43 1125.11 1316.77 1116.66 1356.71 1107.84C1367.44 1105.02 1375.56 1102.58 1386.68 1101.06C1417.57 1098.78 1445.46 1095.58 1476.26 1092.02C1489.79 1088.14 1500.41 1084.62 1512.05 1080.84C1513.07 1080.57 1515.17 1080.52 1515.17 1080.52C1607.17 1076.03 1699.17 1071.54 1793.59 1070.03C1795.74 1094.85 1795.44 1116.71 1793.29 1140.42C1786.58 1145.78 1782.2 1150.47 1776.81 1152.62C1717.36 1176.32 1657.39 1198.78 1598.41 1223.58C1581.3 1230.78 1566.9 1244.4 1548.45 1255.19C1456.27 1288.6 1366.76 1321.29 1259.62 1311.31C1271.98 1337.18 1280.5 1355.02 1288.93 1375.16C1290.9 1379.07 1292.97 1380.68 1294.77 1382.11C1294.5 1381.94 1293.99 1382.32 1293.4 1385.03C1361.57 1517.62 1439.36 1639.59 1575.52 1710.42C1520.53 1726.41 1479.19 1691.16 1436.71 1668.82C1390.82 1644.69 1350.75 1609.66 1307.32 1580.62C1250.71 1542.77 1193.24 1506.22 1136.26 1468.94C1113.13 1453.8 1090.32 1438.2 1063.15 1420.27C980.139 1371.54 972.652 1273.71 995.96 1205.93Z" fill="#FEE003"/>
+<path d="M473.743 1137.47C476.779 1137.08 479.815 1136.68 488.691 1136.06C498.038 1136.38 501.546 1136.92 505.055 1137.47C514.058 1137.92 523.061 1138.36 536.733 1141.44C558.37 1149.77 575.005 1156.93 592.37 1160.91C641.457 1172.15 684.637 1194.46 716.199 1233.43C729.906 1250.36 745.604 1276.19 742.184 1294.6C729.101 1365.01 701.55 1435.73 646.084 1479.14C574.848 1534.91 503.547 1599.29 403.882 1604.24C392.443 1604.81 381.314 1611.63 370.041 1615.55C361.764 1614.25 353.487 1612.95 341.848 1608.22C271.197 1515.55 272.792 1408.28 262.912 1304.01C293.108 1296.61 320.801 1291.47 347.486 1283.11C454.72 1249.5 469.282 1232.16 473.743 1137.47Z" fill="#F1AF85"/>
+<path d="M1236.59 1132.13C1211.11 1139.75 1186.05 1149.89 1160.02 1154.32C1129.99 1159.44 1099.11 1159.53 1066 1160.8C1071.64 1135.09 1079.27 1110.16 1088.28 1085.75C1098.32 1058.55 1108.07 1031.07 1120.83 1005.12C1131.25 983.91 1141.33 956.364 1159.61 946.421C1201.35 923.722 1203.26 890.116 1200.65 848.276C1229.54 780.721 1254.15 714.307 1287.66 652.732C1320.75 591.925 1361.11 534.774 1401.61 478.407C1426.62 443.594 1485.69 445.705 1519.17 474.27C1539.63 491.721 1565.11 503.276 1588.34 517.482C1599.16 524.101 1617.62 529.49 1618.94 537.652C1620.77 548.935 1611.81 563.927 1603.77 574.514C1564.05 626.791 1523.41 678.379 1482.51 729.751C1434.55 790.009 1453.6 850.044 1481.3 910.739C1489.86 929.474 1496.03 949.298 1501.48 973.875C1494.24 981.438 1488.81 983.75 1481.87 984.024C1466.62 959.458 1452.39 937.21 1439.27 914.33C1422.7 885.447 1404.33 891.008 1388.89 913.221C1372.36 936.982 1356.98 933.105 1332.79 924.059C1312.8 916.588 1276.64 914.068 1266.73 925.662C1243.63 952.713 1232.02 989.581 1215.66 1025.64C1222.58 1063.24 1229.59 1097.69 1236.59 1132.13Z" fill="#FF2904"/>
+<path d="M993.45 1204.76C972.652 1273.71 980.139 1371.54 1060.66 1419.33C1052.6 1431.2 1041.31 1440.41 1033.31 1451.92C961.96 1554.66 883.013 1650.58 773.747 1714.87C717.841 1747.76 653.326 1755.11 589.315 1747.89C529.296 1741.13 492.999 1694.78 480.317 1611.52C485.92 1604.94 490.262 1603.37 495.067 1604.41C506.742 1626.81 513.468 1652.19 529.943 1665.44C598.66 1720.72 739.644 1672.44 767.512 1584.68C805.086 1528.67 835.282 1472.97 824.279 1401.41C831.53 1374.04 842.141 1349.96 844.002 1325.23C845.721 1302.37 845.917 1272.14 832.967 1256.87C802.4 1220.85 763.609 1191.8 728.144 1159.94C728.144 1159.94 728.634 1159.86 731.981 1160.38C743.988 1160.73 752.648 1160.56 764.513 1160.12C791.532 1159.91 815.347 1159.97 839.161 1160.04C881.322 1169.89 923.594 1179.3 965.556 1189.93C974.59 1192.22 982.508 1198.92 993.45 1204.76Z" fill="#F2B085"/>
+<path d="M472.524 1135.06C469.282 1232.16 454.72 1249.5 347.486 1283.11C320.801 1291.47 293.108 1296.61 260.622 1302.34C246.885 1303.39 238.404 1305.33 227.06 1306.78C205.015 1298.55 185.833 1290.82 166.651 1283.08C114.696 1234.84 110.751 1171.2 115.315 1107.59C119.09 1054.98 194.335 999.957 264.464 991.678C374.636 978.67 444.355 1026.19 472.524 1135.06Z" fill="#030303"/>
+<path d="M725.034 1159.56C763.609 1191.81 802.4 1220.85 832.967 1256.87C845.917 1272.14 845.721 1302.37 844.002 1325.23C842.141 1349.96 831.53 1374.04 821.921 1401.64C804.038 1416.78 790.026 1430.44 773.721 1440.31C687.531 1492.49 600.763 1543.7 512.022 1595.26C504.768 1597.45 499.685 1599.63 494.603 1601.81C490.262 1603.37 485.92 1604.94 480.405 1608.58C444.759 1612.81 410.287 1614.96 372.928 1616.33C381.314 1611.63 392.443 1604.81 403.882 1604.24C503.547 1599.29 574.848 1534.91 646.084 1479.15C701.55 1435.73 729.101 1365.01 742.184 1294.6C745.604 1276.19 729.906 1250.36 716.199 1233.43C684.637 1194.46 641.457 1172.15 592.37 1160.91C575.005 1156.93 558.37 1149.77 540.102 1141.73C542.031 1138.9 545.26 1138.39 552.654 1137.76C558.036 1137.47 559.252 1137.3 563.1 1138.21C590.92 1144.08 616.109 1148.87 643.195 1154C646.36 1154.13 647.628 1153.93 648.897 1153.73C673.239 1155.55 697.582 1157.36 725.034 1159.56Z" fill="#D69A76"/>
+<path d="M1551.26 1255.07C1566.9 1244.4 1581.3 1230.78 1598.41 1223.58C1657.39 1198.78 1717.36 1176.32 1776.81 1152.62C1782.2 1150.47 1786.58 1145.78 1795.71 1141.55C1806.27 1150.46 1812.55 1160.1 1818.83 1169.74C1801.57 1184.19 1785.13 1199.77 1766.9 1212.88C1719.12 1247.22 1670.57 1280.49 1617.82 1315.33C1603.14 1319.41 1592.97 1322.34 1581.84 1322.63C1571.02 1298.35 1561.14 1276.71 1551.26 1255.07Z" fill="#684004"/>
+<path d="M839.497 1158.53C815.347 1159.97 791.532 1159.91 762.191 1158.36C749.054 1155.45 741.443 1154.03 733.832 1152.61C725.362 1122.91 713.629 1093.66 709.433 1063.37C705.937 1038.13 722.181 1023.98 749.438 1022.26C827.461 1017.34 854.162 1047.41 839.312 1125.01C837.797 1132.93 837.988 1141.17 838.864 1151.62C840.342 1153.98 839.833 1157.02 839.497 1158.53ZM760.158 1111.74C763.782 1114.96 767.883 1121.33 770.947 1120.86C785.23 1118.69 809.287 1117.55 811.275 1110.67C815.713 1095.32 812.437 1075.2 805.443 1060.23C802.308 1053.52 777.394 1048.42 771.724 1053.36C761.776 1062.01 758.401 1078.73 753.708 1092.57C752.471 1096.21 756.494 1101.64 760.158 1111.74Z" fill="#30C4FB"/>
+<path d="M641.299 1153.67C616.109 1148.87 590.92 1144.08 562.615 1136.48C558.536 1131.32 556.887 1129.63 554.55 1128.61C552.893 1125.38 550.868 1122.28 549.634 1118.89C536.146 1081.9 543.329 1045.31 568.005 1029.72C596.236 1011.87 621.649 1021.11 644.43 1040.7C666.907 1060.03 669.292 1103.25 648.149 1137.82C644.117 1145.7 642.708 1149.68 641.299 1153.67ZM638.523 1102.35C632.818 1085.45 629.577 1066.83 619.806 1052.75C617.114 1048.87 586.227 1055.35 583.587 1062.63C578.67 1076.19 579.38 1100.91 588.147 1107.85C597.74 1115.45 619.101 1108.19 638.523 1102.35Z" fill="#30C4FB"/>
+<path d="M1820.95 1168.31C1812.55 1160.1 1806.27 1150.46 1797.57 1139.69C1795.44 1116.71 1795.74 1094.85 1797.22 1070.46C1803.11 1066.88 1808.44 1063.85 1812.41 1065.11C1833.98 1071.99 1855.22 1079.92 1876.57 1087.49C1863.83 1105.44 1851.09 1123.39 1838.74 1144.12C1839.12 1146.9 1839.28 1147.28 1839.28 1147.28C1833.88 1153.81 1828.47 1160.35 1820.95 1168.31Z" fill="#A94105"/>
+<path d="M1483.38 986.062C1488.81 983.75 1494.24 981.438 1501.42 976.661C1508.08 1007.89 1512.99 1041.59 1516.54 1077.9C1515.17 1080.52 1513.07 1080.57 1510.37 1078.28C1499.58 1046.01 1491.48 1016.03 1483.38 986.062Z" fill="#FF4120"/>
+<path d="M507.013 1136.52C502.665 1139.78 499.233 1139.06 494.555 1137.98C497.34 1094.73 497.591 1058.23 505.576 1013.98C509.529 1012.62 516.598 1006.72 516.598 1006.72C513.708 1048.66 510.819 1090.6 507.013 1136.52Z" fill="#62300F"/>
+<path d="M732.275 1153.46C741.443 1154.03 749.054 1155.45 758.987 1158.63C752.648 1160.56 743.988 1160.73 732.096 1160.6C727.352 1157.64 727.969 1155.64 732.275 1153.46Z" fill="#D69A76"/>
+<path d="M1838.96 1146.77C1838.8 1146.64 1839.97 1147.65 1839.97 1147.65C1839.97 1147.65 1839.45 1145.93 1839.37 1146.61C1839.28 1147.28 1839.12 1146.9 1838.96 1146.77Z" fill="#A94105"/>
+<path d="M554.155 1130.62C556.887 1129.63 558.536 1131.32 559.984 1135.4C559.252 1137.3 558.036 1137.47 555.035 1137.17C553.421 1135.35 553.59 1133.99 554.155 1130.62Z" fill="#F7FAFA"/>
+<path d="M666.551 810.825C708.472 802.74 747.539 795.752 786.606 788.763C787.001 790.871 787.396 792.979 787.791 795.087C760.316 808.444 731.945 820.262 705.603 835.571C676.37 852.559 646.88 870.307 621.516 892.344C603.621 907.893 590.764 910.798 570.95 898.525C554.123 888.103 535.005 881.377 510.459 870.041C559.256 829.022 614.42 828.006 666.551 810.825Z" fill="#351907"/>
+<path d="M1060.48 837.973C1062.19 832.254 1063.74 828.534 1066.52 826.569C1090.16 809.888 1120.28 793.79 1141.84 815.877C1155.74 830.123 1157.78 863.91 1153.07 886.418C1146.64 917.172 1118.02 922.553 1092.28 918.453C1081.26 891.193 1071.07 865.99 1060.48 837.973Z" fill="#EEAE83"/>
+<path d="M1581.84 1322.63C1582.05 1328.39 1581.3 1331.5 1580 1336.99C1573.43 1339.03 1565.84 1336.16 1561.61 1338.76C1506.88 1372.38 1445.66 1380.68 1383.57 1384.21C1356.03 1385.78 1328.25 1383.01 1297.28 1382.26C1293.99 1382.32 1294.5 1381.94 1294.26 1380.26C1292.35 1376.68 1290.69 1374.77 1289.03 1372.86C1280.5 1355.02 1271.98 1337.18 1259.61 1311.31C1366.76 1321.29 1456.27 1288.6 1548.45 1255.19C1561.14 1276.71 1571.02 1298.35 1581.84 1322.63Z" fill="#A22986"/>
+<path d="M1239.34 1132.85C1229.59 1097.69 1222.58 1063.24 1218.09 1024.71C1227.89 1016.4 1235.14 1012.14 1242.44 1007.97C1296.64 977.059 1322.84 983.561 1357.79 1036.17C1359.41 1038.6 1363.69 1039.27 1367.07 1040.93C1371.26 988.879 1379.6 982.11 1434.52 985.249C1468.22 987.175 1488.77 1012.11 1485.84 1051.1C1484.79 1065.1 1477.69 1078.64 1473.36 1092.38C1445.46 1095.58 1417.57 1098.78 1386.23 1098.86C1373.23 1099.9 1363.67 1104.05 1354.11 1108.21C1316.77 1116.66 1279.43 1125.11 1239.34 1132.85ZM1296.93 1101.79C1317.5 1093 1343.26 1083.66 1323.77 1056.05C1314.69 1043.19 1292.53 1034.86 1275.87 1034.13C1268.13 1033.79 1253.81 1055.79 1252.26 1068.83C1249.2 1094.4 1270.71 1099.46 1296.93 1101.79ZM1400.93 1065.13C1416.53 1082.98 1434.49 1082.16 1447.13 1064.76C1453.01 1056.68 1452.77 1033.16 1447.64 1030.27C1435.53 1023.47 1417.91 1021.29 1404.46 1024.75C1399.4 1026.04 1399.68 1048.12 1400.93 1065.13ZM1369.82 1071.19C1370.64 1072.02 1371.35 1073.29 1372.32 1073.54C1372.96 1073.7 1374.68 1072.44 1374.71 1071.76C1374.92 1067.05 1374.82 1062.33 1374.82 1057.61C1373.55 1057.58 1372.29 1057.56 1371.02 1057.54C1370.4 1060.8 1369.78 1064.06 1369.82 1071.19Z" fill="#099805"/>
+<path d="M1476.26 1092.02C1477.69 1078.64 1484.79 1065.1 1485.84 1051.1C1488.77 1012.11 1468.22 987.175 1434.52 985.249C1379.6 982.11 1371.26 988.879 1367.07 1040.93C1363.69 1039.27 1359.41 1038.6 1357.79 1036.17C1322.84 983.561 1296.64 977.059 1242.44 1007.97C1235.14 1012.14 1227.89 1016.4 1218.19 1021.54C1232.02 989.581 1243.63 952.713 1266.73 925.662C1276.64 914.068 1312.8 916.588 1332.79 924.058C1356.98 933.105 1372.36 936.982 1388.89 913.22C1404.33 891.008 1422.7 885.447 1439.27 914.33C1452.39 937.21 1466.62 959.457 1481.87 984.024C1491.48 1016.03 1499.58 1046.01 1509.36 1078.54C1500.41 1084.62 1489.79 1088.14 1476.26 1092.02Z" fill="#FBF8F4"/>
+<path d="M1356.71 1107.84C1363.67 1104.05 1373.23 1099.9 1383.23 1097.94C1375.56 1102.58 1367.44 1105.02 1356.71 1107.84Z" fill="#0B9909"/>
+<path d="M759.13 1108.99C756.494 1101.64 752.471 1096.21 753.708 1092.56C758.401 1078.73 761.776 1062.01 771.724 1053.36C777.394 1048.42 802.308 1053.52 805.443 1060.23C812.437 1075.2 815.713 1095.32 811.275 1110.67C809.287 1117.55 785.23 1118.69 770.947 1120.86C767.883 1121.33 763.782 1114.96 759.13 1108.99Z" fill="#02090C"/>
+<path d="M636.928 1104.88C619.101 1108.19 597.74 1115.45 588.147 1107.85C579.38 1100.91 578.67 1076.19 583.587 1062.63C586.227 1055.35 617.114 1048.87 619.806 1052.75C629.577 1066.83 632.818 1085.44 636.928 1104.88Z" fill="#02090C"/>
+<path d="M1294.06 1101.9C1270.71 1099.46 1249.2 1094.4 1252.26 1068.83C1253.81 1055.79 1268.13 1033.79 1275.87 1034.13C1292.53 1034.86 1314.69 1043.19 1323.77 1056.05C1343.26 1083.66 1317.5 1093 1294.06 1101.9Z" fill="#010901"/>
+<path d="M1399.23 1062.93C1399.68 1048.12 1399.4 1026.04 1404.46 1024.75C1417.91 1021.29 1435.53 1023.47 1447.64 1030.27C1452.77 1033.16 1453.01 1056.68 1447.13 1064.76C1434.49 1082.16 1416.53 1082.98 1399.23 1062.93Z" fill="#010901"/>
+<path d="M1369.5 1069.25C1369.78 1064.06 1370.4 1060.8 1371.02 1057.54C1372.29 1057.56 1373.55 1057.58 1374.82 1057.61C1374.82 1062.33 1374.93 1067.05 1374.71 1071.76C1374.68 1072.44 1372.96 1073.7 1372.32 1073.54C1371.35 1073.29 1370.64 1072.02 1369.5 1069.25Z" fill="#0B9909"/>
+</g>
+<defs>
+<clipPath id="clip0_540_3892">
+<rect width="1920" height="1280" fill="white"/>
+</clipPath>
+</defs>
+</svg>

banjo.us.rev0.toml

@@ -4,40 +4,23 @@
 entrypoint = 0x80000400
 # Paths are relative to the location of this config file.
 output_func_path = "RecompiledFuncs"
-rom_file_path = "banjo.us.v10.decompressed.z64"
 symbols_file_path = "BanjoRecompSyms/bk.us.rev0.syms.toml"
+rom_file_path = "banjo.us.v10.decompressed.z64"
 # elf_path = "banjo.us.v10.elf"
-# use_mdebug = true
-# trace_mode = true
-bss_section_suffix = "_bss"
 
 manual_funcs = [
-    { name = "boot___osLeoAbnormalResume", section = ".boot_bk_boot", vram = 0x800037E4, size = 0xE8 },
-    { name = "boot___osLeoResume", section = ".boot_bk_boot", vram = 0x800038CC, size = 0xEC },
-]
-
-mdebug_file_mappings = [
-    { filename = "src/TTC/ch/clam.c", input_section = ".text", output_section = ".TTC" },
-    { filename = "src/TTC/ch/blubber.c", input_section = ".text", output_section = ".TTC" },
-    { filename = "src/TTC/ch/lockup.c", input_section = ".text", output_section = ".TTC" },
-    { filename = "src/TTC/ch/treasure.c", input_section = ".text", output_section = ".TTC" },
-    { filename = "src/SM/ch/attacktutorial.c", input_section = ".text", output_section = ".SM" },
-    { filename = "src/SM/ch/vegetables.c", input_section = ".text", output_section = ".SM" },
+    { name = "__n_CSPVoiceHandler", section = ".core1", vram = 0x8025E438, size = 0x684 },
 ]
 
 [patches]
-
-ignored = [
-    "boot_n_aspMainTextStart",
-    "boot_gSPF3DEX_fifoTextStart",
-    "boot_gSPL3DEX_fifoTextStart",
+stubs = [
 ]
 
 renamed = [
     "wmemcpy"
 ]
 
-stubs = [
+ignored = [
     # Boot segment libultra duplicates
     "boot___ll_div",
     "boot___ll_lshift",
@@ -49,6 +32,7 @@ stubs = [
     "boot___ull_divremi",
     "boot___ull_rem",
     "boot___ull_rshift",
+    "boot___osInitialize_common",
     "boot_osPiRawStartDma",
     "boot_osPiGetStatus",
     "boot___osSetSR",

flatpak/.gitignore

@@ -1,4 +0,0 @@
-.flatpak-builder
-builddir
-repo
-*.flatpak

flatpak/README.md

@@ -1,15 +0,0 @@
-Before building the Flatpak, you must build the patches on the root directory first. **The LLVM Extension for freedesktop does not include the MIPS compiler and will fail to build the patches inside the flatpak**.
-```sh
-make -C patches CC=clang LD=ld.lld
-```
-
-Build
-```sh
-flatpak-builder --force-clean --user --install-deps-from=flathub --repo=repo --install builddir io.github.banjorecomp.banjorecomp.json
-```
-
-Bundle
-```sh
-flatpak build-bundle repo io.github.banjorecomp.banjorecomp.flatpak io.github.banjorecomp.banjorecomp --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
-```
-

flatpak/io.github.banjorecomp.banjorecomp.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Banjo: Recompiled
-Exec=/app/bin/BanjoRecompiled
-Type=Application
-Icon=io.github.banjorecomp.banjorecomp
-Categories=Game;
-Comment=Static recompilation of Banjo-Kazooie for PC.
-MimeType=x-scheme-handler/banjorecomp

flatpak/io.github.banjorecomp.banjorecomp.json

@@ -1,62 +0,0 @@
-{
-  "id": "io.github.banjorecomp.banjorecomp",
-  "runtime": "org.freedesktop.Platform",
-  "runtime-version": "25.08",
-  "sdk": "org.freedesktop.Sdk",
-  "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.llvm20" ],
-  "finish-args": [
-    "--share=network",
-    "--socket=wayland",
-    "--socket=fallback-x11",
-    "--socket=pulseaudio",
-    "--device=all",
-    "--filesystem=host",
-    "--filesystem=/media",
-    "--filesystem=/run/media",
-    "--filesystem=/mnt"
-  ],
-  "modules": [
-    {
-      "name": "BanjoRecompiled",
-      "buildsystem": "simple",
-      "build-commands": [
-        "cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S lib/N64Recomp -B lib/N64Recomp/cmake-build",
-        "cmake --build lib/N64Recomp/cmake-build --config Release --target N64Recomp --parallel",
-        "cmake --build lib/N64Recomp/cmake-build --config Release --target RSPRecomp --parallel",
-        "cp lib/N64Recomp/cmake-build/N64Recomp N64Recomp",
-        "cp lib/N64Recomp/cmake-build/RSPRecomp RSPRecomp",
-        "./N64Recomp banjo.us.rev0.toml",
-        "./RSPRecomp n_aspMain.us.rev0.toml",
-        "cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_MAKE_PROGRAM=ninja -DPATCHES_C_COMPILER=clang -DPATCHES_LD=ld.lld -DRECOMP_FLATPAK=ON -G Ninja -S . -B cmake-build",
-        "cmake --build cmake-build --config Release --target BanjoRecompiled --parallel",
-        "rm -rf assets/scss",
-        "mkdir -p /app/bin",
-        "cp cmake-build/BanjoRecompiled /app/bin/BanjoRecompiled",
-        "cp recompcontrollerdb.txt /app/bin/recompcontrollerdb.txt",
-        "cp -R assets /app/bin/assets",
-        "install -Dm644 icons/app.png /app/share/icons/hicolor/512x512/apps/${FLATPAK_ID}.png",
-        "install -Dm644 flatpak/io.github.banjorecomp.banjorecomp.metainfo.xml /app/share/metainfo/${FLATPAK_ID}.metainfo.xml",
-        "install -Dm644 flatpak/io.github.banjorecomp.banjorecomp.desktop /app/share/applications/${FLATPAK_ID}.desktop"
-      ],
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/N64Recomp/N64Recomp.git",
-          "commit": "2b6f05688de2abc7d86da5b4a89b84c2c6acbabe",
-          "dest": "lib/N64Recomp"
-        },
-        {
-          "type": "dir",
-          "path": "../"
-        }
-      ],
-      "build-options": {
-        "append-path": "/usr/lib/sdk/llvm20/bin",
-        "prepend-ld-library-path": "/usr/lib/sdk/llvm20/lib",
-        "build-args": [
-          "--share=network"
-        ]
-      }
-    }
-  ]
-}

flatpak/io.github.banjorecomp.banjorecomp.metainfo.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>io.github.banjorecomp.banjorecomp</id>
-  
-  <name>Banjo: Recompiled</name>
-  <summary>Static recompilation of Banjo-Kazooie for PC.</summary>
-  
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0+</project_license>
-  
-  <supports>
-    <control>pointing</control>
-    <control>keyboard</control>
-    <control>touch</control>
-    <control>gamepad</control>
-  </supports>
-  
-  <description>
-    <p>
-      Banjo: Recompiled is a project that uses N64: Recompiled to statically recompile Banjo-Kazoie into a native port with many new features and enhancements. This project uses RT64 as the rendering engine to provide some of these enhancements.
-
-      The original game is required to run this project.
-
-      https://github.com/BanjoRecomp/BanjoRecomp
-    </p>
-  </description>
-  
-  <launchable type="desktop-id">io.github.banjorecomp.banjorecomp.desktop</launchable>
-</component>

icons/README.md

@@ -1,18 +0,0 @@
-When making icons for Windows, it is important to generate the multiple ICO files on different sizes and pack them into one single ICO file.
-
-Using a tool such as `icomake` is recommended for this: https://github.com/tringi/icomake
-
-The recommended workflow is to progressively downscale the icon into the following sizes and export them from a tool that supports exporting to ICO:
-
-- 256.ico, 256x256 
-- 128.ico, 128x128
-- 64.ico, 64x64
-- 32.ico, 32x32
-- 16.ico, 16x16
-
-Once these are ready, `icomake` can pack these into one icon with the following command:
-```
-.\icomake.exe app.ico 16.ico 32.ico 64.ico 128.ico 256.ico
-```
-
-If done correctly, Windows will now pick the icon with the correct size on the title bar, the taskbar and as a shortcut.

icons/app.rc

@@ -1,2 +0,0 @@
-1 ICON "appb.ico"
-2 ICON "appk.ico"

include/banjo_config.h

@@ -5,30 +5,20 @@
 #include <string>
 #include <string_view>
 
-#include "json/json.hpp"
-
 namespace banjo {
     inline const std::u8string program_id = u8"BanjoRecompiled";
     inline const std::string program_name = "Banjo: Recompiled";
 
     namespace configkeys {
         namespace general {
-            inline const std::string note_saving_mode = "note_saving_mode";
             inline const std::string camera_invert_mode = "camera_invert_mode";
             inline const std::string analog_cam_mode = "analog_cam_mode";
-            inline const std::string third_person_camera_invert_mode = "third_person_camera_invert_mode";
-            inline const std::string flying_and_swimming_invert_mode = "flying_and_swimming_invert_mode";
-            inline const std::string first_person_invert_mode = "first_person_invert_mode";
-            inline const std::string analog_camera_sensitivity = "analog_camera_sensitivity";
+            inline const std::string analog_camera_invert_mode = "analog_camera_invert_mode";
         }
 
         namespace sound {
             inline const std::string bgm_volume = "bgm_volume";
         }
-
-        namespace graphics {
-            inline const std::string cutscene_aspect_ratio_mode = "cutscene_aspect_ratio_mode";
-        }
     }
 
     // TODO: Move loading configs to the runtime once we have a way to allow per-project customization.
@@ -43,48 +33,9 @@ namespace banjo {
 
     CameraInvertMode get_camera_invert_mode();
 
-    CameraInvertMode get_third_person_camera_mode();
+    CameraInvertMode get_analog_camera_invert_mode();
 
-    CameraInvertMode get_flying_and_swimming_invert_mode();
-
-    CameraInvertMode get_first_person_invert_mode();
-
-    enum class AnalogCamMode {
-        On,
-        Off,
-        OptionCount
-    };
-
-    NLOHMANN_JSON_SERIALIZE_ENUM(banjo::AnalogCamMode, {
-        {banjo::AnalogCamMode::On, "On"},
-        {banjo::AnalogCamMode::Off, "Off"}
-    });
-
-    AnalogCamMode get_analog_cam_mode();
-
-    uint32_t get_analog_cam_sensitivity();
-
-    enum class NoteSavingMode {
-        On,
-        Off,
-        OptionCount
-    };
-
-    NLOHMANN_JSON_SERIALIZE_ENUM(banjo::NoteSavingMode, {
-        {banjo::NoteSavingMode::On, "On"},
-        {banjo::NoteSavingMode::Off, "Off"}
-    });
-
-    NoteSavingMode get_note_saving_mode();
-
-    enum class CutsceneAspectRatioMode {
-        Original,
-        Clamp16x9,
-        Full,
-        OptionCount
-    };
-
-    CutsceneAspectRatioMode get_cutscene_aspect_ratio_mode();
+    bool get_analog_cam_mode();
 
     void open_quit_game_prompt();
 };

include/banjo_launcher.h

@@ -1,16 +0,0 @@
-#ifndef __BANJO_LAUNCHER_H__
-#define __BANJO_LAUNCHER_H__
-
-#include "recompui/recompui.h"
-
-namespace banjo {
-    void launcher_animation_setup(recompui::LauncherMenu *menu);
-    void launcher_animation_update(recompui::LauncherMenu *menu);
-
-    constexpr float launcher_options_right_position_start = 96.0f;
-    constexpr float launcher_options_right_position_end = 96.0f + 24.0f;
-    constexpr float launcher_options_top_offset = 96.0f;
-    constexpr float launcher_options_title_offset = 120.0f;
-}
-
-#endif

include/banjo_render.h

@@ -0,0 +1,62 @@
+#ifndef __BANJO_RENDER_H__
+#define __BANJO_RENDER_H__
+
+#include <unordered_set>
+#include <filesystem>
+
+#include "common/rt64_user_configuration.h"
+#include "ultramodern/renderer_context.hpp"
+#include "librecomp/config.hpp"
+#include "librecomp/mods.hpp"
+
+namespace RT64 {
+    struct Application;
+}
+
+namespace banjo {
+    namespace renderer {
+        inline const std::string special_option_texture_pack_enabled = "_recomp_texture_pack_enabled";
+
+        class RT64Context final : public ultramodern::renderer::RendererContext {
+        public:
+            ~RT64Context() override;
+            RT64Context(uint8_t *rdram, ultramodern::renderer::WindowHandle window_handle, bool developer_mode);
+
+            bool valid() override { return static_cast<bool>(app); }
+
+            bool update_config(const ultramodern::renderer::GraphicsConfig &old_config, const ultramodern::renderer::GraphicsConfig &new_config) override;
+
+            void enable_instant_present() override;
+            void send_dl(const OSTask *task) override;
+            void update_screen(uint32_t vi_origin) override;
+            void shutdown() override;
+            uint32_t get_display_framerate() const override;
+            float get_resolution_scale() const override;
+
+        private:
+            std::unique_ptr<RT64::Application> app;
+            std::unordered_set<std::string> enabled_texture_packs;
+            std::unordered_set<std::string> secondary_disabled_texture_packs;
+
+            void check_texture_pack_actions();
+        };
+
+        std::unique_ptr<ultramodern::renderer::RendererContext> create_render_context(uint8_t *rdram, ultramodern::renderer::WindowHandle window_handle, bool developer_mode);
+
+        RT64::UserConfiguration::Antialiasing RT64MaxMSAA();
+        bool RT64SamplePositionsSupported();
+        bool RT64HighPrecisionFBEnabled();
+
+        void trigger_texture_pack_update();
+        void enable_texture_pack(const recomp::mods::ModContext& context, const recomp::mods::ModHandle& mod);
+        void disable_texture_pack(const recomp::mods::ModHandle& mod);
+        void secondary_enable_texture_pack(const std::string& mod_id);
+        void secondary_disable_texture_pack(const std::string& mod_id);
+
+        // Texture pack enable option. Must be an enum with two options.
+        // The first option is treated as disabled and the second option is treated as enabled.
+        bool is_texture_pack_enable_config_option(const recomp::config::ConfigOption& option, bool show_errors);
+    }
+}
+
+#endif

include/recomp_data.h

@@ -2,8 +2,8 @@
 #define __RECOMP_DATA_H__
 
 namespace recomputil {
-    void init_extended_object_data(size_t num_types);
-    void clear_all_object_data(size_t type_index);
+    void init_extended_actor_data();
+    void reset_actor_data();
 
     void register_data_api_exports();
 }

launch.vs.json

@@ -7,8 +7,7 @@
       "project": "CMakeLists.txt",
       "projectTarget": "BanjoRecompiled.exe",
       "name": "BanjoRecompiled.exe",
-      "currentDir": "${workspaceRoot}",
-      "args": ["--show-console"]
+      "currentDir": "${workspaceRoot}"
     }
   ]
 }

lib/FindFreetype.cmake

@@ -0,0 +1,9 @@
+set(FREETYPE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/include)
+set(FREETYPE_LIBRARIES "${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/release static/vs2015-2022/win64/freetype.lib")
+add_library(Freetype::Freetype STATIC IMPORTED)
+set_target_properties(Freetype::Freetype PROPERTIES
+	IMPORTED_LOCATION ${FREETYPE_LIBRARIES}
+)
+target_include_directories(Freetype::Freetype INTERFACE
+	${FREETYPE_INCLUDE_DIRS}
+)

lib/GamepadMotionHelpers/.gitignore

@@ -0,0 +1,32 @@
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app

lib/GamepadMotionHelpers/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.8)
+
+project(GamepadMotionHelpers LANGUAGES CXX)
+
+add_library(${PROJECT_NAME} INTERFACE)
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+target_include_directories(${PROJECT_NAME}
+        INTERFACE
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+            $<INSTALL_INTERFACE:include>)
+		

lib/GamepadMotionHelpers/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020-2023 Julian "Jibb" Smart
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

lib/GamepadMotionHelpers/README.md

@@ -0,0 +1,76 @@
+# GamepadMotionHelpers
+GamepadMotionHelpers is a lightweight header-only library for sensor fusion, gyro calibration, etc. BYO input library (eg [SDL2](https://github.com/libsdl-org/SDL)).
+
+## Units
+Convert your gyro units into **degrees per second** and accelerometer units to **g-force** (1 g = 9.8 m/s^2). You don't have to use these units in your application, but convert to these units when writing to GamepadMotionHelpers and convert back when reading from it. Your input reader might prefer radians per second and metres per second squared, but the datasheets for every IMU I've seen talk about degrees per second and g-force.
+
+## Coordinate Space
+This library uses a Y-up coordinate system. While Z-up is (only slightly) preferable for many games, PlayStation controllers use Y-up, and have set the standard for input libraries like [SDL2](https://github.com/libsdl-org/SDL) and [JSL](https://github.com/JibbSmart/JoyShockLibrary). These libraries convert inputs from other controller types to the same space used by PlayStation's DualShock 4 and DualSense, so that's what's used here.
+
+## Basic Use
+Include the GamepadMotion.hpp file in your C++ project. That's it! Everything you need is in that file, and its only dependency is ```<math.h>```.
+
+For each controller with gyro (and optionally accelerometer), create a ```GamepadMotion``` object. At regular intervals, whether when a new report comes in from the controller or when polling the controller's state, you should call ```ProcessMotion(...)```. This is when you tell your GamepadMotion object the latest gyro (in degrees per second) and accelerometer (in g-force) inputs. You'll also give it the time since the last update for this controller (in seconds).
+
+ProcessMotion takes these inputs, updates some internal values, and then you can use any of the following to read its current state:
+- ```GetCalibratedGyro(float& x, float& y, float& z)``` - Get the controller's angular velocity in degrees per second. This is just the raw gyro you gave it minus the gyro's bias as determined by your calibration settings (more on that below).
+- ```GetGravity(float& x, float& y, float& z)``` - Get the gravity direction in the controller's local space. When the controller is still on a flat surface it'll be approximately (0, -1, 0). The controller can't detect the gravity direction when it's in freefall or being shaken around, but it can make a pretty good guess if its gyro is correctly calibrated and then make further corrections when the controller is still again.
+- ```GetProcessedAcceleration(float& x, float& y, float& z)``` - Get the controller's current acceleration in g-force with gravity removed. Raw accelerometer input includes gravity -- it is only (0, 0, 0) when the controller is in freefall. However, using the gravity direction as calculated for GetGravity, it can remove that component and detect how you're shaking the controller about. This function gives you that acceleration vector with the gravity removed.
+- ```GetOrientation(float& w, float& x, float& y, float& z)``` - Get the controller's orientation. Gyro and accelerometer input are combined to give a good estimate of the controller's orientation.
+
+Additional helper functions are available for taking gravity into account and returning a "world space" or "player space" rotation in two axes. Bear in mind that the **X** and **Y** set by these functions is still around the controller's axes. This means **Y** is the *horizontal* part of the rotation, and **X** is the vertical part. To convert to a mouse-like input, you'll treat the **Y** as the horizontal or yaw input and **X** as the vertical or pitch input. This might be unintuitive, but since it's also true of the "local space" angular velocities obtained from GetCalibratedGyro, this makes it simple to let the user choose between *local space*, *world space*, and *player space* in your game or application by just swapping GetCalibratedGyro for these functions depending on that selection:
+- ```GetWorldSpaceGyro(float& x, float& y, const float sideReductionThreshold = 0.125f)``` - Get the controller's angular velocity in *world space* as described on GyroWiki in the [player space article here](http://gyrowiki.jibbsmart.com/blog:player-space-gyro-and-alternatives-explained#toc6). Yaw input will be derived from motion around the gravity axis, and pitch input from an appropriate pitch axis calculated from the controller's orientation with respect to the gravity axis. Any errors in the calculated gravity axis (though likely very small) will be taken on by the calculated world space gyro rotation, making it slightly less robust than using calibrated gyro directly ("local space" gyro) or using *player space* gyro below. More info in the linked article.
+- ```GetPlayerSpaceGyro(float& x, float& y, const float yawRelaxFactor = 1.41f)``` - Get the controller's angular velocity in *player space* as described on GyroWiki in the [player space article here](http://gyrowiki.jibbsmart.com/blog:player-space-gyro-and-alternatives-explained#toc7). Yaw input will be derived from motion approximately around the gravity axis, without any impact from errors in the gravity calculation. Pitch is just local pitch. It is robust, accommodates players who are used to both local space and world space gyro, while taking on most of the advantages of each. It is proven in popular games and is an ideal default for players using a standalone controller. For handheld (where the screen is part of the controller, such as mobile, Switch, or Steam Deck) local space (using the calibrated gyro input directly) may be preferable. More info in the linked article.
+
+If you want to plug in the gyro and gravity values yourself (perhaps you're using an externally calculated gravity), you can use ```CalculateWorldSpaceGyro``` and ```CalculatePlayerSpaceGyro``` instead. Make sure you use this GamepadMotionHelpers' coordinate space, units, and gravity is normalized, since those are all assumed for these functions.
+
+## Sensor Fusion
+Combining multiple types of sensor like this to get a better picture of the controller's state is called "sensor fusion". Moment-to-moment changes in orientation are detected using the gyro, but that only gives local angular velocity and needs to be correctly calibrated. Errors can accumulate over time. The gravity vector as detected by the accelerometer is used to make corrections to the relevant components of the controller's orientation.
+
+But this cannot be used to correct the controller's orientation around the gravity vector (the **yaw** axis). If you're using the controller's absolute orientation for some reason, this "yaw drift" may need to be accounted for somehow. Some devices also have a magnetometer (compass) to counter yaw drift, but since popular game controllers don't have a magnetometer, I haven't tried it myself. In future, if I get such a device, I'd like to add the option for GamepadMotionHelpers to accept magnetometer input and account for it when calculating values for the above functions.
+
+## Gyro Calibration
+Modern gyroscopes often need calibration. This is like how a [weighing scale](https://en.wikipedia.org/wiki/Weighing_scale) can need calibration to tell it what 'zero' is. Like a weighing scale, a correctly calibrated gyroscope will give an accurate reading. If you're using the gyro input as a mouse, which is the simplest application of a controller's gyro, you can find essential reading on [GyroWiki here](http://gyrowiki.jibbsmart.com/blog:good-gyro-controls-part-1:the-gyro-is-a-mouse).
+
+Calibration just means having the controller sit still and remembering the average reported angular velocity in each axis. This is the gyro's "bias". In GamepadMotionHelpers, I call our best guess at the controller's bias the "calibration offset". GamepadMotionHelpers has some options to help with calibrating:
+
+At any time, you can begin manually calibrating a controller by calling ```StartContinuousCalibration()```. This will start recording the average angular velocity and apply it immediately to any subsequent **GetGalibratedGyro(...)** call. At any time you can ```PauseContinuousCalibration()``` to no longer add current values to the average angular velocity being recorded. You can ```ResetContinousCalibration()``` to remove the recorded average before starting over with **StartContinuousCalibration** again.
+
+You can read the stored calibration values using ```GetCalibrationOffset(float& xOffset, float& yOffset, float& zOffset)```. You can manually set the calibration offset yourself with ```SetCalibrationOffset(float xOffset, float yOffset, float zOffset, int weight)```. This will override all stored values. The **weight** argument at the end determines how strongly these values should be considered over time if Continuous Calibration is still active (new values are still being added to the average). Each new sample has a weight of 1, so if you **SetCalibrationOffset** with a weight of 10, it'll have the weight of 10 samples when calculating the average. If you're not continuing to add samples (Continuous Calibration is not active), the weight will be meaningless. Setting this manually is unusual, so don't worry about it too much if that sounds complicated.
+
+Most games don't ask the user to calibrate the gyro themselves. They have built-in automatic calibration, which I like to call "auto-calibration". There's no such thing as a "good enough" auto-calibration solution -- at least not with only gyro and accelerometer. Every game that has an auto-calibration solution would be made better for more serious players with the option to manually calibrate their gyro, so I urge you to provide players the option to do the same in your game. Having said that, auto-calibration is a useful option for casual players, and you may choose to have it enabled in your game by default.
+
+So GamepadMotionHelpers provides some auto-calibration options. You can call ```SetCalibrationMode(CalibrationMode)``` on each GamepadMotion instance with the following options:
+- ```CalibrationMode::Manual``` - No auto-calibration. This is the default.
+- ```CalibrationMode::Stillness``` - Automatically try to detect when the controller is being held still and update the calibration offset accordingly.
+- ```CalibrationMode::SensorFusion``` - Calculate an angular velocity from changes in the gravity direction as detected by the accelerometer. If these are steady enough, use them to make corrections to the calibration offset. This will only apply to relevant axes.
+
+Many players are already aware of the shortcomings of trying to automatically detect stillness to automatically calibrate the gyro. Whether on Switch, PlayStation, or using PlayStation controllers on PC, players have tried to track a slow or distant target only to have the aimer suddenly stop moving! The game or the platform has **misinterpreted their slow and steady input as the controller being held still**, and they've incorrectly recalibrated accordingly. Players *hate it* when this happens.
+
+**This is why it's important to let players manually calibrate their gyro** if they want to.
+
+Auto-calibration is used so widely in console games that it's speculated that game developers may not have the option to disable it on these platforms. If this is the case, GamepadMotionHelpers offers a big advantage over those platforms: you can disable it and enable it at any time.
+
+You, the game developer, can have your game tell if the player is tracking a distant or slow-moving target. You can tell if the player's aimer is moving towards a visible target or roughly following the movement of one. When it is, maybe disabling the auto-calibration (```SetCalibrationMode(CalibrationMode::Manual)```) could be the difference between good and bad auto-calibration. I don't know if the GamepadMotionHelpers auto-calibration functions are better or worse than their Switch and PlayStation counterparts generally, but by letting you take the game's context into account, you may be able to offer players a way better experience without them having to manually calibrate.
+
+But still give them the option to calibrate manually, please :)
+
+The **SensorFusion** calibration mode has shortcomings of its own. It's much harder to accidentally trick the game into incorrectly calibrating, but the angular velocity calculated from the accelerometer moment-to-moment is generally much less precise. Leaving the controller still, you'll notice the calibrated gyro moving slightly up and down over time. So while the **Stillness** mode is characterised by good behaviour occasionally punctuated by frustrating errors, the **SensorFusion** mode will tend to be more consistently not-quite-right without being terrible.
+
+Secondly, this library currently only combines accelerometer and gyro, so the **SensorFusion** auto-calibration cannot correct the gyro in all axes at the same time. The **SensorFusion**-only mode will be more useful in future when magnetometer input is supported, which can account for the axes that the accelerometer can't.
+
+Both auto-calibration modes can be combined by passing ```CalibrationMode::Stillness | CalibrationMode::SensorFusion``` to **SetCalibrationMode**. In this case, it'll use **Stillness** auto-calibration, but it'll adjust the calibration offset based on any angular velocity implied by changes in the accelerometer input. This tends to give better results than just using **Stillness** or **SensorFusion** on their own.
+
+If you aren't sure what to choose, I'd suggest using the combined ```CalibrationMode::Stillness | CalibrationMode::SensorFusion``` when auto calibration is enabled, but also allowing the player to manually calibrate.
+
+**TODO** This is a clunky way to let the user set up what is obviously the best solution. Maybe I should just call it "hybrid" or something and be done with it?
+
+Auto-calibration can also be used to communicate manual calibration to the player. ```GetAutoCalibrationIsSteady()``` will tell you whether GamepadMotionHelpers thinks the controller is currently being held steady (if auto-calibration is enabled). ```GetAutoCalibrationConfidence()``` will tell you how confident GamepadMotionHelpers is that it has a good calibration value from auto-calibration, from 0-1. Higher confidence means that new calibration changes will be applied more gradually. You can use these functions to detect when a controller needs to be calibrated, prompt the player to put their controller down, detect when they have put their controller down, and show progress for calibration (default 1 second once it starts). You can also override the confidence yourself (```SetAutoCalibrationConfidence()```), and resetting calibration will reset confidence to 0. How quickly confidence grows as well as other calibration settings can be customised in **GamepadMotionSettings**.
+
+## In the Wild
+GamepadMotionHelpers is currently used in:
+- [JoyShockMapper](https://github.com/Electronicks/JoyShockMapper)
+- [JoyShockLibrary](https://github.com/JibbSmart/JoyShockLibrary)
+- JoyShockOverlay
+
+If you know of any other games or applications using GamepadMotionHelpers, please let me know!

lib/SlotMap/README.md

@@ -1,257 +0,0 @@
-This file is originally from the repo: https://github.com/SergeyMakeev/SlotMap
-
-The original license and README are as follows:
-```
-MIT License
-
-Copyright (c) 2022 Sergey Makeev
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-# Slot Map
-
-[![Actions Status](https://github.com/SergeyMakeev/slot_map/workflows/build/badge.svg)](https://github.com/SergeyMakeev/slot_map/actions)
-[![Build status](https://ci.appveyor.com/api/projects/status/i00kv17e3ia5jr7q?svg=true)](https://ci.appveyor.com/project/SergeyMakeev/slot-map)
-[![codecov](https://codecov.io/gh/SergeyMakeev/slot_map/branch/main/graph/badge.svg?token=3GRAFTRYQU)](https://codecov.io/gh/SergeyMakeev/slot_map)
-![MIT](https://img.shields.io/badge/license-MIT-blue.svg)
-
-A Slot Map is a high-performance associative container with persistent unique keys to access stored values. Upon insertion, a key is returned that can be used to later access or remove the values. Insertion, removal, and access are all guaranteed to take `O(1)` time (best, worst, and average case)  
-Great for storing collections of objects that need stable, safe references but have no clear ownership.
-
-The difference between a `std::unordered_map` and a `dod::slot_map` is that the slot map generates and returns the key when inserting a value. A key is always unique and will only refer to the value that was inserted.
-
-  Usage example:
-  ```cpp
-  slot_map<std::string> strings;
-  auto red = strings.emplace("Red");
-  auto green = strings.emplace("Green");
-  auto blue = strings.emplace("Blue");
-
-  const std::string* val1 = strings.get(red);
-  if (val1)
-  {
-    printf("red = '%s'\n", val1->c_str());
-  }
-
-  strings.erase(green);
-  printf("%d\n", strings.has(green));
-  printf("%d\n", strings.has(blue));
-  ```
-
-  Output:
-  ```
-  red = 'Red'
-  0
-  1
-  ```
-  
-# Implementation details
-
-The slot map container will allocate memory in pages (default page size = 4096 elements) to avoid memory spikes during growth and be able to deallocate pages that are no longer needed.
-Also, the page-based memory allocator is very important since it guarantees "pointers stability"; hence, we never move values in memory.
-
-
-Keys are always uses `uint64_t/uint32_t` (configurable) and technically typless, but we "artificially" make them typed to get a few extra compile-time checks.  
-i.e., the following code will produce a compiler error
-```cpp
-slot_map<std::string> strings;
-slot_map<int> numbers;
-slot_map<int>::key numKey = numbers.emplace(3);
-const std::string* value = strings.get(numKey);   //  <---- can not use slot_map<int>::key to index slot_map<std::string> !
-```
-
-The keys can be converted to/from their numeric types if you do not need additional type checks.
-```cpp
-slot_map<int> numbers;
-slot_map<int>::key numKey = numbers.emplace(3);
-uint64_t rawKey = numKey;  // convert to numeric type (like cast pointer to void*)
-...
-slot_map<int>::key numKey2{rawKey}; // create key from numeric type
-```
-
-When a slot is reused, its version is automatically incremented (to invalidate all existing keys that refers to the same slot).
-But since we only use 20-bits *(10-bits for 32 bit keys)* for version counter, there is a possibility that the version counter will wrap around,
-and a new item will get the same key as a removed item.
-
-To mitigate this potential issue, once the version counter overflows, we disable that slot so that no new keys are returned for this slot
-(this gives us a guarantee that there are no key collisions)
-
-To prevent version overflow from happening too often, we need to ensure that we don't reuse the same slot too often.
-So we do not reuse recently freed slot-indices as long as their number is below a certain threshold (`kMinFreeIndices = 64`).
-
-Keys also can carry a few extra bits of information provided by a user that we called `tag`.  
-That might be handy to add application-specific data to keys.
-
-For example:
-```cpp
-  slot_map<std::string> strings;
-  auto red = strings.emplace("Red");
-  red.set_tag(13);
-  
-  auto tag = red.get_tag();
-  assert(tag == 13);
-```
-
-Here is how a key structure looks like internally
-
-64-bit key type
-
-| Component      |  Number of bits        |
-| ---------------|------------------------|
-| tag            |  12                    |
-| version        |  20 (0..1,048,575      |
-| index          |  32 (0..4,294,967,295) |
-
-32-bit key type
-
-| Component      |  Number of bits     |
-| ---------------|---------------------|
-| tag            |  2                  |
-| version        |  10 (0..1023)       |
-| index          |  20 (0..1,048,575)  |
-
-Note: To use your custom memory allocator define `SLOT_MAP_ALLOC`/`SLOT_MAP_FREE` before including `"slot_map.h"`
-
-```cpp
-#define SLOT_MAP_ALLOC(sizeInBytes, alignment) aligned_alloc(alignment, sizeInBytes)
-#define SLOT_MAP_FREE(ptr) free(ptr)
-#include "slot_map.h"
-```
-
-
-# API
-  
-`bool has_key(key k) const noexcept`  
-Returns true if the slot map contains a specific key  
-    
-`void reset()`  
-Clears the slot map and releases any allocated memory.  
-Note: By calling this function, you must guarantee that no handles are in use!  
-Otherwise calling this function might be dangerous and lead to key "collisions".  
-You might consider using "clear()" instead.  
-  
-`void clear()`  
-Clears the slot map but keeps the allocated memory for reuse.  
-Automatically increases version for all the removed elements (the same as calling "erase()" for all existing elements)  
-      
-`const T* get(key k) const noexcept`  
-If key exists returns a const pointer to the value corresponding to the given key or returns null elsewere.  
-      
-`T* get(key k)`  
-If key exists returns a pointer to the value corresponding to the given key or returns null elsewere.  
-      
-`key emplace(Args&&... args)`  
-Constructs element in-place and returns a unique key that can be used to access this value.  
-      
-`void erase(key k)`  
-Removes element (if such key exists) from the slot map.  
-      
-`std::optional<T> pop(key k)`  
-Removes element (if such key exists) from the slot map, returning the value at the key if the key was not previously removed.  
-      
-`bool empty() const noexcept`  
-Returns true if the slot map is empty.  
-   
-`size_type size() const noexcept`  
-Returns the number of elements in the slot map.  
-
-`void swap(slot_map& other) noexcept`  
-Exchanges the content of the slot map by the content of another slot map object of the same type.  
-  
-`slot_map(const slot_map& other)`  
-Copy constructor  
-
-`slot_map& operator=(const slot_map& other)`  
-Copy assignment  
-
-`slot_map(slot_map&& other) noexcept`  
-Move constructor
-
-`slot_map& operator=(slot_map&& other) noexcept`  
-Move asignment
-
-
-`const_values_iterator begin() const noexcept`  
-`const_values_iterator end() const noexcept`  
-Const values iterator
-
-```cpp
-for (const auto& value : slotMap)
-{
- ...
-}
-```
-
-`Items items() const noexcept`  
-Const key/value iterator
-
-```cpp
-for (const auto& [key, value] : slotMap.items())
-{
-...
-}
-```
-  
-# References
-
-  Sean Middleditch  
-  Data Structures for Game Developers: The Slot Map, 2013  
-  https://web.archive.org/web/20180121142549/http://seanmiddleditch.com/data-structures-for-game-developers-the-slot-map/ 
-  
-  Niklas Gray  
-  Building a Data-Oriented Entity System (part 1), 2014  
-  http://bitsquid.blogspot.com/2014/08/building-data-oriented-entity-system.html  
-
-  Noel Llopis  
-  Managing Data Relationships, 2010  
-  https://gamesfromwithin.com/managing-data-relationships  
-
-  Stefan Reinalter  
-  Adventures in data-oriented design - Part 3c: External References, 2013  
-  https://blog.molecular-matters.com/2013/07/24/adventures-in-data-oriented-design-part-3c-external-references/  
-
-  Niklas Gray  
-  Managing Decoupling Part 4 - The ID Lookup Table, 2011  
-  https://bitsquid.blogspot.com/2011/09/managing-decoupling-part-4-id-lookup.html  
-
-  Sander Mertens  
-  Making the most of ECS identifiers, 2020  
-  https://ajmmertens.medium.com/doing-a-lot-with-a-little-ecs-identifiers-25a72bd2647  
-
-  Michele Caini  
-  ECS back and forth. Part 9 - Sparse sets and EnTT, 2020  
-  https://skypjack.github.io/2020-08-02-ecs-baf-part-9/  
-
-  Andre Weissflog  
-  Handles are the better pointers, 2018  
-  https://floooh.github.io/2018/06/17/handles-vs-pointers.html  
-
-  Allan Deutsch  
-  C++Now 2017: "The Slot Map Data Structure", 2017  
-  https://www.youtube.com/watch?v=SHaAR7XPtNU  
-
-  Jeff Gates  
-  Init, Update, Draw - Data Arrays, 2012  
-  https://greysphere.tumblr.com/post/31601463396/data-arrays  
-  
-  Niklas Gray  
-  Data Structures Part 1: Bulk Data, 2019  
-  https://ourmachinery.com/post/data-structures-part-1-bulk-data/  
-  
-  

lib/concurrentqueue/blockingconcurrentqueue.h

@@ -0,0 +1,582 @@
+// Provides an efficient blocking version of moodycamel::ConcurrentQueue.
+// ©2015-2020 Cameron Desrochers. Distributed under the terms of the simplified
+// BSD license, available at the top of concurrentqueue.h.
+// Also dual-licensed under the Boost Software License (see LICENSE.md)
+// Uses Jeff Preshing's semaphore implementation (under the terms of its
+// separate zlib license, see lightweightsemaphore.h).
+
+#pragma once
+
+#include "concurrentqueue.h"
+#include "lightweightsemaphore.h"
+
+#include <type_traits>
+#include <cerrno>
+#include <memory>
+#include <chrono>
+#include <ctime>
+
+namespace moodycamel
+{
+// This is a blocking version of the queue. It has an almost identical interface to
+// the normal non-blocking version, with the addition of various wait_dequeue() methods
+// and the removal of producer-specific dequeue methods.
+template<typename T, typename Traits = ConcurrentQueueDefaultTraits>
+class BlockingConcurrentQueue
+{
+private:
+	typedef ::moodycamel::ConcurrentQueue<T, Traits> ConcurrentQueue;
+	typedef ::moodycamel::LightweightSemaphore LightweightSemaphore;
+
+public:
+	typedef typename ConcurrentQueue::producer_token_t producer_token_t;
+	typedef typename ConcurrentQueue::consumer_token_t consumer_token_t;
+	
+	typedef typename ConcurrentQueue::index_t index_t;
+	typedef typename ConcurrentQueue::size_t size_t;
+	typedef typename std::make_signed<size_t>::type ssize_t;
+	
+	static const size_t BLOCK_SIZE = ConcurrentQueue::BLOCK_SIZE;
+	static const size_t EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD = ConcurrentQueue::EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD;
+	static const size_t EXPLICIT_INITIAL_INDEX_SIZE = ConcurrentQueue::EXPLICIT_INITIAL_INDEX_SIZE;
+	static const size_t IMPLICIT_INITIAL_INDEX_SIZE = ConcurrentQueue::IMPLICIT_INITIAL_INDEX_SIZE;
+	static const size_t INITIAL_IMPLICIT_PRODUCER_HASH_SIZE = ConcurrentQueue::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE;
+	static const std::uint32_t EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE = ConcurrentQueue::EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE;
+	static const size_t MAX_SUBQUEUE_SIZE = ConcurrentQueue::MAX_SUBQUEUE_SIZE;
+	
+public:
+	// Creates a queue with at least `capacity` element slots; note that the
+	// actual number of elements that can be inserted without additional memory
+	// allocation depends on the number of producers and the block size (e.g. if
+	// the block size is equal to `capacity`, only a single block will be allocated
+	// up-front, which means only a single producer will be able to enqueue elements
+	// without an extra allocation -- blocks aren't shared between producers).
+	// This method is not thread safe -- it is up to the user to ensure that the
+	// queue is fully constructed before it starts being used by other threads (this
+	// includes making the memory effects of construction visible, possibly with a
+	// memory barrier).
+	explicit BlockingConcurrentQueue(size_t capacity = 6 * BLOCK_SIZE)
+		: inner(capacity), sema(create<LightweightSemaphore, ssize_t, int>(0, (int)Traits::MAX_SEMA_SPINS), &BlockingConcurrentQueue::template destroy<LightweightSemaphore>)
+	{
+		assert(reinterpret_cast<ConcurrentQueue*>((BlockingConcurrentQueue*)1) == &((BlockingConcurrentQueue*)1)->inner && "BlockingConcurrentQueue must have ConcurrentQueue as its first member");
+		if (!sema) {
+			MOODYCAMEL_THROW(std::bad_alloc());
+		}
+	}
+	
+	BlockingConcurrentQueue(size_t minCapacity, size_t maxExplicitProducers, size_t maxImplicitProducers)
+		: inner(minCapacity, maxExplicitProducers, maxImplicitProducers), sema(create<LightweightSemaphore, ssize_t, int>(0, (int)Traits::MAX_SEMA_SPINS), &BlockingConcurrentQueue::template destroy<LightweightSemaphore>)
+	{
+		assert(reinterpret_cast<ConcurrentQueue*>((BlockingConcurrentQueue*)1) == &((BlockingConcurrentQueue*)1)->inner && "BlockingConcurrentQueue must have ConcurrentQueue as its first member");
+		if (!sema) {
+			MOODYCAMEL_THROW(std::bad_alloc());
+		}
+	}
+	
+	// Disable copying and copy assignment
+	BlockingConcurrentQueue(BlockingConcurrentQueue const&) MOODYCAMEL_DELETE_FUNCTION;
+	BlockingConcurrentQueue& operator=(BlockingConcurrentQueue const&) MOODYCAMEL_DELETE_FUNCTION;
+	
+	// Moving is supported, but note that it is *not* a thread-safe operation.
+	// Nobody can use the queue while it's being moved, and the memory effects
+	// of that move must be propagated to other threads before they can use it.
+	// Note: When a queue is moved, its tokens are still valid but can only be
+	// used with the destination queue (i.e. semantically they are moved along
+	// with the queue itself).
+	BlockingConcurrentQueue(BlockingConcurrentQueue&& other) MOODYCAMEL_NOEXCEPT
+		: inner(std::move(other.inner)), sema(std::move(other.sema))
+	{ }
+	
+	inline BlockingConcurrentQueue& operator=(BlockingConcurrentQueue&& other) MOODYCAMEL_NOEXCEPT
+	{
+		return swap_internal(other);
+	}
+	
+	// Swaps this queue's state with the other's. Not thread-safe.
+	// Swapping two queues does not invalidate their tokens, however
+	// the tokens that were created for one queue must be used with
+	// only the swapped queue (i.e. the tokens are tied to the
+	// queue's movable state, not the object itself).
+	inline void swap(BlockingConcurrentQueue& other) MOODYCAMEL_NOEXCEPT
+	{
+		swap_internal(other);
+	}
+	
+private:
+	BlockingConcurrentQueue& swap_internal(BlockingConcurrentQueue& other)
+	{
+		if (this == &other) {
+			return *this;
+		}
+		
+		inner.swap(other.inner);
+		sema.swap(other.sema);
+		return *this;
+	}
+	
+public:
+	// Enqueues a single item (by copying it).
+	// Allocates memory if required. Only fails if memory allocation fails (or implicit
+	// production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0,
+	// or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
+	// Thread-safe.
+	inline bool enqueue(T const& item)
+	{
+		if ((details::likely)(inner.enqueue(item))) {
+			sema->signal();
+			return true;
+		}
+		return false;
+	}
+	
+	// Enqueues a single item (by moving it, if possible).
+	// Allocates memory if required. Only fails if memory allocation fails (or implicit
+	// production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0,
+	// or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
+	// Thread-safe.
+	inline bool enqueue(T&& item)
+	{
+		if ((details::likely)(inner.enqueue(std::move(item)))) {
+			sema->signal();
+			return true;
+		}
+		return false;
+	}
+	
+	// Enqueues a single item (by copying it) using an explicit producer token.
+	// Allocates memory if required. Only fails if memory allocation fails (or
+	// Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
+	// Thread-safe.
+	inline bool enqueue(producer_token_t const& token, T const& item)
+	{
+		if ((details::likely)(inner.enqueue(token, item))) {
+			sema->signal();
+			return true;
+		}
+		return false;
+	}
+	
+	// Enqueues a single item (by moving it, if possible) using an explicit producer token.
+	// Allocates memory if required. Only fails if memory allocation fails (or
+	// Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
+	// Thread-safe.
+	inline bool enqueue(producer_token_t const& token, T&& item)
+	{
+		if ((details::likely)(inner.enqueue(token, std::move(item)))) {
+			sema->signal();
+			return true;
+		}
+		return false;
+	}
+	
+	// Enqueues several items.
+	// Allocates memory if required. Only fails if memory allocation fails (or
+	// implicit production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE
+	// is 0, or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
+	// Note: Use std::make_move_iterator if the elements should be moved instead of copied.
+	// Thread-safe.
+	template<typename It>
+	inline bool enqueue_bulk(It itemFirst, size_t count)
+	{
+		if ((details::likely)(inner.enqueue_bulk(std::forward<It>(itemFirst), count))) {
+			sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
+			return true;
+		}
+		return false;
+	}
+	
+	// Enqueues several items using an explicit producer token.
+	// Allocates memory if required. Only fails if memory allocation fails
+	// (or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
+	// Note: Use std::make_move_iterator if the elements should be moved
+	// instead of copied.
+	// Thread-safe.
+	template<typename It>
+	inline bool enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
+	{
+		if ((details::likely)(inner.enqueue_bulk(token, std::forward<It>(itemFirst), count))) {
+			sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
+			return true;
+		}
+		return false;
+	}
+	
+	// Enqueues a single item (by copying it).
+	// Does not allocate memory. Fails if not enough room to enqueue (or implicit
+	// production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE
+	// is 0).
+	// Thread-safe.
+	inline bool try_enqueue(T const& item)
+	{
+		if (inner.try_enqueue(item)) {
+			sema->signal();
+			return true;
+		}
+		return false;
+	}
+	
+	// Enqueues a single item (by moving it, if possible).
+	// Does not allocate memory (except for one-time implicit producer).
+	// Fails if not enough room to enqueue (or implicit production is
+	// disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0).
+	// Thread-safe.
+	inline bool try_enqueue(T&& item)
+	{
+		if (inner.try_enqueue(std::move(item))) {
+			sema->signal();
+			return true;
+		}
+		return false;
+	}
+	
+	// Enqueues a single item (by copying it) using an explicit producer token.
+	// Does not allocate memory. Fails if not enough room to enqueue.
+	// Thread-safe.
+	inline bool try_enqueue(producer_token_t const& token, T const& item)
+	{
+		if (inner.try_enqueue(token, item)) {
+			sema->signal();
+			return true;
+		}
+		return false;
+	}
+	
+	// Enqueues a single item (by moving it, if possible) using an explicit producer token.
+	// Does not allocate memory. Fails if not enough room to enqueue.
+	// Thread-safe.
+	inline bool try_enqueue(producer_token_t const& token, T&& item)
+	{
+		if (inner.try_enqueue(token, std::move(item))) {
+			sema->signal();
+			return true;
+		}
+		return false;
+	}
+	
+	// Enqueues several items.
+	// Does not allocate memory (except for one-time implicit producer).
+	// Fails if not enough room to enqueue (or implicit production is
+	// disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0).
+	// Note: Use std::make_move_iterator if the elements should be moved
+	// instead of copied.
+	// Thread-safe.
+	template<typename It>
+	inline bool try_enqueue_bulk(It itemFirst, size_t count)
+	{
+		if (inner.try_enqueue_bulk(std::forward<It>(itemFirst), count)) {
+			sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
+			return true;
+		}
+		return false;
+	}
+	
+	// Enqueues several items using an explicit producer token.
+	// Does not allocate memory. Fails if not enough room to enqueue.
+	// Note: Use std::make_move_iterator if the elements should be moved
+	// instead of copied.
+	// Thread-safe.
+	template<typename It>
+	inline bool try_enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
+	{
+		if (inner.try_enqueue_bulk(token, std::forward<It>(itemFirst), count)) {
+			sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
+			return true;
+		}
+		return false;
+	}
+	
+	
+	// Attempts to dequeue from the queue.
+	// Returns false if all producer streams appeared empty at the time they
+	// were checked (so, the queue is likely but not guaranteed to be empty).
+	// Never allocates. Thread-safe.
+	template<typename U>
+	inline bool try_dequeue(U& item)
+	{
+		if (sema->tryWait()) {
+			while (!inner.try_dequeue(item)) {
+				continue;
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	// Attempts to dequeue from the queue using an explicit consumer token.
+	// Returns false if all producer streams appeared empty at the time they
+	// were checked (so, the queue is likely but not guaranteed to be empty).
+	// Never allocates. Thread-safe.
+	template<typename U>
+	inline bool try_dequeue(consumer_token_t& token, U& item)
+	{
+		if (sema->tryWait()) {
+			while (!inner.try_dequeue(token, item)) {
+				continue;
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	// Attempts to dequeue several elements from the queue.
+	// Returns the number of items actually dequeued.
+	// Returns 0 if all producer streams appeared empty at the time they
+	// were checked (so, the queue is likely but not guaranteed to be empty).
+	// Never allocates. Thread-safe.
+	template<typename It>
+	inline size_t try_dequeue_bulk(It itemFirst, size_t max)
+	{
+		size_t count = 0;
+		max = (size_t)sema->tryWaitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
+		while (count != max) {
+			count += inner.template try_dequeue_bulk<It&>(itemFirst, max - count);
+		}
+		return count;
+	}
+	
+	// Attempts to dequeue several elements from the queue using an explicit consumer token.
+	// Returns the number of items actually dequeued.
+	// Returns 0 if all producer streams appeared empty at the time they
+	// were checked (so, the queue is likely but not guaranteed to be empty).
+	// Never allocates. Thread-safe.
+	template<typename It>
+	inline size_t try_dequeue_bulk(consumer_token_t& token, It itemFirst, size_t max)
+	{
+		size_t count = 0;
+		max = (size_t)sema->tryWaitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
+		while (count != max) {
+			count += inner.template try_dequeue_bulk<It&>(token, itemFirst, max - count);
+		}
+		return count;
+	}
+	
+	
+	
+	// Blocks the current thread until there's something to dequeue, then
+	// dequeues it.
+	// Never allocates. Thread-safe.
+	template<typename U>
+	inline void wait_dequeue(U& item)
+	{
+		while (!sema->wait()) {
+			continue;
+		}
+		while (!inner.try_dequeue(item)) {
+			continue;
+		}
+	}
+
+	// Blocks the current thread until either there's something to dequeue
+	// or the timeout (specified in microseconds) expires. Returns false
+	// without setting `item` if the timeout expires, otherwise assigns
+	// to `item` and returns true.
+	// Using a negative timeout indicates an indefinite timeout,
+	// and is thus functionally equivalent to calling wait_dequeue.
+	// Never allocates. Thread-safe.
+	template<typename U>
+	inline bool wait_dequeue_timed(U& item, std::int64_t timeout_usecs)
+	{
+		if (!sema->wait(timeout_usecs)) {
+			return false;
+		}
+		while (!inner.try_dequeue(item)) {
+			continue;
+		}
+		return true;
+	}
+    
+    // Blocks the current thread until either there's something to dequeue
+	// or the timeout expires. Returns false without setting `item` if the
+    // timeout expires, otherwise assigns to `item` and returns true.
+	// Never allocates. Thread-safe.
+	template<typename U, typename Rep, typename Period>
+	inline bool wait_dequeue_timed(U& item, std::chrono::duration<Rep, Period> const& timeout)
+    {
+        return wait_dequeue_timed(item, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
+    }
+	
+	// Blocks the current thread until there's something to dequeue, then
+	// dequeues it using an explicit consumer token.
+	// Never allocates. Thread-safe.
+	template<typename U>
+	inline void wait_dequeue(consumer_token_t& token, U& item)
+	{
+		while (!sema->wait()) {
+			continue;
+		}
+		while (!inner.try_dequeue(token, item)) {
+			continue;
+		}
+	}
+	
+	// Blocks the current thread until either there's something to dequeue
+	// or the timeout (specified in microseconds) expires. Returns false
+	// without setting `item` if the timeout expires, otherwise assigns
+	// to `item` and returns true.
+	// Using a negative timeout indicates an indefinite timeout,
+	// and is thus functionally equivalent to calling wait_dequeue.
+	// Never allocates. Thread-safe.
+	template<typename U>
+	inline bool wait_dequeue_timed(consumer_token_t& token, U& item, std::int64_t timeout_usecs)
+	{
+		if (!sema->wait(timeout_usecs)) {
+			return false;
+		}
+		while (!inner.try_dequeue(token, item)) {
+			continue;
+		}
+		return true;
+	}
+    
+    // Blocks the current thread until either there's something to dequeue
+	// or the timeout expires. Returns false without setting `item` if the
+    // timeout expires, otherwise assigns to `item` and returns true.
+	// Never allocates. Thread-safe.
+	template<typename U, typename Rep, typename Period>
+	inline bool wait_dequeue_timed(consumer_token_t& token, U& item, std::chrono::duration<Rep, Period> const& timeout)
+    {
+        return wait_dequeue_timed(token, item, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
+    }
+	
+	// Attempts to dequeue several elements from the queue.
+	// Returns the number of items actually dequeued, which will
+	// always be at least one (this method blocks until the queue
+	// is non-empty) and at most max.
+	// Never allocates. Thread-safe.
+	template<typename It>
+	inline size_t wait_dequeue_bulk(It itemFirst, size_t max)
+	{
+		size_t count = 0;
+		max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
+		while (count != max) {
+			count += inner.template try_dequeue_bulk<It&>(itemFirst, max - count);
+		}
+		return count;
+	}
+	
+	// Attempts to dequeue several elements from the queue.
+	// Returns the number of items actually dequeued, which can
+	// be 0 if the timeout expires while waiting for elements,
+	// and at most max.
+	// Using a negative timeout indicates an indefinite timeout,
+	// and is thus functionally equivalent to calling wait_dequeue_bulk.
+	// Never allocates. Thread-safe.
+	template<typename It>
+	inline size_t wait_dequeue_bulk_timed(It itemFirst, size_t max, std::int64_t timeout_usecs)
+	{
+		size_t count = 0;
+		max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max, timeout_usecs);
+		while (count != max) {
+			count += inner.template try_dequeue_bulk<It&>(itemFirst, max - count);
+		}
+		return count;
+	}
+    
+    // Attempts to dequeue several elements from the queue.
+	// Returns the number of items actually dequeued, which can
+	// be 0 if the timeout expires while waiting for elements,
+	// and at most max.
+	// Never allocates. Thread-safe.
+	template<typename It, typename Rep, typename Period>
+	inline size_t wait_dequeue_bulk_timed(It itemFirst, size_t max, std::chrono::duration<Rep, Period> const& timeout)
+    {
+        return wait_dequeue_bulk_timed<It&>(itemFirst, max, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
+    }
+	
+	// Attempts to dequeue several elements from the queue using an explicit consumer token.
+	// Returns the number of items actually dequeued, which will
+	// always be at least one (this method blocks until the queue
+	// is non-empty) and at most max.
+	// Never allocates. Thread-safe.
+	template<typename It>
+	inline size_t wait_dequeue_bulk(consumer_token_t& token, It itemFirst, size_t max)
+	{
+		size_t count = 0;
+		max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
+		while (count != max) {
+			count += inner.template try_dequeue_bulk<It&>(token, itemFirst, max - count);
+		}
+		return count;
+	}
+	
+	// Attempts to dequeue several elements from the queue using an explicit consumer token.
+	// Returns the number of items actually dequeued, which can
+	// be 0 if the timeout expires while waiting for elements,
+	// and at most max.
+	// Using a negative timeout indicates an indefinite timeout,
+	// and is thus functionally equivalent to calling wait_dequeue_bulk.
+	// Never allocates. Thread-safe.
+	template<typename It>
+	inline size_t wait_dequeue_bulk_timed(consumer_token_t& token, It itemFirst, size_t max, std::int64_t timeout_usecs)
+	{
+		size_t count = 0;
+		max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max, timeout_usecs);
+		while (count != max) {
+			count += inner.template try_dequeue_bulk<It&>(token, itemFirst, max - count);
+		}
+		return count;
+	}
+	
+	// Attempts to dequeue several elements from the queue using an explicit consumer token.
+	// Returns the number of items actually dequeued, which can
+	// be 0 if the timeout expires while waiting for elements,
+	// and at most max.
+	// Never allocates. Thread-safe.
+	template<typename It, typename Rep, typename Period>
+	inline size_t wait_dequeue_bulk_timed(consumer_token_t& token, It itemFirst, size_t max, std::chrono::duration<Rep, Period> const& timeout)
+    {
+        return wait_dequeue_bulk_timed<It&>(token, itemFirst, max, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
+    }
+	
+	
+	// Returns an estimate of the total number of elements currently in the queue. This
+	// estimate is only accurate if the queue has completely stabilized before it is called
+	// (i.e. all enqueue and dequeue operations have completed and their memory effects are
+	// visible on the calling thread, and no further operations start while this method is
+	// being called).
+	// Thread-safe.
+	inline size_t size_approx() const
+	{
+		return (size_t)sema->availableApprox();
+	}
+	
+	
+	// Returns true if the underlying atomic variables used by
+	// the queue are lock-free (they should be on most platforms).
+	// Thread-safe.
+	static constexpr bool is_lock_free()
+	{
+		return ConcurrentQueue::is_lock_free();
+	}
+	
+
+private:
+	template<typename U, typename A1, typename A2>
+	static inline U* create(A1&& a1, A2&& a2)
+	{
+		void* p = (Traits::malloc)(sizeof(U));
+		return p != nullptr ? new (p) U(std::forward<A1>(a1), std::forward<A2>(a2)) : nullptr;
+	}
+	
+	template<typename U>
+	static inline void destroy(U* p)
+	{
+		if (p != nullptr) {
+			p->~U();
+		}
+		(Traits::free)(p);
+	}
+	
+private:
+	ConcurrentQueue inner;
+	std::unique_ptr<LightweightSemaphore, void (*)(LightweightSemaphore*)> sema;
+};
+
+
+template<typename T, typename Traits>
+inline void swap(BlockingConcurrentQueue<T, Traits>& a, BlockingConcurrentQueue<T, Traits>& b) MOODYCAMEL_NOEXCEPT
+{
+	a.swap(b);
+}
+
+}	// end namespace moodycamel

lib/concurrentqueue/lightweightsemaphore.h

@@ -0,0 +1,425 @@
+// Provides an efficient implementation of a semaphore (LightweightSemaphore).
+// This is an extension of Jeff Preshing's sempahore implementation (licensed 
+// under the terms of its separate zlib license) that has been adapted and
+// extended by Cameron Desrochers.
+
+#pragma once
+
+#include <cstddef> // For std::size_t
+#include <atomic>
+#include <type_traits> // For std::make_signed<T>
+
+#if defined(_WIN32)
+// Avoid including windows.h in a header; we only need a handful of
+// items, so we'll redeclare them here (this is relatively safe since
+// the API generally has to remain stable between Windows versions).
+// I know this is an ugly hack but it still beats polluting the global
+// namespace with thousands of generic names or adding a .cpp for nothing.
+extern "C" {
+	struct _SECURITY_ATTRIBUTES;
+	__declspec(dllimport) void* __stdcall CreateSemaphoreW(_SECURITY_ATTRIBUTES* lpSemaphoreAttributes, long lInitialCount, long lMaximumCount, const wchar_t* lpName);
+	__declspec(dllimport) int __stdcall CloseHandle(void* hObject);
+	__declspec(dllimport) unsigned long __stdcall WaitForSingleObject(void* hHandle, unsigned long dwMilliseconds);
+	__declspec(dllimport) int __stdcall ReleaseSemaphore(void* hSemaphore, long lReleaseCount, long* lpPreviousCount);
+}
+#elif defined(__MACH__)
+#include <mach/mach.h>
+#elif defined(__unix__)
+#include <semaphore.h>
+
+#if defined(__GLIBC_PREREQ) && defined(_GNU_SOURCE)
+#if __GLIBC_PREREQ(2,30)
+#define MOODYCAMEL_LIGHTWEIGHTSEMAPHORE_MONOTONIC
+#endif
+#endif
+#endif
+
+namespace moodycamel
+{
+namespace details
+{
+
+// Code in the mpmc_sema namespace below is an adaptation of Jeff Preshing's
+// portable + lightweight semaphore implementations, originally from
+// https://github.com/preshing/cpp11-on-multicore/blob/master/common/sema.h
+// LICENSE:
+// Copyright (c) 2015 Jeff Preshing
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//	claim that you wrote the original software. If you use this software
+//	in a product, an acknowledgement in the product documentation would be
+//	appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//	misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+#if defined(_WIN32)
+class Semaphore
+{
+private:
+	void* m_hSema;
+	
+	Semaphore(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
+	Semaphore& operator=(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
+
+public:
+	Semaphore(int initialCount = 0)
+	{
+		assert(initialCount >= 0);
+		const long maxLong = 0x7fffffff;
+		m_hSema = CreateSemaphoreW(nullptr, initialCount, maxLong, nullptr);
+		assert(m_hSema);
+	}
+
+	~Semaphore()
+	{
+		CloseHandle(m_hSema);
+	}
+
+	bool wait()
+	{
+		const unsigned long infinite = 0xffffffff;
+		return WaitForSingleObject(m_hSema, infinite) == 0;
+	}
+	
+	bool try_wait()
+	{
+		return WaitForSingleObject(m_hSema, 0) == 0;
+	}
+	
+	bool timed_wait(std::uint64_t usecs)
+	{
+		return WaitForSingleObject(m_hSema, (unsigned long)(usecs / 1000)) == 0;
+	}
+
+	void signal(int count = 1)
+	{
+		while (!ReleaseSemaphore(m_hSema, count, nullptr));
+	}
+};
+#elif defined(__MACH__)
+//---------------------------------------------------------
+// Semaphore (Apple iOS and OSX)
+// Can't use POSIX semaphores due to http://lists.apple.com/archives/darwin-kernel/2009/Apr/msg00010.html
+//---------------------------------------------------------
+class Semaphore
+{
+private:
+	semaphore_t m_sema;
+
+	Semaphore(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
+	Semaphore& operator=(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
+
+public:
+	Semaphore(int initialCount = 0)
+	{
+		assert(initialCount >= 0);
+		kern_return_t rc = semaphore_create(mach_task_self(), &m_sema, SYNC_POLICY_FIFO, initialCount);
+		assert(rc == KERN_SUCCESS);
+		(void)rc;
+	}
+
+	~Semaphore()
+	{
+		semaphore_destroy(mach_task_self(), m_sema);
+	}
+
+	bool wait()
+	{
+		return semaphore_wait(m_sema) == KERN_SUCCESS;
+	}
+	
+	bool try_wait()
+	{
+		return timed_wait(0);
+	}
+	
+	bool timed_wait(std::uint64_t timeout_usecs)
+	{
+		mach_timespec_t ts;
+		ts.tv_sec = static_cast<unsigned int>(timeout_usecs / 1000000);
+		ts.tv_nsec = static_cast<int>((timeout_usecs % 1000000) * 1000);
+
+		// added in OSX 10.10: https://developer.apple.com/library/prerelease/mac/documentation/General/Reference/APIDiffsMacOSX10_10SeedDiff/modules/Darwin.html
+		kern_return_t rc = semaphore_timedwait(m_sema, ts);
+		return rc == KERN_SUCCESS;
+	}
+
+	void signal()
+	{
+		while (semaphore_signal(m_sema) != KERN_SUCCESS);
+	}
+
+	void signal(int count)
+	{
+		while (count-- > 0)
+		{
+			while (semaphore_signal(m_sema) != KERN_SUCCESS);
+		}
+	}
+};
+#elif defined(__unix__)
+//---------------------------------------------------------
+// Semaphore (POSIX, Linux)
+//---------------------------------------------------------
+class Semaphore
+{
+private:
+	sem_t m_sema;
+
+	Semaphore(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
+	Semaphore& operator=(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
+
+public:
+	Semaphore(int initialCount = 0)
+	{
+		assert(initialCount >= 0);
+		int rc = sem_init(&m_sema, 0, static_cast<unsigned int>(initialCount));
+		assert(rc == 0);
+		(void)rc;
+	}
+
+	~Semaphore()
+	{
+		sem_destroy(&m_sema);
+	}
+
+	bool wait()
+	{
+		// http://stackoverflow.com/questions/2013181/gdb-causes-sem-wait-to-fail-with-eintr-error
+		int rc;
+		do {
+			rc = sem_wait(&m_sema);
+		} while (rc == -1 && errno == EINTR);
+		return rc == 0;
+	}
+
+	bool try_wait()
+	{
+		int rc;
+		do {
+			rc = sem_trywait(&m_sema);
+		} while (rc == -1 && errno == EINTR);
+		return rc == 0;
+	}
+
+	bool timed_wait(std::uint64_t usecs)
+	{
+		struct timespec ts;
+		const int usecs_in_1_sec = 1000000;
+		const int nsecs_in_1_sec = 1000000000;
+#ifdef MOODYCAMEL_LIGHTWEIGHTSEMAPHORE_MONOTONIC
+		clock_gettime(CLOCK_MONOTONIC, &ts);
+#else
+		clock_gettime(CLOCK_REALTIME, &ts);
+#endif
+		ts.tv_sec += (time_t)(usecs / usecs_in_1_sec);
+		ts.tv_nsec += (long)(usecs % usecs_in_1_sec) * 1000;
+		// sem_timedwait bombs if you have more than 1e9 in tv_nsec
+		// so we have to clean things up before passing it in
+		if (ts.tv_nsec >= nsecs_in_1_sec) {
+			ts.tv_nsec -= nsecs_in_1_sec;
+			++ts.tv_sec;
+		}
+
+		int rc;
+		do {
+#ifdef MOODYCAMEL_LIGHTWEIGHTSEMAPHORE_MONOTONIC
+			rc = sem_clockwait(&m_sema, CLOCK_MONOTONIC, &ts);
+#else
+			rc = sem_timedwait(&m_sema, &ts);
+#endif
+		} while (rc == -1 && errno == EINTR);
+		return rc == 0;
+	}
+
+	void signal()
+	{
+		while (sem_post(&m_sema) == -1);
+	}
+
+	void signal(int count)
+	{
+		while (count-- > 0)
+		{
+			while (sem_post(&m_sema) == -1);
+		}
+	}
+};
+#else
+#error Unsupported platform! (No semaphore wrapper available)
+#endif
+
+}	// end namespace details
+
+
+//---------------------------------------------------------
+// LightweightSemaphore
+//---------------------------------------------------------
+class LightweightSemaphore
+{
+public:
+	typedef std::make_signed<std::size_t>::type ssize_t;
+
+private:
+	std::atomic<ssize_t> m_count;
+	details::Semaphore m_sema;
+	int m_maxSpins;
+
+	bool waitWithPartialSpinning(std::int64_t timeout_usecs = -1)
+	{
+		ssize_t oldCount;
+		int spin = m_maxSpins;
+		while (--spin >= 0)
+		{
+			oldCount = m_count.load(std::memory_order_relaxed);
+			if ((oldCount > 0) && m_count.compare_exchange_strong(oldCount, oldCount - 1, std::memory_order_acquire, std::memory_order_relaxed))
+				return true;
+			std::atomic_signal_fence(std::memory_order_acquire);	 // Prevent the compiler from collapsing the loop.
+		}
+		oldCount = m_count.fetch_sub(1, std::memory_order_acquire);
+		if (oldCount > 0)
+			return true;
+		if (timeout_usecs < 0)
+		{
+			if (m_sema.wait())
+				return true;
+		}
+		if (timeout_usecs > 0 && m_sema.timed_wait((std::uint64_t)timeout_usecs))
+			return true;
+		// At this point, we've timed out waiting for the semaphore, but the
+		// count is still decremented indicating we may still be waiting on
+		// it. So we have to re-adjust the count, but only if the semaphore
+		// wasn't signaled enough times for us too since then. If it was, we
+		// need to release the semaphore too.
+		while (true)
+		{
+			oldCount = m_count.load(std::memory_order_acquire);
+			if (oldCount >= 0 && m_sema.try_wait())
+				return true;
+			if (oldCount < 0 && m_count.compare_exchange_strong(oldCount, oldCount + 1, std::memory_order_relaxed, std::memory_order_relaxed))
+				return false;
+		}
+	}
+
+	ssize_t waitManyWithPartialSpinning(ssize_t max, std::int64_t timeout_usecs = -1)
+	{
+		assert(max > 0);
+		ssize_t oldCount;
+		int spin = m_maxSpins;
+		while (--spin >= 0)
+		{
+			oldCount = m_count.load(std::memory_order_relaxed);
+			if (oldCount > 0)
+			{
+				ssize_t newCount = oldCount > max ? oldCount - max : 0;
+				if (m_count.compare_exchange_strong(oldCount, newCount, std::memory_order_acquire, std::memory_order_relaxed))
+					return oldCount - newCount;
+			}
+			std::atomic_signal_fence(std::memory_order_acquire);
+		}
+		oldCount = m_count.fetch_sub(1, std::memory_order_acquire);
+		if (oldCount <= 0)
+		{
+			if ((timeout_usecs == 0) || (timeout_usecs < 0 && !m_sema.wait()) || (timeout_usecs > 0 && !m_sema.timed_wait((std::uint64_t)timeout_usecs)))
+			{
+				while (true)
+				{
+					oldCount = m_count.load(std::memory_order_acquire);
+					if (oldCount >= 0 && m_sema.try_wait())
+						break;
+					if (oldCount < 0 && m_count.compare_exchange_strong(oldCount, oldCount + 1, std::memory_order_relaxed, std::memory_order_relaxed))
+						return 0;
+				}
+			}
+		}
+		if (max > 1)
+			return 1 + tryWaitMany(max - 1);
+		return 1;
+	}
+
+public:
+	LightweightSemaphore(ssize_t initialCount = 0, int maxSpins = 10000) : m_count(initialCount), m_maxSpins(maxSpins)
+	{
+		assert(initialCount >= 0);
+		assert(maxSpins >= 0);
+	}
+
+	bool tryWait()
+	{
+		ssize_t oldCount = m_count.load(std::memory_order_relaxed);
+		while (oldCount > 0)
+		{
+			if (m_count.compare_exchange_weak(oldCount, oldCount - 1, std::memory_order_acquire, std::memory_order_relaxed))
+				return true;
+		}
+		return false;
+	}
+
+	bool wait()
+	{
+		return tryWait() || waitWithPartialSpinning();
+	}
+
+	bool wait(std::int64_t timeout_usecs)
+	{
+		return tryWait() || waitWithPartialSpinning(timeout_usecs);
+	}
+
+	// Acquires between 0 and (greedily) max, inclusive
+	ssize_t tryWaitMany(ssize_t max)
+	{
+		assert(max >= 0);
+		ssize_t oldCount = m_count.load(std::memory_order_relaxed);
+		while (oldCount > 0)
+		{
+			ssize_t newCount = oldCount > max ? oldCount - max : 0;
+			if (m_count.compare_exchange_weak(oldCount, newCount, std::memory_order_acquire, std::memory_order_relaxed))
+				return oldCount - newCount;
+		}
+		return 0;
+	}
+
+	// Acquires at least one, and (greedily) at most max
+	ssize_t waitMany(ssize_t max, std::int64_t timeout_usecs)
+	{
+		assert(max >= 0);
+		ssize_t result = tryWaitMany(max);
+		if (result == 0 && max > 0)
+			result = waitManyWithPartialSpinning(max, timeout_usecs);
+		return result;
+	}
+	
+	ssize_t waitMany(ssize_t max)
+	{
+		ssize_t result = waitMany(max, -1);
+		assert(result > 0);
+		return result;
+	}
+
+	void signal(ssize_t count = 1)
+	{
+		assert(count >= 0);
+		ssize_t oldCount = m_count.fetch_add(count, std::memory_order_release);
+		ssize_t toRelease = -oldCount < count ? -oldCount : count;
+		if (toRelease > 0)
+		{
+			m_sema.signal((int)toRelease);
+		}
+	}
+	
+	std::size_t availableApprox() const
+	{
+		ssize_t count = m_count.load(std::memory_order_relaxed);
+		return count > 0 ? static_cast<std::size_t>(count) : 0;
+	}
+};
+
+}   // end namespace moodycamel

patches.toml

@@ -9,7 +9,7 @@ single_file_output = true
 use_absolute_symbols = true
 # Point the recompiler at the symbol files so that it can resolve relocations during recompilation.
 func_reference_syms_file = "BanjoRecompSyms/bk.us.rev0.syms.toml"
-data_reference_syms_files = [ "BanjoRecompSyms/bk.us.rev0.datasyms.toml" ]
+data_reference_syms_files = [ "BanjoRecompSyms/bk.us.rev0.datasyms.toml", "BanjoRecompSyms/bk.us.rev0.datasyms_static.toml" ]
 # Tell the recompiler to write the output binary. Doing this instead of using objcopy allows the recompiler to patch MIPS32 relocs.
 output_binary_path = "patches/patches.bin"
 # Do not emit warnings for unpaired LO16 values, as clang produces many of them.

patches/Makefile

@@ -5,9 +5,9 @@ LD      ?= ld.lld
 
 GBI_DEFINE := -DF3DEX_GBI
 CFLAGS   := -target mips -mips2 -mabi=32 -O2 -G0 -mno-abicalls -mno-odd-spreg -mno-check-zero-division \
-			-fomit-frame-pointer -ffast-math -fno-unsafe-math-optimizations -fno-builtin-memset -funsigned-char -fno-builtin-sinf -fno-builtin-cosf \
-			-Wall -Wextra -Wno-incompatible-library-redeclaration -Wno-unused-parameter -Wno-unknown-pragmas -Wno-unused-variable -Wno-missing-braces -Wno-unsupported-floating-point-opt -Wno-cast-function-type-mismatch -Werror=pointer-bool-conversion
-CPPFLAGS := -nostdinc -D_LANGUAGE_C -DMIPS -I ../lib/bk-decomp/include -I ../lib/bk-decomp/include/2.0L -I ../lib/bk-decomp/include/2.0L/PR -I../lib/rt64/include -I../lib/N64ModernRuntime/ultramodern/include $(GBI_DEFINE)
+			-fomit-frame-pointer -ffast-math -fno-unsafe-math-optimizations -fno-builtin-memset \
+			-Wall -Wextra -Wno-incompatible-library-redeclaration -Wno-unused-parameter -Wno-unknown-pragmas -Wno-unused-variable -Wno-missing-braces -Wno-unsupported-floating-point-opt
+CPPFLAGS := -nostdinc -D_LANGUAGE_C -DMIPS -I ../lib/bk-decomp/include -I ../lib/bk-decomp/include/2.0L -I ../lib/bk-decomp/include/2.0L/PR -I../lib/rt64/include $(GBI_DEFINE)
 LDFLAGS  := -nostdlib -T patches.ld -T syms.ld -Map patches.map --unresolved-symbols=ignore-all --emit-relocs
 
 C_SRCS := $(wildcard *.c)

patches/actor_funcs.h

@@ -0,0 +1,14 @@
+#ifndef __MEM_FUNCS_H__
+#define __MEM_FUNCS_H__
+
+#include "patch_helpers.h"
+
+DECLARE_FUNC(u32, recomp_register_actor_extension, u32 actor_type, u32 size);
+DECLARE_FUNC(u32, recomp_register_actor_extension_generic, u32 size);
+DECLARE_FUNC(void, recomp_clear_all_actor_data);
+DECLARE_FUNC(u32, recomp_create_actor_data, u32 actor_type);
+DECLARE_FUNC(void, recomp_destroy_actor_data, u32 actor_handle);
+DECLARE_FUNC(void*, recomp_get_actor_data, u32 actor_handle, u32 extension_handle, u32 actor_type);
+DECLARE_FUNC(u32, recomp_get_actor_spawn_index, u32 actor_handle);
+
+#endif

patches/actor_patches.c

@@ -0,0 +1,379 @@
+#include "patches.h"
+#include "prop.h"
+#include "actor.h"
+#include "functions.h"
+#include "mem_funcs.h"
+#include "bk_api.h"
+
+extern ActorArray *suBaddieActorArray;
+extern Actor *suLastBaddie;
+
+void func_803255FC(Actor *this);
+void func_8032B5C0(ActorMarker *arg0, ActorMarker *arg1, struct5Cs *arg2);
+s32 func_80326C18(void);
+void func_8032FFD4(ActorMarker *this, s32 arg1);
+void marker_setModelId(ActorMarker *this, enum asset_e modelIndex);
+s32 func_80306DDC(s32 *position);
+s32 func_80307258(f32 arg0[3], s32 arg1, s32 arg2);
+struct5Bs *func_8034A2C8(void);
+void func_8033F738(ActorMarker *arg0);
+void func_8034BFF8(ActorMarker *marker);
+Struct83s *func_803406B0(void);
+
+// @recomp Patched to create extension data for the actor.
+RECOMP_PATCH Actor *actor_new(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
+    ActorAnimationInfo * sp54;
+    s32 i;
+    f32 sp44[3];
+    
+    if(suBaddieActorArray == NULL){
+        // @recomp Reset actor data when suBaddieActorArray is initially allocated.
+        recomp_clear_all_actor_data();
+        suBaddieActorArray = (ActorArray *)malloc(sizeof(ActorArray) + 20*sizeof(Actor));
+        suBaddieActorArray->cnt = 0;
+        suBaddieActorArray->max_cnt = 20;
+    }
+    
+    if(suBaddieActorArray->cnt + 1 > suBaddieActorArray->max_cnt){
+        suBaddieActorArray->max_cnt = suBaddieActorArray->cnt + 5;
+        suBaddieActorArray = (ActorArray *)realloc(suBaddieActorArray, sizeof(ActorArray) + suBaddieActorArray->max_cnt*sizeof(Actor));
+    }
+
+    ++suBaddieActorArray->cnt;
+    suLastBaddie = &suBaddieActorArray->data[suBaddieActorArray->cnt - 1];
+
+    suLastBaddie->actor_info = actorInfo;
+    suLastBaddie->unk10_25 = 0;
+    suLastBaddie->unk10_18 = 0;
+    suLastBaddie->state = actorInfo->startAnimation;
+    suLastBaddie->position_x = (f32)position[0];
+    suLastBaddie->position_y = (f32)position[1];
+    suLastBaddie->position_z = (f32)position[2];
+    suLastBaddie->unkF4_8 = 0;
+    suLastBaddie->yaw = (f32) yaw;
+    suLastBaddie->yaw_ideal = (f32) yaw;
+    suLastBaddie->pitch = 0.0f;
+    suLastBaddie->roll = 0.0f;
+    suLastBaddie->unk6C = 0.0f;
+    suLastBaddie->actor_specific_1_f = 0.0f;
+    suLastBaddie->unk10_12 = 0;
+    suLastBaddie->unk38_0 = 0;
+    suLastBaddie->unk38_31 = 0;
+    suLastBaddie->unk58_0 = 1;
+    suLastBaddie->unk40 = 0;
+    suLastBaddie->unk44_31 = 0;
+    suLastBaddie->despawn_flag = 0;
+    suLastBaddie->unk44_14 = -1;
+    suLastBaddie->unk48 = 0.0f;
+    suLastBaddie->unk4C = 100.0f;
+    suLastBaddie->unk10_1 = 1;
+    suLastBaddie->unkF4_30 = 0;
+    suLastBaddie->unkF4_29 = 0;
+    suLastBaddie->scale = 1.0f;
+    suLastBaddie->unk124_7 = 0;
+    suLastBaddie->unk124_6 = 1;
+    suLastBaddie->modelCacheIndex = actorInfo->actorId;
+    suLastBaddie->unk44_2 = func_80326C18();
+    suLastBaddie->marker = marker_init(position, actorInfo->draw_func, (asset_getFlag(actorInfo->modelId) == 1) ? 0 : 1, actorInfo->markerId, (flags & 0x400) ? 1 : 0);
+    suLastBaddie->marker->unk3E_0 = 1;
+    suLastBaddie->unk138_28 = 1;
+    suLastBaddie->unk10_3 = -1;
+    suLastBaddie->unk10_4 = 0;
+    suLastBaddie->unk10_8 = 0;
+    suLastBaddie->unk10_7 = 0;
+    suLastBaddie->unk10_6 = 0;
+    suLastBaddie->unk54 = 0.0f;
+    suLastBaddie->anctrl_asset_id = 0;
+    suLastBaddie->unk5C = 0.0f;
+    suLastBaddie->unkF4_31 = 0;
+    suLastBaddie->unk138_30 = 0;
+    suLastBaddie->unk138_3 = 0;
+    suLastBaddie->unk38_21 = 0;
+    suLastBaddie->unk38_13 = 0;
+    suLastBaddie->unk78_22 = 0;
+    suLastBaddie->unk78_31 = 0;
+    suLastBaddie->unk74 = 0.0f;
+    suLastBaddie->unk70 = 0.0f;
+    suLastBaddie->unkF4_24 = 0;
+    suLastBaddie->unk140 = 0.0f;
+    suLastBaddie->unk144 = 0.0f;
+    suLastBaddie->unk44_1 = 0;
+    suLastBaddie->unk44_0 = 0;
+    suLastBaddie->initialized = FALSE;
+    suLastBaddie->volatile_initialized = FALSE;
+    suLastBaddie->lifetime_value = 0.0f;
+    suLastBaddie->is_bundle = FALSE;
+    suLastBaddie->unk104 = NULL;
+    suLastBaddie->unk100 = NULL;
+    suLastBaddie->unk158[0] = NULL;
+    suLastBaddie->unk158[1] = NULL;
+    suLastBaddie->unk78_13 = 0;
+    suLastBaddie->unk124_31 = 0;
+    suLastBaddie->unkF4_20 = 0;
+    suLastBaddie->sound_timer = 0.0f;
+    func_8032FFD4(suLastBaddie->marker, suBaddieActorArray->cnt - 1);
+    marker_setModelId(suLastBaddie->marker, actorInfo->modelId);
+    marker_setActorUpdateFunc(suLastBaddie->marker, actorInfo->update_func);
+    marker_setActorUpdate2Func(suLastBaddie->marker, actorInfo->update2_func);
+    ml_vec3f_clear(suLastBaddie->unk1C);
+    ml_vec3f_clear(suLastBaddie->velocity);
+    ml_vec3f_clear(suLastBaddie->spawn_position);
+    suLastBaddie->stored_anctrl_index = 0;
+    suLastBaddie->unk58_2 = 1;
+    suLastBaddie->stored_anctrl_playbackType_ = 0;
+    suLastBaddie->stored_anctrl_forwards = 0;
+    suLastBaddie->stored_anctrl_smoothTransistion = 0;
+    suLastBaddie->stored_anctrl_duration = 0.0f;
+    suLastBaddie->stored_anctrl_timer = 0.0f;
+    suLastBaddie->unk138_19 = 0;
+    suLastBaddie->stored_anctrl_subrangeMin = 0.0f;
+    suLastBaddie->stored_anctrl_subrangeMax = 1.0f;
+    suLastBaddie->unkF4_22 = 0;
+    suLastBaddie->unk58_1 = 0;
+    suLastBaddie->unk138_29 = 0;
+    suLastBaddie->unk18 = actorInfo->animations;
+    suLastBaddie->anctrl = NULL;
+    suLastBaddie->stored_anctrl_timer = 0.0f;
+    suLastBaddie->unk130 = 0;
+    suLastBaddie->unk124_5 = 0;
+    suLastBaddie->unk124_3 = 0;
+    suLastBaddie->unk138_9 = 0;
+    suLastBaddie->unk138_8 = 0;
+    suLastBaddie->unk138_25 = 0;
+    suLastBaddie->unk16C_3 = 0;
+    suLastBaddie->unk16C_2 = 0;
+    suLastBaddie->unk16C_1 = 0;
+    suLastBaddie->unk16C_0 = 0;
+    suLastBaddie->unk17C_31 = 0;
+    suLastBaddie->unk14C[0] = NULL;
+    suLastBaddie->unk14C[1] = NULL;
+    suLastBaddie->unk138_27 = 0;
+    suLastBaddie->has_met_before = FALSE;
+    suLastBaddie->unk138_23 = 0;
+    suLastBaddie->unk138_22 = 0;
+    suLastBaddie->unk138_21 = 0;
+    suLastBaddie->unk138_20 = 0;
+    suLastBaddie->unk174 = 0.0f;
+    suLastBaddie->unk178 = 0.0f;
+    if( actorInfo->animations){
+        sp54 = &suLastBaddie->unk18[suLastBaddie->state];
+        if(sp54->index != 0){
+            suLastBaddie->anctrl = anctrl_new(0);
+            anctrl_reset(suLastBaddie->anctrl);
+            anctrl_setIndex(suLastBaddie->anctrl, sp54->index);
+            anctrl_setDuration(suLastBaddie->anctrl, sp54->duration);
+            anctrl_start(suLastBaddie->anctrl, "subaddie.c", 0x4A5);
+        }
+    }//L80327BA8
+    suLastBaddie->unk124_11 = 0;
+    suLastBaddie->alpha_124_19 = 0xff;
+    suLastBaddie->depth_mode = MODEL_RENDER_DEPTH_FULL;
+    suLastBaddie->unk124_0 = suLastBaddie->unk138_31 = 1;
+    for(i = 0; i < 0x10; i++){
+        ((s32 *)suLastBaddie->unk7C)[i] = 0;
+    }
+    for(i = 0; i < 0x0C; i++){
+        ((s32 *)suLastBaddie->unkBC)[i] = 0;
+    }
+    if(flags & ACTOR_FLAG_UNKNOWN_0){
+        suLastBaddie->unk10_25 = func_80306DDC(position) + 1;
+        if(suLastBaddie->unk10_25 == 0){
+            suLastBaddie->unk10_25 = 0;
+        }else{
+            sp44[0] = (f32)position[0];
+            sp44[1] = (f32)position[1];
+            sp44[2] = (f32)position[2];
+            suLastBaddie->unk10_18 = func_80307258(sp44, suLastBaddie->unk10_25 - 1, 0) + 1;
+        }
+    }//L80327D30
+
+    if(flags & ACTOR_FLAG_UNKNOWN_2){
+        suLastBaddie->unk10_1 = 0;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_3){
+        suLastBaddie->unkF4_30 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_1){
+        suLastBaddie->marker->unk44 = (struct5Bs*)1;
+    }
+    else if(flags & ACTOR_FLAG_UNKNOWN_6){
+        suLastBaddie->marker->unk44 = func_8034A2C8();
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_12){
+        func_8033F738(suLastBaddie->marker);
+        func_8034BFF8(suLastBaddie->marker);
+    }
+
+    suLastBaddie->unk148 = 0;
+    if(flags & ACTOR_FLAG_UNKNOWN_11){
+        suLastBaddie->unk148 = skeletalAnim_new();
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_14){
+        suLastBaddie->marker->unk50 = (s32)func_803406B0();
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_4){
+        suLastBaddie->unk124_31 = -1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_7){
+        suLastBaddie->unkF4_22 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_19){
+        suLastBaddie->unk58_1 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_8){
+        suLastBaddie->unk130 = func_803255FC;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_9){
+        suLastBaddie->marker->unk40_21 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_15){
+        suLastBaddie->marker->unk40_20 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_17){
+        suLastBaddie->marker->unk40_22 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_22){
+        suLastBaddie->marker->unk40_19 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_16){
+        suLastBaddie->unk138_9 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_18){
+        suLastBaddie->unk138_8 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_21){
+        suLastBaddie->unk138_25 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_23){
+        suLastBaddie->unk16C_3 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_24){
+        suLastBaddie->unk16C_2 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_25){
+        suLastBaddie->unk16C_1 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_26){
+        suLastBaddie->unk17C_31 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_13){
+        suLastBaddie->unk138_29 = 1;
+    }
+
+    if(flags & ACTOR_FLAG_UNKNOWN_20){
+        suLastBaddie->unk58_2 = 0;
+    }
+
+    suLastBaddie->unk154 = 0x005e0000;
+    suLastBaddie->marker->unk54 = (void (*)(struct actorMarker_s *, struct actorMarker_s *, u16 *))func_8032B5C0;
+
+    
+    for(i = 0; i < 3; ++i){
+        suLastBaddie->unk164[i] = 0x63;
+    }
+
+    suLastBaddie->unk170 = -10.0f;
+    suLastBaddie->unk138_7 = 0;
+    suLastBaddie->unk3C = flags;
+
+    // @recomp Allocate extension data for this actor and place it in padding.
+    suLastBaddie->pad17C_30 = recomp_create_actor_data(actorInfo->actorId) & 0x7FFFFFFFU;
+    
+    return suLastBaddie;
+}
+
+void func_8032BB88(Actor *this, s32 arg1, s32 arg2);
+void func_8033E7CC(ActorMarker *arg0);
+void func_8034A2A8(struct5Bs *this);
+void func_8034BF54(ActorMarker *marker);
+void func_8033F784(ActorMarker *arg0);
+void func_80340690(Struct83s *self);
+void func_8032ACA8(Actor *arg0);
+
+// @recomp Patched to destroy the extended actor data.
+RECOMP_PATCH void func_80325FE8(Actor *this) {
+    ActorMarker *marker;
+    u8 temp_v0;
+
+    // @recomp Destroy the extended actor data.
+    recomp_destroy_actor_data(this->pad17C_30);
+
+    marker = this->marker;
+    marker->id = 0;
+    if (this->anctrl != NULL) {
+        anctrl_free(this->anctrl);
+    }
+    temp_v0 = this->unk44_31;
+    if (temp_v0 != 0) {
+        sfxsource_freeSfxsourceByIndex(temp_v0);
+    }
+    this->anctrl = NULL;
+    this->unk44_31 = 0;
+
+    if (this->unk138_7 != 0) {
+        func_8032BB88(this, -1, 8000);
+        this->unk138_7 = 0;
+    }
+    if (marker->actorFreeFunc != NULL) {
+       marker->actorFreeFunc(this);
+       marker->actorFreeFunc = NULL;
+    }
+    if ((s32)marker->unk44 < 0) {
+        func_8033E7CC(marker);
+        func_8034A2A8(marker->unk44);
+       marker->unk44 = 0;
+    }
+    if (marker->unk4C != 0) {
+        func_8034BF54(this->marker);
+        marker->unk4C = 0;
+    }
+    if (marker->unk48 != 0) {
+        func_8033F784(marker);
+        marker->unk48 = 0;
+    }
+    if (this->unk148 != NULL) {
+        skeletalAnim_free(this->unk148);
+        this->unk148 = NULL;
+    }
+    if (marker->unk50 != 0) {
+        func_80340690((Struct83s *)marker->unk50);
+        marker->unk50 = 0;
+    }
+    func_8032ACA8(this);
+}
+
+RECOMP_EXPORT ActorExtensionId bkrecomp_extend_actor(enum actor_e type, u32 size) {
+    return recomp_register_actor_extension(type, size);
+}
+
+RECOMP_EXPORT ActorExtensionId bkrecomp_extend_actor_all(u32 size) {
+    return recomp_register_actor_extension_generic(size);
+}
+
+RECOMP_EXPORT void* bkrecomp_get_extended_actor_data(Actor* actor, ActorExtensionId extension) {
+    return recomp_get_actor_data(actor->pad17C_30, extension, actor->actor_info->actorId);
+}
+
+RECOMP_EXPORT u32 bkrecomp_get_actor_spawn_index(Actor* actor) {
+    return recomp_get_actor_spawn_index(actor->pad17C_30);
+}

patches/address_patches.c

@@ -1,46 +0,0 @@
-#include "patches.h"
-#include "core1/mlmtx.h"
-
-typedef struct {
-    s32 cmd_0;
-    s32 size_4;
-    s16 unk8[];
-}GeoCmd5;
-
-typedef struct {
-    s32 cmd_0;
-    s32 size_4;
-    u8  pad8;
-    s16 unkA;
-}GeoCmd7;
-
-extern s32 D_80370990;
-extern BKGfxList *modelRenderDisplayList;
-
-// @recomp Patched to remove unnecessary osVirtualToPhysical use to allow extended addresses.
-RECOMP_PATCH void func_80338970(Gfx **gfx, Mtx **mtx, void *arg2){
-    GeoCmd5 *cmd = (GeoCmd5 *)arg2;
-    int i;
-
-    if(D_80370990){
-        // @recomp Remove unnecessary usage of osVirtualToPhysical to allow extended addresses.
-        gSPDisplayList((*gfx)++, /*osVirtualToPhysical*/(modelRenderDisplayList->list + cmd->unk8[0]));
-    }
-
-    if(D_80370990){
-        for(i = 1; cmd->unk8[i]; i++){
-            mlMtxApply(*mtx);
-            gSPMatrix((*gfx)++, (*mtx)++, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList((*gfx)++, /*osVirtualToPhysical*/(modelRenderDisplayList->list + cmd->unk8[i]));
-        }
-    }
-}
-
-
-// @recomp Patched to remove unnecessary osVirtualToPhysical use to allow extended addresses.
-RECOMP_PATCH void func_80338AE8(Gfx **gfx, Mtx **mtx, void *arg2){
-    if(D_80370990){
-        // @recomp Remove unnecessary usage of osVirtualToPhysical to allow extended addresses.
-        gSPDisplayList((*gfx)++, /*osVirtualToPhysical*/(modelRenderDisplayList->list + ((GeoCmd7*)arg2)->unkA));
-    }
-}

patches/bk_api.h

@@ -5,26 +5,12 @@
 #include "enums.h"
 #include "prop.h"
 
-typedef enum {
-    EXTENSION_TYPE_MARKER,
-    EXTENSION_TYPE_PROP,
-} ExtensionType;
+typedef u32 ActorExtensionId;
 
-// ActorMarkers
-typedef u32 MarkerExtensionId;
+ActorExtensionId bkrecomp_extend_actor(enum actor_e type, u32 size);
+ActorExtensionId bkrecomp_extend_actor_all(u32 size);
 
-MarkerExtensionId bkrecomp_extend_marker(enum marker_e type, u32 size);
-MarkerExtensionId bkrecomp_extend_marker_all(u32 size);
-
-void* bkrecomp_get_extended_marker_data(ActorMarker* marker, MarkerExtensionId extension);
-u32 bkrecomp_get_marker_spawn_index(ActorMarker* marker);
-
-// Props
-typedef u32 PropExtensionId;
-
-PropExtensionId bkrecomp_extend_prop_all(u32 size);
-
-void *bkrecomp_get_extended_prop_data(Cube* cube, Prop* prop, PropExtensionId extension_id);
-u32 bkrecomp_get_prop_spawn_index(Cube* cube, Prop* prop);
+void* bkrecomp_get_extended_actor_data(Actor* actor, ActorExtensionId extension);
+u32 bkrecomp_get_actor_spawn_index(Actor* actor);
 
 #endif

patches/camera_and_axis_inversion_patches.c

@@ -1,797 +0,0 @@
-#include "patches.h"
-#include "transform_ids.h"
-#include "functions.h"
-#include "input.h"
-
-#define DYNAMIC_CAMERA_STATE_R_LOOK 0x13
-
-extern u8 D_8037C060;
-extern u8 D_8037C061;
-extern u8 D_8037C062;
-extern u8 D_8037DB40;
-extern f32 D_8037DBA0;
-extern f32 D_8037DBA4;
-extern f32 D_8037DBA8;
-extern f32 D_8037DBAC;
-extern f32 D_8037D994;
-extern f32 D_8037D998;
-extern f32 D_8037D99C;
-extern f32 D_8037D9E0[3];
-extern f32 D_8037D9C8[3];
-extern f32 D_8037DC10;
-extern s32 D_8037C064;
-extern s32 D_8037C068;
-extern s32 D_8037C06C;
-extern s32 D_8037C070;
-extern s32 D_8037C074;
-extern s32 D_8037C078;
-extern s32 D_8037C07C;
-extern s32 D_8037C080;
-extern s32 D_8037C084;
-extern f32 D_8037DB10;
-extern f32 D_8037DB14;
-extern f32 D_8037DB18;
-extern f32 D_8037DB1C;
-extern f32 D_8037DB20;
-extern OSContStatus pfsManagerContStatus;
-extern OSContPad pfsManagerContPadData[4];
-
-extern void func_8024F35C(s32 arg0);
-extern void func_80290B60(s32 arg0);
-extern int func_80290D48(void);
-extern int func_80290E8C(void);
-extern void func_8029103C(void);
-extern void func_80291488(s32 arg0);
-extern s32 func_80298850(void);
-extern s32 func_802BC84C(s32 arg0);
-extern void func_802BD4C0(f32 arg0[3]);
-extern f32 func_802BD51C(void);
-extern void func_802BD720(f32 arg0[3]);
-extern void func_802BDB30(f32 arg0, f32 *arg1, f32 *arg2, f32 arg3, f32 arg4, f32 arg5);
-extern int func_802BE60C(void);
-extern void func_802BE6FC(f32 arg0[3], f32 arg1[3]);
-extern void func_802C0150(s32 arg0);
-extern void func_802C019C(f32 arg0[3]);
-extern void func_802C01BC(f32 arg0[3]);
-extern void func_802C01DC(f32 arg0[3]);
-extern void func_802C0234(f32 arg0[3]);
-extern void func_802C026C(f32 arg0[3]);
-extern void func_802C02B4(f32 arg0[3]);
-extern void func_802C02D4(f32 arg0[3]);
-extern void func_802C04B0(void);
-extern bool func_802C0640(void);
-extern void func_802C095C(void);
-extern void func_802C2264(f32 duration);
-extern void ncDynamicCamera_setPosition(f32 arg0[3]);
-extern void ncDynamicCamera_getPosition(f32 arg0[3]);
-extern void ncDynamicCamera_setRotation(f32 arg0[3]);
-extern void ncDynamicCamera_getRotation(f32 arg0[3]);
-extern void ncDynamicCamera_setState(s32);
-extern int ncDynamicCamera_getState(void);
-extern enum bsgroup_e player_movementGroup(void);
-extern int bainput_should_rotate_camera_left(void);
-extern int bainput_should_rotate_camera_right(void);
-extern int bainput_should_zoom_out_camera(void);
-extern int can_view_first_person(void);
-extern s32 bs_getState(void);
-extern s32 getGameMode(void);
-extern f32 player_getYaw(void);
-extern f32 player_getPitch(void);
-extern enum bswatergroup_e player_getWaterState(void);
-extern enum map_e map_get(void);
-
-f32 dynamic_camera_targets[2][3];
-u32 dynamic_camera_target_frames[2];
-u32 dynamic_camera_target_frame;
-f32 analog_zoom = 2.0f;
-f32 analog_inherited_distance = 100.0f;
-f32 r_look_initial_position_offset[3];
-f32 r_look_initial_target_offset[3];
-f32 r_look_initial_offset_weight;
-bool analog_swimming_look_started;
-bool r_look_initialized_from_r_button;
-bool r_look_get_target_from_previous_frame_fix;
-
-extern bool recomp_in_demo_playback_game_mode();
-
-// @recomp Advances the reference frame for storing camera targets.
-void recomp_advance_dynamic_camera_targets() {
-    dynamic_camera_target_frame++;
-}
-
-// @recomp Check whether the analog camera was enabled by the user. Analog camera can have effects
-// over vanilla behavior, so we ignore the user setting while on demo playback modes.
-bool recomp_analog_camera_enabled() {
-    if (recomp_in_demo_playback_game_mode()) {
-        return FALSE;
-    }
-    else {
-        return recomp_get_analog_cam_enabled();
-    }
-}
-
-// @recomp Check whether analog camera movement is currently allowed. Analog camera movement is disabled while crouching and its
-// related states to allow the user to use the right stick as C Button inputs without rotating the camera.
-bool recomp_analog_camera_allowed(bool allow_transition_states) {
-    switch (bs_getState()) {
-    case BS_CROUCH:
-    case BS_9_EGG_HEAD:
-    case BS_A_EGG_ASS:
-        return FALSE;
-    case BS_14_BTROT_ENTER:
-    case BS_1A_WONDERWING_ENTER:
-        return allow_transition_states;
-    default:
-        return TRUE;
-    }
-}
-
-// @recomp Apply per-axis deadzone to a value.
-f32 recomp_apply_per_axis_deadzone(f32 value) {
-    const f32 per_axis_deadzone = 0.2f;
-    if (value > per_axis_deadzone) {
-        return (value - per_axis_deadzone) / (1.0f - per_axis_deadzone);
-    }
-    else if (value < -per_axis_deadzone) {
-        return (value + per_axis_deadzone) / (1.0f - per_axis_deadzone);
-    }
-    else {
-        return 0.0f;
-    }
-}
-
-// @recomp Functions to get the current values of the analog camera inputs.
-void recomp_analog_camera_get(f32 *x, f32 *y) {
-    float input_x, input_y;
-    s32 inverted_x, inverted_y;
-    recomp_get_right_analog_inputs(&input_x, &input_y);
-    recomp_get_analog_inverted_axes(&inverted_x, &inverted_y);
-    *x = recomp_apply_per_axis_deadzone(input_x) * (inverted_x ? 1.0f : -1.0f);
-    *y = recomp_apply_per_axis_deadzone(input_y) * (inverted_y ? -1.0f : 1.0f);
-}
-
-f32 recomp_analog_camera_get_x() {
-    float x, y;
-    recomp_analog_camera_get(&x, &y);
-    return x;
-}
-
-f32 recomp_analog_camera_get_y() {
-    float x, y;
-    recomp_analog_camera_get(&x, &y);
-    return y;
-}
-
-s32 recomp_get_third_person_inverted_x() {
-    s32 inverted_x, inverted_y;
-    if (recomp_in_demo_playback_game_mode()) {
-        inverted_x = TRUE;
-    } else {
-        recomp_get_analog_inverted_axes(&inverted_x, &inverted_y);
-    }
-    
-    return inverted_x;
-}
-
-s32 recomp_get_third_person_inverted_y() {
-    s32 inverted_x, inverted_y;
-    if (recomp_in_demo_playback_game_mode()) {
-        inverted_y = FALSE;
-    } else {
-        recomp_get_analog_inverted_axes(&inverted_x, &inverted_y);
-    }
-    
-    return inverted_y;
-}
-
-s32 recomp_get_flying_and_swimming_inverted_x() {
-    s32 inverted_x, inverted_y;
-    if (recomp_in_demo_playback_game_mode()) {
-        inverted_x = FALSE;
-    } else {
-        recomp_get_flying_and_swimming_inverted_axes(&inverted_x, &inverted_y);
-    }
-    return inverted_x;
-}
-
-s32 recomp_get_flying_and_swimming_inverted_y() {
-    s32 inverted_x, inverted_y;
-    if (recomp_in_demo_playback_game_mode()) {
-        inverted_y = TRUE;
-    } else {
-        recomp_get_flying_and_swimming_inverted_axes(&inverted_x, &inverted_y);
-    }
-    return inverted_y;
-}
-
-s32 recomp_get_first_person_inverted_x() {
-    s32 inverted_x, inverted_y;
-    if (recomp_in_demo_playback_game_mode()) {
-        inverted_x = TRUE;
-    } else {
-        recomp_get_first_person_inverted_axes(&inverted_x, &inverted_y);
-    }
-    return inverted_x;
-}
-
-s32 recomp_get_first_person_inverted_y() {
-    s32 inverted_x, inverted_y;
-    if (recomp_in_demo_playback_game_mode()) {
-        inverted_y = FALSE;
-    } else {
-        recomp_get_first_person_inverted_axes(&inverted_x, &inverted_y);
-    }
-    return inverted_y;
-}
-
-
-// @recomp Check whether the analog camera stick is currently held.
-bool recomp_analog_camera_held(bool read_x, bool read_y) {
-    if (recomp_analog_camera_enabled() && recomp_analog_camera_allowed(FALSE)) {
-        float input_x, input_y;
-        recomp_analog_camera_get(&input_x, &input_y);
-        return ((mlAbsF(input_x) > 1e-6f) && read_x) || ((mlAbsF(input_y) > 1e-6f) && read_y);
-    }
-    else {
-        return FALSE;
-    }
-}
-
-// @recomp If movement is allowed, update the current camera mode's yaw with the input.
-void recomp_analog_camera_update() {
-    if (recomp_analog_camera_enabled() && recomp_analog_camera_allowed(FALSE)) {
-        f32 analog_yaw = recomp_analog_camera_get_x() * recomp_get_analog_cam_sensitivity() * 40.0f * time_getDelta();
-        if (mlAbsF(analog_yaw) > 1e-6f) {
-            if (ncDynamicCamera_getState() != DYNAMIC_CAMERA_STATE_R_LOOK) {
-                ncDynamicCamera_setState(DYNAMIC_CAMERA_STATE_R_LOOK);
-                func_80291488(0x4);
-            }
-
-            D_8037DBA4 = mlNormalizeAngle(D_8037DBA4 + analog_yaw);
-            D_8037DBA8 = mlNormalizeAngle(D_8037DBA8 + analog_yaw);
-        }
-    }
-}
-
-// @recomp Updates the current yaw based on the analog camera's horizontal movement.
-// Also allows axis inversion for vanilla (non-analog) camera.
-RECOMP_PATCH int func_8029105C(s32 arg0) {
-    if (func_80298850())
-        return FALSE;
-
-    // @recomp: Allow camera axis inversion on the vanilla camera
-    float axisInversionModifier = -1;
-    bool inverted_x = recomp_get_third_person_inverted_x();
-    if (inverted_x) {
-        axisInversionModifier = 1;
-    }
-
-    // @recomp Update the analog camera input.
-    recomp_analog_camera_update();
-
-    // @recomp Account for axis inversion
-    if (bainput_should_rotate_camera_left() && ncDynamicCamA_func_802C1DB0(-45.0f * axisInversionModifier)) {
-        func_80291488(arg0);
-        func_8029103C();
-        return TRUE;
-    }
-
-    // @recomp Account for axis inversion
-    if (bainput_should_rotate_camera_right() && ncDynamicCamA_func_802C1DB0(45.0f * axisInversionModifier)) {
-        func_80291488(arg0);
-        func_8029103C();
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-// @recomp Computes the zoom value coordinate using a 2nd order polynomial and the three
-// reference coordinate values.
-f32 zoom_value(f32 a, f32 b, f32 c) {
-    // 2nd order polynomial.
-    // https://math.stackexchange.com/a/680695
-    const f32 x1 = 1.0f;
-    const f32 x2 = 2.0f;
-    const f32 x3 = 3.0f;
-    f32 pa = (x1 * (c - b) + x2 * (a - c) + x3 * (b - a)) / ((x1 - x2) * (x1 - x3) * (x2 - x3));
-    f32 pb = (b - a) / (x2 - x1) - pa * (x1 + x2);
-    f32 pc = a - pa * x1 * x1 - pb * x1;
-    f32 x = analog_zoom;
-    return pa * x * x + pb * x + pc;
-}
-
-// @recomp Check whether the camera is in a state that has inherited its target from a previous mode.
-bool recomp_analog_camera_r_look_inherit_mode() {
-    bool swimming_state = player_getWaterState() == BSWATERGROUP_2_UNDERWATER;
-    bool prev_camera_is_pole = D_8037C060 == 0x10;
-    return swimming_state || prev_camera_is_pole;
-}
-
-// @recomp Check whether the camera is in flight mode by checking what the previous stored camera mode is.
-bool recomp_analog_camera_r_look_flight_mode() {
-    bool prev_camera_is_flying = D_8037C060 == 0x4;
-    return prev_camera_is_flying;
-}
-
-// @recomp Patched to return the smoothed X value of the current camera offset based on the zoom level.
-RECOMP_PATCH f32 func_802BD8D4(void) {
-    if (recomp_analog_camera_enabled()) {
-        bool r_look_mode = ncDynamicCamera_getState() == DYNAMIC_CAMERA_STATE_R_LOOK;
-        if (r_look_mode && recomp_analog_camera_r_look_flight_mode()) {
-            return D_8037DB18 + 300.0f;
-        }
-        else if (r_look_mode && recomp_analog_camera_r_look_inherit_mode()) {
-            return analog_inherited_distance;
-        }
-        else {
-            return zoom_value(D_8037C064, D_8037C070, D_8037C07C);
-        }
-    }
-    else {
-        return D_8037D994;
-    }
-}
-
-// @recomp Patched to return the smoothed Y value of the current camera offset based on the zoom level.
-RECOMP_PATCH f32 func_802BD8E0(void) {
-    if (recomp_analog_camera_enabled()) {
-        return zoom_value(D_8037C068, D_8037C074, D_8037C080);
-    }
-    else {
-        return D_8037D998;
-    }
-}
-
-// @recomp Patched to return the smoothed Z value of the current camera offset based on the zoom level.
-RECOMP_PATCH f32 func_802BD8C8(void) {
-    if (recomp_analog_camera_enabled()) {
-        return zoom_value(D_8037C06C, D_8037C078, D_8037C084);
-    }
-    else {
-        return D_8037D99C;
-    }
-}
-
-// @recomp Patched to store the last retrieved camera target for the current frame.
-RECOMP_PATCH void func_802C02D4(f32 arg0[3]) {
-    switch (D_8037DB40) {
-    case 1:
-        func_802C019C(arg0);
-        break;
-
-    case 2:
-        func_802C01BC(arg0);
-        break;
-
-    case 3:
-        func_802C01DC(arg0);
-        break;
-
-    case 4:
-        func_802C0234(arg0);
-        break;
-
-    case 5:
-        func_802C026C(arg0);
-        break;
-
-    case 6:
-        func_802C02B4(arg0);
-        break;
-    }
-
-    // @recomp Store the camera target to be used in a future frame as well as the frame number that wrote it.
-    u32 index = dynamic_camera_target_frame & 1;
-    ml_vec3f_copy(dynamic_camera_targets[index], arg0);
-    dynamic_camera_target_frames[index] = dynamic_camera_target_frame;
-}
-
-// @recomp Patched to replace the camera target used for computing the yaw with a version that uses the previous
-// frame's camera target. The regular version of this function has a bug where the camera target is the one
-// determined by the current frame, so it is never able to compute the yaw properly by using the previous frame's
-// camera position and ends up causing a slight rotation of the resulting yaw.
-RECOMP_PATCH void func_802C069C(void) {
-    f32 sp34[3];
-    f32 sp28[3];
-    f32 sp1C[3];
-
-    ncDynamicCamera_getPosition(sp34);
-    
-    // @recomp If the camera target was written last frame and the bug fix is required, we use that value instead
-    // to compute the yaw. Otherwise, use the original function.
-    //func_802C02D4(sp1C);
-    u32 index = (dynamic_camera_target_frame & 1) ^ 1;
-    if (r_look_get_target_from_previous_frame_fix && recomp_analog_camera_enabled() && (dynamic_camera_target_frames[index] == (dynamic_camera_target_frame - 1))) {
-        ml_vec3f_copy(sp1C, dynamic_camera_targets[index]);
-    }
-    else {
-        func_802C02D4(sp1C);
-    }
-
-    ml_vec3f_diff_copy(sp28, sp34, sp1C);
-    D_8037DBA0 = gu_sqrtf(sp28[0] * sp28[0] + sp28[2] * sp28[2]);
-    func_8025801C(sp28, &D_8037DBA8);
-    D_8037DBAC = 0.0f;
-}
-
-// @recomp Patched to skip over initialization of the target yaw based on the player's angle if analog cam is enabled.
-RECOMP_PATCH void ncDynamicCam13_init(void) {
-    func_802BE230(5.0f, 8.0f);
-    func_802BE244(8.0f, 15.0f);
-
-    // @recomp We don't change the target type in this initialization routine when the analog camera is enabled,
-    // unless the the R button is currently held. We also compute the current camera distance to use it as the zoom
-    // level in the case the current mode does not support camera zoom.
-    // func_802C0150(6);
-    if (recomp_analog_camera_enabled() && !r_look_initialized_from_r_button) {
-        f32 camera_position[3];
-        f32 camera_target[3];
-        f32 camera_delta[3];
-        ncDynamicCamera_getPosition(camera_position);
-        func_802C02D4(camera_target);
-        ml_vec3f_diff_copy(camera_delta, camera_position, camera_target);
-        analog_inherited_distance = gu_sqrtf(camera_delta[0] * camera_delta[0] + camera_delta[2] * camera_delta[2]);
-    }
-    else {
-        func_802C0150(6);
-    }
-
-    // @recomp Reduce the duration of the interpolation to this mode when the analog cam is enabled. Thanks to the
-    // bug fix to the target computation, this is less necessary than before.
-    //func_802C2264(0.5f);
-    func_802C2264(recomp_analog_camera_enabled() ? (7.0f / 30.0f) : 0.5f);
-
-    // @recomp Enable the global variable that controls whether the previous frame target fix is used.
-    r_look_get_target_from_previous_frame_fix = TRUE;
-
-    func_802C069C();
-
-    // @recomp Clear the global variable.
-    r_look_get_target_from_previous_frame_fix = FALSE;
-    
-    // @recomp We don't update the target yaw to match the player's angle if analog camera is enabled,
-    // unless the the R button is currently held.
-    // func_802C095C();
-    if (!recomp_analog_camera_enabled() || r_look_initialized_from_r_button) {
-        func_802C095C();
-    }
-    else {
-        D_8037DBA4 = D_8037DBA8;
-    }
-
-    // @recomp A bug exists in the game where the velocity for both the position and rotation of the camera
-    // mode is not reset when another mode that doesn't use it is initialized, carrying over the velocity
-    // from the last time it was used.
-    // 
-    // This results in visible shifting of the camera when returning from this mode to another one that uses
-    // the velocity. Since it seems like a bug and not intentional behavior, we only fix this if not playing
-    // pre-recorded inputs.
-    // 
-    // This fixes large discontinuities when going back from the analog camera mode and can be reproduced in
-    // vanilla by using the R button after moving for a while and standing still.
-    if (!recomp_in_demo_playback_game_mode()) {
-        ml_vec3f_clear(D_8037D9E0);
-        ml_vec3f_clear(D_8037D9C8);
-    }
-}
-
-// @recomp Patched to adjust the target height of the R Look camera mode if it inherited a target mode from another camera mode.
-RECOMP_PATCH f32 func_802C0780(void) {
-    // @recomp Adjust the target height of this mode based on the inherited target from a previous mode.
-    // On these other modes, just use the current camera position as the target height.
-    if (recomp_analog_camera_r_look_flight_mode()) {
-        f32 player_pos[3];
-        player_getPosition(player_pos);
-        return player_pos[1] + 250.0f;
-    }
-    else if (recomp_analog_camera_r_look_inherit_mode()) {
-        f32 camera_pos[3];
-        ncDynamicCamera_getPosition(camera_pos);
-        return camera_pos[1];
-    }
-
-    return func_802BD51C();
-}
-
-// @recomp Updates the current zoom level based on the analog camera's vertical movement.
-// The zoom level is a variable between 0.5 and 3.0, with 1.0 indicating the closest
-// original zoom level possible and 3.0 the furthest one. The range is lowered to 0.5
-// to allow the player to look a bit closer than normally allowed.
-RECOMP_PATCH void func_80290F14(void) {
-    // @recomp Replicate the existing group of conditions to check if zoom level changes are allowed.
-    // If they are, use the vertical movement to update the zoom level.
-    if (recomp_analog_camera_enabled()) {
-        if (!func_80298850() && player_movementGroup() != BSGROUP_4_LOOK && batimer_get(7) == 0.0f && recomp_analog_camera_allowed(FALSE)) {
-            analog_zoom = ml_clamp_f(analog_zoom + recomp_analog_camera_get_y() * recomp_get_analog_cam_sensitivity() * 1.5f * time_getDelta(), 0.5f, 3.0f);
-        }
-    }
-
-    if (!func_80298850()
-        && player_movementGroup() != BSGROUP_4_LOOK
-        && batimer_get(7) == 0.0f
-        && bainput_should_zoom_out_camera()
-        ) {
-        switch (D_8037C061) {
-        case 1://L80290FA4
-            basfx_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.0f, 12000);
-            func_80290B60(2);
-            break;
-        case 2://L80290FBC
-            if (D_8037C07C) {
-                basfx_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000);
-                func_80290B60(3);
-            }
-            else {
-                basfx_80299D2C(SFX_12D_CAMERA_ZOOM_CLOSEST, 1.0f, 12000);
-                func_80290B60(1);
-            }
-            break;
-        case 3://L80291008
-            basfx_80299D2C(SFX_12D_CAMERA_ZOOM_CLOSEST, 1.0f, 12000);
-            func_80290B60(1);
-            break;
-        }
-        batimer_set(0x7, 0.4f);
-    }
-}
-
-// @recomp Patched to update the analog zoom level every time the original one is modified.
-RECOMP_PATCH void func_80290B60(s32 arg0) {
-    D_8037C061 = arg0;
-
-    // @recomp Update the analog zoom level.
-    analog_zoom = (f32)arg0;
-}
-
-// @recomp Patched to allow the flying camera to switch to analog look.
-RECOMP_PATCH void func_80291108(void) {
-    if (!func_80290D48() && ncDynamicCamera_getState() == 0x10) {
-        func_80290F14();
-        func_8029105C(8);
-    }
-
-    // @recomp Switch to the analog camera mode.
-    if (!func_80290D48() && recomp_analog_camera_held(TRUE, FALSE) && ncDynamicCamera_getState() == 0x4) {
-        ncDynamicCamera_setState(DYNAMIC_CAMERA_STATE_R_LOOK);
-        func_80291488(0x4);
-    }
-}
-
-// @recomp Patched to add the target yaw initialization back on the cases where the camera state was changed when pressing the R button.
-// Also patched to switch the camera to the R look mode if the analog camera input is held.
-RECOMP_PATCH void func_80291154(void) {
-    int tmp;
-    if (!func_80290D48() && !func_80290E8C()) {
-        if (bakey_held(BUTTON_R)) {
-            // @recomp Set a global flag to indicate the camera initialization was done by pressing the R button.
-            r_look_initialized_from_r_button = TRUE;
-
-            ncDynamicCamera_setState(0x13);
-            func_80291488(0x4);
-            func_80290F14();
-
-            // @recomp Clear the R button initialization flag.
-            r_look_initialized_from_r_button = FALSE;
-        }
-        // @recomp Switch to the R Look mode if the analog camera input is held. Unlike the R Button input, this one will not initialize the
-        // target yaw to match the player's angle, but will rather use whatever current yaw is present.
-        else if (recomp_analog_camera_held(TRUE, TRUE)) {
-            ncDynamicCamera_setState(DYNAMIC_CAMERA_STATE_R_LOOK);
-            func_80291488(0x4);
-            func_80290F14();
-        }
-        else {
-            tmp = func_8029105C(7);
-            func_80290F14();
-            if (!tmp) {
-                ncDynamicCamera_setState(0xB);
-            }
-        }
-    }
-}
-
-// @recomp Patched to extend the condition of the R button in this function to consider the analog camera movement.
-RECOMP_PATCH void func_802911E0(void) {
-    if (!func_80290D48() && !func_80290E8C() && !func_8029105C(7)) {
-        func_80290F14();
-        if (bakey_held(BUTTON_R)) {
-            func_802C095C();
-        }
-        // @recomp Don't execute the other branch if analog camera movement is present.
-        else if (recomp_analog_camera_held(TRUE, TRUE)) {
-            // Do nothing.
-        }
-        else {
-            if (func_802C0640())
-                func_80291488(2);
-        }
-    }
-}
-
-// @recomp Patched to allow swimming to use the analog camera mode.
-RECOMP_PATCH int func_80290E8C(void) {
-    if (player_getWaterState() != BSWATERGROUP_2_UNDERWATER) {
-        // @recomp Clear the analog look flag when not underwater.
-        analog_swimming_look_started = FALSE;
-
-        return FALSE;
-    }
-
-    // @recomp Check whether the analog camera is active or if it was activated.
-    // Switching to a diving state will reset back to the regular camera.
-    //ncDynamicCamera_setState(3);
-    bool analog_camera_held = recomp_analog_camera_held(TRUE, FALSE);
-    if (analog_camera_held || analog_swimming_look_started) {
-        ncDynamicCamera_setState(DYNAMIC_CAMERA_STATE_R_LOOK);
-        recomp_analog_camera_update();
-        analog_swimming_look_started = analog_camera_held || (bs_getState() != BS_2C_DIVE_B && bs_getState() != BS_39_DIVE_A);
-    }
-    else {
-        ncDynamicCamera_setState(3);
-    }
-
-    func_80291488(0xB);
-
-    if (map_get() == MAP_B_CC_CLANKERS_CAVERN
-        && player_getYPosition() < 1201.0f
-        ) {
-        func_802C1B20(1100.0f);
-    }
-    return TRUE;
-}
-
-// @recomp Patched to supress right stick analog inputs on situations where the analog camera is allowed.
-RECOMP_PATCH void pfsManager_readData() {
-    // @recomp Supress right stick analog input if analog camera movement is allowed. This will prevent
-    // any bindings associated to the right analog stick from triggering.
-    recomp_set_right_analog_suppressed(recomp_analog_camera_enabled() && recomp_analog_camera_allowed(TRUE));
-
-    func_8024F35C(0);
-    if (!pfsManagerContStatus.errno)
-        osContGetReadData(pfsManagerContPadData);
-}
-
-extern f32 bastick_getX(void);
-extern f32 bastick_getY(void);
-
-// @recomp Patched to allow configuring Y axis inversion when flying
-RECOMP_PATCH void func_802A3648(void){
-    // @recomp Get the axis inversion setting
-    s32 inverted_y = recomp_get_flying_and_swimming_inverted_y();
-
-    // @recomp Apply axis inversion setting
-    f32 tmp_f0 = inverted_y ? bastick_getY() : -bastick_getY();
-
-    if(tmp_f0 < 0.0f)
-        pitch_setIdeal(ml_map_f(tmp_f0, -1.0f, 0.0f, 300.0f, 360.0f));
-    else
-        pitch_setIdeal(ml_map_f(tmp_f0, 0.0f, 1.0f, 0.0f, 80.0f));
-}
-
-// @recomp Patched to allow configuring X axis inversion when flying
-RECOMP_PATCH void func_802A354C(void){
-    f32 yaw_range;
-    f32 roll_range;
-    f32 sp2C; 
-
-    // @recomp Get the axis inversion setting
-    s32 inverted_x = recomp_get_flying_and_swimming_inverted_x();
-
-    // @recomp Apply axis inversion setting
-    sp2C = inverted_x ? -bastick_getX() : bastick_getX();
-    if(bakey_held(BUTTON_R)){
-        yaw_setVelocityBounded(500.0f, 30.0f);
-        yaw_range = 6.0f;
-        roll_range = 85.0f;
-    }
-    else{
-        yaw_setVelocityBounded(500.0f, 2.0f);
-        yaw_range = 3.0f;
-        roll_range = 75.0f;
-    }
-    roll_setIdeal(ml_map_f(sp2C, -1.0f, 1.0f, -roll_range, roll_range));
-    yaw_setIdeal(mlNormalizeAngle(yaw_getIdeal() + ml_map_f(sp2C, -1.0f, 1.0f, yaw_range, -yaw_range)));
-}
-
-// @recomp Patched to allow configuring Y axis inversion when swimming
-f32 func_802A716C();
-RECOMP_PATCH void func_802A7304() {
-    f32 temp_f0;
-
-    // @recomp Get the axis inversion setting
-    s32 inverted_y = recomp_get_flying_and_swimming_inverted_y();
-
-    pitch_setAngVel(ml_interpolate_f(func_802A716C(), 70.0f, 30.0f), 0.9f);
-
-    // @recomp Apply axis inversion setting
-    temp_f0 = inverted_y ? bastick_getY() : -bastick_getY();
-    if (temp_f0 < 0.0f) {
-        pitch_setIdeal(ml_map_f(temp_f0, -1.0f, 0.0f, 275.0f, 360.0f));
-        return;
-    }
-    pitch_setIdeal(ml_map_f(temp_f0, 0.0f, 1.0f, 0.0f, 85.0f));
-}
-
-// @recomp Patched to allow configuring X axis inversion when swimming
-RECOMP_PATCH void func_802A71D8(void) {
-    f32 yaw_range;
-    f32 sp38;
-    f32 roll_range;
-    f32 sp30;
-    
-    // @recomp Get the axis inversion setting
-    s32 inverted_x = recomp_get_flying_and_swimming_inverted_x();
-
-    // @recomp Apply axis inversion setting
-    sp30 = inverted_x ? -bastick_getX() : bastick_getX();
-    sp38 = func_802A716C();
-    if (bakey_held(BUTTON_R)) {
-        roll_range = 45.0f;
-        yaw_range = 4.3f;
-        yaw_setVelocityBounded(250.0f, 20.0f);
-    } else {
-        roll_range = 35.0f;
-        yaw_range = ml_interpolate_f(sp38, 3.1f, 2.4f);
-        yaw_setVelocityBounded(90.0f, ml_interpolate_f(sp38, 3.8f, 2.2f));
-    }
-    roll_setIdeal(ml_map_f(sp30, -1.0f, 1.0f, -roll_range, roll_range));
-    yaw_setIdeal(mlNormalizeAngle(yaw_getIdeal() + ml_map_f(sp30, -1.0f, 1.0f, yaw_range, -yaw_range)));
-}
-
-extern s32 ncFirstPersonCamera_getState(void);
-extern void ncFirstPersonCamera_getZoomedInRotation(f32 *);
-extern void ncFirstPersonCamera_setZoomedOutRotation(f32 src[3]);
-extern bool func_8028B254(s32 arg0);
-extern void __bsDroneLook_getEyePos(f32 arg0[3]);
-extern enum bs_e func_8029BDBC(void);
-extern void ncFirstPersonCamera_setZoomedOutPosition(f32 src[3]);
-
-// @recomp: Patched to allow inverting the first person camera
-RECOMP_PATCH void bsDroneLook_update(void) {
-    s32 next_state;
-    f32 eye_rotation[3];
-    f32 eye_position[3];
-    f32 dt;
-    s32 exit_first_person;
-
-    // @recomp: Get the axis inversion setting
-    s32 inverted_x = recomp_get_first_person_inverted_x();
-    s32 inverted_y = recomp_get_first_person_inverted_y();
-    float x = inverted_x ? -bastick_getX() : bastick_getX();
-    float y = inverted_y ? bastick_getY() : -bastick_getY();
-
-    next_state = 0;
-    dt = time_getDelta();
-    if (ncFirstPersonCamera_getState() == FIRSTPERSON_STATE_2_IDLE) {
-        //camera is in "idle" state
-        ncFirstPersonCamera_getZoomedInRotation(eye_rotation);
-        // @recomp: Apply the axis inversion setting
-        eye_rotation[0] -= y * 90.0f * dt;
-        eye_rotation[1] -= x * 90.0f * dt;
-        eye_rotation[2] = 0.0f;
-        eye_rotation[0] = (eye_rotation[0] > 180.0f) ? ml_max_f(305.0f, eye_rotation[0]) : ml_min_f(70.0f, eye_rotation[0]);
-        ncFirstPersonCamera_setZoomedOutRotation(eye_rotation);
-        yaw_setIdeal(eye_rotation[1] + 180.0f);
-
-        exit_first_person = FALSE;
-        // 1st person cancelled via input
-        if (bakey_pressed(BUTTON_B) || bakey_pressed(BUTTON_A) || bakey_pressed(BUTTON_C_UP)) {
-            exit_first_person = TRUE;
-        }
-        // 1st person cancelled via entering water
-        if (player_inWater()) {
-            if (player_getTransformation() == TRANSFORM_1_BANJO && player_getWaterState() == BSWATERGROUP_0_NONE) {
-                exit_first_person += TRUE;
-            }
-        } else if (func_8028B254(25) == 0) {
-            exit_first_person += TRUE;
-        }
-        if (exit_first_person) {
-            next_state = func_8029BDBC();
-        }
-    }
-    __bsDroneLook_getEyePos(eye_position);
-    ncFirstPersonCamera_setZoomedOutPosition(eye_position);
-    bs_setState(next_state);
-}

patches/camera_transform_tagging.c

@@ -1,280 +0,0 @@
-#include "patches.h"
-#include "transform_ids.h"
-#include "core1/core1.h"
-#include "core2/nc/camera.h"
-
-s32 cur_perspective_projection_transform_id = 0;
-s32 backup_perspective_projection_transform_id = 0;
-
-s32 cur_ortho_projection_transform_id = 0;
-s32 backup_ortho_projection_transform_id = 0;
-
-void reset_projection_ids() {
-    cur_perspective_projection_transform_id = 0;
-    cur_ortho_projection_transform_id = 0;
-}
-
-bool skip_perspective_interpolation = FALSE;
-
-bool perspective_interpolation_skipped() {
-    return skip_perspective_interpolation;
-}
-
-s32 getGameMode(void);
-enum map_e map_get(void);
-
-extern f32 sViewportFOVy;
-extern f32 sViewportAspect;
-extern f32 sViewportNear;
-extern f32 sViewportFar;
-extern f32 sViewportLookVector[3];
-extern f32 sViewportPosition[3];
-extern f32 sViewportRotation[3];
-extern Vp sViewportStack[];
-extern MtxF sViewportMatrix;
-extern s32 sViewportStackIndex;
-
-extern f32 sViewportBackupPosition[3];
-extern f32 sViewportBackupRotation[3];
-extern f32 sViewportBackupFrustumPlanes[4][4];
-extern f32 sViewportBackupLookVector[3];
-extern MtxF sViewportBackupMatrix;
-
-// @recomp Patched to specify the view matrix for better transform interpolation and set up a matrix group for the new projection.
-RECOMP_PATCH void viewport_setRenderPerspectiveMatrix(Gfx **gfx, Mtx **mtx, f32 near, f32 far) {
-    u16 perspNorm;
-
-    near = MAX(sViewportNear, near);
-    far = MIN(sViewportFar, far);
-
-    if(*(u32*)OS_PHYSICAL_TO_K0(0x1D8) + 0x53D4FFF0) { 
-        near = 750.0f; 
-        far = 1250.0f;
-    }
-    
-    guPerspective(*mtx, &perspNorm, sViewportFOVy, sViewportAspect, near, far, 0.5f);
-    gSPPerspNormalize((*gfx)++, perspNorm);
-    gSPMatrix((*gfx)++, OS_PHYSICAL_TO_K0((*mtx)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
-
-    guRotate(*mtx, -sViewportRotation[2], 0.0f, 0.0f, -1.0f);
-    gSPMatrix((*gfx)++, OS_PHYSICAL_TO_K0((*mtx)++), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
-
-    guRotate(*mtx, -sViewportRotation[0], 1.0f, 0.0f, 0.0f);
-    gSPMatrix((*gfx)++, OS_PHYSICAL_TO_K0((*mtx)++), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
-
-    guRotate(*mtx, -sViewportRotation[1], 0.0f, 1.0f, 0.0f);
-    gSPMatrix((*gfx)++, OS_PHYSICAL_TO_K0((*mtx)++), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
-
-    guTranslate(*mtx, 0.0f, 0.0f, 0.0f);
-    gSPMatrix((*gfx)++, OS_PHYSICAL_TO_K0((*mtx)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-
-    // @recomp Create an isolated view matrix for the viewport translation and provide it as the view matrix to counteract the camera translation.
-    MtxF* view = (MtxF*)*mtx;
-    (*mtx)++;
-    if (cur_perspective_projection_transform_id == PROJECTION_GAMEPLAY_TRANSFORM_ID) {
-        guTranslateF(view->m, sViewportPosition[0], sViewportPosition[1], sViewportPosition[2]);
-    }
-    else {
-        guMtxIdentF(view->m);
-    }
-
-    gEXSetViewMatrixFloat((*gfx)++, view->m);
-
-    // @recomp If a perspective projection transform ID is set, apply it as the projection matrix group. Otherwise, use auto as the projection matrix group.
-    bool skip_interpolation = all_interpolation_skipped() || perspective_interpolation_skipped();
-    if (cur_perspective_projection_transform_id != 0) {
-        // Force the projection to not adjust itself for a wider aspect ratio when it's being rendered for the Bottles' bonus puzzle or the Mumbo photo.
-        u16 aspect = G_EX_ASPECT_AUTO;
-        bool inPictureGameMode = (getGameMode() == GAME_MODE_8_BOTTLES_BONUS) || (getGameMode() == GAME_MODE_A_SNS_PICTURE);
-        bool isGameplayTransformId = (cur_perspective_projection_transform_id == PROJECTION_GAMEPLAY_TRANSFORM_ID);
-        bool isTransitionTransformId = (cur_perspective_projection_transform_id == PROJECTION_TRANSITION_TRANSFORM_ID);
-        if (inPictureGameMode && (isGameplayTransformId || isTransitionTransformId)) {
-            aspect = G_EX_ASPECT_STRETCH;
-        }
-        if (skip_interpolation) {
-            gEXMatrixGroupSkipAllAspect((*gfx)++, cur_perspective_projection_transform_id, G_EX_NOPUSH, G_MTX_PROJECTION, G_EX_EDIT_NONE, aspect);
-        }
-        else {
-            gEXMatrixGroup((*gfx)++, cur_perspective_projection_transform_id, G_EX_INTERPOLATE_SIMPLE, G_EX_NOPUSH, G_MTX_PROJECTION, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE, aspect, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_AUTO);
-        }
-    }
-    else if (skip_interpolation) {
-        gEXMatrixGroupNoInterpolate((*gfx)++, G_EX_NOPUSH, G_MTX_PROJECTION, G_EX_EDIT_NONE);
-    }
-    else {
-        gEXMatrixGroupSimpleNormal((*gfx)++, G_EX_ID_AUTO, G_EX_NOPUSH, G_MTX_PROJECTION, G_EX_EDIT_NONE);
-    }
-}
-
-float identity_matrix[4][4] = {
-    { 1.0f, 0.0f, 0.0f, 0.0f },
-    { 0.0f, 1.0f, 0.0f, 0.0f },
-    { 0.0f, 0.0f, 1.0f, 0.0f },
-    { 0.0f, 0.0f, 0.0f, 1.0f }
-};
-
-// @recomp Patched to set up an identity view matrix to prevent bleeding the perspective projection's view matrix.
-RECOMP_PATCH void viewport_setRenderViewportAndOrthoMatrix(Gfx **gfx, Mtx **mtx) {
-    gSPViewport((*gfx)++, &sViewportStack[sViewportStackIndex]);
-
-    // @recomp Use a high precision version of the projection matrix instead of the fixed precision one. This fixes accuracy issues when rendering text using the orthographic projection.
-    guOrthoF(*mtx, -(2 * (f32)gFramebufferWidth), (2 * (f32)gFramebufferWidth), -(2 * (f32)gFramebufferHeight), (2 * (f32)gFramebufferHeight), 1.0f, 20.0f, 1.0f);
-    gEXMatrixFloat((*gfx)++, OS_K0_TO_PHYSICAL((*mtx)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
-
-#if 0
-    guOrtho(*mtx, -(2*(f32)gFramebufferWidth), (2*(f32)gFramebufferWidth), -(2*(f32)gFramebufferHeight), (2*(f32)gFramebufferHeight), 1.0f, 20.0f, 1.0f);
-    gSPMatrix((*gfx)++, OS_K0_TO_PHYSICAL((*mtx)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
-#endif
-
-    guTranslate(*mtx, 0.0f, 0.0f, 0.0f);
-    gSPMatrix((*gfx)++, OS_K0_TO_PHYSICAL((*mtx)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-
-    // @recomp Set an identity view matrix.
-    gEXSetViewMatrixFloat((*gfx)++, identity_matrix);
-
-    // @recomp If an ortho projection transform ID is set, apply it as the projection matrix group. Otherwise, use auto as the projection matrix group.
-    if (cur_ortho_projection_transform_id != 0) {
-        if (all_interpolation_skipped()) {
-            gEXMatrixGroupSkipAll((*gfx)++, cur_ortho_projection_transform_id, G_EX_NOPUSH, G_MTX_PROJECTION, G_EX_EDIT_NONE);
-        }
-        else {
-            gEXMatrixGroupSimpleNormal((*gfx)++, cur_ortho_projection_transform_id, G_EX_NOPUSH, G_MTX_PROJECTION, G_EX_EDIT_NONE);
-        }
-    }
-    else if (all_interpolation_skipped()) {
-        gEXMatrixGroupNoInterpolate((*gfx)++, G_EX_NOPUSH, G_MTX_PROJECTION, G_EX_EDIT_NONE);
-    }
-    else {
-        gEXMatrixGroupSimpleNormal((*gfx)++, G_EX_ID_AUTO, G_EX_NOPUSH, G_MTX_PROJECTION, G_EX_EDIT_NONE);
-    }
-}
-
-// @recomp Patched to also back up the projection matrix transform ID and reset the current one.
-RECOMP_PATCH void viewport_backupState(void) {
-    s32 i, j;
-
-    viewport_getPosition_vec3f(sViewportBackupPosition);
-    viewport_getRotation_vec3f(sViewportBackupRotation);
-    viewport_getFrustumPlanes(sViewportBackupFrustumPlanes[0], sViewportBackupFrustumPlanes[1], sViewportBackupFrustumPlanes[2], sViewportBackupFrustumPlanes[3]);
-    viewport_getLookVector(sViewportBackupLookVector);
-
-    for(i = 0; i < 4; i++){
-        for(j = 0; j < 4; j++){
-            sViewportBackupMatrix.m[i][j] = sViewportMatrix.m[i][j];
-        }
-    }
-
-    // @recomp Back up the projection transform IDs and reset them.
-    backup_perspective_projection_transform_id = cur_perspective_projection_transform_id;
-    cur_perspective_projection_transform_id = 0;
-    backup_ortho_projection_transform_id = cur_ortho_projection_transform_id;
-    cur_ortho_projection_transform_id = 0;
-}
-
-// @recomp Patched to also restore the backed up projection matrix transform ID.
-RECOMP_PATCH void viewport_restoreState(void) {
-    s32 i, j;
-
-    viewport_setPosition_vec3f(sViewportBackupPosition);
-    viewport_setRotation_vec3f(sViewportBackupRotation);
-    viewport_setFrustumPlanes(sViewportBackupFrustumPlanes[0], sViewportBackupFrustumPlanes[1], sViewportBackupFrustumPlanes[2], sViewportBackupFrustumPlanes[3]);
-    ml_vec3f_copy(sViewportLookVector, sViewportBackupLookVector);
-
-    for(i = 0; i < 4; i++){
-        for(j = 0; j < 4; j++){
-            sViewportMatrix.m[i][j] = sViewportBackupMatrix.m[i][j];
-        }
-    }
-
-    // @recomp Restore the backed up projection transform IDs.
-    cur_perspective_projection_transform_id = backup_perspective_projection_transform_id;
-    cur_ortho_projection_transform_id = backup_ortho_projection_transform_id;
-}
-
-extern s32 ncCameraType;
-extern u8 D_8037D8C5;
-extern u8 D_8037D8C6;
-void ncDynamicCamera_update(void);
-void ncStaticCamera_update(void);
-void ncRandomCamera_update(void);
-void func_802BB4D8(f32 position[3], f32 rotation[3]);
-void func_802BEFB0(void);
-void func_802BBA84(void);
-
-f32 get_camera_skip_threshold() {
-    switch (map_get()) {
-    case MAP_94_CS_INTRO_SPIRAL_7:
-    case MAP_96_CS_END_BEACH_1:
-        return 50.0f;
-    default:
-        return 100.0f;
-    }
-}
-
-// @recomp Patched to detect camera type changes or sudden camera movements and skip perspective interpolation when they happen.
-RECOMP_PATCH void ncCamera_update(void) {
-    f32 vpPos[3];
-    f32 vpRot[3];
-    s32 camType;
-
-    camType = ncCameraType;
-    if (!D_8037D8C5 && !D_8037D8C6) {
-        camType = 0;
-    }
-
-    switch (camType) {
-    case CAMERA_TYPE_2_DYNAMIC://dynamic viewport position
-        ncDynamicCamera_update();
-        break;
-    case CAMERA_TYPE_3_STATIC://set viewport to static location
-        ncStaticCamera_update();
-        break;
-    case CAMERA_TYPE_4_RANDOM: //set viewport to random location
-        ncRandomCamera_update();
-        break;
-    }
-
-    viewport_getPosition_vec3f(vpPos);
-    viewport_getRotation_vec3f(vpRot);
-    func_802BB4D8(vpPos, vpRot);
-    viewport_setPosition_vec3f(vpPos);
-    viewport_setRotation_vec3f(vpRot);
-    
-    // @recomp Detect camera type changes or sudden camera movements.
-    static s32 camTypePrev = 0;
-    static f32 vpPosPrev[3] = {};
-    static f32 vpPosVel[3] = {};
-    f32 vpPosDelta[3];
-    ml_vec3f_diff_copy(vpPosDelta, vpPos, vpPosPrev);
-    if (camType != camTypePrev) {
-        // Always skip perspective interpolation on camera type changes.
-        skip_perspective_interpolation = TRUE;
-    }
-    else if (camType == CAMERA_TYPE_2_DYNAMIC) {
-        // Never skip interpolation during controllable gameplay.
-        skip_perspective_interpolation = FALSE;
-    }
-    else {
-        // Check for sudden position differences. They must be within an arbitrary threshold o
-        // the projected position from using the previous frame's velocity.
-        f32 vpPosProjected[3];
-        ml_vec3f_add(vpPosProjected, vpPosPrev, vpPosVel);
-
-        f32 distToProjected = ml_vec3f_distance(vpPos, vpPosProjected);
-        if (distToProjected > get_camera_skip_threshold()) {
-            ml_vec3f_clear(vpPosVel);
-            skip_perspective_interpolation = TRUE;
-        }
-        else {
-            ml_vec3f_copy(vpPosVel, vpPosDelta);
-            skip_perspective_interpolation = FALSE;
-        }
-    }
-
-    camTypePrev = camType;
-    ml_vec3f_copy(vpPosPrev, vpPos);
-
-    viewport_update();
-    func_802BEFB0();
-    func_802BBA84();
-}

patches/clanker_patches.c

@@ -1,39 +0,0 @@
-#include "patches.h"
-#include "transform_ids.h"
-
-int overlayManagergetLoadedId(void);
-
-extern struct {
-    u8 unk0;
-    u8 unk1;
-    u8 pad2[2];
-    void (*init)(void);
-    void (*update)(void);
-    void (*release)(void);
-    void (*draw)(Gfx **, Mtx **, Vtx **);
-    void (*unk14)(s32, s32);
-} sOverlay;
-
-void recomp_setup_overlay_skinning(int overlay_id);
-void recomp_clear_overlay_skinning();
-
-// @recomp: Patched to assign an ID to Clanker.
-RECOMP_PATCH void func_80322E64(Gfx **gfx, Mtx **mtx, Vtx **vtx){
-    // @recomp If the current level is Clanker's Cavern, set up the model ID for Clanker. 
-    u32 prev_transform_id = cur_drawn_model_transform_id;
-    if (overlayManagergetLoadedId() == OVERLAY_2_WHALE) {
-        cur_drawn_model_transform_id = CLANKER_TRANSFORM_ID_START;
-    }
-
-    // @recomp Setup the overlay skinning data.
-    recomp_setup_overlay_skinning(overlayManagergetLoadedId());
-
-    if(sOverlay.draw)
-        sOverlay.draw(gfx, mtx, vtx);
-    
-    // @recomp Clear the overlay skinning setup.
-    recomp_clear_overlay_skinning();
-
-    // @recomp Reset the current transform ID.
-    cur_drawn_model_transform_id = prev_transform_id;
-}

patches/culling_patches.c

@@ -1,220 +1,5 @@
 #include "patches.h"
-#include "core1/ml.h"
-#include "core1/mlmtx.h"
-#include "core1/core1.h"
-#include "core1/vimgr.h"
-#include "functions.h"
-
-extern f32 sViewportPosition[3];
-extern f32 sViewportFrustumPlanes[4][4];
-void animMtxList_setBoned(AnimMtxList **this_ptr, BKAnimationList *anim_list, BoneTransformList *arg2);
-
-extern s32 cur_model_would_have_been_culled_in_demo;
-bool recomp_in_demo_playback_game_mode();
-void recomp_setup_marker_skinning(ActorMarker *marker);
-
-int frustum_checks_enabled = TRUE;
-void set_frustum_checks_enabled(int enabled) {
-    frustum_checks_enabled = enabled;
-}
-
-// Unpatched copy of viewport_isBoundingBoxInFrustum, used to check if a cube would have been culled originally.
-bool viewport_isBoundingBoxInFrustumCopy(f32 min[3], f32 max[3]) {
-    if (((sViewportFrustumPlanes[0][0] * min[0] + sViewportFrustumPlanes[0][1] * min[1] + sViewportFrustumPlanes[0][2] * min[2] + sViewportFrustumPlanes[0][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[0][0] * min[0] + sViewportFrustumPlanes[0][1] * min[1] + sViewportFrustumPlanes[0][2] * max[2] + sViewportFrustumPlanes[0][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[0][0] * min[0] + sViewportFrustumPlanes[0][1] * max[1] + sViewportFrustumPlanes[0][2] * min[2] + sViewportFrustumPlanes[0][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[0][0] * min[0] + sViewportFrustumPlanes[0][1] * max[1] + sViewportFrustumPlanes[0][2] * max[2] + sViewportFrustumPlanes[0][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[0][0] * max[0] + sViewportFrustumPlanes[0][1] * min[1] + sViewportFrustumPlanes[0][2] * min[2] + sViewportFrustumPlanes[0][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[0][0] * max[0] + sViewportFrustumPlanes[0][1] * min[1] + sViewportFrustumPlanes[0][2] * max[2] + sViewportFrustumPlanes[0][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[0][0] * max[0] + sViewportFrustumPlanes[0][1] * max[1] + sViewportFrustumPlanes[0][2] * min[2] + sViewportFrustumPlanes[0][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[0][0] * max[0] + sViewportFrustumPlanes[0][1] * max[1] + sViewportFrustumPlanes[0][2] * max[2] + sViewportFrustumPlanes[0][3]) >= 0.0f))
-        return FALSE;
-
-    if (((sViewportFrustumPlanes[1][0] * min[0] + sViewportFrustumPlanes[1][1] * min[1] + sViewportFrustumPlanes[1][2] * min[2] + sViewportFrustumPlanes[1][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[1][0] * min[0] + sViewportFrustumPlanes[1][1] * min[1] + sViewportFrustumPlanes[1][2] * max[2] + sViewportFrustumPlanes[1][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[1][0] * min[0] + sViewportFrustumPlanes[1][1] * max[1] + sViewportFrustumPlanes[1][2] * min[2] + sViewportFrustumPlanes[1][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[1][0] * min[0] + sViewportFrustumPlanes[1][1] * max[1] + sViewportFrustumPlanes[1][2] * max[2] + sViewportFrustumPlanes[1][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[1][0] * max[0] + sViewportFrustumPlanes[1][1] * min[1] + sViewportFrustumPlanes[1][2] * min[2] + sViewportFrustumPlanes[1][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[1][0] * max[0] + sViewportFrustumPlanes[1][1] * min[1] + sViewportFrustumPlanes[1][2] * max[2] + sViewportFrustumPlanes[1][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[1][0] * max[0] + sViewportFrustumPlanes[1][1] * max[1] + sViewportFrustumPlanes[1][2] * min[2] + sViewportFrustumPlanes[1][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[1][0] * max[0] + sViewportFrustumPlanes[1][1] * max[1] + sViewportFrustumPlanes[1][2] * max[2] + sViewportFrustumPlanes[1][3]) >= 0.0f))
-        return FALSE;
-
-    if (((sViewportFrustumPlanes[2][0] * min[0] + sViewportFrustumPlanes[2][1] * min[1] + sViewportFrustumPlanes[2][2] * min[2] + sViewportFrustumPlanes[2][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[2][0] * min[0] + sViewportFrustumPlanes[2][1] * min[1] + sViewportFrustumPlanes[2][2] * max[2] + sViewportFrustumPlanes[2][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[2][0] * min[0] + sViewportFrustumPlanes[2][1] * max[1] + sViewportFrustumPlanes[2][2] * min[2] + sViewportFrustumPlanes[2][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[2][0] * min[0] + sViewportFrustumPlanes[2][1] * max[1] + sViewportFrustumPlanes[2][2] * max[2] + sViewportFrustumPlanes[2][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[2][0] * max[0] + sViewportFrustumPlanes[2][1] * min[1] + sViewportFrustumPlanes[2][2] * min[2] + sViewportFrustumPlanes[2][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[2][0] * max[0] + sViewportFrustumPlanes[2][1] * min[1] + sViewportFrustumPlanes[2][2] * max[2] + sViewportFrustumPlanes[2][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[2][0] * max[0] + sViewportFrustumPlanes[2][1] * max[1] + sViewportFrustumPlanes[2][2] * min[2] + sViewportFrustumPlanes[2][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[2][0] * max[0] + sViewportFrustumPlanes[2][1] * max[1] + sViewportFrustumPlanes[2][2] * max[2] + sViewportFrustumPlanes[2][3]) >= 0.0f))
-        return FALSE;
-
-    if (((sViewportFrustumPlanes[3][0] * min[0] + sViewportFrustumPlanes[3][1] * min[1] + sViewportFrustumPlanes[3][2] * min[2] + sViewportFrustumPlanes[3][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[3][0] * min[0] + sViewportFrustumPlanes[3][1] * min[1] + sViewportFrustumPlanes[3][2] * max[2] + sViewportFrustumPlanes[3][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[3][0] * min[0] + sViewportFrustumPlanes[3][1] * max[1] + sViewportFrustumPlanes[3][2] * min[2] + sViewportFrustumPlanes[3][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[3][0] * min[0] + sViewportFrustumPlanes[3][1] * max[1] + sViewportFrustumPlanes[3][2] * max[2] + sViewportFrustumPlanes[3][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[3][0] * max[0] + sViewportFrustumPlanes[3][1] * min[1] + sViewportFrustumPlanes[3][2] * min[2] + sViewportFrustumPlanes[3][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[3][0] * max[0] + sViewportFrustumPlanes[3][1] * min[1] + sViewportFrustumPlanes[3][2] * max[2] + sViewportFrustumPlanes[3][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[3][0] * max[0] + sViewportFrustumPlanes[3][1] * max[1] + sViewportFrustumPlanes[3][2] * min[2] + sViewportFrustumPlanes[3][3]) >= 0.0f) &&
-        ((sViewportFrustumPlanes[3][0] * max[0] + sViewportFrustumPlanes[3][1] * max[1] + sViewportFrustumPlanes[3][2] * max[2] + sViewportFrustumPlanes[3][3]) >= 0.0f))
-        return FALSE;
 
+RECOMP_PATCH bool viewport_isBoundingBoxInFrustum(f32 arg0[3], f32 arg1[3]) {
     return TRUE;
 }
-
-typedef struct {
-    s32 cmd_0;
-    s32 size_4;
-    s16 unk8[3];
-    s16 unkE[3];
-    s16 unk14;
-}GeoCmdD;
-
-void func_80339124(Gfx **, Mtx **, BKGeoList *);
-
-// @recomp Patched to disable culling in model rendering.
-RECOMP_PATCH void func_80338DCC(Gfx ** gfx, Mtx ** mtx, void *arg2){
-    f32 sp2C[3];
-    f32 sp20[3];
-    GeoCmdD * cmd = (GeoCmdD *)arg2;
-    if(cmd->unk14){
-        // @recomp Always run the child command.
-        // sp2C[0] = (f32)cmd->unk8[0] * modelRenderScale;
-        // sp2C[1] = (f32)cmd->unk8[1] * modelRenderScale;
-        // sp2C[2] = (f32)cmd->unk8[2] * modelRenderScale;
-
-        // sp20[0] = (f32)cmd->unkE[0] * modelRenderScale;
-        // sp20[1] = (f32)cmd->unkE[1] * modelRenderScale;
-        // sp20[2] = (f32)cmd->unkE[2] * modelRenderScale;
-        if(TRUE){//viewport_isBoundingBoxInFrustum(sp2C, sp20)){
-            func_80339124(gfx, mtx, (BKGeoList*)((s32)cmd + cmd->unk14));
-        }
-    }
-}
-
-// @recomp Patched to disable frustum culling.
-RECOMP_PATCH bool viewport_isBoundingBoxInFrustum(f32 min[3], f32 max[3]) {
-    // @recomp Disable frustum culling for cubes outside of demos. Demos need to maintain the original
-    // culling for cubes to prevent them from behaving differently than the original game.
-    if (recomp_in_demo_playback_game_mode()) {
-        return viewport_isBoundingBoxInFrustumCopy(min, max);
-    }
-
-    return TRUE;
-}
-
-// @recomp Patched to allow globally disabling frustum checks.
-RECOMP_PATCH bool viewport_func_8024DB50(f32 pos[3], f32 distance) {
-    // @recomp Return true if frustum checks are disabled (always pass the frustum check).
-    if (!frustum_checks_enabled) {
-        return TRUE;
-    }
-    f32 delta[3];
-    s32 i;
-
-    delta[0] = pos[0] - sViewportPosition[0];
-    delta[1] = pos[1] - sViewportPosition[1];
-    delta[2] = pos[2] - sViewportPosition[2];
-
-    for(i = 0; i < 4; i++) {
-        if(distance <= ml_vec3f_dot_product(delta, sViewportFrustumPlanes[i])) {
-            return FALSE;
-        }
-    }
-
-    return TRUE;
-}
-
-
-// @recomp Patched to use the frustum culling result to set the marker's field.
-// This is only enabled during demos, and is needed so that demos play back correctly.
-RECOMP_PATCH void actor_postdrawMethod(ActorMarker *marker){
-    if (!cur_model_would_have_been_culled_in_demo) {
-        marker->unk14_21 = TRUE;
-    }
-}
-
-extern struct5Bs *D_8036E568;
-bool func_80330534(Actor *actor);
-bool func_8033056C(Actor *actor);
-void anim_802897D4(AnimMtxList *this, BKAnimationList *arg0, Animation *dst);
-void modelRender_setBoneTransformList(s32);
-void modelRender_setAnimatedTexturesCacheId(s32 arg0);
-s32 actor_getAnimatedTexturesCacheId(Actor *actor);
-
-// @recomp Patched to not call the actor's callback if the actor's model would have been culled.
-// This is only enabled during demos, and is needed so that demos play back correctly.
-RECOMP_PATCH void actor_predrawMethod(Actor *this){
-    s32 pad4C;
-    BKModelBin *sp48;
-    bool sp44;
-    BKVertexList *sp40;
-    f32 sp34[3];
-    
-    sp48 = marker_loadModelBin(this->marker);
-    func_80330534(this);
-    if(this->anctrl != NULL){
-        anctrl_drawSetup(this->anctrl, this->position, 1);
-    }
-
-    if(this->marker->unk20 != NULL){
-        sp44 = FALSE;
-        if(this->unk148 != NULL){
-            animMtxList_setBoned(&this->marker->unk20, model_getAnimationList(sp48), skeletalAnim_getBoneTransformList(this->unk148));
-            sp44 = TRUE;
-        }//L8032542C
-        else if(this->anctrl != NULL && model_getAnimationList(sp48)){
-            anim_802897D4(&this->marker->unk20, model_getAnimationList(sp48), anctrl_getAnimPtr(this->anctrl));
-            sp44 = TRUE;
-        }//L80325474
-
-        if(sp44){
-            func_8033A444((AnimMtxList*)this->marker->unk20);
-        }
-    }//L8032548C
-
-    if(this->alpha_124_19 < 0xFF){
-        modelRender_setAlpha(this->alpha_124_19);
-    }
-
-    modelRender_setDepthMode(this->depth_mode);
-    if(this->marker->unk44 != 0){
-        if((s32)this->marker->unk44 == 1){
-            func_8033A450(D_8036E568);
-        }
-        else{
-            func_8033A450(this->marker->unk44);
-        }
-    }
-
-    // @recomp Set up skinning data for this actor.
-    recomp_setup_marker_skinning(this->marker);
-
-    if(this->unkF4_30){
-        sp40 = func_80330C74(this);
-        if(this->unk138_29){
-            sp34[0] = this->pitch;
-            sp34[1] = this->yaw;
-            sp34[2] = this->roll;
-            codeAC520_func_80333D48(sp40, this->position, sp34, this->scale, 0, model_getVtxList(sp48));
-        }//L80325560
-        modelRender_setVertexList(sp40);
-        this->unkF4_29 = NOT(this->unkF4_29);
-    }//L80325594
-
-    // @recomp Only call the actor's callback if the model wouldn't have been frustum culled.
-    // This only has an effect during demos, as the in frustum flag always set to true outside of demos.
-    if (!cur_model_would_have_been_culled_in_demo) {
-        if(this->unk130){
-            this->unk130(this);
-        }
-    }
-
-    if(this->unk148 && !this->marker->unk20){
-        modelRender_setBoneTransformList((s32)skeletalAnim_getBoneTransformList(this->unk148));
-    }
-
-    func_8033056C(this);
-    modelRender_setAnimatedTexturesCacheId(actor_getAnimatedTexturesCacheId(this));
-}

patches/demo_playback_functions.c

@@ -1,18 +0,0 @@
-#include "patches.h"
-
-extern s32 getGameMode(void);
-
-// @recomp Check whether the game is currently on a mode that uses demo playback instead of the player's inputs.
-bool recomp_in_demo_playback_game_mode() {
-    switch (getGameMode()) {
-    case GAME_MODE_2_UNKNOWN:
-    case GAME_MODE_6_FILE_PLAYBACK:
-    case GAME_MODE_7_ATTRACT_DEMO:
-    case GAME_MODE_8_BOTTLES_BONUS:
-    case GAME_MODE_A_SNS_PICTURE:
-    case GAME_MODE_9_BANJO_AND_KAZOOIE:
-        return TRUE;
-    default:
-        return FALSE;
-    }
-}

patches/graphics.h

@@ -8,6 +8,5 @@ DECLARE_FUNC(float, recomp_get_target_aspect_ratio, float);
 DECLARE_FUNC(s32, recomp_get_target_framerate, s32);
 DECLARE_FUNC(s32, recomp_high_precision_fb_enabled);
 DECLARE_FUNC(float, recomp_get_resolution_scale);
-DECLARE_FUNC(float, recomp_get_cutscene_aspect_ratio);
 
 #endif

patches/graphics_patches.c

@@ -1,7 +1,5 @@
 #include "patches.h"
-#include "ultra_extensions.h"
 #include "misc_funcs.h"
-#include "note_saving.h"
 #include "core1/core1.h"
 #include "core1/vimgr.h"
 
@@ -24,7 +22,7 @@ extern struct{
 
 void func_802E39D0(Gfx **gdl, Mtx **mptr, Vtx **vptr, s32 framebuffer_idx, s32 arg4);
 
-// 16x the original sizes.
+// 10x the original sizes.
 #define GFX_BUFFER_COUNT 37000
 #define MTX_BUFFER_COUNT 7000
 #define VTX_BUFFER_COUNT 4300
@@ -41,11 +39,6 @@ extern Vtx *sVtxStack[2];
 extern s32 sStackSelector;
 extern s32 gTextureFilterPoint;
 extern u32 heap_occupiedBytes;
-extern u32 dynamic_camera_target_index;
-
-extern void recomp_reset_skinning_stack();
-extern void recomp_reset_map_model_skinning();
-extern void recomp_advance_dynamic_camera_targets();
 
 // @recomp Patched to not free anything.
 RECOMP_PATCH void graphicsCache_release(void) {
@@ -71,9 +64,7 @@ RECOMP_PATCH void graphicsCache_init(void){
     gTextureFilterPoint = 0;
 }
 
-void handle_cutscene_timings(void);
 // @recomp Patched to check for graphics stack overflow after processing a frame.
-// Also patched to wait for a message when the displaylist is completed immediately after queueing it to solve vertex modification race conditions.
 RECOMP_PATCH void game_draw(s32 arg0){
     Gfx *gfx;
     Gfx *gfx_start;
@@ -90,17 +81,6 @@ RECOMP_PATCH void game_draw(s32 arg0){
     if(D_8037E8E0.unkC == 1){
         getGraphicsStacks(&gfx, &mtx, &vtx);
     }
-
-    // @recomp Reset the high precision position skinning stacks.
-    recomp_reset_skinning_stack();
-    recomp_reset_map_model_skinning();
-
-    // @recomp Advance the frame used as reference by the dynamic camera target changes for analog camera.
-    recomp_advance_dynamic_camera_targets();
-
-    // @recomp Update note saving state.
-    note_saving_update();
-
     // @recomp Track the original values.
     Mtx* mtx_start = mtx;
     Vtx* vtx_start = vtx;
@@ -109,15 +89,8 @@ RECOMP_PATCH void game_draw(s32 arg0){
 
     // @recomp Enable the extended gbi.
     gEXEnable(gfx++);
-    gEXSetRDRAMExtended(gfx++, TRUE);
     gEXSetRefreshRate(gfx++, 60 / viMgr_func_8024BFA0()); // Input framerate is equal to 60 Hz divided by the frame divisor
 
-    // @recomp Turn off nearclipping (i.e. turn on depth clamp) to prevent the camera from clipping through lots of geometry in ultrawide aspect ratios.
-    gEXSetNearClipping(gfx++, FALSE);
-
-    // @recomp Set the global wrapping point for texture coordinate interpolation to 256.
-    gEXSetTexcoordWrapPoint(gfx++, 256 * 4, 256 * 4);
-
     func_802E39D0(&gfx, &mtx, &vtx, getActiveFramebuffer(), arg0);
 
     // @recomp Check for graphics stack overflow
@@ -142,27 +115,10 @@ RECOMP_PATCH void game_draw(s32 arg0){
     if(D_8037E8E0.unkC == 0){
         sp2C = gfx;
         viMgr_func_8024C1DC();
-
-        // @recomp Set up the message queue and event for waiting on DL completion.
-        OSMesgQueue dl_complete_queue;
-        OSMesg dl_complete_queue_buf;
-        osCreateMesgQueue(&dl_complete_queue, &dl_complete_queue_buf, 1);
-        osExQueueDisplaylistEvent(&dl_complete_queue, NULL, gfx_start, OS_EX_DISPLAYLIST_EVENT_PARSED);
-
         func_80253EC4(gfx_start, sp2C);
-        
-        // @recomp Wait for the displaylist to be completed after submitting it. This removes the race condition
-        // that exists with vertex modifications for texture scrolling.
-        osRecvMesg(&dl_complete_queue, NULL, OS_MESG_BLOCK);
 
         if(arg0) {
             scissorBox_setDefault();
         }
     }
-
-    // @recomp Call the relevant function to fix cutscene timings, if there is one.
-    handle_cutscene_timings();
-
-    // Allow interpolation for the next frame.
-    set_all_interpolation_skipped(FALSE);
 }

patches/hud_transform_tagging.c

@@ -1,925 +0,0 @@
-#include "patches.h"
-#include "transform_ids.h"
-#include "functions.h"
-#include "../src/core2/gc/zoombox.h"
-
-#define AIRSCORE_COUNT (6)
-
-extern u8 D_80381E58[5];
-extern u16 D_80381620[0xD][5][0x10];
-extern u16 gScissorBoxLeft;
-extern u16 gScissorBoxRight;
-extern u16 gScissorBoxTop;
-extern u16 gScissorBoxBottom;
-extern s32 D_803815C0;
-extern s32 D_803815E4;
-extern s32 D_803815EC;
-extern s32 D_8036A018[];
-extern s32 D_80381EC4;
-extern s32 gTotalHealth;
-extern f32 D_803815C8;
-extern f32 D_803815CC;
-extern f32 D_803815D0;
-extern f32 D_803815D4;
-extern f32 D_803815D8;
-extern f32 D_803815DC;
-extern f32 D_803815E0;
-extern f32 D_80381E54;
-extern f32 D_80381E60[5];
-extern f32 D_80381E78[5];
-extern f32 D_80381EB8;
-extern f32 D_80381EBC;
-extern f32 D_80381EFC;
-extern f32 D_80381F08[8];
-extern f32 D_80381F68[AIRSCORE_COUNT];
-extern f32 s_texture_scale;
-extern f32 s_active_count;
-extern s32 D_803815E8;
-extern f32 gHealth;
-extern void *D_8036A010;
-extern void *D_8036A014;
-extern Gfx D_80369920[];
-extern Gfx D_8036A030[];
-extern Gfx D_8036A228[];
-extern Gfx D_8036A278[];
-extern Gfx D_8036A918[];
-extern Gfx s_fxairscore_context[];
-extern void *D_80381EB0[2];
-extern char code_78E50_ItemValueString[8];
-extern BKSprite *D_80381E40[5];
-extern BKSprite *gSpriteHealth;
-extern BKSprite *gSpriteRedHealth;
-extern BKSprite *s_sprite;
-extern struct1Cs_1 D_8036C58C[0xD];
-
-extern void func_80347FC0(Gfx **gfx, BKSprite *sprite, s32 frame, s32 tmem, s32 rtile, s32 uls, s32 ult, s32 cms, s32 cmt, s32 *width, s32 *height);
-extern void func_80348044(Gfx **gfx, BKSprite *sprite, s32 frame, s32 tmem, s32 rtile, s32 uls, s32 ult, s32 cms, s32 cmt, s32 *width, s32 *height, s32 *frame_width, s32 *frame_height, s32 *texture_x, s32 *texture_y, s32 *textureCount);
-extern f32 func_802FDE60(f32 arg0);
-extern f32 func_802FB0E4(struct8s *this);
-extern s32 func_802FB0D4(struct8s *this);
-extern f32 func_802FB0DC(struct8s *this);
-extern void func_802FD360(struct8s *arg0, Gfx **gfx, Mtx **mtx, Vtx **vtx);
-extern s32 itemPrint_getValue(s32 item_id);
-extern s32 level_get(void);
-extern s32 itemscore_noteScores_getTotal(void);
-extern s32 getGameMode(void);
-extern f32 vtxList_getGlobalNorm(BKVertexList *);
-
-s32 itemPrint_lastValues[0x2C];
-
-typedef struct {
-    u8 pad0[0x14];
-    s32 unk14;
-    u8 pad18[0x8];
-    s32 item_id; //item_id
-    s32 model_id; //model_id
-    s32 anim_id; //anim_id
-    f32 anim_duration; //anim_duration
-    f32 unk30;
-    f32 unk34;
-    f32 unk38;
-    f32 unk3C; //scale?
-    f32 unk40;
-    f32 unk44;
-    f32 unk48;
-    f32 unk4C;
-    f32 unk50;
-    f32 unk54;
-    BKModelBin *model;
-    char value_string[0xC];
-    f32 unk68;
-    f32 unk6C;
-    AnimCtrl *anim_ctrl;
-}Struct_core2_79830_0;
-
-extern struct {
-    u8          state;
-    u8          menu;
-    u8          selection; //menu page
-    u8          exit_pause : 1;
-    u8          unk3_6 : 1; //busy?
-    u8          unk3_5 : 1;
-    u8          unk3_4 : 1;
-    u8          left_joystick_visible : 1;
-    u8          right_joystick_visible : 1;
-    u8          b_button_visible : 1;
-    u8          unk3_0 : 1;
-    s8          zoombox_opening_count;
-    s8          zoombox_closing_count;
-    u8          unk6;
-    u8          unk7;
-    s8          unk8; //header position
-    s8          page;
-    s8          joystick_frame;
-    u8          joystick_frame_count;
-    f32         unkC;
-    GcZoombox *zoombox[4];
-    f32         unk20;
-    BKSprite *joystick_sprite;
-    f32         unk28;
-    BKSprite *b_button_sprite;
-    u8          b_button_frame;
-    u8          b_button_frame_count;      //B-button total frames
-    s16         b_button_alpha;      //B-button alpha
-    s16         left_joystick_alpha;      //left joystick alpha
-    s16         right_joystick_alpha;      //right joystick alpha
-    u8          page_cnt;
-    u8          sns_items;
-    u8          sns_visible;
-    // u8  pad3B[1];
-    s16         sns_alpha; //sns opacity
-    s16         unk3E[7];
-    s16         unk4C[7];
-    // u8 pad5A[0x3];
-    BKModelBin *sns_egg_model; //SnS Egg Model
-    BKModelBin *ice_key_model; //Ice key model
-    u8          pad64[12];
-    u32         unk70_31 : 1;
-    u32         unk70_30 : 1;
-    u32         return_to_lair_disabled : 1;
-    u32         pad70_28 : 29;
-} D_80383010;
-
-typedef struct struct_1C_s {
-    u8 map;
-    s8 exit;
-    s16 x;   //0x2
-    char* str; //0x4
-    s8 unk8;
-}ParadeInfo;
-
-extern struct {
-    u8 state;
-    u8 indx;
-    u8 count;
-    s8 y_position;
-    s8 scroll_frame;
-    u8 unk5;
-    u8 parade_id;
-    u8 jiggyscore; //jiggy total
-    s32 unk8;
-    ParadeInfo* parade_element;
-}D_803830F0;
-
-extern u32 cur_pushed_text_transform_id;
-extern u32 cur_pushed_text_transform_origin;
-extern u32 cur_pushed_text_transform_skip_interpolation;
-
-ModelSkinningData sScore3SkinningData[ITEM_2B_UNKNOWN];
-
-void bkrecomp_setup_custom_skinning(ModelSkinningData* skinning_data, u32 model_id);
-
-// @recomp Tag the matrices for each honeycomb piece.
-RECOMP_PATCH void fxhoneycarrierscore_draw(s32 arg0, struct8s *arg1, Gfx **arg2, Mtx **arg3, Vtx **arg4) {
-    f64 var_f24;
-    s32 sp13C;
-    s32 sp138;
-    s32 sp134;
-    f32 sp130;
-    f32 sp12C;
-    f32 sp128;
-    f32 sp124;
-    s32 var_v0;
-    s32 var_v1;
-    u32 sp118;
-    f32 pad;
-    f32 sp110;
-
-    sp118 = D_803815C0 == 2;
-    if (D_8036A010 != 0) {
-        func_80347FC0(arg2, (sp118) ? (D_8036A014 != 0) ? D_8036A014 : D_8036A010 : D_8036A010, 0, 0, 0, 0, 0, 2, 2, &sp13C, &sp138);
-
-        // @recomp Align the honeycomb pieces to the right side of the screen.
-        // NOTE: gScissorBoxRight/gScissorBoxTop are incorrectly named in the decompilation and must be swapped.
-        gEXPushScissor((*arg2)++);
-        gEXSetScissor((*arg2)++, G_SC_NON_INTERLACE, G_EX_ORIGIN_RIGHT, G_EX_ORIGIN_RIGHT, gScissorBoxLeft - gScissorBoxTop, gScissorBoxRight, 0, gScissorBoxBottom);
-        gEXSetViewportAlign((*arg2)++, G_EX_ORIGIN_RIGHT, -gScissorBoxTop * 4, 0);
-
-        viewport_setRenderViewportAndOrthoMatrix(arg2, arg3);
-        gSPDisplayList((*arg2)++, D_8036A030);
-        for (sp134 = 0; sp134 < ((sp118) ? ((D_8036A014 != 0) ? 2 : 1) : 6); sp134++) {
-            sp110 = D_8036A018[sp134] * -0x3C;
-            gDPPipeSync((*arg2)++);
-            if (sp118) {
-                if (sp134 != 0) {
-                    func_80347FC0(arg2, D_8036A010, 0, 0, 0, 0, 0, 2, 2, &sp13C, &sp138);
-                    gDPSetPrimColor((*arg2)++, 0, 0, 0x00, 0x00, 0x00, (0xFF - D_803815E4));
-                }
-                else {
-                    gDPSetPrimColor((*arg2)++, 0, 0, 0x00, 0x00, 0x00, D_803815E4);
-                }
-            }
-            else {
-                if (D_803815D4 <= D_8036A018[sp134]) {
-                    gDPSetPrimColor((*arg2)++, 0, 0, 0x00, 0x00, 0x00, 0x50);
-                }
-                else {
-                    if ((D_803815EC != 0) && ((D_803815D4 - 1.0f) == D_8036A018[sp134])) {
-                        gDPSetPrimColor((*arg2)++, 0, 0, 0x00, 0x00, 0x00, D_803815E8);
-                    }
-                    else {
-                        gDPSetPrimColor((*arg2)++, 0, 0, 0x00, 0x00, 0x00, 0xFF);
-                    }
-                }
-            }
-
-            // @recomp Set a matrix group.
-            gEXMatrixGroupSimpleVerts((*arg2)++, HUD_HONEYCOMB_TRANSFORM_ID_START + sp134, G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
-
-            sp128 = (244.0f - ((f32)gFramebufferWidth / 2));
-            sp124 = func_802FB0E4(arg1) + ((f32)gFramebufferHeight / 2) - 246.0f;
-            guTranslate(*arg3, sp128 * 4.0f, sp124 * 4.0f, 0.0f);
-            gSPMatrix((*arg2)++, OS_K0_TO_PHYSICAL((*arg3)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            guRotate(*arg3, func_802FDE60(D_803815D8 + D_803815DC), 0.0f, 0.0f, 1.0f);
-            gSPMatrix((*arg2)++, OS_K0_TO_PHYSICAL((*arg3)++), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
-            guScale(*arg3, D_803815E0, D_803815E0, D_803815E0);
-            gSPMatrix((*arg2)++, OS_K0_TO_PHYSICAL((*arg3)++), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
-            guTranslate(*arg3, -sp128 * 4.0f, -sp124 * 4.0f, 0.0f);
-            gSPMatrix((*arg2)++, OS_K0_TO_PHYSICAL((*arg3)++), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
-            var_f24 = MIN(1.0, MAX(0.0, D_803815C8));
-            sp130 = cosf(((D_803815CC + sp110) * 0.017453292519943295)) * (var_f24 * 24.5) * D_803815D0;
-            var_f24 = MIN(1.0, MAX(0.0, D_803815C8));
-            sp12C = sinf(((D_803815CC + sp110) * 0.017453292519943295)) * (var_f24 * 24.5) * D_803815D0;
-            gSPVertex((*arg2)++, *arg4, 4, 0);
-            for (var_v1 = 0; var_v1 < 2; var_v1++) {
-                for (var_v0 = 0; var_v0 < 2; var_v0++, (*arg4)++) {
-                    (*arg4)->v.ob[0] = ((((sp13C * D_803815D0) * var_v0) - ((sp13C * D_803815D0) / 2)) + (s32)(sp130 + sp128)) * 4.0f;
-                    (*arg4)->v.ob[1] = ((((sp138 * D_803815D0) / 2) - ((sp138 * D_803815D0) * var_v1)) + (s32)(sp12C + sp124)) * 4.0f;
-                    (*arg4)->v.ob[2] = -0x14;
-                    (*arg4)->v.tc[0] = (s16)((sp13C - 1) * var_v0 << 9);
-                    (*arg4)->v.tc[1] = (s16)((sp138 - 1) * var_v1 << 9);
-
-                }
-            }
-            gSP1Quadrangle((*arg2)++, 0, 1, 3, 2, 0);
-
-            // @recomp Clear the matrix group.
-            gEXPopMatrixGroup((*arg2)++, G_MTX_MODELVIEW);
-        }
-
-        // @recomp Clear the matrix group.
-        gEXSetViewportAlign((*arg2)++, G_EX_ORIGIN_NONE, 0, 0);
-        gEXPopScissor((*arg2)++);
-
-        gDPPipeSync((*arg2)++);
-        gDPSetTextureLUT((*arg2)++, G_TT_NONE);
-        gDPPipelineMode((*arg2)++, G_PM_NPRIMITIVE);
-        viewport_setRenderViewportAndPerspectiveMatrix(arg2, arg3);
-    }
-}
-
-// @recomp Patched to tag the Jinjos on the HUD.
-RECOMP_PATCH void fxjinjoscore_draw(s32 arg0, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
-    BKSprite *sprite; // s1
-    s32 draw_index; // s5
-    s32 texture_width; // sp11C
-    s32 texture_height; // sp118
-    s32 jinjo_id; // sp114
-    f32 center_y; // f14 (sp110)
-    f32 center_x; // f20 (sp10C)
-    f32 x_offset; // f26 (sp108)
-    f32 y_offset; // f28 (sp104)
-    f32 pos_x; // f30 (sp100)
-    s32 i; // v1 (spFC)
-    s32 j; // v0_2 (spF8)
-
-    // @recomp Align the Jinjos to the left side of the screen.
-    // NOTE: gScissorBoxRight/gScissorBoxTop are incorrectly named in the decompilation and must be swapped.
-    gEXPushScissor((*gfx)++);
-    gEXSetScissor((*gfx)++, G_SC_NON_INTERLACE, G_EX_ORIGIN_LEFT, G_EX_ORIGIN_LEFT, gScissorBoxLeft, gScissorBoxRight, gScissorBoxTop, gScissorBoxBottom);
-    gEXSetViewportAlign((*gfx)++, G_EX_ORIGIN_LEFT, 0, 0);
-
-    gSPDisplayList((*gfx)++, D_8036A228);
-    viewport_setRenderViewportAndOrthoMatrix(gfx, mtx);
-
-    pos_x = 44.0f;
-    // Draw all jinjo heads
-    for (jinjo_id = 0; jinjo_id < 5; jinjo_id++) {
-        s32 jinjo_collected; // spF0 <----
-        sprite = D_80381E40[jinjo_id];
-        jinjo_collected = (D_80381E58[jinjo_id] != 0) ? 1 : 0;
-        if (sprite != NULL) {
-            func_80347FC0(gfx, sprite, (s32)D_80381E60[jinjo_id], 0, 0, 0, 0, 2, 2, &texture_width, &texture_height);
-            // Load the palette for the corresponding jinjo color
-            gDPLoadTLUT_pal16((*gfx)++, 0, D_80381620[(s32)D_80381E60[jinjo_id]][jinjo_id]);
-            x_offset = 0.0f;
-            y_offset = 0.0f;
-            // Draw the jinjo head, once if uncollected and twice if collected
-            // If the head is drawn twice then the first draw will be the drop shadow
-            for (draw_index = jinjo_collected; draw_index >= 0; draw_index--) {
-                gDPPipeSync((*gfx)++);
-                // Draw 0 is the jinjo's head, anything else is a shadow
-                if (draw_index != 0) {
-                    // Use only primitive color as the color input in order to make a solid color shadow
-                    gDPSetCombineLERP((*gfx)++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0);
-                    // Set up a translucent black for primitive color to draw the shadow
-                    gDPSetPrimColor((*gfx)++, 0, 0, 0x00, 0x00, 0x00, 0x8C);
-                }
-                else {
-                    // Use the texture as the color input
-                    gDPSetCombineLERP((*gfx)++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0);
-                    // If the jinjo is collected then it's drawn fully opaque, otherwise it's drawn with partial alpha
-                    gDPSetPrimColor((*gfx)++, 0, 0, 0x00, 0x00, 0x00, jinjo_collected ? 0xFF : 0x6E);
-                }
-                center_x = pos_x - (f32)gFramebufferWidth / 2 + x_offset;
-
-                // @recomp Remove vertical translation from the vertices.
-                center_y = (f32)gFramebufferHeight / 2 - 266.0f + 40.0f + y_offset;
-                //center_y = (f32)gFramebufferHeight / 2 + func_802FB0E4(arg1) - 266.0f + 40.0f + y_offset - D_80381E78[jinjo_id];
-
-                // @recomp Assign the matrix group for each Jinjo and its shadow separately.
-                gEXMatrixGroupSimpleNormal((*gfx)++, HUD_JINJOSCORE_TRANSFORM_ID_START + jinjo_id * 2 + draw_index, G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
-
-                // @recomp Add vertical translation to matrix.
-                guTranslate(*mtx, 0.0f, (func_802FB0E4(arg1) - D_80381E78[jinjo_id]) * 4.0f, 0.0f);
-                gSPMatrix((*gfx)++, OS_K0_TO_PHYSICAL((*mtx)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-
-                gSPVertex((*gfx)++, *vtx, 4, 0);
-                // Set up the positions of the four vertices
-                for (i = 0; i < 2; i++) {
-                    for (j = 0; j < 2; j++) {
-                        (*vtx)->v.ob[0] = ((texture_width * D_80381E54 * j) - (texture_width * D_80381E54 / 2) + center_x) * 4;
-                        (*vtx)->v.ob[1] = ((texture_height * D_80381E54 / 2) - (texture_height * D_80381E54 * i) + center_y) * 4;
-                        (*vtx)->v.ob[2] = -20;
-                        (*vtx)->v.tc[0] = ((texture_width - 1) * j) << 6;
-                        (*vtx)->v.tc[1] = ((texture_height - 1) * i) << 6;
-                        (*vtx)++;
-                    }
-                }
-                // Draw a quad made of the four vertices
-                gSP1Quadrangle((*gfx)++, 0, 1, 3, 2, 0);
-
-                // @recomp Clear the matrix group.
-                gEXPopMatrixGroup((*gfx)++, G_MTX_MODELVIEW);
-
-                x_offset += -2;
-                y_offset += 2;
-            }
-        }
-        // Move the next jinjo head over by 32 pixels
-        pos_x += 32.0f;
-    }
-
-    // @recomp Clear the matrix group.
-    gEXSetViewportAlign((*gfx)++, G_EX_ORIGIN_NONE, 0, 0);
-    gEXPopScissor((*gfx)++);
-
-    gDPPipeSync((*gfx)++);
-    gDPSetTextureLUT((*gfx)++, G_TT_NONE);
-    gDPPipelineMode((*gfx)++, G_PM_NPRIMITIVE);
-    viewport_setRenderViewportAndPerspectiveMatrix(gfx, mtx);
-}
-
-// @recomp Patched to tag the pieces of air and also align them to the left side of the screen.
-RECOMP_PATCH void fxairscore_draw(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
-    f32 y;
-    f32 x;
-    s32 texture_width;
-    s32 texture_height;
-    s32 i_part;
-    s32 var_s6;
-    s32 v_x;
-    s32 v_y;
-
-    if (s_sprite != 0) {
-        gSPDisplayList((*gfx)++, s_fxairscore_context);
-        func_80347FC0(gfx, s_sprite, 0, 0, 0, 0, 0, 2, 2, &texture_width, &texture_height);
-
-        // @recomp Align the pieces of air to the left side of the screen.
-        // NOTE: gScissorBoxRight/gScissorBoxTop are incorrectly named in the decompilation and must be swapped.
-        gEXPushScissor((*gfx)++);
-        gEXSetScissor((*gfx)++, G_SC_NON_INTERLACE, G_EX_ORIGIN_LEFT, G_EX_ORIGIN_LEFT, gScissorBoxLeft, gScissorBoxRight, gScissorBoxTop, gScissorBoxBottom);
-        gEXSetViewportAlign((*gfx)++, G_EX_ORIGIN_LEFT, 0, 0);
-
-        viewport_setRenderViewportAndOrthoMatrix(gfx, mtx);
-        //render all 6 air pieces
-        for (i_part = 0; i_part < AIRSCORE_COUNT; i_part++) {
-            if ((i_part != 0) && (i_part != 5)) {
-                var_s6 = (i_part & 1) ? i_part + 1 : i_part - 1;
-            }
-            else {
-                var_s6 = i_part;
-            }
-            gDPPipeSync((*gfx)++);
-            if ((f32)(5 - i_part) < s_active_count) {
-                gDPSetPrimColor((*gfx)++, 0, 0, 0x00, 0x00, 0x00, 0xFF);
-            }
-            else {
-                gDPSetPrimColor((*gfx)++, 0, 0, 0x00, 0x00, 0x00, 0x78);
-            }
-            x = func_802FB0E4(arg1);
-            x = ((-40 + x) + D_80381F68[var_s6]) - ((f32)gFramebufferWidth / 2);
-            y = ((78 + (i_part * 15.5)) - ((f32)gFramebufferHeight / 2));
-
-            // @recomp Assign a matrix group to each piece of air.
-            gEXMatrixGroupSimpleVerts((*gfx)++, HUD_AIRSCORE_TRANSFORM_ID_START + i_part, G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
-
-            //stagger x position
-            x = (i_part & 1) ? x + 5.0f : x - 5.0f;
-            gSPVertex((*gfx)++, *vtx, 4, 0);
-            for (v_y = 0; v_y < 2; v_y++) {
-                for (v_x = 0; v_x < 2; v_x++) {
-                    (*vtx)->v.ob[0] = (x + (((texture_width * s_texture_scale) * v_x) - ((texture_width * s_texture_scale) / 2))) * 4.0f;
-                    (*vtx)->v.ob[1] = (y + (((texture_height * s_texture_scale) / 2) - (texture_height * s_texture_scale) * v_y)) * 4.0f;
-                    (*vtx)->v.ob[2] = -0x14;
-                    (*vtx)->v.tc[0] = ((texture_width - 1) * v_x) << 6;
-                    (*vtx)->v.tc[1] = ((texture_height - 1) * v_y) << 6;
-                    (*vtx)++;
-                }
-            }
-            gSP1Quadrangle((*gfx)++, 0, 1, 3, 2, 0);
-
-            // @recomp Clear the matrix group.
-            gEXPopMatrixGroup((*gfx)++, G_MTX_MODELVIEW);
-        }
-
-        // @recomp Clear the matrix group.
-        gEXSetViewportAlign((*gfx)++, G_EX_ORIGIN_NONE, 0, 0);
-        gEXPopScissor((*gfx)++);
-
-        gDPPipeSync((*gfx)++);
-        gDPSetTextureLUT((*gfx)++, G_TT_NONE);
-        gDPPipelineMode((*gfx)++, G_PM_NPRIMITIVE);
-        viewport_setRenderViewportAndPerspectiveMatrix(gfx, mtx);
-    }
-}
-
-// @recomp Patched to tag the health bar and align it to the left side of the screen.
-RECOMP_PATCH void fxhealthscore_draw(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
-    int i;
-    int tmp_v1;
-    s32 honeycomb_width;
-    s32 honeycomb_height;
-    int tmp_v0;
-    f32 f18;
-    f32 f14;
-    f32 f20;
-    s32 is_red_health_initialized = FALSE;
-    s32 s6;
-
-    if (gSpriteHealth == NULL) {
-        return;
-    }
-
-    gSPDisplayList((*gfx)++, D_8036A918);
-    func_80347FC0(gfx, gSpriteHealth, 0, 0, 0, 0, 0, 2, 2, &honeycomb_width, &honeycomb_height);
-
-    // @recomp Align the health bar to the left side of the screen.
-    // NOTE: gScissorBoxRight/gScissorBoxTop are incorrectly named in the decompilation and must be swapped.
-    gEXPushScissor((*gfx)++);
-    gEXSetScissor((*gfx)++, G_SC_NON_INTERLACE, G_EX_ORIGIN_LEFT, G_EX_ORIGIN_LEFT, gScissorBoxLeft, gScissorBoxRight, gScissorBoxTop, gScissorBoxBottom);
-    gEXSetViewportAlign((*gfx)++, G_EX_ORIGIN_LEFT, 0, 0);
-
-    viewport_setRenderViewportAndOrthoMatrix(gfx, mtx);
-
-    //loop over each honeycomb piece
-    for (i = gTotalHealth - 1; i >= 0; i--) {//L80300E40
-        if (i != 0 && (i + 1 != gTotalHealth || gTotalHealth & 1)) {
-            s6 = (i & 1) ? i + 1 : i - 1;
-        }
-        else {//L80300E84
-            s6 = i;
-        }
-
-        gDPPipeSync((*gfx)++);
-
-        if (gHealth > i) {
-            if (0 < (gHealth - 8.0f) && (gHealth - 8.0f) > i) {
-                if (!is_red_health_initialized) {
-                    func_80347FC0(gfx, gSpriteRedHealth, 0, 0, 0, 0, 0, 2, 2, &honeycomb_width, &honeycomb_height);
-                    is_red_health_initialized = TRUE;
-                }
-            }//L80300F38
-
-            gDPSetPrimColor((*gfx)++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF);
-        }
-        else {//L80300F58
-            gDPSetPrimColor((*gfx)++, 0, 0, 0xFF, 0xFF, 0xFF, 0x78);
-        }
-
-        f20 = 96.0f - (f32)gFramebufferWidth / 2 + (i * 13);
-        f14 = (f32)gFramebufferHeight / 2 - func_802FB0E4(arg1) - D_80381F08[s6] - -48.0f;
-        f14 = (i & 1) ? f14 + 5.75 : f14 - 5.75;
-
-        // @recomp Assign a matrix group to each piece of health.
-        gEXMatrixGroupSimpleVerts((*gfx)++, HUD_HEALTHSCORE_TRANSFORM_ID_START + i, G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
-
-        gSPVertex((*gfx)++, *vtx, 4, 0);
-
-        for (tmp_v1 = 0; tmp_v1 < 2; tmp_v1++) {//L8030101C
-            for (tmp_v0 = 0; tmp_v0 < 2; tmp_v0++) {//L80301030
-                (*vtx)->v.ob[0] = (((honeycomb_width * D_80381EFC) * tmp_v0 - (honeycomb_width * D_80381EFC) / 2) + f20) * 4.0f;
-                (*vtx)->v.ob[1] = (((honeycomb_height * D_80381EFC) / 2 - (honeycomb_height * D_80381EFC) * tmp_v1) + f14) * 4.0f;
-                (*vtx)->v.ob[2] = -0x14;
-
-                (*vtx)->v.tc[0] = ((honeycomb_width - 1) * tmp_v0) << 6;
-                (*vtx)->v.tc[1] = ((honeycomb_height - 1) * tmp_v1) << 6;
-                (*vtx)++;
-            }
-        }
-
-        gSP1Quadrangle((*gfx)++, 0, 1, 3, 2, 0);
-
-        // @recomp Clear the matrix group.
-        gEXPopMatrixGroup((*gfx)++, G_MTX_MODELVIEW);
-    }
-
-    // @recomp Clear the matrix group.
-    gEXSetViewportAlign((*gfx)++, G_EX_ORIGIN_NONE, 0, 0);
-    gEXPopScissor((*gfx)++);
-
-    gDPPipeSync((*gfx)++);
-    gDPSetTextureLUT((*gfx)++, G_TT_NONE);
-    gDPPipelineMode((*gfx)++, G_PM_NPRIMITIVE);
-    viewport_setRenderViewportAndPerspectiveMatrix(gfx, mtx);
-}
-
-// @recomp Patched to tag the life icon and align it to the left side of the screen. 
-RECOMP_PATCH void fxlifescore_draw(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
-    s32 sp10C;
-    Vtx *sp108;
-    s32 sp104;
-    s32 var_v0;
-    s32 var_v1;
-    s32 var_s5;
-    s32 var_s4;
-    s32 spF0;
-    s32 spEC;
-    s32 spE8;
-    s32 spE4;
-    s32 spE0;
-    s32 spDC;
-
-    sp10C = -1;
-    sp108 = *vtx;
-    code_78E50_ItemValueString[0] = '\0';
-    strIToA(code_78E50_ItemValueString, MIN(9, itemPrint_getValue(item_id)));
-
-    // @recomp Assign an ID to the text and align it to the left side of the screen.
-    cur_pushed_text_transform_id = HUD_LIFESCORE_TRANSFORM_PRINT_ID_START;
-    cur_pushed_text_transform_origin = G_EX_ORIGIN_LEFT;
-
-    // @recomp Keep track of the last item value. If the value has changed, skip vertex interpolation this frame.
-    if (itemPrint_lastValues[item_id] != itemPrint_getValue(item_id)) {
-        cur_pushed_text_transform_skip_interpolation = TRUE;
-        itemPrint_lastValues[item_id] = itemPrint_getValue(item_id);
-    }
-
-    print_bold_spaced(0x4E, (s32)(func_802FB0E4(arg1) + -16.0f + 4.0f), (char *)&code_78E50_ItemValueString);
-
-    // @recomp Clear the ID and alignment for the text.
-    cur_pushed_text_transform_id = 0;
-    cur_pushed_text_transform_origin = G_EX_ORIGIN_NONE;
-    cur_pushed_text_transform_skip_interpolation = FALSE;
-
-    if (1); //fake
-    if (D_80381EB0[D_80381EC4] != NULL) {
-        // @recomp Align the life icon to the left side of the screen. 
-        // NOTE: gScissorBoxRight/gScissorBoxTop are incorrectly named in the decompilation and must be swapped.
-        gEXPushScissor((*gfx)++);
-        gEXSetScissor((*gfx)++, G_SC_NON_INTERLACE, G_EX_ORIGIN_LEFT, G_EX_ORIGIN_LEFT, gScissorBoxLeft, gScissorBoxRight, gScissorBoxTop, gScissorBoxBottom);
-        gEXSetViewportAlign((*gfx)++, G_EX_ORIGIN_LEFT, 0, 0);
-
-        gSPDisplayList((*gfx)++, D_8036A278);
-        viewport_setRenderViewportAndOrthoMatrix(gfx, mtx);
-        if (gfx);
-
-        // @recomp Assign a matrix group to the life icon.
-        gEXMatrixGroupSimpleNormal((*gfx)++, HUD_LIFESCORE_TRANSFORM_ID_START, G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
-
-        gDPPipeSync((*gfx)++);
-        gDPSetCombineLERP((*gfx)++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0);
-        gDPSetPrimColor((*gfx)++, 0, 0, 0x00, 0x00, 0x00, 0xFF);
-        do {
-            func_80348044(gfx, D_80381EB0[D_80381EC4], (s32)D_80381EBC % 4, 0, 0, 0, 0, 2, 2, &spF0, &spEC, &spE8, &spE4, &spE0, &spDC, &sp10C);
-
-            if (((*vtx - sp108) & 0xF) == 0) {
-                gSPVertex((*gfx)++, *vtx, MIN(0x10, (1 + sp10C) << 2), 0);
-                sp104 = 0;
-            }
-            else {
-                sp104 = sp104 + 4;
-            }
-
-            var_s5 = (40.0f - ((f32)gFramebufferWidth / 2)) + spE0;
-            var_s4 = (((((f32)gFramebufferHeight / 2) - func_802FB0E4(arg1)) - -16.0f) - spDC);
-
-            // @recomp Assign the vertical translation of the life icon to the matrix.
-            guTranslate(*mtx - 1, 0.0f, -func_802FB0E4(arg1) * 4.0f, 0.0f);
-            var_s4 += func_802FB0E4(arg1);
-
-            for (var_v1 = 0; var_v1 < 2; var_v1++) {
-                for (var_v0 = 0; var_v0 < 2; var_v0++) {
-                    (*vtx)->v.ob[0] = (s16)(s32)(((((f32)spF0 * D_80381EB8 * (f32)var_v0) - (((f32)spE8 * D_80381EB8) / 2)) + var_s5) * 4.0f);
-                    (*vtx)->v.ob[1] = (s16)(s32)((((((f32)spE4 * D_80381EB8) / 2) - ((f32)spEC * D_80381EB8 * var_v1)) + var_s4) * 4.0f);
-                    (*vtx)->v.ob[2] = -0x14;
-                    (*vtx)->v.tc[0] = ((spF0 - 1) * var_v0) << 6;
-                    (*vtx)->v.tc[1] = ((spEC - 1) * var_v1) << 6;
-                    (*vtx)++;
-                }
-            }
-            gSP1Quadrangle((*gfx)++, sp104, sp104 + 1, sp104 + 3, sp104 + 2, 0);
-        } while (sp10C != 0);
-
-        // @recomp Clear the matrix group and the viewport alignment.
-        gEXPopMatrixGroup((*gfx)++, G_MTX_MODELVIEW);
-        gEXSetViewportAlign((*gfx)++, G_EX_ORIGIN_NONE, 0, 0);
-        gEXPopScissor((*gfx)++);
-
-        gDPPipeSync((*gfx)++);
-        gDPSetTextureLUT((*gfx)++, G_TT_NONE);
-        gDPPipelineMode((*gfx)++, G_PM_NPRIMITIVE);
-        viewport_setRenderViewportAndPerspectiveMatrix(gfx, mtx);
-    }
-}
-
-// @recomp Patched to remove translation of the score element from the vertices and move it to the matrix.
-RECOMP_PATCH void func_802FD360(struct8s *arg0, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
-    s32 tmp_s2 = 0;
-    s32 tmp_s4;
-    s32 texture_width;
-    s32 texture_height;
-    f32 tmp_f26;
-    f32 f2;
-
-
-    if (arg0->unk50 == NULL) return;
-
-    gSPDisplayList((*gfx)++, &D_80369920);
-    if (arg0->unk20 == ITEM_C_NOTE) {
-        gDPSetCombineMode((*gfx)++, G_CC_MODULATEIA, G_CC_MODULATEIA);
-    }
-    viewport_setRenderViewportAndOrthoMatrix(gfx, mtx);
-
-    // @recomp Add vertical animation component to the matrix.
-    guTranslate(*mtx - 1, 0.0f, -func_802FB0E4(arg0) * arg0->unk4C * 4.0f, 0.0f);
-
-    gSPVertex((*gfx)++, *vtx, 4, 0);
-    if (arg0->unk20 == ITEM_0_HOURGLASS_TIMER) {
-        tmp_s2 = 0xC;
-    }
-    func_80347FC0(gfx, (BKSprite *)(arg0->unk50), ((s32)arg0->unk60 + tmp_s2) % arg0->unk2C, 0, 0, 0, 0, 2, 2, &texture_width, &texture_height);
-    tmp_f26 = (arg0->unk20 == ITEM_0_HOURGLASS_TIMER && texture_width == 0x10) ? 1.0f : 0.0f;
-    for (tmp_s4 = 0; tmp_s4 < 2; tmp_s4++) {//L802FD528
-        for (tmp_s2 = 0; tmp_s2 < 2; tmp_s2++) {//
-            (*vtx)->v.ob[0] = ((func_802FB0DC(arg0) + (((texture_width * arg0->unk40 * tmp_s2 - texture_width * arg0->unk40 / 2) - (f32)gFramebufferWidth / 2) + arg0->unk38)) + tmp_f26) * 4.0f;
-            // @recomp Removed vertical animation component from the vertices.
-            //(*vtx)->v.ob[1] = ((((texture_height * arg0->unk40 / 2 - texture_height * arg0->unk40 * tmp_s4) + (f32)gFramebufferHeight / 2) - arg0->unk3C) - func_802FB0E4(arg0) * arg0->unk4C) * 4.0f;
-            (*vtx)->v.ob[1] = ((((texture_height * arg0->unk40 / 2 - texture_height * arg0->unk40 * tmp_s4) + (f32)gFramebufferHeight / 2) - arg0->unk3C)) * 4.0f;
-            (*vtx)->v.ob[2] = -0x14;
-            (*vtx)->v.tc[0] = ((texture_width - 1) * tmp_s2) << 6;
-            (*vtx)->v.tc[1] = ((texture_height - 1) * tmp_s4) << 6;
-            if (arg0->unk20 == ITEM_C_NOTE) {
-                if (tmp_s4 == 0) {
-                    (*vtx)->v.cn[0] = 0xff;
-                    (*vtx)->v.cn[1] = 0xff;
-                    (*vtx)->v.cn[2] = 0x0;
-                    (*vtx)->v.cn[3] = 0xff;
-                }
-                else if (tmp_s2 != 0) {
-                    (*vtx)->v.cn[0] = 0xff;
-                    (*vtx)->v.cn[1] = 100;
-                    (*vtx)->v.cn[2] = 0x0;
-                    (*vtx)->v.cn[3] = 0xff;
-                }
-                else {
-                    (*vtx)->v.cn[0] = 0xff;
-                    (*vtx)->v.cn[1] = 200;
-                    (*vtx)->v.cn[2] = 0x0;
-                    (*vtx)->v.cn[3] = 0xff;
-                }
-            }
-            (*vtx)++;
-        }
-    }
-    gSP1Quadrangle((*gfx)++, 0, 1, 3, 2, 0);
-    gDPPipeSync((*gfx)++);
-    gDPSetTextureLUT((*gfx)++, G_TT_NONE);
-    gDPPipelineMode((*gfx)++, G_PM_NPRIMITIVE);
-    viewport_setRenderViewportAndPerspectiveMatrix(gfx, mtx);
-}
-
-// @recomp Patch to tag any 2D score elements and align them to the right side of the screen.
-RECOMP_PATCH void fxcommon2score_draw(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
-    f32 pad;
-    s32 sp38;
-    f32 sp34;
-
-
-    sp38 = itemPrint_getValue(item_id);
-    sp34 = 0.0f;
-    if (item_id == ITEM_C_NOTE) {
-        if (level_get() == LEVEL_6_LAIR || level_get() == LEVEL_C_BOSS) {
-            sp38 = itemscore_noteScores_getTotal();
-        }
-    }
-    if (item_id < 6) {
-        sp38 = ((sp38) ? 1 : 0) + sp38 / 60;
-    }//L802FDBA8
-    if (item_id == ITEM_1B_VILE_VILE_SCORE && 9 < sp38) {
-        sp34 = -16.0f;
-    }
-    if (item_id == ITEM_1C_MUMBO_TOKEN || item_id == ITEM_25_MUMBO_TOKEN_TOTAL) {
-        if (sp38 >= 100) {
-            sp38 = 99;
-        }
-    }
-    arg1->string_54[0] = 0;
-    //convert to string
-    strIToA(arg1->string_54, sp38);
-
-    // @recomp Assign an ID to the text and align it to the left or the right side of the screen.
-    bool left_alignment = arg1->unk38 < (gFramebufferWidth * 1.0f / 3.0f);
-    cur_pushed_text_transform_id = HUD_SCORE2_TRANSFORM_PRINT_ID_START + item_id * HUD_SCORE2_TRANSFORM_PRINT_ID_COUNT;
-    cur_pushed_text_transform_origin = left_alignment ? G_EX_ORIGIN_LEFT : G_EX_ORIGIN_RIGHT;
-
-    // @recomp Keep track of the last item value. If the value has changed, skip vertex interpolation this frame.
-    if (itemPrint_lastValues[item_id] != sp38) {
-        cur_pushed_text_transform_skip_interpolation = TRUE;
-        itemPrint_lastValues[item_id] = sp38;
-    }
-
-    //print text (blue egg font)
-    print_bold_spaced(
-        (s32)(func_802FB0DC(arg1) + arg1->unk38 + arg1->unk44 + sp34),
-        (s32)(func_802FB0E4(arg1) * arg1->unk4C + (arg1->unk3C + arg1->unk48)),
-        arg1->string_54
-    );
-
-    // @recomp Clear the ID and alignment for the text.
-    cur_pushed_text_transform_id = 0;
-    cur_pushed_text_transform_origin = G_EX_ORIGIN_NONE;
-    cur_pushed_text_transform_skip_interpolation = FALSE;
-
-    // @recomp Align the score element to either the left or the right side of the screen.
-    // NOTE: gScissorBoxRight/gScissorBoxTop are incorrectly named in the decompilation and must be swapped.
-    gEXPushScissor((*gfx)++);
-    gEXSetScissor((*gfx)++, G_SC_NON_INTERLACE, G_EX_ORIGIN_LEFT, G_EX_ORIGIN_RIGHT, 0, gScissorBoxRight, 0, gScissorBoxBottom);
-    gEXSetViewportAlign((*gfx)++, left_alignment ? G_EX_ORIGIN_LEFT : G_EX_ORIGIN_RIGHT, left_alignment ? 0 : gScissorBoxTop * -4, 0);
-
-    // @recomp Assign a matrix group to the score element.
-    gEXMatrixGroupSimpleNormal((*gfx)++, HUD_SCORE2_TRANSFORM_ID_START + item_id, G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
-
-    //draw sprite?
-    func_802FD360(arg1, gfx, mtx, vtx);
-
-    // @recomp Clear the matrix group.
-    gEXPopMatrixGroup((*gfx)++, G_MTX_MODELVIEW);
-    gEXSetViewportAlign((*gfx)++, G_EX_ORIGIN_NONE, 0, 0);
-    gEXPopScissor((*gfx)++);
-}
-
-#define RM_DEPTH_SET(clk) \
-        Z_UPD | CVG_DST_FULL | ALPHA_CVG_SEL | FORCE_BL | G_ZS_PRIM | \
-        ZMODE_OPA | \
-        GBL_c##clk(G_BL_CLR_BL, G_BL_0, G_BL_CLR_MEM, G_BL_1MA)
-
-// @recomp Tag the matrices for any model using this score type.
-RECOMP_PATCH void fxcommon3score_draw(enum item_e item_id, void *arg1, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
-    Struct_core2_79830_0 *a1 = (Struct_core2_79830_0 *)arg1;
-    f32 sp68[3];
-    f32 sp5C[3];
-    f32 sp50[3];
-    f32 sp44[3];
-    f32 sp40;
-    f32 sp3C;
-
-    sp40 = func_802FB0E4(arg1) * a1->unk54 + a1->unk34;
-    if (a1->model != NULL && func_802FB0D4(arg1)) {
-        a1->value_string[0] = '\0';
-        strIToA(a1->value_string, itemPrint_getValue(item_id));
-
-        // @recomp Align the score element's text to the right or use its default alignment.
-        bool aligned_to_the_right = a1->unk30 > (gFramebufferWidth * 2 / 3);
-        cur_pushed_text_transform_id = HUD_SCORE3_TRANSFORM_PRINT_ID_START + item_id * HUD_SCORE3_TRANSFORM_PRINT_ID_COUNT;
-        cur_pushed_text_transform_origin = aligned_to_the_right ? G_EX_ORIGIN_RIGHT : G_EX_ORIGIN_NONE;
-
-        // @recomp Keep track of the last item value. If the value has changed, skip vertex interpolation this frame.
-        if (itemPrint_lastValues[item_id] != itemPrint_getValue(item_id)) {
-            cur_pushed_text_transform_skip_interpolation = TRUE;
-            itemPrint_lastValues[item_id] = itemPrint_getValue(item_id);
-        }
-
-        print_bold_spaced(a1->unk30 + a1->unk40, sp40 + a1->unk44, a1->value_string);
-
-        // @recomp Clear the ID and alignment for the text.
-        cur_pushed_text_transform_id = 0;
-        cur_pushed_text_transform_origin = G_EX_ORIGIN_NONE;
-        cur_pushed_text_transform_skip_interpolation = FALSE;
-
-        sp3C = viewport_transformCoordinate(a1->unk30, sp40, sp5C, sp68);
-
-        sp44[0] = 0.0f;
-        sp44[1] = a1->unk38;
-        sp44[2] = 0.0f;
-
-        sp50[0] = 0.0f;
-        sp50[1] = a1->unk68;
-        sp50[2] = 0.0f;
-        func_8033A308(sp50);
-        if (getGameMode() != GAME_MODE_4_PAUSED) {
-            modelRender_setDepthMode(MODEL_RENDER_DEPTH_FULL);
-        }
-        sp68[0] += a1->unk4C;
-        if (a1->unk6C == 0.0f) {
-            a1->unk6C = 1.1 * (vtxList_getGlobalNorm(model_getVtxList(a1->model)) * a1->unk3C);
-        }
-
-        if (a1->anim_ctrl != NULL) {
-            anctrl_drawSetup(a1->anim_ctrl, sp5C, 1);
-        }
-
-        // @recomp If necessary, align the score element to the right of the screen.
-        // NOTE: gScissorBoxRight/gScissorBoxTop are incorrectly named in the decompilation and must be swapped.
-        if (aligned_to_the_right) {
-            gEXPushScissor((*gfx)++);
-            gEXSetScissor((*gfx)++, G_SC_NON_INTERLACE, G_EX_ORIGIN_RIGHT, G_EX_ORIGIN_RIGHT, gScissorBoxLeft - gScissorBoxTop, gScissorBoxRight, 0, gScissorBoxBottom);
-            gEXSetViewportAlign((*gfx)++, G_EX_ORIGIN_RIGHT, gScissorBoxTop * -4, 0);
-        }
-
-        viewport_setRenderViewportAndPerspectiveMatrix(gfx, mtx);
-
-        // @recomp Draw a rectangle that clears the depth and gets interpolated along with the 3D model.
-        // This fixes an issue where the rectangle would teleport ahead of the movement of the model in HFR
-        // and it also provides a minor performance boost by skipping the need to switch render targets.
-        if (getGameMode() != GAME_MODE_4_PAUSED) {
-            u32 depth_rect_transform_id = HUD_SCORE3_DEPTH_RECT_TRANSFORM_ID_START + item_id;
-            guMtxIdent(*mtx);
-            gSPMatrix((*gfx)++, OS_K0_TO_PHYSICAL((*mtx)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gEXMatrixGroupSimpleVerts((*gfx)++, depth_rect_transform_id, G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
-
-            f32 x = a1->unk30 - a1->unk6C;
-            f32 y = sp40 - a1->unk6C;
-            f32 w = 2 * a1->unk6C;
-            f32 h = 2 * a1->unk6C;
-            gSPVertex((*gfx)++, *vtx, 4, 0);
-
-            f32 vpos[3];
-            f32 vrot[3];
-            for (u32 v_y = 0; v_y < 2; v_y++) {
-                for (u32 v_x = 0; v_x < 2; v_x++) {
-                    viewport_transformCoordinate(x + (w * v_x), y + (h * v_y), vpos, vrot);
-                    (*vtx)->v.ob[0] = vpos[0];
-                    (*vtx)->v.ob[1] = vpos[1];
-                    (*vtx)->v.ob[2] = vpos[2];
-                    (*vtx)++;
-                }
-            }
-
-            gEXPushOtherMode((*gfx)++);
-            gEXPushCombineMode((*gfx)++);
-            gDPSetRenderMode((*gfx)++, RM_DEPTH_SET(1), RM_DEPTH_SET(2));
-            gDPSetCycleType((*gfx)++, G_CYC_1CYCLE);
-            gDPSetCombineLERP((*gfx)++, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-            gDPSetPrimDepth((*gfx)++, 0xFFFF, 0xFFFF);
-            gSP1Quadrangle((*gfx)++, 0, 1, 3, 2, 0);
-            gEXPopMatrixGroup((*gfx)++, G_MTX_MODELVIEW);
-            gEXPopOtherMode((*gfx)++);
-            gEXPopCombineMode((*gfx)++);
-        }
-
-        // @recomp Set the skinning data for this score.
-        if (item_id < ITEM_2B_UNKNOWN) {
-            bkrecomp_setup_custom_skinning(&sScore3SkinningData[item_id], a1->model_id);
-        }
-
-        // @recomp Set the model transform ID.
-        cur_drawn_model_transform_id = HUD_SCORE3_TRANSFORM_ID_START + item_id * MARKER_TRANSFORM_ID_COUNT;
-
-        modelRender_draw(gfx, mtx, sp5C, sp68, a1->unk3C * sp3C, sp44, a1->model);
-
-        // @recomp Clear the model transform ID.
-        cur_drawn_model_transform_id = 0;
-
-        if (aligned_to_the_right) {
-            // @recomp Clear the matrix group.
-            gEXSetViewportAlign((*gfx)++, G_EX_ORIGIN_NONE, 0, 0);
-            gEXPopScissor((*gfx)++);
-        }
-    }//L80300BA4
-}
-
-// @recomp: Patched to interpolate the header of the totals screen on the pause menu.
-RECOMP_PATCH void gcpausemenu_printTotalsHeader(s32 page_id) {
-    // @recomp Assign an ID for the totals text.
-    cur_pushed_text_transform_id = HUD_TOTALS_PRINT_TRANSFORM_ID_START;
-
-    struct1Cs_1 *v0 = D_8036C58C + page_id;
-    print_bold_overlapping(v0->x, D_80383010.unk8, -1.05f, v0->string);
-
-    // @recomp Clear the ID text.
-    cur_pushed_text_transform_id = 0;
-}
-
-// @recomp Patched to interpolate the character names during the parade.
-RECOMP_PATCH void gcparade_print(s32 index) {
-    ParadeInfo* v0 = D_803830F0.parade_element;
-
-    // @recomp Assign an ID for the totals text.
-    cur_pushed_text_transform_id = PARADE_PRINT_TRANSFORM_ID_START;
-
-    print_bold_overlapping(v0->x, D_803830F0.y_position, -1.2f, v0->str);
-
-    // @recomp Clear the ID text.
-    cur_pushed_text_transform_id = 0;
-}

patches/init_patches.c

@@ -1,30 +1,21 @@
 #include "patches.h"
-#include "note_saving.h"
-#include "transform_ids.h"
 #include "bk_api.h"
 #include "misc_funcs.h"
 
-#include "core1/core1.h"
-#include "core1/main.h"
-#include "core1/vimgr.h"
-
 RECOMP_DECLARE_EVENT(recomp_on_init());
 
-void recomp_init_vertex_skinning(void);
-
-// @recomp Patched to perform some initialization after core2 has been loaded.
-RECOMP_PATCH void dummy_func_8025AFB0(void) {
-    // @recomp Initialize note saving data before the init event is run.
-    // This will allow mods to override it as necessary.
-    init_note_saving();
-
-    // @recomp Perform the necessary initialization for vertex skinning.
-    recomp_init_vertex_skinning();
+void core1_init();
+void sns_write_payload_over_heap();
+void mainLoop();
 
+RECOMP_PATCH void mainThread_entry(void *arg) { 
     // @recomp Register actor extension data and call the init event.
     recomp_on_init();
 
-    // @recomp Calculate the note start indices for each map after the init event.
-    // This allows the start indices to account for any changes made by mods. 
-    calculate_map_start_note_indices();
+    core1_init();
+    sns_write_payload_over_heap();
+
+    while (1) {
+        mainLoop();
+    }
 }

patches/input.h

@@ -20,12 +20,9 @@ extern RecompAimingOverideMode recomp_aiming_override_mode;
 DECLARE_FUNC(void, recomp_get_gyro_deltas, float* x, float* y);
 DECLARE_FUNC(void, recomp_get_mouse_deltas, float* x, float* y);
 DECLARE_FUNC(void, recomp_get_inverted_axes, s32* x, s32* y);
-DECLARE_FUNC(u32, recomp_get_analog_cam_sensitivity);
 DECLARE_FUNC(s32, recomp_get_analog_cam_enabled);
 DECLARE_FUNC(void, recomp_get_analog_inverted_axes, s32* x, s32* y);
-DECLARE_FUNC(void, recomp_get_flying_and_swimming_inverted_axes, s32* x, s32* y);
-DECLARE_FUNC(void, recomp_get_first_person_inverted_axes, s32* x, s32* y);
-DECLARE_FUNC(void, recomp_get_right_analog_inputs, float* x, float* y);
+DECLARE_FUNC(void, recomp_get_camera_inputs, float* x, float* y);
 DECLARE_FUNC(void, recomp_set_right_analog_suppressed, s32 suppressed);
 
 #endif

patches/load_patches.c

@@ -1,136 +0,0 @@
-#include "patches.h"
-#include "misc_funcs.h"
-#include "functions.h"
-#include "bk_api.h"
-#include "object_extension_funcs.h"
-#include "note_saving.h"
-
-extern ActorMarker *D_8036E7C8;
-extern u8 D_80383428[0x1C];
-
-typedef struct {
-    s16 map_id; //enum map_e
-    s16 opa_model_id; //enum asset_e level_model_id
-    s16 xlu_model_id; //enum asset_e level2_model_id
-    s16 unk6[3]; // min bounds (for cubes?)
-    s16 unkC[3]; // max bounds (for cubes?)
-    // u8 pad12[0x2];
-    f32 scale;
-}MapModelDescription;
-
-extern struct {
-    void *unk0;
-    void *unk4;
-    BKCollisionList *collision_opa;
-    BKCollisionList *collision_xlu;
-    BKModel *model_opa;
-    BKModel *model_xlu;
-    BKModelBin *model_bin_opa;
-    BKModelBin *model_bin_xlu;
-    s32 unk20;
-    struct5Bs *unk24;
-    MapModelDescription *description;
-    u8 env_red;
-    u8 env_green;
-    u8 env_blue;
-    f32 scale;
-}mapModel;
-
-BKGfxList *model_getDisplayList(BKModelBin *arg0);
-
-
-#define INTRO_OPA_DL_LENGTH 97
-#define INTRO_OPA_DL_GRASS_PATCH_INDEX 63
-#define INTRO_OPA_DL_WALL_PATCH_INDEX 84
-#define INTRO_OPA_DL_HASH 0xA912614C535FA0BBULL
-
-Vtx intro_grass_extension_verts[3] = {
-	{{ {-1262, 20, 1040}, 0, {230, 538}, {51, 190, 133, 255} }},
-	{{ {-10, 20, 5107}, 0, {3124, -10067}, {0, 13, 169, 255} }},
-	{{ {-10, 20, 1372}, 0, {3376, -195}, {51, 190, 133, 255} }},
-};
-
-Gfx intro_grass_extension_dl[] = {
-    // Copy of the replaced command.
-    gsSP1Triangle(31, 28, 29, 0),
-    // New commands.
-	gsSPVertex(intro_grass_extension_verts + 0, 3, 0),
-	gsSP1Triangle(0, 1, 2, 0),
-	gsSPEndDisplayList(),
-};
-
-Vtx intro_wall_extension_verts[4] = {
-	{{ {-1262, 20, 1040}, 0, {-15, 49}, {51, 190, 133, 255} }},
-	{{ {-1262, 1004, 1040}, 0, {-44, 1966}, {255, 255, 255, 255} }},
-	{{ {189, 1004, 4315}, 0, {-7400, 1817}, {255, 255, 255, 255} }},
-	{{ {189, 20, 4315}, 0, {-7371, -100}, {51, 190, 133, 255} }},
-};
-
-Gfx intro_wall_extension_dl[] = {
-    // Copy of the replaced command.
-    gsSP1Triangle(22, 24, 21, 0),
-    // New commands.
-	gsSPVertex(intro_wall_extension_verts + 0, 4, 0),
-	gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
-	gsSPEndDisplayList(),
-};
-
-void hotpatch_intro_opa_map_model(BKModelBin* model_bin) {
-    BKGfxList *gfx_list = model_getDisplayList(model_bin);
-    Gfx* dl = &gfx_list->list[0];
-
-    // Hash the displaylist of the model to make sure it's unmodified. This will prevent the hotpatch from
-    // affecting mods.
-    u64 hash = recomp_xxh3(dl, INTRO_OPA_DL_LENGTH * sizeof(Gfx));
-    if (hash != INTRO_OPA_DL_HASH) {
-        return;
-    }
-
-    // Patch a call to the new displaylist after the grass material.
-    gSPDisplayList(&dl[INTRO_OPA_DL_GRASS_PATCH_INDEX], intro_grass_extension_dl);
-
-    // Patch a call to the new displaylist after the wall material.
-    gSPDisplayList(&dl[INTRO_OPA_DL_WALL_PATCH_INDEX], intro_wall_extension_dl);
-}
-
-void reset_cutscene_timings_state(void);
-
-// @recomp Patched to act as a point to run code when a new map is loaded.
-// This includes:
-//   * Resetting all extended marker data and skip interpolation for the next frame.
-//   * Hotpatching the map model for the title cutscene to fix ultrawide effects. 
-//   * Resetting the spawned static note count.
-//   * Resetting the variables used to keep track of correcting the intro cutscene timings
-RECOMP_PATCH void func_803329AC(void){
-    s32 i;
-    
-    D_8036E7C8 = (ActorMarker *)malloc(0xE0*sizeof(ActorMarker));
-
-    for( i = 0; i < 0x1C; i++){
-        D_80383428[i] = 0;
-    }
-       
-    for(i =0; i<0xE0; i++){
-        D_8036E7C8[i].unk5C = 0;
-    }
-
-    // @recomp Run any new code on map load.
-
-    // @recomp If the current map's model is ASSET_149D_MODEL_CS_START_NINTENDO_OPA,
-    // hotpatch it to fill in some regions for widescreen.
-    if (mapModel.description->opa_model_id == ASSET_149D_MODEL_CS_START_NINTENDO_OPA) {
-        hotpatch_intro_opa_map_model(mapModel.model_bin_opa);
-    }
-
-    // @recomp Reset all actor data and skip interpolation for the next frame.
-    // Interpolation is skipped as the next frame will potentially reuse IDs from the previous frame,
-    // as the marker ID tracking gets reset here.
-    recomp_clear_all_object_data(EXTENSION_TYPE_MARKER);
-    set_all_interpolation_skipped(TRUE);
-
-    // @recomp Run note saving map load code.
-    note_saving_on_map_load();
-
-    // @recomp Reset the intro cutscene timing corrections so the cutscene can be played again
-    reset_cutscene_timings_state();
-}

patches/lod_patches.c

@@ -1,30 +0,0 @@
-#include "patches.h"
-#include "core1/mlmtx.h"
-
-typedef struct {
-    s32 cmd_0;
-    s32 size_4;
-    f32 max_8;
-    f32 min_C;
-    f32 unk10[3];
-    s32 subgeo_offset_1C;
-}GeoCmd8;
-
-extern f32 D_80383C98[3];
-extern void func_80339124(Gfx **gfx, Mtx **mtx, BKGeoList *geo_list);
-extern float gu_sqrtf(float val);
-
-// @recomp Patched to force all LODs to act as if they were a fixed distance from the camera.
-RECOMP_PATCH void func_80338B50(Gfx **gfx, Mtx **mtx, void *arg2) {
-    GeoCmd8 *cmd = (GeoCmd8 *)arg2;
-    f32 dist;
-
-    if (cmd->subgeo_offset_1C) {
-        mlMtx_apply_vec3f(D_80383C98, cmd->unk10);
-        // @recomp Force distance for LOD to be 50.
-        dist = 50.0f; //gu_sqrtf(D_80383C98[0] * D_80383C98[0] + D_80383C98[1] * D_80383C98[1] + D_80383C98[2] * D_80383C98[2]);
-        if (cmd->min_C < dist && dist <= cmd->max_8) {
-            func_80339124(gfx, mtx, (BKGeoList *)((s32)cmd + cmd->subgeo_offset_1C));
-        }
-    }
-}

patches/map_transform_tagging.c

@@ -1,398 +0,0 @@
-#include "patches.h"
-#include "transform_ids.h"
-#include "functions.h"
-#include "core2/anctrl.h"
-#include "core2/modelRender.h"
-
-typedef struct struct_1D_s {
-    BKModel *model;
-    s16 unk4;
-    u8 xform_id;
-    // u8 pad7[1];
-    Struct70s unk8;//union of subtypes
-}struct1Ds;
-
-extern struct {
-    u8 unk0;
-    vector(struct1Ds) *unk4;
-} D_80386140;
-
-typedef struct struct_1E_s {
-    void (*unk0)(void *arg0, s32 arg1, s32 arg2, s32 arg3);
-    void (*unk4)(void *arg0, s32 arg1, s32 arg2);
-    void (*unk8)(void *arg0);
-}struct1Es;
-
-extern struct1Es D_80372030[];
-
-s32 func_80320708(void);
-s32 levelSpecificFlags_validateCRC2(void);
-s32 dummy_func_80320248(void);
-enum asset_e mapModel_getOpaModelId(void);
-enum map_e map_get(void);
-s32 mapSpecificFlags_get(s32 i);
-s32 levelSpecificFlags_get(s32 i);
-u32 jiggyscore_isCollected(enum jiggy_e);
-enum bsgroup_e player_movementGroup(void);
-bool jigsawPicture_isJigsawPictureComplete(s32 world);
-bool fileProgressFlag_get(enum file_progress_e index);
-void modelRender_setAnimatedTexturesCacheId(s32 arg0);
-bool mapModel_has_xlu_bin(void);
-void func_802F7BC0(Gfx **, Mtx **, Vtx **);
-void func_8034E660(s32 arg0, BKVtxRef *src, Vtx *dst, s32 arg3);
-void func_8034EC50(s32 arg0, BKVtxRef* ref, Vtx* dst, s32 arg3);
-void BKModel_transformMesh(BKModel *model, s32 mesh_id, void (*fn)(s32, BKVtxRef *, Vtx *, s32), s32 arg3);
-
-void recomp_setup_map_skinning(int map_model_id, float *pos_floats);
-void recomp_clear_map_skinning();
-
-typedef struct {
-    s16 map_id; //enum map_e
-    s16 opa_model_id; //enum asset_e level_model_id
-    s16 xlu_model_id; //enum asset_e level2_model_id
-    s16 unk6[3]; // min bounds (for cubes?)
-    s16 unkC[3]; // max bounds (for cubes?)
-    // u8 pad12[0x2];
-    f32 scale;
-}MapModelDescription;
-
-extern struct {
-    s32 unk0; // Changed from void* in the decomp
-    s32 unk4; // Changed from void* in the decomp
-    BKCollisionList *collision_opa;
-    BKCollisionList *collision_xlu;
-    BKModel *model_opa;
-    BKModel *model_xlu;
-    BKModelBin *model_bin_opa;
-    BKModelBin *model_bin_xlu;
-    s32 unk20;
-    struct5Bs *unk24;
-    MapModelDescription *description;
-    u8 env_red;
-    u8 env_green;
-    u8 env_blue;
-    f32 scale;
-}mapModel;
-
-// @recomp Patched to set the transform ID when drawing the map's opaque model.
-RECOMP_PATCH void mapModel_opa_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
-    s32 temp_a0;
-
-    if (func_80320708() && levelSpecificFlags_validateCRC2() && dummy_func_80320248()) {
-        if (mapModel_getOpaModelId() == ASSET_14CF_MODEL_SM_SPIRAL_MOUNTAIN_OPA) {
-            func_8033A45C(1, 0);
-            func_8033A45C(2, 1);
-        }
-        switch (map_get()) {                          /* irregular */
-        case MAP_88_CS_SPIRAL_MOUNTAIN_6:
-            if (mapSpecificFlags_get(0) != 0) {
-                func_8033A45C(1, 1);
-                func_8033A45C(2, 0);
-            }
-            break;
-
-        case MAP_12_GV_GOBIS_VALLEY:
-            func_8033A45C(1, levelSpecificFlags_get(LEVEL_FLAG_6_GV_UNKNOWN) ? 1 : 0);
-            func_8033A45C(2, jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID) ? 0 : 1);
-            func_8033A45C(5, jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID) ? 1 : 0);
-            break;
-
-        case MAP_14_GV_SANDYBUTTS_MAZE:
-            func_8033A45C(5, (player_movementGroup() == BSGROUP_4_LOOK) ? 1 : 0);
-            break;
-
-        case MAP_E_MM_MUMBOS_SKULL:
-            func_8033A45C(1, 1);
-            func_8033A45C(5, 1);
-            break;
-
-        case MAP_47_BGS_MUMBOS_SKULL:
-            func_8033A45C(1, 2);
-            func_8033A45C(5, 2);
-            break;
-
-        case MAP_48_FP_MUMBOS_SKULL:
-            func_8033A45C(1, 3);
-            func_8033A45C(5, 3);
-            break;
-
-        case MAP_30_MMM_MUMBOS_SKULL:
-            func_8033A45C(1, 4);
-            func_8033A45C(5, 4);
-            break;
-            
-        case MAP_4A_CCW_SPRING_MUMBOS_SKULL:
-            func_8033A45C(1, 5);
-            func_8033A45C(5, 5);
-            break;
-        case MAP_4B_CCW_SUMMER_MUMBOS_SKULL:
-            func_8033A45C(1, 6);
-            func_8033A45C(5, 6);
-            break;
-        case MAP_4C_CCW_AUTUMN_MUMBOS_SKULL:
-            func_8033A45C(1, 7);
-            func_8033A45C(5, 7);
-            break;
-        case MAP_4D_CCW_WINTER_MUMBOS_SKULL:
-            func_8033A45C(1, 8);
-            func_8033A45C(5, 8);
-            break;
-        case MAP_5E_CCW_SPRING_NABNUTS_HOUSE:
-        case MAP_5F_CCW_SUMMER_NABNUTS_HOUSE:
-        case MAP_60_CCW_AUTUMN_NABNUTS_HOUSE:
-            func_8033A45C(1, 1);
-            func_8033A45C(2, 0);
-            break;
-        case MAP_61_CCW_WINTER_NABNUTS_HOUSE:
-            func_8033A45C(1, 0);
-            func_8033A45C(2, 1);
-            break;
-        case MAP_1D_MMM_CELLAR:
-            func_8033A45C(1, actorArray_findActorFromActorId(0x191) ?  0 : 1);
-            break;
-        case MAP_7C_CS_INTRO_BANJOS_HOUSE_1:
-        case MAP_89_CS_INTRO_BANJOS_HOUSE_2:
-        case MAP_8A_CS_INTRO_BANJOS_HOUSE_3:
-        case MAP_8C_SM_BANJOS_HOUSE:
-        case MAP_91_FILE_SELECT:
-            func_8033A45C(5, 1);
-            break;
-        case MAP_7B_CS_INTRO_GL_DINGPOT_1:
-        case MAP_81_CS_INTRO_GL_DINGPOT_2:
-            func_8033A45C(4, 0);
-            func_8033A45C(5, 0);
-            func_8033A45C(6, 0);
-            break;
-        case MAP_82_CS_ENTERING_GL_MACHINE_ROOM:
-        case MAP_83_CS_GAME_OVER_MACHINE_ROOM:
-        case MAP_84_CS_UNUSED_MACHINE_ROOM:
-            func_8033A45C(4, 1);
-            func_8033A45C(5, 1);
-            func_8033A45C(6, 1);
-            break;
-        case MAP_93_GL_DINGPOT:
-            func_8033A45C(4, 1);
-            func_8033A45C(5, 1);
-            func_8033A45C(6, (jigsawPicture_isJigsawPictureComplete(0xA) || fileProgressFlag_get(FILEPROG_E2_DOOR_OF_GRUNTY_OPEN) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)));
-            break;
-        }
-        func_8033A450(mapModel.unk24);
-        modelRender_setDepthMode(MODEL_RENDER_DEPTH_FULL);
-        temp_a0 = mapModel.unk0;
-        if (temp_a0 != 0) {
-            modelRender_setAnimatedTexturesCacheId(temp_a0);
-        }
-        modelRender_setEnvColor(mapModel.env_red, mapModel.env_green, mapModel.env_blue, 0xFF);
-        
-        // @recomp Set the map opaque model transform id.
-        cur_drawn_model_is_map = TRUE;
-        cur_drawn_model_transform_id = MAP_MODEL_OPA_TRANSFORM_ID_START;
-
-        modelRender_draw(gfx, mtx, NULL, NULL, mapModel.description->scale, NULL, mapModel.model_bin_opa);
-        
-        // @recomp Clear the current model transform id after drawing.
-        cur_drawn_model_is_map = FALSE;
-        cur_drawn_model_transform_id = 0;
-
-        if (!mapModel_has_xlu_bin()) {
-            func_802F7BC0(gfx, mtx, vtx);
-        }
-    }
-}
-
-// @recomp Reserve a static amount of memory to be used for storing the current modifications to the map model with higher precision floats.
-#define MAP_MODEL_XLU_VERTEX_COUNT_MAX 0x400
-f32 map_model_xlu_pos_floats[MAP_MODEL_XLU_VERTEX_COUNT_MAX * 3];
-u32 map_model_xlu_pos_floats_count = 0;
-
-void recomp_reset_map_model_skinning() {
-    map_model_xlu_pos_floats_count = 0;
-}
-
-// @recomp Patched to store the moved water vertices with higher precision floats for TTC.
-RECOMP_PATCH void func_8034E8E4(Struct73s *arg0, BKModel *arg1, s32 arg2) {
-    f32 sp3C;
-    f32 sp38;
-    f32 sp30[2];
-    f32 sin;
-    f32 cos;
-    f32 sp2C;
-    f32 sp28;
-
-    sp38 = time_getDelta();
-    arg0->unk4 += sp38;
-    cos = cosf(arg0->unk4 * 0.2 * BAD_PI);
-    sin = sinf(arg0->unk4 * 0.08 * BAD_PI);
-    sp30[0] = (sin * 100.0f + 150.0f * cos) * 0.8;
-
-
-    cos = sinf(arg0->unk4 * 0.5 * BAD_PI);
-    sin = cosf(arg0->unk4 * 0.22 * BAD_PI);
-    sp30[1] = (sin * 100.0f + 50.0f * cos) * 0.8;
-
-    arg0->d_tc[0] = (sp30[0] >= 0.0) ? sp30[0] + 0.5 : sp30[0] - 0.5;
-    arg0->d_tc[1] = (sp30[1] >= 0.0) ? sp30[1] + 0.5 : sp30[1] - 0.5;
-
-    cos = cosf(arg0->unk4 * 0.5 * BAD_PI);
-    sin = sinf(arg0->unk4 * 0.11 * BAD_PI);
-    sp2C = sin * (arg0->unk8 * 0.25) + (arg0->unk8 * 0.75) * cos;
-
-    if (arg0->unk14 < arg0->unk1C) {
-        arg0->unk18 = arg0->unk14;
-        arg0->unk14 += sp38;
-        if (arg0->unk1C < arg0->unk14) {
-            arg0->unk14 = arg0->unk1C;
-        }
-    }
-    sp28 = ((arg0->unk14 < arg0->unk1C) ? arg0->unkC + ((arg0->unk14 / arg0->unk1C) * (arg0->unkE - arg0->unkC)) : arg0->unkE);
-    sp28 += sp2C;
-    arg0->dy = (sp28 >= 0.0) ? sp28 + 0.5 : sp28 - 0.5;
-    BKModel_transformMesh(arg1, arg2, func_8034E660, (s32)arg0);
-
-    // @recomp Don't use high precision floats if the model exceeds the bounds of the floats array, in case the model was modified.
-    if (arg1->vtxList_4->count <= MAP_MODEL_XLU_VERTEX_COUNT_MAX) {
-        // @recomp Make sure to copy all the vertices from the model to the higher precision floats at least once per frame.
-        s32 i, j = 0;
-        if (map_model_xlu_pos_floats_count < arg1->vtxList_4->count) {
-            Vtx *vtx = vtxList_getVertices(arg1->vtxList_4);
-            for (i = 0; i < arg1->vtxList_4->count; i++) {
-                map_model_xlu_pos_floats[j++] = vtx->v.ob[0];
-                map_model_xlu_pos_floats[j++] = vtx->v.ob[1];
-                map_model_xlu_pos_floats[j++] = vtx->v.ob[2];
-                vtx++;
-            }
-
-            map_model_xlu_pos_floats_count = arg1->vtxList_4->count;
-        }
-
-        // @recomp Run the logic of BKModel_transformMesh again with only the modification of the Y component as seen in func_8034E660.
-        // The result is stored in the higher precision floats instead of the model binary itself. The original value of dy is used
-        // before it's rounded to make the animation smoother.
-        BKMesh *iMesh = (BKMesh *)(arg1 + 1);
-        BKVtxRef *iVtx;
-        BKVtxRef *start_vtx_ref;
-        BKVtxRef *end_vtx_ref;
-        for (i = 0; i < arg1->meshList_0->meshCount_0; i++) {
-            if (arg2 == iMesh->uid_0) {
-                start_vtx_ref = (BKVtxRef *)(iMesh + 1);
-                end_vtx_ref = start_vtx_ref + iMesh->vtxCount_2;
-                for (iVtx = start_vtx_ref; iVtx < end_vtx_ref; iVtx++) {
-                    j = iVtx->unk10 * 3;
-                    map_model_xlu_pos_floats[j + 0] = iVtx->v.v.ob[0];
-                    map_model_xlu_pos_floats[j + 1] = iVtx->v.v.ob[1] + sp28;
-                    map_model_xlu_pos_floats[j + 2] = iVtx->v.v.ob[2];
-                }
-
-                break;
-            }
-
-            iMesh = (BKMesh *)(((BKVtxRef *)(iMesh + 1)) + iMesh->vtxCount_2);
-        };
-    }
-}
-
-// @recomp Patched to store the moved water vertices with higher precision floats for the ending cutscene.
-RECOMP_PATCH void func_8034EF60(Struct77s* arg0, BKModel* arg1, s32 arg2) {
-    f32 temp_f0;
-    f32 sp2C[2];
-
-    temp_f0 = time_getDelta();
-    arg0->unk2C += temp_f0;
-    arg0->unk4 += temp_f0 * arg0->unk0 * 3;
-    arg0->unk8 += temp_f0 * (arg0->unk0 + 0.01) * 3;
-    sp2C[0] = ((150.0f * cosf(arg0->unk2C * 0.2 * BAD_PI)) + (sinf(arg0->unk2C * 0.08 * BAD_PI) * 100.0f)) * 0.8;
-    sp2C[1] = ((50.0f * sinf(arg0->unk2C * 0.5 * BAD_PI)) + (cosf(arg0->unk2C * 0.22 * BAD_PI) * 100.0f)) * 0.8;
-    arg0->unk28[0] = (sp2C[0] >= 0.0) ? (sp2C[0] + 0.5) : (sp2C[0] - 0.5);
-    arg0->unk28[1] = (sp2C[1] >= 0.0) ? (sp2C[1] + 0.5) : (sp2C[1] - 0.5);
-    BKModel_transformMesh(arg1, arg2, &func_8034EC50, (s32)arg0);
-
-    // @recomp Don't use high precision floats if the model exceeds the bounds of the floats array, in case the model was modified.
-    if (arg1->vtxList_4->count <= MAP_MODEL_XLU_VERTEX_COUNT_MAX) {
-        // @recomp Make sure to copy all the vertices from the model to the higher precision floats at least once per frame.
-        s32 i, j = 0;
-        if (map_model_xlu_pos_floats_count < arg1->vtxList_4->count) {
-            Vtx* vtx = vtxList_getVertices(arg1->vtxList_4);
-            for (i = 0; i < arg1->vtxList_4->count; i++) {
-                map_model_xlu_pos_floats[j++] = vtx->v.ob[0];
-                map_model_xlu_pos_floats[j++] = vtx->v.ob[1];
-                map_model_xlu_pos_floats[j++] = vtx->v.ob[2];
-                vtx++;
-            }
-
-            map_model_xlu_pos_floats_count = arg1->vtxList_4->count;
-        }
-
-        // @recomp Run the logic of BKModel_transformMesh again with only the modification of the Y component as seen in func_8034EC50.
-        // The result is stored in the higher precision floats instead of the model binary itself. The original value of dy is used
-        // before it's rounded to make the animation smoother.
-        BKMesh* iMesh = (BKMesh*)(arg1 + 1);
-        BKVtxRef* iVtx;
-        BKVtxRef* start_vtx_ref;
-        BKVtxRef* end_vtx_ref;
-        f32 tmp0, tmp1, temp_f2;
-        for (i = 0; i < arg1->meshList_0->meshCount_0; i++) {
-            if (arg2 == iMesh->uid_0) {
-                start_vtx_ref = (BKVtxRef*)(iMesh + 1);
-                end_vtx_ref = start_vtx_ref + iMesh->vtxCount_2;
-                for (iVtx = start_vtx_ref; iVtx < end_vtx_ref; iVtx++) {
-                    j = iVtx->unk10 * 3;
-                    tmp0 = arg0->unk4 + (iVtx->v.v.ob[0] - arg0->unk10) * 200.0f;
-                    tmp1 = arg0->unk8 + (iVtx->v.v.ob[2] - arg0->unk14) * 200.0f;
-                    temp_f2 = (sinf(tmp0) + cosf(tmp1)) * arg0->unk20;
-                    map_model_xlu_pos_floats[j + 0] = iVtx->v.v.ob[0];
-                    map_model_xlu_pos_floats[j + 1] = arg0->unkC + temp_f2;
-                    map_model_xlu_pos_floats[j + 2] = iVtx->v.v.ob[2];
-                }
-
-                break;
-            }
-
-            iMesh = (BKMesh*)(((BKVtxRef*)(iMesh + 1)) + iMesh->vtxCount_2);
-        };
-    }
-}
-
-// @recomp Patched to set the transform ID when drawing the map's translucent model.
-RECOMP_PATCH void mapModel_xlu_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
-    s32 temp_a0;
-
-    if (mapModel.model_bin_xlu != NULL) {
-        if (map_get() == MAP_1D_MMM_CELLAR) {
-            func_8033A45C(1, (actorArray_findActorFromActorId(0x191) != NULL) ? 0 : 1);
-        }
-        modelRender_setDepthMode(MODEL_RENDER_DEPTH_COMPARE);
-        temp_a0 = mapModel.unk4;
-        if (temp_a0 != 0) {
-            modelRender_setAnimatedTexturesCacheId(temp_a0);
-        }
-        modelRender_setEnvColor(mapModel.env_red, mapModel.env_green, mapModel.env_blue, 0xFF);
-        
-        // @recomp Set the map opaque model transform id.
-        cur_drawn_model_is_map = TRUE;
-        cur_drawn_model_transform_id = MAP_MODEL_XLU_TRANSFORM_ID_START;
-
-        // @recomp Because the patched water functions run after this function, run through the vector and see if there's a model
-        // that uses the vertex modification function that was patched. The addresses must be hardcoded as it's not possible to
-        // retrieve the right function address inside a recompiled patch instead.
-        BKVertexList *vtxList = (BKVertexList *)((s32)mapModel.model_bin_xlu + mapModel.model_bin_xlu->vtx_list_offset_10);
-        if (vtxList->count <= MAP_MODEL_XLU_VERTEX_COUNT_MAX) {
-            struct1Ds *iPtr;
-            struct1Ds *endPtr = vector_getEnd(D_80386140.unk4);
-            for (iPtr = vector_getBegin(D_80386140.unk4); iPtr < endPtr; iPtr++) {
-                if (D_80372030[iPtr->xform_id].unk4 == 0x8034E8E4 || D_80372030[iPtr->xform_id].unk4 == 0x8034EF60) {
-                    recomp_setup_map_skinning(mapModel.description->xlu_model_id, map_model_xlu_pos_floats);
-                    break;
-                }
-            }
-        }
-
-        modelRender_draw(gfx, mtx, NULL, NULL, mapModel.description->scale, NULL, mapModel.model_bin_xlu);
-        
-        // @recomp Clear the current model transform id after drawing.
-        cur_drawn_model_is_map = FALSE;
-        cur_drawn_model_transform_id = 0;
-        recomp_clear_map_skinning();
-
-        func_802F7BC0(gfx, mtx, vtx);
-    }
-}

patches/marker_extension_patches.c

@@ -1,110 +0,0 @@
-#include "patches.h"
-#include "prop.h"
-#include "actor.h"
-#include "functions.h"
-#include "object_extension_funcs.h"
-#include "bk_api.h"
-#include "note_saving.h"
-
-// Array of handles for ActorMarker instances.
-// Normally the game only has at most 0xE0 ActorMarker instances, but this is larger to account for mods increasing
-// the ActorMarker count.
-u32 marker_handles[0x1000];
-
-extern ActorMarker *D_8036E7C8;
-extern u8 D_80383428[0x1C];
-void func_8032F3D4(s32 arg0[3], ActorMarker *marker, s32 arg2);
-ActorMarker * func_80332A60(void);
-
-extern Actor *suLastBaddie;
-
-// @recomp Patched to create extension data for the marker.
-RECOMP_PATCH ActorMarker * marker_init(s32 *pos, MarkerDrawFunc draw_func, int arg2, int marker_id, int arg4){
-    ActorMarker * marker = func_80332A60();
-    marker->propPtr = NULL;
-    marker->cubePtr = NULL;
-    marker->drawFunc = draw_func;
-    marker->id = marker_id;
-    marker->unk40_23 = arg4;
-    func_8032F3D4(pos, marker, arg2);
-    marker->actrArrayIdx = 0;
-    marker->unk14_10 = 0;
-    marker->modelId = 0;
-    marker->isBanjoOnTop = 0;
-    marker->unk14_22 = 0;
-    marker->unk14_21 = 0;
-    marker->yaw = 0;
-    marker->pitch =  0;
-    marker->roll = 0;
-    marker->unk2C_2 = 0;
-    marker->unk2C_1 = 0;
-    marker->collidable = TRUE;
-    marker->unk3E_0 = 0; 
-    marker->unk40_22 = 0;
-    marker->unk40_19 = 0;
-    marker->unk40_21 = 0;
-    marker->collisionFunc = NULL;
-    marker->collision2Func = NULL;
-    marker->dieFunc = NULL;
-    marker->unk54 = NULL;
-    marker->unk58 = 0;
-    marker->unk18 = 0;
-    marker->actorUpdateFunc = NULL;
-    marker->actorFreeFunc = NULL;
-    marker->commonParticleIndex = 0;
-    marker->actorUpdate2Func = NULL;
-    marker->unk38[0] = 0;
-    marker->unk38[1] = 0;
-    marker->unk38[2] = 0;
-    marker->unk44 = 0;
-    marker->unk20 = 0;
-    marker->unk50 = 0;
-    marker->unk48 = 0;
-    marker->unk4C = 0;
-    marker->unk40_20 = 0;
-    marker->unk40_31 = 0;
-
-    // @recomp Set the marker's handle.
-    u32 index = marker - D_8036E7C8;
-    marker_handles[index] = recomp_create_object_data(EXTENSION_TYPE_MARKER, marker_id);
-    
-    // @recomp If this is a note marker, initialize it. Make sure that this marker belongs to suLastBaddie.
-    if (marker->id == MARKER_5F_MUSIC_NOTE && suLastBaddie && suLastBaddie->actor_info->markerId == marker_id) {
-        note_saving_handle_dynamic_note(suLastBaddie, marker);
-    }
-
-    return marker;
-}
-
-// @recomp Patched to destroy the marker's extended data.
-RECOMP_PATCH void func_80332B2C(ActorMarker * arg0){
-    static s32 D_8036E804[8] = {(u8)~(1 << 7), (u8)~(1 << 6), (u8)~(1 << 5), (u8)~(1 << 4), (u8)~(1 << 3), (u8)~(1 << 2), (u8)~(1 << 1), (u8)~(1 << 0)};
-
-    s32 index = (arg0 - D_8036E7C8);
-    arg0->unk5C = 0;
-    D_80383428[index >> 3] =  D_80383428[index >> 3] & D_8036E804[index & 7];
-
-    // @recomp Delete the handle for this marker.
-    recomp_destroy_object_data(EXTENSION_TYPE_MARKER, marker_handles[index]);
-    marker_handles[index] = 0;
-}
-
-RECOMP_EXPORT MarkerExtensionId bkrecomp_extend_marker(enum marker_e type, u32 size) {
-    return recomp_register_object_extension(EXTENSION_TYPE_MARKER, type, size);
-}
-
-RECOMP_EXPORT MarkerExtensionId bkrecomp_extend_marker_all(u32 size) {
-    return recomp_register_object_extension_generic(EXTENSION_TYPE_MARKER, size);
-}
-
-RECOMP_EXPORT void* bkrecomp_get_extended_marker_data(ActorMarker* marker, MarkerExtensionId extension) {
-    s32 index = (marker - D_8036E7C8);
-    u32 handle = marker_handles[index];
-    return recomp_get_object_data(EXTENSION_TYPE_MARKER, marker->id, handle, extension);
-}
-
-RECOMP_EXPORT u32 bkrecomp_get_marker_spawn_index(ActorMarker* marker) {
-    s32 index = (marker - D_8036E7C8);
-    u32 handle = marker_handles[index];
-    return recomp_get_object_spawn_index(EXTENSION_TYPE_MARKER, handle);
-}

patches/marker_transform_tagging.c

@@ -1,84 +0,0 @@
-#include "patches.h"
-#include "bk_api.h"
-#include "transform_ids.h"
-#include "functions.h"
-
-extern u8 D_8037BFB8;
-extern s32 D_8036E7B0;
-
-void eggShatter_draw(Gfx **gPtr, Mtx **mPtr, Vtx **vPtr);
-void baModel_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx);
-enum asset_e baModel_getModelId(void);
-void func_8033A28C(bool arg0);
-void func_8033A244(f32);
-void func_8033A280(f32);
-
-ModelSkinningData sPlayerSkinningData;
-
-void bkrecomp_setup_custom_skinning(ModelSkinningData* skinning_data, u32 model_id);
-
-// @recomp Patched to set the current transform ID to banjo's when drawing the player.
-RECOMP_PATCH void player_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
-    if (D_8037BFB8) {
-        eggShatter_draw(gfx, mtx, vtx);
-
-        // @recomp Set the custom skinning data for Banjo, so CPU-skinning forms such as the seal are interpolated.
-        bkrecomp_setup_custom_skinning(&sPlayerSkinningData, baModel_getModelId());
-
-        // @recomp Set the current transform ID to banjo's.
-        u32 prev_transform_id = cur_drawn_model_transform_id;
-        cur_drawn_model_transform_id = BANJO_TRANSFORM_ID_START;
-
-        baModel_draw(gfx, mtx, vtx);
-
-        // @recomp Reset the current transform ID.
-        cur_drawn_model_transform_id = prev_transform_id;
-    }
-}
-
-// @recomp Patched to set the actor being drawn before the actor's draw func is called.
-RECOMP_PATCH void __marker_draw(ActorMarker *this, Gfx **gfx, Mtx **mtx, Vtx **vtx){
-    Actor *actor;
-    u32 draw_dist;
-    f32 draw_dist_f;
-    f32 percentage;
-
-    // @recomp Calculate the current drawn marker's transform ID.
-    s32 cur_drawn_marker_spawn_index = bkrecomp_get_marker_spawn_index(this);
-    u32 prev_transform_id = cur_drawn_model_transform_id;
-    u32 transform_id = MARKER_TRANSFORM_ID_START + cur_drawn_marker_spawn_index * MARKER_TRANSFORM_ID_COUNT;
-    if(!this->unk3E_0){
-        // @recomp Set the current drawn marker's transform ID.
-        cur_drawn_model_transform_id = transform_id;
-        this->drawFunc(this, gfx, mtx, vtx);
-        // @recomp Clear the current transform ID after drawing.
-        cur_drawn_model_transform_id = prev_transform_id;
-        return;
-    }
-    actor =  marker_getActor(this);
-    func_8033A28C(actor->unk58_2);
-    if( actor->unk58_2 && !this->unk40_23 && !this->unk40_21 && !D_8036E7B0){
-        func_8033A244(3700.0f);
-    }
-    
-    if(actor->unk124_7 && !actor->despawn_flag && actor->unk58_0){
-        draw_dist = actor->actor_info->draw_distance;
-        if(draw_dist != 0){
-            percentage = (f32)draw_dist*(1/(f64)0x400);
-        }
-        else if(this->unk40_21){
-            percentage = 2.0f;
-        }
-        else{
-            percentage = 1.0f;
-        }
-        func_8033A280(percentage);
-        // @recomp Set the current drawn marker's transform ID.
-        cur_drawn_model_transform_id = transform_id;
-        this->drawFunc(this, gfx, mtx, vtx);
-        // @recomp Set the current drawn marker to null after drawing.
-        cur_drawn_model_transform_id = prev_transform_id;
-    }//L8032D300
-    func_8033A244(30000.0f);
-    func_8033A280(1.0f);
-}

patches/mem_funcs.h

@@ -0,0 +1,14 @@
+#ifndef __MEM_FUNCS_H__
+#define __MEM_FUNCS_H__
+
+#include "patch_helpers.h"
+
+DECLARE_FUNC(u32, recomp_register_actor_extension, u32 actor_type, u32 size);
+DECLARE_FUNC(u32, recomp_register_actor_extension_generic, u32 size);
+DECLARE_FUNC(void, recomp_clear_all_actor_data);
+DECLARE_FUNC(u32, recomp_create_actor_data, u32 actor_type);
+DECLARE_FUNC(void, recomp_destroy_actor_data, u32 actor_handle);
+DECLARE_FUNC(void*, recomp_get_actor_data, u32 actor_handle, u32 extension_handle, u32 actor_type);
+DECLARE_FUNC(u32, recomp_get_actor_spawn_index, u32 actor_handle);
+
+#endif

patches/misc_funcs.h

@@ -7,7 +7,5 @@ DECLARE_FUNC(void, recomp_load_overlays, u32 rom, void* ram, u32 size);
 DECLARE_FUNC(void, recomp_puts, const char* data, u32 size);
 DECLARE_FUNC(void, recomp_exit);
 DECLARE_FUNC(void, recomp_error, const char* str);
-DECLARE_FUNC(u64, recomp_xxh3, void* data, u32 size);
-DECLARE_FUNC(s32, recomp_get_note_saving_enabled);
 
 #endif

patches/mumbo_token_patches.c

@@ -1,53 +0,0 @@
-#include "patches.h"
-#include "prop.h"
-
-enum map_e map_get(void);
-s32 func_80307164(s32 position[3]);
-s32 func_80306DBC(s32 arg0);
-
-bool mumbo_token_fixes_enabled = TRUE;
-
-RECOMP_EXPORT void bkrecomp_set_mumbo_token_fixes_enabled(bool val) {
-    mumbo_token_fixes_enabled = val;
-}
-
-// @recomp Patched to replace the IDs of duplicate tokens.
-RECOMP_PATCH enum mumbotoken_e func_802E0A90(Actor *this){
-    s32 id;
-    s32 pos[3];
-
-    // @recomp Record the map ID.
-    enum map_e map_id = map_get();
-    pos[0] = (s32)this->position[0];
-    pos[1] = (s32)this->position[1];
-    pos[2] = (s32)this->position[2];
-    id = func_80307164(pos);
-    if(id < 0){
-        return 0;
-    }
-    else{
-        // @recomp Replace the IDs of duplicate tokens.
-        // return func_80306DBC(id) - 199;
-        s32 ret = func_80306DBC(id) - 199;
-
-        // @recomp Only replace token IDs if the fixes are enabled.
-        if (mumbo_token_fixes_enabled) {
-            // @recomp Replace the ID for the following token:
-            // Mumbo token ID: 0x3D @ 424, 170, 304 (Map 0x8D)
-            if (ret == 0x3D && pos[0] == 424 && pos[1] == 170 && pos[2] == 304 && map_id == MAP_8D_MMM_INSIDE_LOGGO) {
-                // @recomp Swap to unused ID 0x74
-                ret = 0x74;
-            }
-
-            // @recomp Replace the ID for the following token:
-            // Mumbo token ID: 0x5E @ -2649, 0, -395 (Map 0x43)
-            if (ret == 0x5E && pos[0] == -2649 && pos[1] == 0 && pos[2] == -395 && map_id == MAP_43_CCW_SPRING) {
-                // @recomp Swap to unused ID 0x5D
-                ret = 0x5D;
-            }
-        }
-
-        // @recomp Return the modified ID.
-        return ret;
-    }
-}

patches/note_saving.c

@@ -1,466 +0,0 @@
-#include "patches.h"
-#include "bk_api.h"
-#include "misc_funcs.h"
-#include "save_extension.h"
-#include "note_saving.h"
-
-#include "functions.h"
-#include "prop.h"
-#include "core2/timedfunc.h"
-
-// Vanilla declarations.
-typedef struct map_info{
-    s16 map_id;
-    s16 level_id;
-    char* name;
-}MapInfo;
-
-extern struct {
-    s32 unk0;
-    s32 unk4;
-    u8 unk8[0x25];
-} gFileProgressFlags;
-
-MapInfo * func_8030AD00(enum map_e map_id);
-enum map_e map_get(void);
-enum level_e level_get(void);
-void progressDialog_showDialogMaskZero(s32);
-void fxSparkle_musicNote(s16 position[3]);
-void item_inc(enum item_e item);
-void item_adjustByDiffWithoutHud(enum item_e item, s32 diff);
-bool func_802FADD4(enum item_e item_id);
-s32 item_getCount(enum item_e item);
-s32 jiggyscore_leveltotal(s32 lvl);
-void itemPrint_reset(void);
-s32 bitfield_get_bit(u8 *array, s32 index);
-
-extern s32 D_80385F30[0x2C];
-extern s32 D_80385FE8;
-
-extern struct {
-    Cube *cubes;
-    f32 margin;
-    s32 min[3];
-    s32 max[3];
-    s32 stride[2];
-    s32 cubeCnt; 
-    s32 unk2C;
-    s32 width[3];
-    Cube *unk3C; // fallback cube?
-    Cube *unk40; // some other fallback cube?
-    s32 unk44; // index of some sort
-} sCubeList;
-
-// New declarations.
-typedef struct {
-    u16 static_note_count;
-    u16 dynamic_note_count;
-    u16 start_note_index;
-    u16 level_id;
-} MapNoteData;
-
-MapNoteData map_note_data[512]; // One entry per map, with room for extras in case any mods add additional maps.
-u16 level_note_counts[256]; // One entry per level, with room for extras in case any mods add additional levels.
-
-typedef struct {
-    u32 note_index;
-} NoteSavingExtensionData;
-
-PropExtensionId note_saving_prop_extension_id;
-
-// Note saving can only savely be changed while in the lair, so this value is only updated when in the lair.
-bool note_saving_enabled_cached = FALSE;
-// Override for allowing mods to disable note saving.
-bool note_saving_override_disabled = FALSE;
-
-u32 spawned_static_note_count = 0;
-
-// Per-map values containing the number of dynamic notes to despawn for the current session.
-// This is calculated when a new level is entered for every map in the level.
-u8 map_dynamic_note_despawn_counts[512];
-
-bool recomp_in_demo_playback_game_mode();
-
-void init_note_saving() {
-    note_saving_prop_extension_id = bkrecomp_extend_prop_all(sizeof(NoteSavingExtensionData));
-
-    // Collected from map data.
-    map_note_data[MAP_2_MM_MUMBOS_MOUNTAIN].static_note_count = 85;
-    map_note_data[MAP_2_MM_MUMBOS_MOUNTAIN].dynamic_note_count = 5;
-    map_note_data[MAP_5_TTC_BLUBBERS_SHIP].static_note_count = 8;
-    map_note_data[MAP_6_TTC_NIPPERS_SHELL].static_note_count = 6;
-    map_note_data[MAP_7_TTC_TREASURE_TROVE_COVE].static_note_count = 82;
-    map_note_data[MAP_A_TTC_SANDCASTLE].static_note_count = 4;
-    map_note_data[MAP_B_CC_CLANKERS_CAVERN].static_note_count = 72;
-    map_note_data[MAP_C_MM_TICKERS_TOWER].static_note_count = 6;
-    map_note_data[MAP_D_BGS_BUBBLEGLOOP_SWAMP].static_note_count = 83;
-    map_note_data[MAP_D_BGS_BUBBLEGLOOP_SWAMP].dynamic_note_count = 5;
-    map_note_data[MAP_E_MM_MUMBOS_SKULL].static_note_count = 4;
-    map_note_data[MAP_10_BGS_MR_VILE].static_note_count = 6;
-    map_note_data[MAP_11_BGS_TIPTUP].static_note_count = 6;
-    map_note_data[MAP_12_GV_GOBIS_VALLEY].static_note_count = 70;
-    map_note_data[MAP_13_GV_MEMORY_GAME].static_note_count = 4;
-    map_note_data[MAP_14_GV_SANDYBUTTS_MAZE].static_note_count = 7;
-    map_note_data[MAP_15_GV_WATER_PYRAMID].static_note_count = 4;
-    map_note_data[MAP_16_GV_RUBEES_CHAMBER].static_note_count = 8;
-    map_note_data[MAP_1A_GV_INSIDE_JINXY].static_note_count = 7;
-    map_note_data[MAP_1B_MMM_MAD_MONSTER_MANSION].static_note_count = 47;
-    map_note_data[MAP_1C_MMM_CHURCH].static_note_count = 10;
-    map_note_data[MAP_1D_MMM_CELLAR].static_note_count = 4;
-    map_note_data[MAP_21_CC_WITCH_SWITCH_ROOM].static_note_count = 6;
-    map_note_data[MAP_22_CC_INSIDE_CLANKER].static_note_count = 16;
-    map_note_data[MAP_23_CC_GOLDFEATHER_ROOM].static_note_count = 6;
-    map_note_data[MAP_24_MMM_TUMBLARS_SHED].static_note_count = 4;
-    map_note_data[MAP_25_MMM_WELL].static_note_count = 7;
-    map_note_data[MAP_26_MMM_NAPPERS_ROOM].static_note_count = 8;
-    map_note_data[MAP_27_FP_FREEZEEZY_PEAK].static_note_count = 82;
-    map_note_data[MAP_29_MMM_NOTE_ROOM].static_note_count = 9;
-    map_note_data[MAP_2D_MMM_BEDROOM].static_note_count = 4;
-    map_note_data[MAP_2F_MMM_WATERDRAIN_BARREL].static_note_count = 5;
-    map_note_data[MAP_30_MMM_MUMBOS_SKULL].static_note_count = 2;
-    map_note_data[MAP_31_RBB_RUSTY_BUCKET_BAY].static_note_count = 43;
-    map_note_data[MAP_34_RBB_ENGINE_ROOM].static_note_count = 16;
-    map_note_data[MAP_35_RBB_WAREHOUSE].static_note_count = 4;
-    map_note_data[MAP_37_RBB_CONTAINER_1].static_note_count = 8;
-    map_note_data[MAP_38_RBB_CONTAINER_3].static_note_count = 4;
-    map_note_data[MAP_39_RBB_CREW_CABIN].static_note_count = 4;
-    map_note_data[MAP_3B_RBB_STORAGE_ROOM].static_note_count = 5;
-    map_note_data[MAP_3C_RBB_KITCHEN].static_note_count = 5;
-    map_note_data[MAP_3D_RBB_NAVIGATION_ROOM].static_note_count = 4;
-    map_note_data[MAP_3F_RBB_CAPTAINS_CABIN].static_note_count = 3;
-    map_note_data[MAP_40_CCW_HUB].static_note_count = 4;
-    map_note_data[MAP_43_CCW_SPRING].static_note_count = 16;
-    map_note_data[MAP_44_CCW_SUMMER].static_note_count = 16;
-    map_note_data[MAP_45_CCW_AUTUMN].static_note_count = 37;
-    map_note_data[MAP_46_CCW_WINTER].static_note_count = 16;
-    map_note_data[MAP_48_FP_MUMBOS_SKULL].static_note_count = 6;
-    map_note_data[MAP_4C_CCW_AUTUMN_MUMBOS_SKULL].static_note_count = 4;
-    map_note_data[MAP_53_FP_CHRISTMAS_TREE].static_note_count = 12;
-    map_note_data[MAP_5C_CCW_AUTUMN_ZUBBA_HIVE].static_note_count = 4;
-    map_note_data[MAP_60_CCW_AUTUMN_NABNUTS_HOUSE].static_note_count = 3;
-    map_note_data[MAP_8B_RBB_ANCHOR_ROOM].static_note_count = 4;
-}
-
-RECOMP_EXPORT void bkrecomp_notesaving_clear_all_map_note_counts() {
-    for (u32 i = 0; i < ARRLEN(map_note_data); i++) {
-        map_note_data[i].static_note_count = 0;
-        map_note_data[i].dynamic_note_count = 0;
-    }
-}
-
-RECOMP_EXPORT void bkrecomp_notesaving_set_map_static_note_count(u32 map_id, u16 static_note_count) {
-    if (map_id >= ARRLEN(map_note_data)) {
-        recomp_error("Mod error: Attempted to set static note count of an invalid map ID\n");
-    }
-    map_note_data[map_id].static_note_count = static_note_count;
-}
-
-RECOMP_EXPORT void bkrecomp_notesaving_set_map_dynamic_note_count(u32 map_id, u16 dynamic_note_count) {
-    if (map_id >= ARRLEN(map_note_data)) {
-        recomp_error("Mod error: Attempted to set dynamic note count of an invalid map ID\n");
-    }
-    map_note_data[map_id].dynamic_note_count = dynamic_note_count;
-}
-
-RECOMP_EXPORT void bkrecomp_notesaving_force_disabled(bool disabled) {
-    note_saving_override_disabled = disabled;
-}
-
-// Notes are always saved, but this function controls whether to use the saved data to prevent notes from spawning and adjust the note score. 
-RECOMP_EXPORT s32 bkrecomp_note_saving_enabled() {
-    return recomp_get_note_saving_enabled();
-}
-
-RECOMP_EXPORT s32 bkrecomp_note_saving_active() {
-    return note_saving_enabled_cached;
-}
-
-void calculate_map_start_note_indices() {
-    for (u32 map_id = 0; map_id < ARRLEN(map_note_data); map_id++) {
-        MapNoteData* note_data = &map_note_data[map_id];
-        MapInfo* info = func_8030AD00(map_id);
-        if (info != NULL) {
-            note_data->level_id = info->level_id;
-            note_data->start_note_index = level_note_counts[info->level_id];
-            level_note_counts[info->level_id] += note_data->static_note_count + note_data->dynamic_note_count;
-        }
-        else {
-            note_data->level_id = 0;
-        }
-    }
-}
-
-s32 level_id_to_level_array_index(enum level_e level_id) {
-    switch (level_id) {
-        case LEVEL_1_MUMBOS_MOUNTAIN:
-            return 0;
-        case LEVEL_2_TREASURE_TROVE_COVE:
-            return 1;
-        case LEVEL_3_CLANKERS_CAVERN:
-            return 2;
-        case LEVEL_4_BUBBLEGLOOP_SWAMP:
-            return 3;
-        case LEVEL_5_FREEZEEZY_PEAK:
-            return 4;
-        case LEVEL_7_GOBIS_VALLEY:
-            return 5;
-        case LEVEL_A_MAD_MONSTER_MANSION:
-            return 6;
-        case LEVEL_9_RUSTY_BUCKET_BAY:
-            return 7;
-        case LEVEL_8_CLICK_CLOCK_WOOD:
-            return 8;
-        default:
-            return -1;
-    }
-}
-
-bool is_note_collected(enum map_e map_id, enum level_e level_id, u8 note_index) {
-    if (map_id >= ARRLEN(map_note_data)) {
-        return FALSE;
-    }
-
-    s32 level_array_index = level_id_to_level_array_index(level_id);
-    if (level_array_index == -1 || level_array_index >= ARRLEN(loaded_file_extension_data.level_notes)) {
-        return FALSE;
-    }
-
-    MapNoteData *note_data = &map_note_data[map_id];
-    note_index += note_data->start_note_index;
-
-    u32 byte_index = note_index / 8;
-    u32 bit_index = note_index % 8;
-
-    return (loaded_file_extension_data.level_notes[level_array_index].bytes[byte_index] & (1 << bit_index)) != 0;
-}
-
-void set_note_collected(enum map_e map_id, enum level_e level_id, u8 note_index) {
-    if (map_id >= ARRLEN(map_note_data)) {
-        return;
-    }
-
-    s32 level_array_index = level_id_to_level_array_index(level_id);
-    if (level_array_index == -1 || level_array_index >= ARRLEN(loaded_file_extension_data.level_notes)) {
-        return;
-    }
-
-    MapNoteData *note_data = &map_note_data[map_id];
-    note_index += note_data->start_note_index;
-
-    u32 byte_index = note_index / 8;
-    u32 bit_index = note_index % 8;
-
-    loaded_file_extension_data.level_notes[level_array_index].bytes[byte_index] |= (1 << bit_index);
-}
-
-void collect_dynamic_note(enum map_e map_id, enum level_e level_id) {
-    if (map_id < ARRLEN(map_note_data)) {
-        MapNoteData *map_data = &map_note_data[map_id];
-        s32 start_note_index = map_data->static_note_count + map_data->start_note_index;
-        s32 map_dynamic_note_count = map_data->dynamic_note_count;
-
-        // Set the first unset dynamic note bit for this map.
-        for (s32 i = 0; i < map_dynamic_note_count; i++) {
-            s32 note_index = start_note_index + i;
-            if (!is_note_collected(map_id, level_id, note_index)) {
-                set_note_collected(map_id, level_id, note_index);
-                break;
-            }
-        }
-    }
-}
-
-s32 dynamic_note_collected_count(enum map_e map_id) {
-    s32 ret = 0;
-    if (map_id < ARRLEN(map_note_data)) {
-        MapNoteData *map_data = &map_note_data[map_id];
-        s32 start_note_index = map_data->static_note_count + map_data->start_note_index;
-        s32 map_dynamic_note_count = map_data->dynamic_note_count;
-
-        // Check the dynamic note bits for this map.
-        for (s32 i = 0; i < map_dynamic_note_count; i++) {
-            s32 note_index = start_note_index + i;
-            if (is_note_collected(map_id, map_data->level_id, note_index)) {
-                ret++;
-            }
-        }
-    }
-    return ret;
-}
-
-void note_saving_on_map_load() {
-    spawned_static_note_count = 0;
-
-    // Prevent the note score passed dialog from running if note saving is enabled.
-    if (note_saving_enabled_cached) {
-        // This flag controls whether Bottles will tell you when you pass your note score.
-        levelSpecificFlags_set(LEVEL_FLAG_34_UNKNOWN, TRUE);
-    }
-}
-
-void note_saving_update() {
-    // When in the lair or file select, update the cached note saving enabled state.
-    if (level_get() == LEVEL_6_LAIR || map_get() == MAP_91_FILE_SELECT) {
-        if (note_saving_override_disabled) {
-            note_saving_enabled_cached = FALSE;
-        }
-        else {
-            note_saving_enabled_cached = bkrecomp_note_saving_enabled();
-        }
-    }
-}
-
-void note_saving_handle_static_note(Cube *c, Prop *p) {
-
-    // If note saving is enabled, check if this note has been collected and remove it if so.
-    if (note_saving_enabled_cached) {
-        if (is_note_collected(map_get(), level_get(), spawned_static_note_count)) {
-            // Clear the note's alive bit.
-            p->spriteProp.unk8_4 = FALSE;
-        }
-    }
-
-    NoteSavingExtensionData* note_data = (NoteSavingExtensionData*)bkrecomp_get_extended_prop_data(c, p, note_saving_prop_extension_id);
-    note_data->note_index = spawned_static_note_count;
-
-    spawned_static_note_count++;
-}
-
-void note_saving_handle_dynamic_note(Actor *actor, ActorMarker *marker) {
-    if (note_saving_enabled_cached) {
-        s32 map_id = map_get();
-        if (map_id < ARRLEN(map_dynamic_note_despawn_counts)) {
-            if (map_dynamic_note_despawn_counts[map_id] > 0) {
-                map_dynamic_note_despawn_counts[map_id]--;
-                // Clear the note's alive bit so it doesn't draw for good measure.
-                marker->propPtr->unk8_4 = FALSE;
-                // Set the actor as despawned.
-                actor->despawn_flag = TRUE;
-            }
-        }
-    }
-}
-
-bool prop_in_cube(Cube *c, Prop *p) {
-    s32 prop_index = p - c->prop2Ptr;
-    if (prop_index >= 0 && prop_index < c->prop2Cnt) {
-        return TRUE;
-    }
-    return FALSE;
-}
-
-Cube *find_cube_for_prop(Prop *p) {
-    for (s32 i = 0; i < sCubeList.cubeCnt; i++) {
-        Cube *cur_cube = &sCubeList.cubes[i];
-        if (prop_in_cube(cur_cube, p)) {
-            return cur_cube;
-        }
-    }
-    
-    if (prop_in_cube(sCubeList.unk3C, p)) {
-        return sCubeList.unk3C;
-    }
-
-    if (prop_in_cube(sCubeList.unk40, p)) {
-        return sCubeList.unk40;
-    }
-
-    return NULL;
-}
-
-// @recomp Patched to track collected notes.
-RECOMP_PATCH void __baMarker_resolveMusicNoteCollision(Prop *arg0) {
-    // @recomp Set that the note was collected if this isn't demo playback.
-    if (!recomp_in_demo_playback_game_mode()) {
-        // Check if this is an actor prop and collect a dynamic note if so.
-        if (arg0->is_actor) {
-            collect_dynamic_note(map_get(), level_get());
-        }
-        // Otherwise, make sure this is a sprite prop and use the prop data.
-        else if (!arg0->is_3d) {
-            Cube *prop_cube = find_cube_for_prop(arg0);
-            if (prop_cube != NULL) {
-                NoteSavingExtensionData* note_data = (NoteSavingExtensionData*)bkrecomp_get_extended_prop_data(prop_cube, arg0, note_saving_prop_extension_id);
-                set_note_collected(map_get(), level_get(), note_data->note_index);
-            }
-        }
-    }
-
-    if (!func_802FADD4(ITEM_1B_VILE_VILE_SCORE)) {
-        item_inc(ITEM_C_NOTE);
-    } else {
-        item_adjustByDiffWithoutHud(ITEM_C_NOTE, 1);
-    }
-    if (item_getCount(ITEM_C_NOTE) < 100) {
-        coMusicPlayer_playMusic(COMUSIC_9_NOTE_COLLECTED, 16000);
-        timedFunc_set_1(0.75f, progressDialog_showDialogMaskZero, FILEPROG_3_MUSIC_NOTE_TEXT);
-    }
-    fxSparkle_musicNote(arg0->unk4);
-}
-
-s32 get_collected_note_count(enum level_e level) {
-    s32 level_array_index = level_id_to_level_array_index(level);
-    if (level_array_index == -1) {
-        return 0;
-    }
-
-    s32 count = 0;
-    for (int i = 0; i < ARRLEN(loaded_file_extension_data.level_notes[0].bytes); i++) {
-        u8 cur_byte = loaded_file_extension_data.level_notes[level_array_index].bytes[i];
-        count += __builtin_popcount(cur_byte);
-    }
-
-    return count;
-}
-
-// @recomp Patched to restore the saved note count when entering a level and reset the per-map collected dynamic note counts.
-RECOMP_PATCH void itemscore_levelReset(enum level_e level){
-    int i;
-    
-    for(i = 0; i < 6; i++){
-        D_80385F30[ITEM_0_HOURGLASS_TIMER + i] = 0;
-        D_80385F30[ITEM_6_HOURGLASS + i] = 0;
-    }
-    
-    D_80385F30[ITEM_C_NOTE] = 0;
-    D_80385F30[ITEM_E_JIGGY] = jiggyscore_leveltotal(level);
-    D_80385F30[ITEM_12_JINJOS] = 0;
-    D_80385F30[ITEM_17_AIR] = 3600;
-    D_80385F30[ITEM_18_GOLD_BULLIONS] = 0;
-    D_80385F30[ITEM_19_ORANGE] = 0;
-    D_80385F30[ITEM_23_ACORNS] = 0;
-    D_80385F30[ITEM_1A_PLAYER_VILE_SCORE] = 0;
-    D_80385F30[ITEM_1B_VILE_VILE_SCORE] = 0;
-    D_80385F30[ITEM_1F_GREEN_PRESENT] = 0;
-    D_80385F30[ITEM_20_BLUE_PRESENT] = 0;
-    D_80385F30[ITEM_21_RED_PRESENT] = 0;
-    D_80385F30[ITEM_22_CATERPILLAR] = 0;
-    itemPrint_reset();
-    D_80385FE8 = 1;
-
-    // @recomp If note saving is currently enabled, set load the note count for the current level.
-    if (note_saving_enabled_cached) {
-        D_80385F30[ITEM_C_NOTE] = get_collected_note_count(level);
-    }
-
-    // @recomp Set the number of dynamic notes to respawn for each map in the level.
-    for (s32 map_id = 0; map_id < ARRLEN(map_note_data); map_id++) {
-        MapNoteData *map_data = &map_note_data[map_id];
-        if (map_data->level_id == level) {
-            map_dynamic_note_despawn_counts[map_id] = dynamic_note_collected_count(map_id);
-        }
-        else {
-            map_dynamic_note_despawn_counts[map_id] = 0;
-        }
-    }
-}
-
-// @recomp Patched to return true for FILEPROG_99_PAST_50_NOTE_DOOR_TEXT if note saving is enabled.
-// That flag controls whether to show the "Grunty's magic stops you from taking the notes..." dialog.
-RECOMP_PATCH bool fileProgressFlag_get(enum file_progress_e index) {
-    if (note_saving_enabled_cached && index == FILEPROG_99_PAST_50_NOTE_DOOR_TEXT) {
-        return TRUE;
-    }
-    
-    return bitfield_get_bit(gFileProgressFlags.unk8, index);
-}

patches/note_saving.h

@@ -1,17 +0,0 @@
-#ifndef __NOTE_SAVING_H__
-#define __NOTE_SAVING_H__
-
-#include "prop.h"
-
-void init_note_saving();
-void calculate_map_start_note_indices();
-
-// Notes are always saved, but this function controls whether to use the saved data to prevent notes from spawning and adjust the note score. 
-bool note_saving_enabled();
-
-void note_saving_on_map_load();
-void note_saving_update();
-void note_saving_handle_static_note(Cube *c, Prop *p);
-void note_saving_handle_dynamic_note(Actor *actor, ActorMarker *marker);
-
-#endif

patches/object_extension_funcs.h

@@ -1,14 +0,0 @@
-#ifndef __MEM_FUNCS_H__
-#define __MEM_FUNCS_H__
-
-#include "patch_helpers.h"
-
-DECLARE_FUNC(u32, recomp_register_object_extension, u32 type_index, u32 subtype_index, u32 size);
-DECLARE_FUNC(u32, recomp_register_object_extension_generic, u32 type_index, u32 size);
-DECLARE_FUNC(void, recomp_clear_all_object_data, u32 type_index);
-DECLARE_FUNC(u32, recomp_create_object_data, u32 type_index, u32 subtype_index);
-DECLARE_FUNC(void, recomp_destroy_object_data, u32 type_index, u32 object_handle);
-DECLARE_FUNC(void*, recomp_get_object_data, u32 type_index, u32 subtype_index, u32 object_handle, u32 extension_handle);
-DECLARE_FUNC(u32, recomp_get_object_spawn_index, u32 type_index, u32 object_handle);
-
-#endif

patches/overlay_loading.c

@@ -54,8 +54,37 @@ MAKE_OVERLAYS()
 #define OVERLAY_END(ovl) boot_##ovl##_rzip_ROM_END
 
 // @recomp Patched to load overlays, prefixed with boot_ to account for the decomp build system.
-RECOMP_PATCH void boot___osInitialize_common(void) {
-    // Nothing of the original function needs to happen, so the body can be empty besides the overlay load.
+RECOMP_PATCH void boot_overlay_table_init(void) {
+    gOverlayTable[ 0].start = OVERLAY_START(core2);
+    gOverlayTable[ 0].end   = OVERLAY_END(core2);
+    gOverlayTable[ 1].start = OVERLAY_START(emptyLvl);
+    gOverlayTable[ 1].end   = OVERLAY_END(emptyLvl);
+    gOverlayTable[ 2].start = OVERLAY_START(CC);
+    gOverlayTable[ 2].end   = OVERLAY_END(CC);
+    gOverlayTable[ 3].start = OVERLAY_START(MMM);
+    gOverlayTable[ 3].end   = OVERLAY_END(MMM);
+    gOverlayTable[ 4].start = OVERLAY_START(GV);
+    gOverlayTable[ 4].end   = OVERLAY_END(GV);
+    gOverlayTable[ 5].start = OVERLAY_START(TTC);
+    gOverlayTable[ 5].end   = OVERLAY_END(TTC);
+    gOverlayTable[ 6].start = OVERLAY_START(MM);
+    gOverlayTable[ 6].end   = OVERLAY_END(MM);
+    gOverlayTable[ 7].start = OVERLAY_START(BGS);
+    gOverlayTable[ 7].end   = OVERLAY_END(BGS);
+    gOverlayTable[ 8].start = OVERLAY_START(RBB);
+    gOverlayTable[ 8].end   = OVERLAY_END(RBB);
+    gOverlayTable[ 9].start = OVERLAY_START(FP);
+    gOverlayTable[ 9].end   = OVERLAY_END(FP);
+    gOverlayTable[10].start = OVERLAY_START(CCW);
+    gOverlayTable[10].end   = OVERLAY_END(CCW);
+    gOverlayTable[11].start = OVERLAY_START(SM);
+    gOverlayTable[11].end   = OVERLAY_END(SM);
+    gOverlayTable[12].start = OVERLAY_START(cutscenes);
+    gOverlayTable[12].end   = OVERLAY_END(cutscenes);
+    gOverlayTable[13].start = OVERLAY_START(lair);
+    gOverlayTable[13].end   = OVERLAY_END(lair);
+    gOverlayTable[14].start = OVERLAY_START(fight);
+    gOverlayTable[14].end   = OVERLAY_END(fight);
 
     // @recomp Load core1.
     recomp_load_overlays_by_rom((u32)core1_ROM_START, core1_VRAM, core1_ROM_END - core1_ROM_START);
@@ -84,7 +113,7 @@ RECOMP_PATCH void overlay_load(
     u32 uncompressed_rom_start = rom_start;
     u32 uncompressed_rom_size = rom_end - rom_start;
     u32 overlay_vram_start = ram_start;
-    u8* sp34;
+    void* sp34;
     u32 sp30;
     u32 sp2C;
     u32 *tmp;
@@ -108,10 +137,10 @@ RECOMP_PATCH void overlay_load(
         sp34 = &D_8002D500;
     }
     piMgr_read(sp34, rom_start, rom_end - rom_start);
-    rarezip_uncompress(&sp34, (u8**)&ram_start);
+    rarezip_uncompress(&sp34, &ram_start);
     sp2C = D_8027BF2C;
     sp30 = D_8027BF30;
-    rarezip_uncompress(&sp34, (u8**)&ram_start);
+    rarezip_uncompress(&sp34, &ram_start);
 
     if(bss_start){
         bzero((void*)bss_start, bss_end - bss_start);

patches/particle_transform_tagging.c

@@ -1,348 +0,0 @@
-#include "patches.h"
-#include "transform_ids.h"
-#include "functions.h"
-#include "rand.h"
-#include "core1/ml.h"
-#include "core2/anctrl.h"
-#include "core2/modelRender.h"
-#include "core2/particle.h"
-#include "core2/timedfunc.h"
-
-u32 particle_spawn_count = 0;
-
-extern ParticleEmitter **partEmitMgr;
-extern s32 partEmitMgrLength;
-
-typedef struct particle{
-    f32 acceleration[3];
-    f32 fade;
-    f32 frame; //frame
-    f32 framerate; //framerate
-    f32 position[3];
-    f32 rotation[3];
-    f32 scale; //size
-    f32 initialSize_34; //initial_size
-    f32 finalSizeDiff; //delta_size
-    f32 angluar_velocity[3];
-    f32 age_48;
-    f32 lifetime_4C;
-    f32 velocity_50[3];
-    u8 unk5C;
-    //u8 pad5D[3];
-} Particle;
-
-u32 get_particle_id(Particle *p) {
-    u8 *padding = &p->unk5C + 1;
-
-    u32 id = (padding[0] << 16) | (padding[1] << 8) | (padding[2] << 0);
-    return id;
-}
-
-void set_particle_id(Particle *p, u32 id) {
-    u8 *padding = &p->unk5C + 1;
-
-    padding[0] = (id >> 16) & 0xFF;
-    padding[1] = (id >>  8) & 0xFF;
-    padding[2] = (id >>  0) & 0xFF;
-}
-
-extern Gfx D_80368978[];
-extern Gfx D_80368940[];
-
-void __particleEmitter_drawOnPass(ParticleEmitter *this, Gfx **gfx, Mtx **mtx, Vtx **vtx, u32 draw_pass);
-void func_803382E4(s32);
-void func_80338338(s32, s32, s32);
-void func_803382B4(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_80338370(void);
-void func_80335D30(Gfx **);
-void func_802EED1C(ParticleEmitter *this, f32 age, f32 arg2[3]);
-void func_80344C2C(bool arg0);
-void func_80344720(BKSpriteDisplayData *arg0, s32 frame, bool mirrored, f32 position[3], f32 rotation[3], f32 scale[3], Gfx **gfx, Mtx **mtx);
-void func_80344424(BKSpriteDisplayData *arg0, s32 frame, bool mirrored, f32 position[3], f32 scale[3], f32 rotation, Gfx **gfx, Mtx **mtx);
-void func_8033687C(Gfx **);
-s32 func_8034E698(Struct73s *arg0);
-
-// @recomp Patched to tag particles as they're drawn.
-RECOMP_PATCH void __particleEmitter_drawOnPass(ParticleEmitter *this, Gfx **gfx, Mtx **mtx, Vtx **vtx, u32 draw_pass){
-    f32 position[3];
-    f32 flat_rotation[3];
-    f32 scale[3];
-    Particle *iPtr;
-
-    if(reinterpret_cast(u32, draw_pass) != (this->draw_mode & 0x4) != 0)
-        return;
-
-    if(this->model_20 != NULL){
-        for(iPtr = this->pList_start_124; iPtr < this->pList_end_128; iPtr++){
-            position[0] = iPtr->position[0] + this->unk4[0];
-            position[1] = iPtr->position[1] + this->unk4[1];
-            position[2] = iPtr->position[2] + this->unk4[2];
-            if( 0.0f != this->fade_in || 1.0 != this->fade_out || this->alpha != 0xff ){
-                modelRender_setAlpha((s32) (iPtr->fade*this->alpha));
-            }//L802EEF5C
-            modelRender_setDepthMode((this->draw_mode & PART_EMIT_NO_DEPTH)? MODEL_RENDER_DEPTH_NONE : MODEL_RENDER_DEPTH_FULL);
-            // @recomp Get the particle's ID and use it to set the current model transform ID.
-            cur_drawn_model_transform_id = MODEL_PARTICLE_TRANSFORM_ID_START + (get_particle_id(iPtr) % MODEL_PARTICLE_ID_MAX) * MARKER_TRANSFORM_ID_COUNT;
-
-            modelRender_draw(gfx, mtx, position, iPtr->rotation, iPtr->scale, NULL, this->model_20);
-
-            // @recomp Reset the current model transform ID.
-            cur_drawn_model_transform_id = 0;
-        }
-        return;
-    }
-    
-    if(this->unk34){//L802EEFC4
-        if( this->rgb[0] != 0xff 
-            || this->rgb[1] != 0xff 
-            || this->rgb[2] != 0xff 
-            || this->alpha != 0xff 
-        ){
-            func_803382E4((this->draw_mode & PART_EMIT_NO_DEPTH)? 9: 0xf);
-            func_80338338(this->rgb[0], this->rgb[1], this->rgb[2]);
-            func_803382B4(
-                (this->rgb[0] < 8)? 0 : this->rgb[0] - 8,
-                (this->rgb[1] < 8)? 0 : this->rgb[1] - 8,
-                (this->rgb[2] < 8)? 0 : this->rgb[2] - 8,
-                (this->draw_mode & PART_EMIT_NO_OPA)? 0xff : this->alpha
-            );
-            func_80338370();
-            func_80335D30(gfx);
-        }
-        else if(this->draw_mode & PART_EMIT_NO_DEPTH){//L802EF0C0
-            gSPDisplayList((*gfx)++, D_80368978);
-        }
-        else{//L802EF0EC
-            gSPDisplayList((*gfx)++, D_80368940);
-        }//L802EF10C
-        flat_rotation[0] = 90.0f;
-        flat_rotation[1] = 0.0f;
-        flat_rotation[2] = 0.0f;
-        for(iPtr = this->pList_start_124; iPtr < this->pList_end_128; iPtr++){
-            gDPSetPrimColor((*gfx)++, 0, 0, this->rgb[0], this->rgb[1], this->rgb[2], iPtr->fade*this->alpha);
-            position[0] = iPtr->position[0] + this->unk4[0];
-            position[1] = iPtr->position[1] + this->unk4[1];
-            position[2] = iPtr->position[2] + this->unk4[2];
-
-            scale[0] = iPtr->scale;
-            scale[1] = iPtr->scale;
-            scale[2] = iPtr->scale;
-            if(0.0f != this->unk108){
-                func_802EED1C(this, iPtr->age_48, scale);
-            }
-            func_80344C2C(this->unk0_16);
-            // @recomp Get the particle's ID and use it to set a matrix group for this particle.
-            u32 transform_id = NORMAL_PARTICLE_TRANSFORM_ID_START + get_particle_id(iPtr);
-            gEXMatrixGroupDecomposedNormal((*gfx)++, transform_id, G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
-
-            if(this->draw_mode & PART_EMIT_ROTATABLE){
-                func_80344720(this->unk34, (s32)iPtr->frame, 0, position, flat_rotation, scale, gfx, mtx);
-            }//L802EF2F8
-            else{
-                func_80344424(this->unk34, (s32)iPtr->frame, 0, position, scale, iPtr->rotation[2], gfx, mtx);
-            }//L802EF324
-
-            // @recomp Pop the particle's matrix group.
-            gEXPopMatrixGroup((*gfx)++, G_MTX_MODELVIEW);
-        }//L802EF338
-        if( this->rgb[0] != 0xff || this->rgb[1] != 0xff || this->rgb[2] != 0xff || this->alpha != 0xff 
-        ){
-            func_8033687C(gfx);
-        }
-    }
-}
-
-// @recomp Patched to set an incrementing ID for the particle.
-RECOMP_PATCH void __particleEmitter_initParticle(ParticleEmitter *this, Particle *particle){
-    particle->acceleration[0] = randf2(this->particleAccerationRange_4C_min_x, this->particleAccerationRange_4C_max_x);
-    particle->acceleration[1] = randf2(this->particleAccerationRange_4C_min_y, this->particleAccerationRange_4C_max_y);
-    particle->acceleration[2] = randf2(this->particleAccerationRange_4C_min_z, this->particleAccerationRange_4C_max_z);
-    particle->unk5C = this->unk64;
-    
-    particle->fade = (0.0f == this->fade_in) ? 1.0f : 0; 
-    particle->frame = randf2((f32)this->particleStartingFrameRange_84_min, (f32)this->particleStartingFrameRange_84_max);
-    particle->framerate = randf2(this->particleFramerateRange_8C_min, this->particleFramerateRange_8C_max);
-
-    particle->position[0] = this->postion_28[0];
-    particle->position[1] = this->postion_28[1];
-    particle->position[2] = this->postion_28[2];
-
-    particle->position[0] = particle->position[0] + randf2(this->particleSpawnPositionRange_94_min_x, this->particleSpawnPositionRange_94_max_x);
-    particle->position[1] = particle->position[1] + randf2(this->particleSpawnPositionRange_94_min_y, this->particleSpawnPositionRange_94_max_y);
-    particle->position[2] = particle->position[2] + randf2(this->particleSpawnPositionRange_94_min_z, this->particleSpawnPositionRange_94_max_z);
-
-    // @recomp This bit of code was copied over from particleEmitter_update. Particles can be attached to entities that can move vertically,
-    // like water surfaces, and will teleport accordingly based on their movement. This can introduce interpolation issues the first time
-    // a particle is updated, as they'll teleport from the spawner's position to the amount that the entity has moved since.
-    // 
-    // Replicating the logic here fixes the teleporting ripple particles on levels that change the water level, like the water pyramid in
-    // Gobi's Valley after the jiggy is collected.
-    if (this->unk100) {
-        particle->position[1] = func_8034E698((Struct73s *)(this->unk100)) + this->unk104;
-    }
-
-    particle->initialSize_34 = particle->scale = randf2(this->particleStartingScaleRange_AC_min, this->particleStartingScaleRange_AC_max);
-    if(0.0f == this->particleFinalScaleRange_B4_min && 0.0f == this->particleFinalScaleRange_B4_max)
-        particle->finalSizeDiff = 0.0f;
-    else
-        particle->finalSizeDiff = randf2(this->particleFinalScaleRange_B4_min, this->particleFinalScaleRange_B4_max)- particle->initialSize_34;
-
-    particle->rotation[2] = 0.0f;
-    particle->rotation[1] = 0.0f;
-    particle->rotation[0] = 0.0f;
-
-    particle->angluar_velocity[0] = randf2(this->unkBC[0], this->unkC8[0]);
-    particle->angluar_velocity[1] = randf2(this->unkBC[1], this->unkC8[1]);
-    particle->angluar_velocity[2] = randf2(this->unkBC[2], this->unkC8[2]);
-    
-    particle->age_48 = 0.0f;
-    particle->lifetime_4C = randf2(this->particleLifeTimeRange[0], this->particleLifeTimeRange[1]) + 0.001;
-    if(!this->sphericalParticleVelocity_48){
-        particle->velocity_50[0] = randf2(this->particleVelocityRange_E4.cartisian_min_x, this->particleVelocityRange_E4.cartisian_max_x);
-        particle->velocity_50[1] = randf2(this->particleVelocityRange_E4.cartisian_min_y, this->particleVelocityRange_E4.cartisian_max_y);
-        particle->velocity_50[2] = randf2(this->particleVelocityRange_E4.cartisian_min_z, this->particleVelocityRange_E4.cartisian_max_z);
-    }
-    else{
-        func_80256E24(particle->velocity_50, 
-            mlNormalizeAngle(randf2(this->particleVelocityRange_E4.spherical.pitch_min, this->particleVelocityRange_E4.spherical.pitch_max)),
-            mlNormalizeAngle(randf2(this->particleVelocityRange_E4.spherical.yaw_min, this->particleVelocityRange_E4.spherical.yaw_max)),
-            0.0f,
-            0.0f,
-            randf2(this->particleVelocityRange_E4.spherical.radius_min, this->particleVelocityRange_E4.spherical.radius_max)
-        );
-    }
-    
-    // @recomp Set the particle's ID based on the particle spawn count.
-    set_particle_id(particle, particle_spawn_count);
-    // @recomp Increment the particle spawn count.
-    particle_spawn_count++;
-    if (particle_spawn_count >= NORMAL_PARTICLE_ID_MAX) {
-        particle_spawn_count = 0;
-    }
-}
-
-extern void mlMtxRotatePYR(f32, f32, f32);
-
-typedef struct {
-    BKSprite *sprite_0;
-    f32 position[3];
-    f32 rotation[3];
-    f32 unk1C;
-    s16 unk20[2];
-    u8 color[3];
-    u8  unk27;
-    u32 frame_28_31:8;
-    u32 unk28_23:2;
-    u32 unk28_21:8;
-    u32 unk28_13:1;
-    u32 unk28_12:1;
-    u32 pad28_11:12;
-} Struct_B8860_0s;
-
-void projectile_setRoll(u8 indx, f32 angle);
-f32 projectile_getRoll(u8 indx);
-void projectile_freeByIndex(u8 arg0);
-void func_803382FC(s32);
-void func_80338308(s32 arg0, s32 arg1);
-void func_8033837C(s32 arg0);
-void spriteRender_draw(Gfx **gfx, Vtx **vtx, BKSprite *sp, u32 frame);
-
-#define PROJECTILE_RESET_FLAG 0x1
-#define PROJECTILE_MOVED_FLAG 0x2
-
-extern Struct_B8860_0s D_80385000[0x32];
-u8 projectileSkipFlags[0x32];
-
-// @recomp Patched to indicate a projectile has been moved.
-RECOMP_PATCH void projectile_setPosition(u8 indx, f32 position[3]) {
-    ml_vec3f_copy(D_80385000[indx].position, position);
-
-    // @recomp Mark the projectile as moved only if the position is not at the origin.
-    if (ml_isNonzero_vec3f(position)) {
-        projectileSkipFlags[indx] |= PROJECTILE_MOVED_FLAG;
-    }
-}
-
-// @recomp Patched to indicate when projectiles have been reset.
-RECOMP_PATCH u8 func_8033FA84(void) {
-    int i;
-    for (i = 1; i < 0x32; i++) {
-        if (!D_80385000[i].unk28_13) {
-            ml_vec3f_clear(D_80385000[i].position);
-            ml_vec3f_clear(D_80385000[i].rotation);
-            D_80385000[i].frame_28_31 = 0;
-            D_80385000[i].unk28_13 = TRUE;
-            D_80385000[i].unk28_23 = 0;
-            D_80385000[i].unk28_21 = 0xb;
-            D_80385000[i].sprite_0 = NULL;
-            D_80385000[i].unk28_12 = TRUE;
-            D_80385000[i].unk20[0] = 100;
-            D_80385000[i].unk20[1] = 100;
-            D_80385000[i].color[0] = 0xff;
-            D_80385000[i].color[1] = 0xff;
-            D_80385000[i].color[2] = 0xff;
-            D_80385000[i].unk27 = 0xff;
-            D_80385000[i].unk1C = 0.0f;
-
-            // @recomp Mark the projectile as reset.
-            projectileSkipFlags[i] = PROJECTILE_RESET_FLAG;
-
-            return i;
-        }
-    }
-    return 0;
-}
-
-// @recomp Patched to tag projectiles.
-RECOMP_PATCH void func_8033F7F0(u8 indx, Gfx **gfx, Mtx **mtx, Vtx **vtx){
-    Struct_B8860_0s *sp54;
-    f32 sp48[3];
-    f32 sp3C[3];
-    f32 sp30[3];
-
-    sp54 = &D_80385000[indx];
-    if(sp54->unk28_23 != 1){
-        ml_vec3f_copy(sp48,  sp54->position);
-        sp48[1] += (sp54->unk1C*sp54->unk20[1])/100.0;
-        viewport_getPosition_vec3f(sp3C);
-        ml_vec3f_diff_copy(sp30, sp48, sp3C);
-        if(sp54->unk28_12){
-            mlMtxSet(viewport_getMatrix());
-        }
-        else{
-            mlMtxIdent();
-        }
-        mlMtxRotatePYR(sp54->rotation[0], sp54->rotation[1], sp54->rotation[2]);
-        func_80252330(sp30[0], sp30[1], sp30[2]);
-        mlMtxApply(*mtx);
-        // @recomp Remove unnecessary usage of OS_PHYSICAL_TO_K0 (which should actually be OS_K0_TO_PHYSICAL) to allow extended addresses.
-        gSPMatrix((*gfx)++, /*OS_PHYSICAL_TO_K0*/((*mtx)++), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        func_803382E4(sp54->unk28_21);
-        func_80338338(sp54->color[0], sp54->color[1],sp54->color[2]);
-        func_803382FC(sp54->unk27);
-        func_80338308(sp54->unk20[0], sp54->unk20[1]);
-        func_8033837C(1);
-        func_80338370();
-
-        // @recomp Set a matrix group before drawing the sprite. Skip interpolation if it was just freed.
-        u32 projectileID = PROJECTILE_TRANSFORM_ID_START + indx;
-        if (projectileSkipFlags[indx] & PROJECTILE_RESET_FLAG) {
-            gEXMatrixGroupSkipAll((*gfx)++, projectileID, G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
-
-            // @recomp Some projectiles are spawned but not used right away and are visible at (0, 0, 0) due to a bug
-            // (visible on the magic carpets and jiggies), so the reset flag is not cleared until the projectile is moved.
-            if (projectileSkipFlags[indx] & PROJECTILE_MOVED_FLAG) {
-                projectileSkipFlags[indx] &= ~PROJECTILE_RESET_FLAG;
-            }
-        }
-        else {
-            gEXMatrixGroupSimpleNormal((*gfx)++, projectileID, G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
-        }
-
-        spriteRender_draw(gfx, vtx, sp54->sprite_0, sp54->frame_28_31);
-        gSPPopMatrix((*gfx)++, G_MTX_MODELVIEW);
-
-        // @recomp Clear the matrix group.
-        gEXPopMatrixGroup((*gfx)++, G_MTX_MODELVIEW);
-    }
-}

patches/patches.h

@@ -20,7 +20,6 @@
 #define osCreateMesgQueue osCreateMesgQueue_recomp
 void osWriteBackDCacheAll(void);
 #define bzero bzero_recomp
-#define bcopy bcopy_recomp
 #define osDpSetStatus osDpSetStatus_recomp
 #define malloc malloc_recomp
 #define free free_recomp
@@ -29,10 +28,6 @@ void osWriteBackDCacheAll(void);
 #define strchr strchr_recomp
 #define strlen strlen_recomp
 #define osVirtualToPhysical osVirtualToPhysical_recomp
-#define osPiStartDma osPiStartDma_recomp
-#define sinf sinf_recomp
-#define cosf __cosf_recomp
-#define osContGetReadData osContGetReadData_recomp
 
 #include "ultra64.h"
 #pragma GCC diagnostic push
@@ -41,10 +36,6 @@ void osWriteBackDCacheAll(void);
 #pragma GCC diagnostic pop
 #include "rt64_extended_gbi.h"
 
-#ifndef ARRLEN
-#   define ARRLEN(x) ((s32)(sizeof(x) / sizeof(x[0])))
-#endif
-
 #ifndef gEXFillRectangle
 #define gEXFillRectangle(cmd, lorigin, rorigin, ulx, uly, lrx, lry) \
     G_EX_COMMAND2(cmd, \
@@ -56,41 +47,29 @@ void osWriteBackDCacheAll(void);
     )
 #endif
 
-#define gEXMatrixGroupSkipAll(cmd, id, push, proj, edit) \
-    gEXMatrixGroup(cmd, id, G_EX_INTERPOLATE_SIMPLE, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_ORDER_LINEAR, edit, G_EX_ASPECT_AUTO, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP)
+#define gEXMatrixGroupNoInterpolation(cmd, push, proj, edit) \
+    gEXMatrixGroup(cmd, G_EX_ID_IGNORE, G_EX_INTERPOLATE_SIMPLE, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_ORDER_LINEAR, edit)
 
-#define gEXMatrixGroupSkipAllAspect(cmd, id, push, proj, edit, aspect) \
-    gEXMatrixGroup(cmd, id, G_EX_INTERPOLATE_SIMPLE, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_ORDER_LINEAR, edit, aspect, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP)
-
-#define gEXMatrixGroupSimpleNormal(cmd, id, push, proj, edit) \
-    gEXMatrixGroup(cmd, id, G_EX_INTERPOLATE_SIMPLE, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_ASPECT_AUTO, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_AUTO)
-    
-#define gEXMatrixGroupSimpleVerts(cmd, id, push, proj, edit) \
-    gEXMatrixGroup(cmd, id, G_EX_INTERPOLATE_SIMPLE, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_ASPECT_AUTO, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_AUTO)
-
-#define gEXMatrixGroupSimpleVertsSkipRot(cmd, id, push, proj, edit) \
-    gEXMatrixGroup(cmd, id, G_EX_INTERPOLATE_SIMPLE, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_ASPECT_AUTO, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_AUTO)
+#define gEXMatrixGroupInterpolateOnlyTiles(cmd, push, proj, edit) \
+    gEXMatrixGroup(cmd, G_EX_ID_IGNORE, G_EX_INTERPOLATE_SIMPLE, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit)
 
 #define gEXMatrixGroupDecomposedNormal(cmd, id, push, proj, edit) \
-    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_AUTO)
-
-#define gEXMatrixGroupDecomposedNormalTcs(cmd, id, push, proj, edit) \
-    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_AUTO)
+    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit)
 
 #define gEXMatrixGroupDecomposedSkipRot(cmd, id, push, proj, edit) \
-    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_AUTO)
+    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit)
 
 #define gEXMatrixGroupDecomposedSkipPosRot(cmd, id, push, proj, edit) \
-    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_AUTO)
+    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit)
+
+#define gEXMatrixGroupDecomposedSkipAll(cmd, id, push, proj, edit) \
+    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit)
 
 #define gEXMatrixGroupDecomposedVerts(cmd, id, push, proj, edit) \
-    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_AUTO)
-
-#define gEXMatrixGroupDecomposedVertsSkipRot(cmd, id, push, proj, edit) \
-    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_AUTO)
+    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit)
 
 #define gEXMatrixGroupDecomposedVertsOrderAuto(cmd, id, push, proj, edit) \
-    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_AUTO, edit, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_AUTO)
+    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_AUTO, edit)
 
 typedef int bool;
 
@@ -99,10 +78,4 @@ void memcpy(void * dst, void *src, int size);
 char* strchr(const char* s, int c);
 int recomp_printf(const char* fmt, ...);
 
-void set_additional_model_scale(f32 x, f32 y, f32 z);
-void set_frustum_checks_enabled(int enabled);
-void set_all_interpolation_skipped(bool skipped);
-bool all_interpolation_skipped();
-bool perspective_interpolation_skipped();
-
 #endif

patches/pause_menu_patches.c

@@ -1,42 +0,0 @@
-#include "patches.h"
-#include "core1/core1.h"
-
-extern Gfx D_8036C630[];
-extern Gfx D_8036C690[];
-
-// @recomp Patched to fix artifacts in the pause menu background when using wide aspect ratios. Rewritten to draw rows instead of tiles to avoid issues when upscaling the effect.
-RECOMP_PATCH void func_80314BB0(Gfx **gfx, Mtx **mtx, Vtx **vtx, void *frame_buffer_1, void *frame_buffer_2) {
-    s32 x;
-    s32 y;
-
-    gSPDisplayList((*gfx)++, D_8036C630);
-    gDPSetColorImage((*gfx)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gFramebufferWidth, OS_PHYSICAL_TO_K0(frame_buffer_1));
-
-#if 1
-    // @recomp New implementation that uses rows instead of tiles. Remove unnecessary usage of osVirtualToPhysical.
-    for (y = 0; y < gFramebufferHeight / 7 + 1; y++) {
-        gDPLoadTextureTile((*gfx)++, /*osVirtualToPhysical*/(frame_buffer_2), G_IM_FMT_RGBA, G_IM_SIZ_16b, gFramebufferWidth, gFramebufferHeight,
-            0, y * 7, gFramebufferWidth - 1, MIN((y + 1) * 7, gFramebufferHeight) - 1,
-            NULL, G_TX_CLAMP, G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, 0, 0
-        );
-        gSPScisTextureRectangle((*gfx)++, 0, (y * 7) * 4, gFramebufferWidth * 4, MIN((y + 1) * 7, gFramebufferHeight) * 4,
-            G_TX_RENDERTILE, 0, (y * 7) << 5, 0x400, 0x400
-        );
-    }
-#else
-    for (y = 0; y < gFramebufferHeight / 32 + 1; y++) {
-        for (x = 0; x < gFramebufferWidth / 32 + 1; x++) {
-            gDPLoadTextureTile((*gfx)++, osVirtualToPhysical(frame_buffer_2), G_IM_FMT_RGBA, G_IM_SIZ_16b, gFramebufferWidth, gFramebufferHeight,
-                0x20 * x, 0x20 * y, 0x20 * (x + 1) - 1, 0x20 * (y + 1) - 1,
-                NULL, G_TX_CLAMP, G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, 0, 0
-            );
-            gSPScisTextureRectangle((*gfx)++, (0x20 * x) * 4, (0x20 * y) * 4, 0x20 * (x + 1) * 4, (0x20 * (y + 1) * 4),
-                G_TX_RENDERTILE, (0x20 * x) << 5, (0x20 * y) << 5, 0x400, 0x400
-            );
-        }
-    }
-#endif
-
-    gSPDisplayList((*gfx)++, D_8036C690);
-    gDPSetColorImage((*gfx)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gFramebufferWidth, OS_PHYSICAL_TO_K0(gFramebuffers[getActiveFramebuffer()]));
-}