update cargo packages

use rust 2024 edition (#268 )
add note about building on linux
2026-07-11 09:35:21 +02:00 · 2025-02-20 18:21:15 +01:00 · 2025-02-20 18:20:55 +01:00 · 2025-02-20 16:12:31 +01:00 · 2025-02-20 12:46:44 +01:00 · 2025-02-19 20:57:03 +01:00
41 changed files with 1246 additions and 695 deletions
@@ -18,8 +18,10 @@ jobs:
        include:
          - os: ubuntu-24.04
            target: x86_64-unknown-linux-gnu
+            arch: linux-x86_64
          - os: ubuntu-24.04-arm
            target: aarch64-unknown-linux-gnu
+            arch: linux-aarch64
    steps:
      - uses: actions/checkout@v4
        with:
@@ -43,18 +45,22 @@ jobs:
      - name: Build
        run: |
          cargo build --release -v --target=${{ matrix.target }}
+          mkdir output
+          cp target/${{ matrix.target }}/release/gopher64 output/gopher64-${{ matrix.arch }}
      - name: Upload file
        uses: actions/upload-artifact@v4
        with:
-          name: gopher64-${{ matrix.target }}
-          path: target/${{ matrix.target }}/release/gopher64
+          name: gopher64-${{ matrix.arch }}
+          path: output/gopher64-${{ matrix.arch }}

  build-windows:
    runs-on: windows-2025
    strategy:
      fail-fast: false
      matrix:
-        target: [x86_64-pc-windows-msvc]
+        include:
+          - target: x86_64-pc-windows-msvc
+            arch: windows-x86_64
    steps:
      - uses: actions/checkout@v4
        with:
@@ -66,18 +72,24 @@ jobs:
      - name: Build
        run: |
          cargo build --release -v --target=${{ matrix.target }}
+          mkdir output
+          cp target/${{ matrix.target }}/release/gopher64.exe output/gopher64-${{ matrix.arch }}.exe
      - name: Upload file
        uses: actions/upload-artifact@v4
        with:
-          name: gopher64-${{ matrix.target }}
-          path: target/${{ matrix.target }}/release/gopher64.exe
+          name: gopher64-${{ matrix.arch }}
+          path: output/gopher64-${{ matrix.arch }}.exe

  build-macos:
    runs-on: macos-14
    strategy:
      fail-fast: false
      matrix:
-        target: [x86_64-apple-darwin, aarch64-apple-darwin]
+        include:
+          - target: x86_64-apple-darwin
+            arch: mac-x86_64
+          - target: aarch64-apple-darwin
+            arch: mac-aarch64
    steps:
      - uses: actions/checkout@v4
        with:
@@ -89,8 +101,10 @@ jobs:
      - name: Build
        run: |
          cargo build --release -v --target=${{ matrix.target }}
+          mkdir output
+          cp target/${{ matrix.target }}/release/gopher64 output/gopher64-${{ matrix.arch }}
      - name: Upload file
        uses: actions/upload-artifact@v4
        with:
-          name: gopher64-${{ matrix.target }}
-          path: target/${{ matrix.target }}/release/gopher64
+          name: gopher64-${{ matrix.arch }}
+          path: output/gopher64-${{ matrix.arch }}
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4

 [[package]]
 name = "ab_glyph"
@@ -54,7 +54,7 @@ dependencies = [
 "getrandom 0.2.15",
 "once_cell",
 "version_check",
- "zerocopy",
+ "zerocopy 0.7.35",
 ]

 [[package]]
@@ -215,7 +215,7 @@ dependencies = [
 "enumflags2",
 "futures-channel",
 "futures-util",
- "rand",
+ "rand 0.8.5",
 "raw-window-handle",
 "serde",
 "serde_repr",
@@ -485,9 +485,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.2.13"
+version = "1.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
+checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9"
 dependencies = [
 "jobserver",
 "libc",
@@ -567,9 +567,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.28"
+version = "4.5.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e77c3243bd94243c03672cb5154667347c457ca271254724f9f393aee1c05ff"
+checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -577,9 +577,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.27"
+version = "4.5.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7"
+checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
 dependencies = [
 "anstream",
 "anstyle",
@@ -887,9 +887,9 @@ dependencies = [

 [[package]]
 name = "document-features"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0"
+checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
 dependencies = [
 "litrs",
 ]
@@ -1107,9 +1107,9 @@ dependencies = [

 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

 [[package]]
 name = "errno"
@@ -1482,7 +1482,7 @@ dependencies = [

 [[package]]
 name = "gopher64"
-version = "1.0.5"
+version = "1.0.8"
 dependencies = [
 "bindgen",
 "cc",
@@ -1529,7 +1529,7 @@ dependencies = [
 "parking_lot",
 "portable-atomic",
 "quanta",
- "rand",
+ "rand 0.8.5",
 "smallvec",
 "spinning_top",
 ]
@@ -1575,9 +1575,9 @@ dependencies = [

 [[package]]
 name = "h2"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
+checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
 dependencies = [
 "atomic-waker",
 "bytes",
@@ -2221,9 +2221,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"

 [[package]]
 name = "miniz_oxide"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
+checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b"
 dependencies = [
 "adler2",
 "simd-adler32",
@@ -2821,7 +2821,7 @@ version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
- "zerocopy",
+ "zerocopy 0.7.35",
 ]

 [[package]]
@@ -2908,7 +2908,7 @@ checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
 "bytes",
 "getrandom 0.2.15",
- "rand",
+ "rand 0.8.5",
 "ring",
 "rustc-hash 2.1.1",
 "rustls",
@@ -2922,9 +2922,9 @@ dependencies = [

 [[package]]
 name = "quinn-udp"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
+checksum = "e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944"
 dependencies = [
 "cfg_aliases",
 "libc",
@@ -2950,8 +2950,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
 "libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.1",
+ "zerocopy 0.8.20",
 ]

 [[package]]
@@ -2961,7 +2972,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
 "ppv-lite86",
- "rand_core",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.1",
 ]

 [[package]]
@@ -2974,10 +2995,20 @@ dependencies = [
 ]

 [[package]]
-name = "raw-cpuid"
-version = "11.3.0"
+name = "rand_core"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6928fa44c097620b706542d428957635951bade7143269085389d42c8a4927e"
+checksum = "a88e0da7a2c97baa202165137c158d0a2e824ac465d13d81046727b34cb247d3"
+dependencies = [
+ "getrandom 0.3.1",
+ "zerocopy 0.8.20",
+]
+
+[[package]]
+name = "raw-cpuid"
+version = "11.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "529468c1335c1c03919960dfefdb1b3648858c20d7ec2d0663e728e4a717efbc"
 dependencies = [
 "bitflags 2.8.0",
 ]
@@ -3123,15 +3154,14 @@ dependencies = [

 [[package]]
 name = "ring"
-version = "0.17.8"
+version = "0.17.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "e75ec5e92c4d8aede845126adc388046234541629e76029599ed35a003c7ed24"
 dependencies = [
 "cc",
 "cfg-if",
 "getrandom 0.2.15",
 "libc",
- "spin",
 "untrusted",
 "windows-sys 0.52.0",
 ]
@@ -3184,9 +3214,9 @@ dependencies = [

 [[package]]
 name = "rustls"
-version = "0.23.22"
+version = "0.23.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
+checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
 dependencies = [
 "once_cell",
 "ring",
@@ -3293,9 +3323,9 @@ checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"

 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
 dependencies = [
 "serde_derive",
 ]
@@ -3311,9 +3341,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3322,9 +3352,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.138"
+version = "1.0.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
+checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
 dependencies = [
 "itoa",
 "memchr",
@@ -3435,9 +3465,9 @@ dependencies = [

 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"

 [[package]]
 name = "smithay-client-toolkit"
@@ -3609,9 +3639,9 @@ dependencies = [

 [[package]]
 name = "tempfile"
-version = "3.16.0"
+version = "3.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91"
+checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
 dependencies = [
 "cfg-if",
 "fastrand",
@@ -3892,17 +3922,16 @@ checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"

 [[package]]
 name = "tungstenite"
-version = "0.26.1"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413083a99c579593656008130e29255e54dcaae495be556cc26888f211648c24"
+checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
 dependencies = [
- "byteorder",
 "bytes",
 "data-encoding",
 "http",
 "httparse",
 "log",
- "rand",
+ "rand 0.9.0",
 "sha1",
 "thiserror 2.0.11",
 "utf-8",
@@ -3919,9 +3948,9 @@ dependencies = [

 [[package]]
 name = "typenum"
-version = "1.17.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"

 [[package]]
 name = "uds_windows"
@@ -3936,9 +3965,9 @@ dependencies = [

 [[package]]
 name = "unicode-ident"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
+checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"

 [[package]]
 name = "unicode-segmentation"
@@ -4766,9 +4795,9 @@ dependencies = [

 [[package]]
 name = "winnow"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59690dea168f2198d1a3b0cac23b8063efcd11012f10ae4698f284808c8ef603"
+checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
 dependencies = [
 "memchr",
 ]
@@ -4964,7 +4993,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
 "byteorder",
- "zerocopy-derive",
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dde3bb8c68a8f3f1ed4ac9221aad6b10cece3e60a8e2ea54a6a2dec806d0084c"
+dependencies = [
+ "zerocopy-derive 0.8.20",
 ]

 [[package]]
@@ -4978,6 +5016,17 @@ dependencies = [
 "syn",
 ]

+[[package]]
+name = "zerocopy-derive"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "zerofrom"
 version = "0.1.5"
@@ -5061,7 +5110,7 @@ dependencies = [
 "lzma-rs",
 "memchr",
 "pbkdf2",
- "rand",
+ "rand 0.8.5",
 "sha1",
 "thiserror 2.0.11",
 "time",
@@ -1,8 +1,8 @@
 [package]
 name = "gopher64"
-version = "1.0.5"
-edition = "2021"
-rust-version = "1.82"
+version = "1.0.8"
+edition = "2024"
+rust-version = "1.85"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

@@ -29,7 +29,7 @@ tungstenite = "0.26"
 socket2 = "0.5"
 fatfs = "0.3"
 postcard = { version = "1.1", features = ["use-std"] }
-clap = { version = "4.4", features = ["derive"] }
+clap = { version = "4.5", features = ["derive"] }
 reqwest = { version = "0.12", default-features = false, features = ["http2","rustls-tls","charset","json"] }

 [build-dependencies]
@@ -39,3 +39,5 @@ cc = { version = "1.2", features = ["parallel"] }

 [profile.release]
 codegen-units = 1
+strip = true
+panic = "abort"
@@ -1,41 +1,17 @@
 # gopher64
-(gopher64 also has a GUI that can be launched by just running the executable)
+Gopher64 can be used via its GUI or the command line.

-```
-Usage: gopher64 [OPTIONS] [GAME]
+## wiki

-Arguments:
-  [GAME]  
+https://github.com/gopher64/gopher64/wiki

-Options:
-  -f, --fullscreen
-          
-  -c, --configure-input-profile <PROFILE_NAME>
-          Create a new input profile (keyboard/gamepad mappings).
-  -u, --use-dinput
-          Use DirectInput when configuring a new input profile.
-  -b, --bind-input-profile <PROFILE_NAME>
-          Must also specify --port. Used to bind a previously created profile to a port
-  -l, --list-controllers
-          Lists connected controllers which can be used in --assign-controller
-  -a, --assign-controller <CONTROLLER_NUMBER>
-          Must also specify --port. Used to assign a controller listed in --list-controllers to a port
-  -p, --port <PORT>
-          Valid values: 1-4. To be used alongside --bind-input-profile and --assign-controller
-  -z, --clear-input-bindings
-          Clear all input profile bindings and controller assignments
-  -h, --help
-          Print help
-  -V, --version
-          Print version
-```
 ## discord

 https://discord.gg/9RGXq8W8JQ

 ## controls

-Keys are mapped according to mupen64plus defaults: https://mupen64plus.org/wiki/index.php/KeyboardSetup#2._Default_Key_Mappings_for_SDL-Input_Plugin. Xbox-style controllers also have a default mapping applied.
+Keys are mapped according to [these defaults](https://github.com/gopher64/gopher64/wiki/Default-Keyboard-Setup). Xbox-style controllers also have a [default mapping applied](https://github.com/gopher64/gopher64/wiki/Default-Gamepad-Setup).

 You can create you own mappings by running `./gopher64 --configure-input-profile my_profile`. You then bind that profile to a port: `./gopher64 --bind-input-profile my_profile --port 1`

@@ -57,11 +33,12 @@ If you would like to keep all the game data in the same folder as executable, yo

 ## building and usage

-1. Install rust: https://www.rust-lang.org/tools/install
-2. `git clone --recursive https://github.com/gopher64/gopher64.git`
-3. `cd gopher64`
-4. `cargo build --release`
-5. `./target/release/gopher64 /path/to/rom.z64`
+1. Linux only: install the SDL3 dependencies: https://wiki.libsdl.org/SDL3/README/linux
+2. Install rust: https://www.rust-lang.org/tools/install
+3. `git clone --recursive https://github.com/gopher64/gopher64.git`
+4. `cd gopher64`
+5. `cargo build --release`
+6. `./target/release/gopher64 /path/to/rom.z64`

 ## contributing

@@ -101,6 +101,8 @@ fn main() {
        .allowlist_function("rdp_process_commands")
        .allowlist_function("rdp_check_callback")
        .allowlist_function("rdp_new_processor")
+        .allowlist_function("rdp_check_framebuffers")
+        .allowlist_function("rdp_full_sync")
        .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
        .generate()
        .expect("Unable to generate bindings");
@@ -64,6 +64,22 @@ static CALL_BACK callback;
 static GFX_INFO gfx_info;
 static uint32_t region;

+typedef struct
+{
+	uint32_t depthbuffer_address;
+	uint32_t framebuffer_address;
+	uint32_t framebuffer_pixel_size;
+	uint32_t framebuffer_width;
+	uint32_t framebuffer_height;
+	uint32_t framebuffer_size;
+	uint32_t depthbuffer_size;
+	uint8_t depthbuffer_enabled;
+} FrameBufferInfo;
+
+static uint8_t *rdram_dirty;
+static uint64_t sync_signal;
+static FrameBufferInfo frame_buffer_info;
+
 static const unsigned cmd_len_lut[64] = {
 	1,
 	1,
@@ -141,10 +157,23 @@ bool sdl_event_filter(void *userdata, SDL_Event *event)
 	{
 		wsi_platform->do_resize();
 	}
-	else if (event->type == SDL_EVENT_KEY_DOWN)
+	else if (event->type == SDL_EVENT_KEY_DOWN && !event->key.repeat)
 	{
 		switch (event->key.scancode)
 		{
+		case SDL_SCANCODE_RETURN:
+			if (event->key.mod & SDL_KMOD_ALT)
+			{
+				fullscreen = !fullscreen;
+				SDL_SetWindowFullscreen(window, fullscreen);
+			}
+			break;
+		case SDL_SCANCODE_F:
+			if (event->key.mod & SDL_KMOD_ALT)
+			{
+				callback.enable_speedlimiter = !callback.enable_speedlimiter;
+			}
+			break;
 		case SDL_SCANCODE_ESCAPE:
 			if (fullscreen)
 				callback.emu_running = false;
@@ -163,23 +192,34 @@ bool sdl_event_filter(void *userdata, SDL_Event *event)
 	return 0;
 }

-void rdp_new_processor(GFX_INFO _gfx_info, bool _upscale)
+void rdp_new_processor(GFX_INFO _gfx_info, uint32_t upscale)
 {
+	memset(&frame_buffer_info, 0, sizeof(FrameBufferInfo));
+	sync_signal = 0;
+	memset(rdram_dirty, 0, gfx_info.RDRAM_SIZE / 8);
+
 	gfx_info = _gfx_info;
 	if (processor)
 	{
 		delete processor;
 	}
 	RDP::CommandProcessorFlags flags = 0;
-	if (_upscale)
+
+	if (upscale == 2)
 	{
-		flags |= RDP::COMMAND_PROCESSOR_FLAG_UPSCALING_2X_BIT;
 		flags |= RDP::COMMAND_PROCESSOR_FLAG_SUPER_SAMPLED_DITHER_BIT;
+		flags |= RDP::COMMAND_PROCESSOR_FLAG_UPSCALING_2X_BIT;
 	}
+	else if (upscale == 4)
+	{
+		flags |= RDP::COMMAND_PROCESSOR_FLAG_SUPER_SAMPLED_DITHER_BIT;
+		flags |= RDP::COMMAND_PROCESSOR_FLAG_UPSCALING_4X_BIT;
+	}
+
 	processor = new RDP::CommandProcessor(wsi->get_device(), gfx_info.RDRAM, 0, gfx_info.RDRAM_SIZE, gfx_info.RDRAM_SIZE / 2, flags);
 }

-void rdp_init(void *_window, GFX_INFO _gfx_info, bool _upscale, bool _integer_scaling, bool _fullscreen)
+void rdp_init(void *_window, GFX_INFO _gfx_info, uint32_t _upscale, bool _integer_scaling, bool _fullscreen)
 {
 	window = (SDL_Window *)_window;
 	bool result = SDL_AddEventWatch(sdl_event_filter, nullptr);
@@ -208,6 +248,8 @@ void rdp_init(void *_window, GFX_INFO _gfx_info, bool _upscale, bool _integer_sc
 	{
 		rdp_close();
 	}
+
+	rdram_dirty = (uint8_t *)malloc(gfx_info.RDRAM_SIZE / 8);
 	rdp_new_processor(gfx_info, _upscale);

 	if (!processor->device_is_supported())
@@ -220,10 +262,17 @@ void rdp_init(void *_window, GFX_INFO _gfx_info, bool _upscale, bool _integer_sc
 	wsi->begin_frame();

 	callback.emu_running = true;
+	callback.enable_speedlimiter = true;
 }

 void rdp_close()
 {
+	if (rdram_dirty)
+	{
+		free(rdram_dirty);
+		rdram_dirty = nullptr;
+	}
+
 	wsi->end_frame();

 	if (processor)
@@ -245,8 +294,8 @@ void rdp_close()

 static void calculate_viewport(float *x, float *y, float *width, float *height)
 {
-	const int32_t display_width = 320;
-	const int32_t display_height = 240;
+	const int32_t display_width = gfx_info.PAL ? 384 : 320;
+	const int32_t display_height = gfx_info.PAL ? 288 : 240;

 	int w, h;
 	SDL_GetWindowSize(window, &w, &h);
@@ -355,6 +404,41 @@ CALL_BACK rdp_check_callback()
 	return return_value;
 }

+void rdp_check_framebuffers(uint32_t address)
+{
+	if (sync_signal && rdram_dirty[address >> 3])
+	{
+		processor->wait_for_timeline(sync_signal);
+		memset(rdram_dirty, 0, gfx_info.RDRAM_SIZE / 8);
+		sync_signal = 0;
+	}
+}
+
+void rdp_full_sync()
+{
+	processor->wait_for_timeline(processor->signal_timeline());
+}
+
+void calculate_buffer_size()
+{
+	switch (frame_buffer_info.framebuffer_pixel_size)
+	{
+	case 0:
+		frame_buffer_info.framebuffer_size = (frame_buffer_info.framebuffer_width * frame_buffer_info.framebuffer_height / 2) >> 3;
+		break;
+	case 1:
+		frame_buffer_info.framebuffer_size = (frame_buffer_info.framebuffer_width * frame_buffer_info.framebuffer_height) >> 3;
+		break;
+	case 2:
+		frame_buffer_info.framebuffer_size = (frame_buffer_info.framebuffer_width * frame_buffer_info.framebuffer_height * 2) >> 3;
+		break;
+	case 3:
+		frame_buffer_info.framebuffer_size = (frame_buffer_info.framebuffer_width * frame_buffer_info.framebuffer_height * 4) >> 3;
+		break;
+	}
+	frame_buffer_info.depthbuffer_size = (frame_buffer_info.framebuffer_width * frame_buffer_info.framebuffer_height * 2) >> 3;
+}
+
 uint64_t rdp_process_commands()
 {
 	uint64_t interrupt_timer = 0;
@@ -416,18 +500,55 @@ uint64_t rdp_process_commands()
 		if (command >= 8)
 			processor->enqueue_command(cmd_length * 2, &cmd_data[2 * cmd_cur]);

-		if (RDP::Op(command) == RDP::Op::SetScissor)
+		if ((RDP::Op(command) >= RDP::Op::FillTriangle && RDP::Op(command) <= RDP::Op::ShadeTextureZBufferTriangle) ||
+			RDP::Op(command) == RDP::Op::TextureRectangle ||
+			RDP::Op(command) == RDP::Op::TextureRectangleFlip ||
+			RDP::Op(command) == RDP::Op::FillRectangle)
+		{
+			if (!rdram_dirty[frame_buffer_info.framebuffer_address])
+			{
+				for (uint32_t i = frame_buffer_info.framebuffer_address; i < frame_buffer_info.framebuffer_address + frame_buffer_info.framebuffer_size; ++i)
+				{
+					rdram_dirty[i] = 1;
+				}
+			}
+
+			if (frame_buffer_info.depthbuffer_enabled && !rdram_dirty[frame_buffer_info.depthbuffer_address])
+			{
+				for (uint32_t i = frame_buffer_info.depthbuffer_address; i < frame_buffer_info.depthbuffer_address + frame_buffer_info.depthbuffer_size; ++i)
+				{
+					rdram_dirty[i] = 1;
+				}
+			}
+		}
+		else if (RDP::Op(command) == RDP::Op::SetOtherModes)
+		{
+			frame_buffer_info.depthbuffer_enabled = (w2 >> 5) & 1;
+		}
+		else if (RDP::Op(command) == RDP::Op::SetColorImage)
+		{
+			frame_buffer_info.framebuffer_address = (w2 & 0x00FFFFFF) >> 3;
+			frame_buffer_info.framebuffer_pixel_size = (w1 >> 19) & 0x3;
+			frame_buffer_info.framebuffer_width = (w1 & 0x3FF) + 1;
+			calculate_buffer_size();
+		}
+		else if (RDP::Op(command) == RDP::Op::SetMaskImage)
+		{
+			frame_buffer_info.depthbuffer_address = (w2 & 0x00FFFFFF) >> 3;
+		}
+		else if (RDP::Op(command) == RDP::Op::SetScissor)
 		{
 			uint32_t upper_left_x = ((w1 >> 12) & 0xFFF) >> 2;
 			uint32_t upper_left_y = (w1 & 0xFFF) >> 2;
 			uint32_t lower_right_x = ((w2 >> 12) & 0xFFF) >> 2;
 			uint32_t lower_right_y = (w2 & 0xFFF) >> 2;
 			region = (lower_right_x - upper_left_x) * (lower_right_y - upper_left_y);
+			frame_buffer_info.framebuffer_height = lower_right_y;
+			calculate_buffer_size();
 		}
-		if (RDP::Op(command) == RDP::Op::SyncFull)
+		else if (RDP::Op(command) == RDP::Op::SyncFull)
 		{
-			processor->wait_for_timeline(processor->signal_timeline());
-
+			sync_signal = processor->signal_timeline();
 			interrupt_timer = region;
 			if (interrupt_timer == 0)
 				interrupt_timer = 5000;
@@ -16,6 +16,7 @@ extern "C"
 		uint32_t *DPC_START_REG;
 		uint32_t *DPC_END_REG;
 		uint32_t *DPC_STATUS_REG;
+		bool PAL;
 	} GFX_INFO;

 	typedef struct
@@ -23,15 +24,18 @@ extern "C"
 		bool emu_running;
 		bool save_state;
 		bool load_state;
+		bool enable_speedlimiter;
 	} CALL_BACK;

-	void rdp_init(void *_window, GFX_INFO _gfx_info, bool _upscale, bool _integer_scaling, bool _fullscreen);
+	void rdp_init(void *_window, GFX_INFO _gfx_info, uint32_t _upscale, bool _integer_scaling, bool _fullscreen);
 	void rdp_close();
 	void rdp_set_vi_register(uint32_t reg, uint32_t value);
 	void rdp_update_screen();
 	CALL_BACK rdp_check_callback();
 	uint64_t rdp_process_commands();
-	void rdp_new_processor(GFX_INFO _gfx_info, bool _upscale);
+	void rdp_new_processor(GFX_INFO _gfx_info, uint32_t _upscale);
+	void rdp_check_framebuffers(uint32_t address);
+	void rdp_full_sync();

 #ifdef __cplusplus
 }
@@ -61,7 +61,6 @@ void SDL_WSIPlatform::poll_input()

 void SDL_WSIPlatform::poll_input_async(Granite::InputTrackerHandler *handler)
 {
-	SDL_PumpEvents();
 }

 void SDL_WSIPlatform::set_window(SDL_Window *_window)
@@ -66,7 +66,6 @@ pub fn run_game(rom_contents: Vec<u8>, device: &mut Device) {

    ui::storage::init(&mut device.ui, &device.cart.rom);
    ui::storage::load_saves(&mut device.ui, &mut device.netplay);
-    cart::rom::load_rom_save(device);

    cpu::run(device);

@@ -358,6 +357,7 @@ impl Device {
                        pc: 0,
                    },
                    broken: false,
+                    running: false,
                    halted: false,
                    sync_point: false,
                    cycle_counter: 0,
@@ -435,8 +435,15 @@ impl Device {
                field: 0,
                delay: 0,
                count_per_scanline: 0,
+                enable_speed_limiter: true,
                limiter: None,
                vi_counter: 0,
+                last_origin: 0,
+                internal_frame_counter: 0,
+                min_wait_time: std::time::Duration::from_secs(1),
+                frame_time: 0.0,
+                limit_freq: 2,
+                limit_freq_check: std::time::Instant::now(),
            },
            vru_window: controller::vru::VruWindow {
                window_notifier: None,
@@ -126,8 +126,8 @@ pub fn process(device: &mut device::Device, channel: usize) {
 }

 fn format_eeprom(device: &mut device::Device) {
-    if device.ui.saves.eeprom.0.len() < EEPROM_MAX_SIZE {
-        device.ui.saves.eeprom.0.resize(EEPROM_MAX_SIZE, 0xFF)
+    if device.ui.saves.eeprom.data.len() < EEPROM_MAX_SIZE {
+        device.ui.saves.eeprom.data.resize(EEPROM_MAX_SIZE, 0xFF)
    }
 }

@@ -137,7 +137,7 @@ fn eeprom_read_block(device: &mut device::Device, block: usize, offset: usize) {
    format_eeprom(device);

    device.pif.ram[offset..offset + EEPROM_BLOCK_SIZE]
-        .copy_from_slice(&device.ui.saves.eeprom.0[address..address + EEPROM_BLOCK_SIZE]);
+        .copy_from_slice(&device.ui.saves.eeprom.data[address..address + EEPROM_BLOCK_SIZE]);
 }

 fn eeprom_write_block(device: &mut device::Device, block: usize, offset: usize, status: usize) {
@@ -145,12 +145,12 @@ fn eeprom_write_block(device: &mut device::Device, block: usize, offset: usize,

    format_eeprom(device);

-    device.ui.saves.eeprom.0[address..address + EEPROM_BLOCK_SIZE]
+    device.ui.saves.eeprom.data[address..address + EEPROM_BLOCK_SIZE]
        .copy_from_slice(&device.pif.ram[offset..offset + EEPROM_BLOCK_SIZE]);

    device.pif.ram[status] = 0x00;

-    device.ui.saves.eeprom.1 = true
+    device.ui.saves.eeprom.written = true
 }

 fn time2data(device: &mut device::Device, offset: usize) {
@@ -3,17 +3,29 @@ use sha2::{Digest, Sha256};

 const CART_MASK: usize = 0xFFFFFFF;

+fn read_cart_word(device: &mut device::Device, address: usize) -> u32 {
+    let mut data: [u8; 4] = device.cart.rom[address..address + 4].try_into().unwrap();
+    for i in 0..4 {
+        if device
+            .ui
+            .saves
+            .romsave
+            .data
+            .contains_key(&(address as u32 + i))
+        {
+            data[i as usize] = device.ui.saves.romsave.data[&(address as u32 + i)];
+        }
+    }
+    u32::from_be_bytes(data)
+}
+
 pub fn read_mem_fast(
    device: &mut device::Device,
    address: u64,
    _access_size: device::memory::AccessSize,
 ) -> u32 {
    let masked_address = address as usize & CART_MASK;
-    u32::from_be_bytes(
-        device.cart.rom[masked_address..masked_address + 4]
-            .try_into()
-            .unwrap(),
-    )
+    read_cart_word(device, masked_address)
 }

 pub fn read_mem(
@@ -29,31 +41,24 @@ pub fn read_mem(
        device.cart.latch
    } else {
        let masked_address = address as usize & CART_MASK;
-        u32::from_be_bytes(
-            device.cart.rom[masked_address..masked_address + 4]
-                .try_into()
-                .unwrap(),
-        )
+        read_cart_word(device, masked_address)
    }
 }

 pub fn write_mem(device: &mut device::Device, address: u64, value: u32, mask: u32) {
    if device.cart.sc64.cfg[device::cart::sc64::SC64_ROM_WRITE_ENABLE as usize] != 0 {
        let masked_address = address as usize & CART_MASK;
-        let mut data = u32::from_be_bytes(
-            device.cart.rom[masked_address..masked_address + 4]
-                .try_into()
-                .unwrap(),
-        );
+        let mut data = read_cart_word(device, masked_address);
        device::memory::masked_write_32(&mut data, value, mask);
-        device.cart.rom[masked_address..masked_address + 4].copy_from_slice(&data.to_be_bytes());
-        for i in 0..4 {
-            device.ui.saves.romsave.0.insert(
-                (masked_address + i) as u32,
-                device.cart.rom[masked_address + i],
-            );
+        for (i, item) in data.to_be_bytes().iter().enumerate() {
+            device
+                .ui
+                .saves
+                .romsave
+                .data
+                .insert((masked_address + i) as u32, *item);
        }
-        device.ui.saves.romsave.1 = true;
+        device.ui.saves.romsave.written = true;
    }

    device.cart.latch = value & mask;
@@ -80,17 +85,12 @@ pub fn dma_read(

        for i in 0..length {
            if cart_addr + i < device.cart.rom.len() as u32 {
-                device.cart.rom[(cart_addr + i) as usize] =
-                    device.rdram.mem[(dram_addr + i) as usize ^ device.byte_swap];
+                device.ui.saves.romsave.data.insert(
+                    cart_addr + i,
+                    device.rdram.mem[(dram_addr + i) as usize ^ device.byte_swap],
+                );

-                device
-                    .ui
-                    .saves
-                    .romsave
-                    .0
-                    .insert(cart_addr + i, device.cart.rom[(cart_addr + i) as usize]);
-
-                device.ui.saves.romsave.1 = true;
+                device.ui.saves.romsave.written = true;
            }
        }
    }
@@ -110,7 +110,11 @@ pub fn dma_write(
    let mut i = dram_addr;
    let mut j = cart_addr;
    while i < dram_addr + length && j < device.cart.rom.len() as u32 {
-        device.rdram.mem[i as usize ^ device.byte_swap] = device.cart.rom[j as usize];
+        if device.ui.saves.romsave.data.contains_key(&j) {
+            device.rdram.mem[i as usize ^ device.byte_swap] = device.ui.saves.romsave.data[&j];
+        } else {
+            device.rdram.mem[i as usize ^ device.byte_swap] = device.cart.rom[j as usize];
+        }
        i += 1;
        j += 1;
    }
@@ -124,7 +128,7 @@ pub fn dma_write(

 pub fn init(device: &mut device::Device, rom_file: Vec<u8>) {
    device.cart.rom = rom_file;
-    set_system_region(device, device.cart.rom[0x3E]);
+    device.cart.pal = is_system_pal(device.cart.rom[0x3E]);
    set_cic(device);

    device.ui.game_hash = calculate_hash(&device.cart.rom);
@@ -135,22 +139,14 @@ pub fn init(device: &mut device::Device, rom_file: Vec<u8>) {
    }
 }

-pub fn load_rom_save(device: &mut device::Device) {
-    if device.ui.saves.romsave.0.is_empty() {
-        return;
-    }
-    for (key, value) in device.ui.saves.romsave.0.iter() {
-        device.cart.rom[*key as usize] = *value
-    }
-}
-
-fn set_system_region(device: &mut device::Device, country: u8) {
+fn is_system_pal(country: u8) -> bool {
    let pal_codes: [u8; 8] = [b'D', b'F', b'I', b'P', b'S', b'U', b'X', b'Y'];
    for i in pal_codes {
        if country == i {
-            device.cart.pal = true
+            return true;
        }
    }
+    false
 }

 fn set_cic(device: &mut device::Device) {
@@ -27,9 +27,9 @@ pub struct Sc64 {
 }

 fn format_sdcard(device: &mut device::Device) {
-    if device.ui.saves.sdcard.0.is_empty() {
-        device.ui.saves.sdcard.0.resize(SDCARD_SIZE, 0);
-        let buf = std::io::Cursor::new(&mut device.ui.saves.sdcard.0);
+    if device.ui.saves.sdcard.data.is_empty() {
+        device.ui.saves.sdcard.data.resize(SDCARD_SIZE, 0);
+        let buf = std::io::Cursor::new(&mut device.ui.saves.sdcard.data);
        fatfs::format_volume(buf, fatfs::FormatVolumeOptions::new()).unwrap();
    }
 }
@@ -117,9 +117,9 @@ pub fn write_regs(device: &mut device::Device, address: u64, value: u32, mask: u
                        let mut i = 0;

                        while i < length {
-                            if offset + i < device.ui.saves.sdcard.0.len() {
+                            if offset + i < device.ui.saves.sdcard.data.len() {
                                let data = u32::from_be_bytes(
-                                    device.ui.saves.sdcard.0[(offset + i)..(offset + i + 4)]
+                                    device.ui.saves.sdcard.data[(offset + i)..(offset + i + 4)]
                                        .try_into()
                                        .unwrap(),
                                );
@@ -148,7 +148,7 @@ pub fn write_regs(device: &mut device::Device, address: u64, value: u32, mask: u
                        let mut i = 0;

                        while i < length {
-                            if offset + i < device.ui.saves.sdcard.0.len() {
+                            if offset + i < device.ui.saves.sdcard.data.len() {
                                let data = device::memory::data_read(
                                    device,
                                    address + i as u64,
@@ -156,14 +156,14 @@ pub fn write_regs(device: &mut device::Device, address: u64, value: u32, mask: u
                                    false,
                                )
                                .to_be_bytes();
-                                device.ui.saves.sdcard.0[(offset + i)..(offset + i + 4)]
+                                device.ui.saves.sdcard.data[(offset + i)..(offset + i + 4)]
                                    .copy_from_slice(&data);
                            } else {
                                panic!("sd card write out of bounds")
                            }
                            i += 4;
                        }
-                        device.ui.saves.sdcard.1 = true;
+                        device.ui.saves.sdcard.written = true;
                    }
                    'U' => {} // USB_WRITE_STATUS, ignored
                    'M' => {} // USB_WRITE, ignored
@@ -29,14 +29,14 @@ pub struct Flashram {
 }

 fn format_sram(device: &mut device::Device) {
-    if device.ui.saves.sram.0.len() < SRAM_SIZE {
-        device.ui.saves.sram.0.resize(SRAM_SIZE, 0xFF)
+    if device.ui.saves.sram.data.len() < SRAM_SIZE {
+        device.ui.saves.sram.data.resize(SRAM_SIZE, 0xFF)
    }
 }

 fn format_flash(device: &mut device::Device) {
-    if device.ui.saves.flash.0.len() < FLASHRAM_SIZE {
-        device.ui.saves.flash.0.resize(FLASHRAM_SIZE, 0xFF)
+    if device.ui.saves.flash.data.len() < FLASHRAM_SIZE {
+        device.ui.saves.flash.data.resize(FLASHRAM_SIZE, 0xFF)
    }
 }

@@ -46,7 +46,7 @@ fn read_mem_sram(device: &mut device::Device, address: u64) -> u32 {
    format_sram(device);

    u32::from_be_bytes(
-        device.ui.saves.sram.0[masked_address..masked_address + 4]
+        device.ui.saves.sram.data[masked_address..masked_address + 4]
            .try_into()
            .unwrap(),
    )
@@ -88,14 +88,15 @@ fn write_mem_sram(device: &mut device::Device, address: u64, value: u32, mask: u
    format_sram(device);

    let mut data = u32::from_be_bytes(
-        device.ui.saves.sram.0[masked_address..masked_address + 4]
+        device.ui.saves.sram.data[masked_address..masked_address + 4]
            .try_into()
            .unwrap(),
    );
    device::memory::masked_write_32(&mut data, value, mask);
-    device.ui.saves.sram.0[masked_address..masked_address + 4].copy_from_slice(&data.to_be_bytes());
+    device.ui.saves.sram.data[masked_address..masked_address + 4]
+        .copy_from_slice(&data.to_be_bytes());

-    device.ui.saves.sram.1 = true
+    device.ui.saves.sram.written = true
 }

 fn write_mem_flash(device: &mut device::Device, address: u64, value: u32, mask: u32) {
@@ -138,12 +139,12 @@ fn dma_read_sram(device: &mut device::Device, mut cart_addr: u32, mut dram_addr:
    format_sram(device);

    while i < dram_addr + length && i < device.rdram.size {
-        device.ui.saves.sram.0[j as usize] = device.rdram.mem[i as usize ^ device.byte_swap];
+        device.ui.saves.sram.data[j as usize] = device.rdram.mem[i as usize ^ device.byte_swap];
        i += 1;
        j += 1;
    }

-    device.ui.saves.sram.1 = true
+    device.ui.saves.sram.written = true
 }

 fn dma_read_flash(device: &mut device::Device, cart_addr: u32, dram_addr: u32, length: u32) {
@@ -188,7 +189,7 @@ fn dma_write_sram(
    format_sram(device);

    while i < dram_addr + length && i < device.rdram.size {
-        device.rdram.mem[i as usize ^ device.byte_swap] = device.ui.saves.sram.0[j as usize];
+        device.rdram.mem[i as usize ^ device.byte_swap] = device.ui.saves.sram.data[j as usize];
        i += 1;
        j += 1;
    }
@@ -231,7 +232,7 @@ fn dma_write_flash(
        /* do actual DMA */
        for i in 0..length {
            device.rdram.mem[(dram_addr + i) as usize ^ device.byte_swap] =
-                device.ui.saves.flash.0[(cart_addr + i) as usize];
+                device.ui.saves.flash.data[(cart_addr + i) as usize];
        }
    } else {
        /* other accesses are not implemented */
@@ -270,14 +271,14 @@ fn flashram_command(device: &mut device::Device, command: u32) {
            if device.cart.flashram.mode == FlashramMode::SectorErase {
                let offset: usize = (device.cart.flashram.erase_page & 0xff80) as usize * 128;
                for i in 0..128 * 128 {
-                    device.ui.saves.flash.0[offset + i] = 0xFF;
+                    device.ui.saves.flash.data[offset + i] = 0xFF;
                }
-                device.ui.saves.flash.1 = true
+                device.ui.saves.flash.written = true
            } else if device.cart.flashram.mode == FlashramMode::ChipErase {
                for i in 0..FLASHRAM_SIZE {
-                    device.ui.saves.flash.0[i] = 0xFF;
+                    device.ui.saves.flash.data[i] = 0xFF;
                }
-                device.ui.saves.flash.1 = true
+                device.ui.saves.flash.written = true
            } else {
                panic!("Unexpected flash erase command")
            }
@@ -295,9 +296,9 @@ fn flashram_command(device: &mut device::Device, command: u32) {
            /* program selected page */
            let offset: usize = (command & 0xffff) as usize * 128;
            for i in 0..128 {
-                device.ui.saves.flash.0[offset + i] = device.cart.flashram.page_buf[i];
+                device.ui.saves.flash.data[offset + i] = device.cart.flashram.page_buf[i];
            }
-            device.ui.saves.flash.1 = true;
+            device.ui.saves.flash.written = true;

            /* clear program busy flag, set program success flag, transition to status mode */
            device.cart.flashram.status &= !0x01;
@@ -2,6 +2,7 @@ use crate::{device, netplay, savestates, ui};

 pub mod mempak;
 pub mod rumble;
+pub mod transferpak;
 pub mod vru;

 pub const JCMD_STATUS: u8 = 0x00;
@@ -24,6 +25,7 @@ pub enum PakType {
    None = 0,
    MemPak = 1,
    RumblePak = 2,
+    TransferPak = 3,
 }

 #[derive(Copy, Clone, serde::Serialize, serde::Deserialize)]
@@ -64,8 +66,8 @@ pub fn process(device: &mut device::Device, channel: usize) {
                netplay::get_input(device, channel)
            };

-            device.pif.ram[offset..offset + 4].copy_from_slice(&input.0.to_ne_bytes());
-            if input.1 {
+            device.pif.ram[offset..offset + 4].copy_from_slice(&input.data.to_ne_bytes());
+            if input.pak_change_pressed {
                // pak change button pressed
                if device::events::get_event(device, device::events::EVENT_TYPE_PAK).is_none() {
                    device.pif.channels[channel].change_pak =
@@ -159,29 +161,41 @@ fn data_crc(device: &device::Device, data_offset: usize, size: usize) -> u8 {
 pub fn pak_switch_event(device: &mut device::Device) {
    for (i, channel) in device.pif.channels.iter_mut().enumerate() {
        if channel.change_pak != PakType::None {
-            if channel.change_pak == PakType::RumblePak {
-                if device.netplay.is_none() {
-                    device::ui::input::set_rumble(&mut device.ui, i, 0);
-                } else if device.netplay.as_ref().unwrap().player_number as usize == i {
-                    device::ui::input::set_rumble(&mut device.ui, 0, 0);
-                }
+            //stop rumble if it is on
+            if device.netplay.is_none() {
+                device::ui::input::set_rumble(&mut device.ui, i, 0);
+            } else if device.netplay.as_ref().unwrap().player_number as usize == i {
+                device::ui::input::set_rumble(&mut device.ui, 0, 0);
+            }

-                let handler = device::controller::PakHandler {
+            let new_pak_type = match channel.change_pak {
+                PakType::MemPak => PakType::RumblePak,
+                PakType::RumblePak => PakType::MemPak,
+                _ => {
+                    panic!("Invalid pak type");
+                }
+            };
+
+            if new_pak_type == PakType::MemPak {
+                channel.pak_handler = Some(device::controller::PakHandler {
                    read: device::controller::mempak::read,
                    write: device::controller::mempak::write,
-                    pak_type: device::controller::PakType::MemPak,
-                };
-                channel.pak_handler = Some(handler);
-                ui::audio::play_pak_switch(&mut device.ui, PakType::MemPak);
-            } else if channel.change_pak == PakType::MemPak {
-                let handler = device::controller::PakHandler {
+                    pak_type: new_pak_type,
+                });
+            } else if new_pak_type == PakType::RumblePak {
+                channel.pak_handler = Some(device::controller::PakHandler {
                    read: device::controller::rumble::read,
                    write: device::controller::rumble::write,
-                    pak_type: device::controller::PakType::RumblePak,
-                };
-                channel.pak_handler = Some(handler);
-                ui::audio::play_pak_switch(&mut device.ui, PakType::RumblePak);
+                    pak_type: new_pak_type,
+                });
+            } else if new_pak_type == PakType::TransferPak {
+                channel.pak_handler = Some(device::controller::PakHandler {
+                    read: device::controller::transferpak::read,
+                    write: device::controller::transferpak::write,
+                    pak_type: new_pak_type,
+                });
            }
+            ui::audio::play_pak_switch(&mut device.ui, new_pak_type);
            channel.change_pak = PakType::None;
        }
    }
@@ -4,8 +4,8 @@ pub const MEMPAK_SIZE: usize = 0x8000;
 const MPK_PAGE_SIZE: usize = 256;

 fn format_mempak(device: &mut device::Device) {
-    if device.ui.saves.mempak.0.len() < MEMPAK_SIZE * 4 {
-        device.ui.saves.mempak.0.resize(MEMPAK_SIZE * 4, 0);
+    if device.ui.saves.mempak.data.len() < MEMPAK_SIZE * 4 {
+        device.ui.saves.mempak.data.resize(MEMPAK_SIZE * 4, 0);

        let page_0: [u8; MPK_PAGE_SIZE] = [
            /* Label area */
@@ -38,28 +38,28 @@ fn format_mempak(device: &mut device::Device) {
            let offset = i * MEMPAK_SIZE;

            /* Fill Page 0 with pre-initialized content */
-            device.ui.saves.mempak.0[offset..offset + MPK_PAGE_SIZE].copy_from_slice(&page_0);
+            device.ui.saves.mempak.data[offset..offset + MPK_PAGE_SIZE].copy_from_slice(&page_0);

            /* Fill INODE page 1 and update it's checkum */
            let start_page = 5;
            for i in MPK_PAGE_SIZE..2 * start_page {
-                device.ui.saves.mempak.0[offset + i] = 0;
+                device.ui.saves.mempak.data[offset + i] = 0;
            }
            for i in (MPK_PAGE_SIZE + 2 * start_page..2 * MPK_PAGE_SIZE).step_by(2) {
-                device.ui.saves.mempak.0[offset + i] = 0x00;
-                device.ui.saves.mempak.0[offset + i + 1] = 0x03;
+                device.ui.saves.mempak.data[offset + i] = 0x00;
+                device.ui.saves.mempak.data[offset + i + 1] = 0x03;
            }
-            device.ui.saves.mempak.0[offset + (MPK_PAGE_SIZE + 1)] = 0x71;
+            device.ui.saves.mempak.data[offset + (MPK_PAGE_SIZE + 1)] = 0x71;

            /* Page 2 is identical to page 1 */
            let page1 = offset + MPK_PAGE_SIZE;
            let page2 = offset + 2 * MPK_PAGE_SIZE;
-            let page1data = device.ui.saves.mempak.0[page1..page1 + MPK_PAGE_SIZE].to_vec();
-            device.ui.saves.mempak.0[page2..page2 + MPK_PAGE_SIZE].copy_from_slice(&page1data);
+            let page1data = device.ui.saves.mempak.data[page1..page1 + MPK_PAGE_SIZE].to_vec();
+            device.ui.saves.mempak.data[page2..page2 + MPK_PAGE_SIZE].copy_from_slice(&page1data);

            /* Remaining pages DIR+DATA (3...) are initialized with 0x00 */
            for i in 3 * MPK_PAGE_SIZE..MEMPAK_SIZE - 3 * MPK_PAGE_SIZE {
-                device.ui.saves.mempak.0[offset + i] = 0;
+                device.ui.saves.mempak.data[offset + i] = 0;
            }
        }
    }
@@ -71,7 +71,7 @@ pub fn read(device: &mut device::Device, channel: usize, address: u16, data: usi

        let offset = (channel * MEMPAK_SIZE) + address as usize;
        device.pif.ram[data..data + size]
-            .copy_from_slice(&device.ui.saves.mempak.0[offset..offset + size])
+            .copy_from_slice(&device.ui.saves.mempak.data[offset..offset + size])
    } else {
        for i in 0..size {
            device.pif.ram[data + i] = 0;
@@ -84,9 +84,9 @@ pub fn write(device: &mut device::Device, channel: usize, address: u16, data: us
        format_mempak(device);

        let offset = (channel * MEMPAK_SIZE) + address as usize;
-        device.ui.saves.mempak.0[offset..offset + size]
+        device.ui.saves.mempak.data[offset..offset + size]
            .copy_from_slice(&device.pif.ram[data..data + size]);

-        device.ui.saves.mempak.1 = true
+        device.ui.saves.mempak.written = true
    }
 }
@@ -0,0 +1,19 @@
+use crate::device;
+
+pub fn read(
+    _device: &mut device::Device,
+    _channel: usize,
+    _address: u16,
+    _data: usize,
+    _size: usize,
+) {
+}
+
+pub fn write(
+    _device: &mut device::Device,
+    _channel: usize,
+    _address: u16,
+    _data: usize,
+    _size: usize,
+) {
+}
@@ -21,9 +21,10 @@ pub fn write_mem(device: &mut device::Device, address: u64, value: u32, mask: u3
        let length = (value & mask) as u64;
        let data = std::str::from_utf8(
            &device.cart.is_viewer_buffer[0x20_usize..(0x20 + length) as usize],
-        )
-        .unwrap();
-        print!("{}", data);
+        );
+        if data.is_ok() {
+            print!("{}", data.unwrap());
+        }
    } else {
        let mut data = u32::from_be_bytes(
            device.cart.is_viewer_buffer[masked_address..masked_address + 4]
@@ -1,4 +1,4 @@
-use crate::device;
+use crate::{device, ui};

 const PI_DRAM_ADDR_REG: u32 = 0;
 const PI_CART_ADDR_REG: u32 = 1;
@@ -86,6 +86,7 @@ fn dma_write(device: &mut device::Device) {
    let cart_addr = device.pi.regs[PI_CART_ADDR_REG as usize] & !1;
    let dram_addr = device.pi.regs[PI_DRAM_ADDR_REG as usize] & 0xFFFFFE;
    let mut length = (device.pi.regs[PI_WR_LEN_REG as usize] & 0xFFFFFF) + 1;
+    ui::video::check_framebuffers(dram_addr);

    /* PI seems to treat the first 128 bytes differently, see https://n64brew.dev/wiki/Peripheral_Interface#Unaligned_DMA_transfer */
    if length >= 0x7f && (length & 1) != 0 {
@@ -53,7 +53,9 @@ pub fn read_regs_dpc(
    address: u64,
    _access_size: device::memory::AccessSize,
 ) -> u32 {
-    device::cop0::add_cycles(device, 20);
+    if !device.rsp.cpu.running {
+        device::cop0::add_cycles(device, 20);
+    }
    let reg = (address & 0xFFFF) >> 2;
    match reg as u32 {
        DPC_STATUS_REG => {
@@ -116,6 +118,7 @@ fn run_rdp(device: &mut device::Device) {
    let timer = ui::video::process_rdp_list();
    device.rdp.regs_dpc[DPC_STATUS_REG as usize] |=
        DPC_STATUS_START_GCLK | DPC_STATUS_PIPE_BUSY | DPC_STATUS_CMD_BUSY;
+    device.rdp.regs_dpc[DPC_PIPEBUSY_REG as usize] = 0xFFFFFF;

    if timer != 0 {
        if device.save_state {
@@ -203,6 +206,7 @@ fn update_dpc_status(device: &mut device::Device, w: u32) {
 pub fn init(device: &mut device::Device) {
    device.rdp.regs_dpc[DPC_STATUS_REG as usize] |=
        DPC_STATUS_START_GCLK | DPC_STATUS_PIPE_BUSY | DPC_STATUS_CBUF_READY;
+    device.rdp.regs_dpc[DPC_PIPEBUSY_REG as usize] = 0xFFFFFF;
 }

 pub fn rdp_interrupt_event(device: &mut device::Device) {
@@ -1,5 +1,6 @@
 use crate::device;
-use std::alloc::{alloc_zeroed, Layout};
+use crate::ui;
+use std::alloc::{Layout, alloc_zeroed};

 //const RDRAM_CONFIG_REG: u32 = 0;
 //const RDRAM_DEVICE_ID_REG: u32 = 1;
@@ -46,6 +47,7 @@ pub fn read_mem(
    );
    let masked_address = address as usize & RDRAM_MASK;
    if address < device.rdram.size as u64 {
+        ui::video::check_framebuffers(masked_address as u32);
        u32::from_ne_bytes(
            device.rdram.mem[masked_address..masked_address + 4]
                .try_into()
@@ -58,6 +60,7 @@ pub fn read_mem(

 pub fn write_mem(device: &mut device::Device, address: u64, value: u32, mask: u32) {
    if address < device.rdram.size as u64 {
+        ui::video::check_framebuffers(address as u32);
        let mut data = u32::from_ne_bytes(
            device.rdram.mem[address as usize..(address + 4) as usize]
                .try_into()
@@ -34,6 +34,7 @@ pub struct Cpu {
    pub pipeline_full: bool,
    pub branch_state: BranchState,
    pub broken: bool,
+    pub running: bool,
    pub halted: bool,
    pub sync_point: bool,
    pub cycle_counter: u64,
@@ -125,6 +126,7 @@ pub fn in_delay_slot_taken(device: &device::Device) -> bool {
 pub fn run(device: &mut device::Device) -> u64 {
    device.rsp.cpu.broken = false;
    device.rsp.cpu.cycle_counter = 0;
+    device.rsp.cpu.running = true;
    while !device.rsp.cpu.sync_point {
        device.rsp.cpu.instruction_type = InstructionType::Su;
        device.rsp.cpu.gpr[0] = 0; // gpr 0 is read only
@@ -186,6 +188,7 @@ pub fn run(device: &mut device::Device) -> u64 {
            }
        }
    }
+    device.rsp.cpu.running = false;
    (device.rsp.cpu.cycle_counter as f64 * 1.5) as u64 // converting RCP clock to CPU clock
 }

@@ -288,70 +291,70 @@ pub fn map_instructions(device: &mut device::Device) {
    ];

    device.rsp.cpu.special_instrs = [
-        device::rsp_su_instructions::sll,      // 0
-        device::rsp_su_instructions::reserved, // 1
-        device::rsp_su_instructions::srl,      // 2
-        device::rsp_su_instructions::sra,      // 3
-        device::rsp_su_instructions::sllv,     // 4
-        device::rsp_su_instructions::reserved, // 5
-        device::rsp_su_instructions::srlv,     // 6
-        device::rsp_su_instructions::srav,     // 7
-        device::rsp_su_instructions::jr,       // 8
-        device::rsp_su_instructions::jalr,     // 9
-        device::rsp_su_instructions::reserved, // 10
-        device::rsp_su_instructions::reserved, // 11
-        device::rsp_su_instructions::reserved, // 12
-        device::rsp_su_instructions::break_,   // 13
-        device::rsp_su_instructions::reserved, // 14
-        device::rsp_su_instructions::reserved, // 15
-        device::rsp_su_instructions::reserved, // 16
-        device::rsp_su_instructions::reserved, // 17
-        device::rsp_su_instructions::reserved, // 18
-        device::rsp_su_instructions::reserved, // 19
-        device::rsp_su_instructions::reserved, // 20
-        device::rsp_su_instructions::reserved, // 21
-        device::rsp_su_instructions::reserved, // 22
-        device::rsp_su_instructions::reserved, // 23
-        device::rsp_su_instructions::reserved, // 24
-        device::rsp_su_instructions::reserved, // 25
-        device::rsp_su_instructions::reserved, // 26
-        device::rsp_su_instructions::reserved, // 27
-        device::rsp_su_instructions::reserved, // 28
-        device::rsp_su_instructions::reserved, // 29
-        device::rsp_su_instructions::reserved, // 30
-        device::rsp_su_instructions::reserved, // 31
-        device::rsp_su_instructions::add,      // 32
-        device::rsp_su_instructions::addu,     // 33
-        device::rsp_su_instructions::sub,      // 34
-        device::rsp_su_instructions::subu,     // 35
-        device::rsp_su_instructions::and,      // 36
-        device::rsp_su_instructions::or,       // 37
-        device::rsp_su_instructions::xor,      // 38
-        device::rsp_su_instructions::nor,      // 39
-        device::rsp_su_instructions::reserved, // 40
-        device::rsp_su_instructions::reserved, // 41
-        device::rsp_su_instructions::slt,      // 42
-        device::rsp_su_instructions::sltu,     // 43
-        device::rsp_su_instructions::reserved, // 44
-        device::rsp_su_instructions::reserved, // 45
-        device::rsp_su_instructions::reserved, // 46
-        device::rsp_su_instructions::reserved, // 47
-        device::rsp_su_instructions::reserved, // 48
-        device::rsp_su_instructions::reserved, // 49
-        device::rsp_su_instructions::reserved, // 50
-        device::rsp_su_instructions::reserved, // 51
-        device::rsp_su_instructions::reserved, // 52
-        device::rsp_su_instructions::reserved, // 53
-        device::rsp_su_instructions::reserved, // 54
-        device::rsp_su_instructions::reserved, // 55
-        device::rsp_su_instructions::reserved, // 56
-        device::rsp_su_instructions::reserved, // 57
-        device::rsp_su_instructions::reserved, // 58
-        device::rsp_su_instructions::reserved, // 59
-        device::rsp_su_instructions::reserved, // 60
-        device::rsp_su_instructions::reserved, // 61
-        device::rsp_su_instructions::reserved, // 62
-        device::rsp_su_instructions::reserved, // 63
+        device::rsp_su_instructions::sll,              // 0
+        device::rsp_su_instructions::special_reserved, // 1
+        device::rsp_su_instructions::srl,              // 2
+        device::rsp_su_instructions::sra,              // 3
+        device::rsp_su_instructions::sllv,             // 4
+        device::rsp_su_instructions::special_reserved, // 5
+        device::rsp_su_instructions::srlv,             // 6
+        device::rsp_su_instructions::srav,             // 7
+        device::rsp_su_instructions::jr,               // 8
+        device::rsp_su_instructions::jalr,             // 9
+        device::rsp_su_instructions::special_reserved, // 10
+        device::rsp_su_instructions::special_reserved, // 11
+        device::rsp_su_instructions::special_reserved, // 12
+        device::rsp_su_instructions::break_,           // 13
+        device::rsp_su_instructions::special_reserved, // 14
+        device::rsp_su_instructions::special_reserved, // 15
+        device::rsp_su_instructions::special_reserved, // 16
+        device::rsp_su_instructions::special_reserved, // 17
+        device::rsp_su_instructions::special_reserved, // 18
+        device::rsp_su_instructions::special_reserved, // 19
+        device::rsp_su_instructions::special_reserved, // 20
+        device::rsp_su_instructions::special_reserved, // 21
+        device::rsp_su_instructions::special_reserved, // 22
+        device::rsp_su_instructions::special_reserved, // 23
+        device::rsp_su_instructions::special_reserved, // 24
+        device::rsp_su_instructions::special_reserved, // 25
+        device::rsp_su_instructions::special_reserved, // 26
+        device::rsp_su_instructions::special_reserved, // 27
+        device::rsp_su_instructions::special_reserved, // 28
+        device::rsp_su_instructions::special_reserved, // 29
+        device::rsp_su_instructions::special_reserved, // 30
+        device::rsp_su_instructions::special_reserved, // 31
+        device::rsp_su_instructions::add,              // 32
+        device::rsp_su_instructions::addu,             // 33
+        device::rsp_su_instructions::sub,              // 34
+        device::rsp_su_instructions::subu,             // 35
+        device::rsp_su_instructions::and,              // 36
+        device::rsp_su_instructions::or,               // 37
+        device::rsp_su_instructions::xor,              // 38
+        device::rsp_su_instructions::nor,              // 39
+        device::rsp_su_instructions::special_reserved, // 40
+        device::rsp_su_instructions::special_reserved, // 41
+        device::rsp_su_instructions::slt,              // 42
+        device::rsp_su_instructions::sltu,             // 43
+        device::rsp_su_instructions::special_reserved, // 44
+        device::rsp_su_instructions::special_reserved, // 45
+        device::rsp_su_instructions::special_reserved, // 46
+        device::rsp_su_instructions::special_reserved, // 47
+        device::rsp_su_instructions::special_reserved, // 48
+        device::rsp_su_instructions::special_reserved, // 49
+        device::rsp_su_instructions::special_reserved, // 50
+        device::rsp_su_instructions::special_reserved, // 51
+        device::rsp_su_instructions::special_reserved, // 52
+        device::rsp_su_instructions::special_reserved, // 53
+        device::rsp_su_instructions::special_reserved, // 54
+        device::rsp_su_instructions::special_reserved, // 55
+        device::rsp_su_instructions::special_reserved, // 56
+        device::rsp_su_instructions::special_reserved, // 57
+        device::rsp_su_instructions::special_reserved, // 58
+        device::rsp_su_instructions::special_reserved, // 59
+        device::rsp_su_instructions::special_reserved, // 60
+        device::rsp_su_instructions::special_reserved, // 61
+        device::rsp_su_instructions::special_reserved, // 62
+        device::rsp_su_instructions::special_reserved, // 63
    ];

    device.rsp.cpu.regimm_instrs = [
@@ -1,4 +1,5 @@
 use crate::device;
+use crate::ui;

 const SP_MEM_ADDR_REG: u32 = 0;
 const SP_DRAM_ADDR_REG: u32 = 1;
@@ -146,6 +147,7 @@ fn do_dma(device: &mut device::Device, dma: RspDma) {
    let mut dram_addr = dma.dramaddr & 0xfffff8;
    let offset = dma.memaddr & 0x1000;

+    ui::video::check_framebuffers(dram_addr);
    if dma.dir == DmaDir::Read {
        let mut j = 0;
        while j < count {
@@ -267,7 +269,9 @@ pub fn read_regs(
    address: u64,
    _access_size: device::memory::AccessSize,
 ) -> u32 {
-    device::cop0::add_cycles(device, 20);
+    if !device.rsp.cpu.running {
+        device::cop0::add_cycles(device, 20);
+    }
    let reg = (address & 0xFFFF) >> 2;
    match reg as u32 {
        SP_DMA_BUSY_REG | SP_DMA_FULL_REG => {
@@ -292,7 +296,6 @@ pub fn read_regs(
            let value = device.rsp.regs[reg as usize];
            if value == 1 {
                device.rsp.cpu.sync_point = true;
-                device.rsp.cpu.cycle_counter += 4; // needed for DK64
            }
            device.rsp.regs[reg as usize] = 1;
            value
@@ -552,6 +552,7 @@ pub fn bgezal(device: &mut device::Device, opcode: u32) {
 }

 pub fn mfc0(device: &mut device::Device, opcode: u32) {
+    device.rsp.cpu.cycle_counter += 2;
    if rd(opcode) < device::rsp_interface::SP_REGS_COUNT {
        device.rsp.cpu.gpr[rt(opcode) as usize] = device::rsp_interface::read_regs(
            device,
@@ -1204,6 +1205,9 @@ pub fn stv(device: &mut device::Device, opcode: u32) {
    }
 }

-pub fn reserved(_device: &mut device::Device, _opcode: u32) {
-    panic!("rsp su reserved")
+pub fn special_reserved(device: &mut device::Device, opcode: u32) {
+    device.rsp.cpu.gpr[rd(opcode) as usize] =
+        device.rsp.cpu.gpr[rs(opcode) as usize] >> (device.rsp.cpu.gpr[rs(opcode) as usize] & 31)
 }
+
+pub fn reserved(_device: &mut device::Device, _opcode: u32) {}
@@ -2,7 +2,7 @@ use crate::{device, netplay, ui};
 use governor::clock::Clock;

 const VI_STATUS_REG: u32 = 0;
-//const VI_ORIGIN_REG: u32 = 1;
+const VI_ORIGIN_REG: u32 = 1;
 //const VI_WIDTH_REG: u32 = 2;
 //const VI_V_INTR_REG: u32 = 3;
 const VI_CURRENT_REG: u32 = 4;
@@ -26,27 +26,41 @@ pub struct Vi {
    #[serde(skip)]
    pub limiter: Option<governor::DefaultDirectRateLimiter>,
    pub count_per_scanline: u64,
+    pub enable_speed_limiter: bool,
    pub vi_counter: u64,
+    pub last_origin: u32,
+    pub internal_frame_counter: u64,
+    pub min_wait_time: std::time::Duration,
+    pub frame_time: f64,
+    pub limit_freq: u64,
+    #[serde(skip)]
+    #[serde(default = "std::time::Instant::now")]
+    pub limit_freq_check: std::time::Instant,
 }

-//static mut FRAME_COUNTER: u64 = 0;
-
-const LIMIT_BUFFER: u64 = 3;
+const MAX_LIMIT_FREQ: u64 = 3;

 pub fn set_expected_refresh_rate(device: &mut device::Device) {
    let expected_refresh_rate = device.vi.clock as f64
        / (device.vi.regs[VI_V_SYNC_REG as usize] + 1) as f64
        / ((device.vi.regs[VI_H_SYNC_REG as usize] & 0xFFF) + 1) as f64
        * 2.0;
+    device.vi.frame_time = 1.0 / expected_refresh_rate;
    device.vi.delay = (device.cpu.clock_rate as f64 / expected_refresh_rate) as u64;
    device.vi.count_per_scanline =
        device.vi.delay / (device.vi.regs[VI_V_SYNC_REG as usize] + 1) as u64;

+    create_limiter(device);
+}
+
+fn create_limiter(device: &mut device::Device) {
    let quota = governor::Quota::with_period(std::time::Duration::from_secs_f64(
-        (1.0 / expected_refresh_rate) * LIMIT_BUFFER as f64,
+        device.vi.frame_time * device.vi.limit_freq as f64,
    ))
    .unwrap();
-    device.vi.limiter = Some(governor::RateLimiter::direct(quota))
+    device.vi.limiter = Some(governor::RateLimiter::direct(quota));
+    let _ = device.vi.limiter.as_ref().unwrap().check();
+    //println!("new limit freq: {}", device.vi.limit_freq);
 }

 fn set_vertical_interrupt(device: &mut device::Device) {
@@ -109,6 +123,13 @@ pub fn write_regs(device: &mut device::Device, address: u64, value: u32, mask: u
                set_expected_refresh_rate(device);
            }
        }
+        VI_ORIGIN_REG => {
+            device::memory::masked_write_32(&mut device.vi.regs[reg as usize], value, mask);
+            if device.vi.regs[reg as usize] != device.vi.last_origin {
+                device.vi.last_origin = device.vi.regs[reg as usize];
+                device.vi.internal_frame_counter += 1;
+            }
+        }
        _ => {
            device::memory::masked_write_32(&mut device.vi.regs[reg as usize], value, mask);
        }
@@ -117,25 +138,26 @@ pub fn write_regs(device: &mut device::Device, address: u64, value: u32, mask: u
 }

 pub fn vertical_interrupt_event(device: &mut device::Device) {
-    ui::video::update_screen();
    ui::video::check_callback(device);

-    /*
-        unsafe {
-            FRAME_COUNTER += 1;
-        }
-    */
-
-    let mut enable_speed_limiter = true;
    if device.netplay.is_some() {
        netplay::send_sync_check(device);
-        enable_speed_limiter = !device.netplay.as_ref().unwrap().fast_forward;
+        device.vi.enable_speed_limiter = !device.netplay.as_ref().unwrap().fast_forward;
    }

    device.vi.vi_counter += 1;
-    if device.vi.vi_counter % LIMIT_BUFFER == 0 && enable_speed_limiter {
+    if device.vi.vi_counter % device.vi.limit_freq == 0 && device.vi.enable_speed_limiter {
        speed_limiter(device);
    }
+    ui::video::update_screen();
+
+    /*
+    let vis = if device.cart.pal { 50 } else { 60 };
+    if device.vi.vi_counter % vis == 0 {
+        println!("FPS: {}", device.vi.internal_frame_counter);
+        device.vi.internal_frame_counter = 0;
+    }
+    */

    /* toggle vi field if in interlaced mode */
    device.vi.field ^= (device.vi.regs[VI_STATUS_REG as usize] >> 6) & 0x1;
@@ -155,27 +177,40 @@ pub fn init(device: &mut device::Device) {
    } else {
        device.vi.clock = 48681812
    }
-    /*
-    std::thread::spawn(move || {
-        let mut last_count = 0;
-        loop {
-            unsafe {
-                println!("{:?}", FRAME_COUNTER - last_count);
-                last_count = FRAME_COUNTER;
-            }
-            std::thread::sleep(std::time::Duration::from_secs(1));
-        }
-    });
-    */
 }

-fn speed_limiter(device: &device::Device) {
+fn speed_limiter(device: &mut device::Device) {
    let result = device.vi.limiter.as_ref().unwrap().check();
    if result.is_err() {
        let outcome = result.unwrap_err();
        let dur = outcome.wait_time_from(governor::clock::DefaultClock::default().now());
        spin_sleep::sleep(dur);
+        if dur < device.vi.min_wait_time {
+            device.vi.min_wait_time = dur;
+        }

        let _ = device.vi.limiter.as_ref().unwrap().check();
+    } else {
+        device.vi.min_wait_time = std::time::Duration::from_secs(0);
+    }
+
+    if std::time::Instant::now()
+        .duration_since(device.vi.limit_freq_check)
+        .as_secs_f64()
+        > 1.0
+    {
+        if device.vi.min_wait_time.as_secs_f64() == 0.0 && device.vi.limit_freq < MAX_LIMIT_FREQ {
+            device.vi.limit_freq += 1;
+            create_limiter(device);
+        } else if device.vi.min_wait_time.as_secs_f64() > device.vi.frame_time
+            && device.vi.limit_freq > 1
+        {
+            device.vi.limit_freq -= 1;
+            create_limiter(device);
+        }
+
+        //println!("limit freq: {}", device.vi.limit_freq);
+        device.vi.min_wait_time = std::time::Duration::from_secs(1);
+        device.vi.limit_freq_check = std::time::Instant::now();
    }
 }
@@ -1,5 +1,4 @@
 use crate::{device, ui};
-use eframe::egui;
 use std::io::{Read, Write};
 //UDP packet formats
 const UDP_SEND_KEY_INFO: u8 = 0;
@@ -29,8 +28,6 @@ pub struct Netplay {
    status: u8,
    buffer_target: u8,
    pub fast_forward: bool,
-    pub error_notifier: tokio::sync::mpsc::Sender<String>,
-    pub gui_ctx: egui::Context,
 }

 pub struct PlayerData {
@@ -45,11 +42,13 @@ struct InputEvent {
    plugin: u8,
 }

-fn send_error(netplay: &mut Netplay, error: String) {
-    netplay.error_notifier.try_send(error).unwrap();
-
-    netplay.gui_ctx.request_repaint(); // this is so the window pops up right away
-}
+pub const NETPLAY_ERROR_DESYNC: u32 = 0;
+pub const NETPLAY_ERROR_LOST_CONNECTION: u32 = 1;
+pub const NETPLAY_ERROR_PLAYER_DISCONNECTED: u32 = 2;
+pub const NETPLAY_ERROR_PLAYER_1_DISCONNECTED: u32 = 3;
+pub const NETPLAY_ERROR_PLAYER_2_DISCONNECTED: u32 = 4;
+pub const NETPLAY_ERROR_PLAYER_3_DISCONNECTED: u32 = 5;
+pub const NETPLAY_ERROR_PLAYER_4_DISCONNECTED: u32 = 6;

 pub fn send_save(netplay: &mut Netplay, save_type: &str, save_data: &[u8], size: usize) {
    let mut request: Vec<u8> = [TCP_SEND_SAVE].to_vec();
@@ -91,25 +90,25 @@ pub fn send_sync_check(device: &mut device::Device) {
    netplay.vi_counter = netplay.vi_counter.wrapping_add(1);
 }

-pub fn send_input(netplay: &Netplay, input: (u32, bool)) {
+pub fn send_input(netplay: &Netplay, input: ui::input::InputData) {
    let mut request: Vec<u8> = [UDP_SEND_KEY_INFO].to_vec();
    request.push(netplay.player_number);
    request.extend_from_slice(
        &(netplay.player_data[netplay.player_number as usize].count).to_be_bytes(),
    );
-    request.extend_from_slice(&(input.0).to_be_bytes());
-    request.push(input.1 as u8);
+    request.extend_from_slice(&(input.data).to_be_bytes());
+    request.push(input.pak_change_pressed as u8);
    netplay.udp_socket.send(&request).unwrap();
 }

-pub fn get_input(device: &mut device::Device, channel: usize) -> (u32, bool) {
+pub fn get_input(device: &mut device::Device, channel: usize) -> ui::input::InputData {
    let netplay = device.netplay.as_mut().unwrap();
    let mut input = None;

    let timeout = std::time::Instant::now() + std::time::Duration::from_secs(10);
    let mut request_timer = std::time::Instant::now() - std::time::Duration::from_millis(5);
    while input.is_none() {
-        process_incoming(netplay); // we execute process_incoming before request_input so that we send an accurate buffer count
+        process_incoming(netplay, &mut device.ui); // we execute process_incoming before request_input so that we send an accurate buffer count
        if std::time::Instant::now() > request_timer {
            // sends a request packet every 5ms
            request_input(netplay, channel);
@@ -120,10 +119,7 @@ pub fn get_input(device: &mut device::Device, channel: usize) -> (u32, bool) {
            .remove(&netplay.player_data[channel].count);

        if std::time::Instant::now() > timeout {
-            send_error(
-                netplay,
-                "Timed out waiting for input. Lost connection to server".to_string(),
-            );
+            ui::audio::play_netplay_audio(&mut device.ui, NETPLAY_ERROR_LOST_CONNECTION);
            input = Some(InputEvent {
                input: 0,
                plugin: 0,
@@ -136,10 +132,10 @@ pub fn get_input(device: &mut device::Device, channel: usize) -> (u32, bool) {
        && netplay.player_data[channel].input_events.len() as u8 > netplay.buffer_target;

    netplay.player_data[channel].count = netplay.player_data[channel].count.wrapping_add(1);
-    (
-        input.as_ref().unwrap().input,
-        input.as_ref().unwrap().plugin != 0,
-    )
+    ui::input::InputData {
+        data: input.as_ref().unwrap().input,
+        pak_change_pressed: input.as_ref().unwrap().plugin != 0,
+    }
 }

 fn request_input(netplay: &Netplay, channel: usize) {
@@ -154,7 +150,7 @@ fn request_input(netplay: &Netplay, channel: usize) {
    netplay.udp_socket.send(&request).unwrap();
 }

-fn process_incoming(netplay: &mut Netplay) {
+fn process_incoming(netplay: &mut Netplay, ui: &mut ui::Ui) {
    let mut buf: [u8; 1024] = [0; 1024];
    while let Ok(_incoming) = netplay.udp_socket.recv(&mut buf) {
        match buf[0] {
@@ -168,15 +164,15 @@ fn process_incoming(netplay: &mut Netplay) {
                }
                if current_status != netplay.status {
                    if ((current_status & 0x1) ^ (netplay.status & 0x1)) != 0 {
-                        send_error(
-                            netplay,
-                            format!("Players have desynced at VI {}", netplay.vi_counter),
-                        );
+                        ui::audio::play_netplay_audio(ui, NETPLAY_ERROR_DESYNC);
                    }
                    for dis in 1..5 {
                        if ((current_status & (0x1 << dis)) ^ (netplay.status & (0x1 << dis))) != 0
                        {
-                            send_error(netplay, format!("Player {} has disconnected", dis));
+                            ui::audio::play_netplay_audio(
+                                ui,
+                                NETPLAY_ERROR_PLAYER_DISCONNECTED + dis,
+                            );
                        }
                    }
                    netplay.status = current_status;
@@ -218,8 +214,6 @@ pub fn init(
    mut peer_addr: std::net::SocketAddr,
    session: ui::gui::gui_netplay::NetplayRoom,
    player_number: u8,
-    error_notifier: tokio::sync::mpsc::Sender<String>,
-    gui_ctx: egui::Context,
 ) -> Netplay {
    peer_addr.set_port(session.port.unwrap() as u16);
    let udp_socket;
@@ -283,8 +277,6 @@ pub fn init(
        status: 0,
        buffer_target,
        fast_forward: false,
-        error_notifier,
-        gui_ctx,
        player_data: [
            PlayerData {
                lag: 0,
@@ -70,6 +70,8 @@ where
 }

 pub fn create_savestate(device: &device::Device) {
+    ui::video::full_sync();
+
    let data: &[(&[u8], &str)] = &[
        (&postcard::to_stdvec(device).unwrap(), "device"),
        (&postcard::to_stdvec(&device.ui.saves).unwrap(), "saves"),
@@ -189,8 +191,8 @@ where
    [device::cop0::reserved; N]
 }

-pub fn default_memory_read(
-) -> [fn(&mut device::Device, u64, device::memory::AccessSize) -> u32; 0x2000] {
+pub fn default_memory_read()
+-> [fn(&mut device::Device, u64, device::memory::AccessSize) -> u32; 0x2000] {
    [device::rdram::read_mem; 0x2000]
 }

@@ -22,10 +22,10 @@ pub struct Ui {
    pub game_hash: String,
    pub paths: storage::Paths,
    pub saves: storage::Saves,
-    pub pak_audio: audio::PakAudio,
+    pub event_audio: audio::EventAudio,
    pub window: *mut sdl3_sys::video::SDL_Window,
    pub audio_stream: *mut sdl3_sys::audio::SDL_AudioStream,
-    pub pak_audio_stream: *mut sdl3_sys::audio::SDL_AudioStream,
+    pub event_audio_stream: *mut sdl3_sys::audio::SDL_AudioStream,
    pub audio_device: u32,
    pub num_joysticks: i32,
    pub fullscreen: bool,
@@ -122,20 +122,48 @@ impl Ui {
                savestate_file_path: std::path::PathBuf::new(),
            },
            saves: storage::Saves {
-                eeprom: (Vec::new(), false),
-                sram: (Vec::new(), false),
-                flash: (Vec::new(), false),
-                mempak: (Vec::new(), false),
-                sdcard: (Vec::new(), false),
-                romsave: (std::collections::HashMap::new(), false),
+                eeprom: storage::Save {
+                    data: Vec::new(),
+                    written: false,
+                },
+                sram: storage::Save {
+                    data: Vec::new(),
+                    written: false,
+                },
+                flash: storage::Save {
+                    data: Vec::new(),
+                    written: false,
+                },
+                mempak: storage::Save {
+                    data: Vec::new(),
+                    written: false,
+                },
+                sdcard: storage::Save {
+                    data: Vec::new(),
+                    written: false,
+                },
+                romsave: storage::RomSave {
+                    data: std::collections::HashMap::new(),
+                    written: false,
+                },
            },
-            pak_audio: audio::PakAudio {
+            event_audio: audio::EventAudio {
                mempak: include_bytes!("../data/mempak.wav").to_vec(),
                rumblepak: include_bytes!("../data/rumblepak.wav").to_vec(),
+                transferpak: include_bytes!("../data/transferpak.wav").to_vec(),
+                netplay_desync: include_bytes!("../data/netplay_desync.wav").to_vec(),
+                netplay_lost_connection: include_bytes!("../data/netplay_lost_connection.wav")
+                    .to_vec(),
+                netplay_disconnected: [
+                    include_bytes!("../data/netplay_p1_disconnected.wav").to_vec(),
+                    include_bytes!("../data/netplay_p2_disconnected.wav").to_vec(),
+                    include_bytes!("../data/netplay_p3_disconnected.wav").to_vec(),
+                    include_bytes!("../data/netplay_p4_disconnected.wav").to_vec(),
+                ],
            },
            window: std::ptr::null_mut(),
            audio_stream: std::ptr::null_mut(),
-            pak_audio_stream: std::ptr::null_mut(),
+            event_audio_stream: std::ptr::null_mut(),
            audio_device: 0,
            fullscreen: false,
            num_joysticks,
@@ -1,9 +1,14 @@
 use crate::device;
+use crate::netplay;
 use crate::ui;

-pub struct PakAudio {
+pub struct EventAudio {
    pub mempak: Vec<u8>,
    pub rumblepak: Vec<u8>,
+    pub transferpak: Vec<u8>,
+    pub netplay_desync: Vec<u8>,
+    pub netplay_lost_connection: Vec<u8>,
+    pub netplay_disconnected: [Vec<u8>; 4],
 }

 pub fn init(ui: &mut ui::Ui, frequency: u64) {
@@ -45,8 +50,9 @@ pub fn init(ui: &mut ui::Ui, frequency: u64) {
        channels: 1,
    };

-    ui.pak_audio_stream = unsafe { sdl3_sys::audio::SDL_CreateAudioStream(&wav_audio_spec, &dst) };
-    if !unsafe { sdl3_sys::audio::SDL_BindAudioStream(ui.audio_device, ui.pak_audio_stream) } {
+    ui.event_audio_stream =
+        unsafe { sdl3_sys::audio::SDL_CreateAudioStream(&wav_audio_spec, &dst) };
+    if !unsafe { sdl3_sys::audio::SDL_BindAudioStream(ui.audio_device, ui.event_audio_stream) } {
        panic!("Could not bind audio stream");
    }
 }
@@ -57,31 +63,53 @@ pub fn close(ui: &mut ui::Ui) {
            sdl3_sys::audio::SDL_DestroyAudioStream(ui.audio_stream);
            ui.audio_stream = std::ptr::null_mut();
        }
-        if !ui.pak_audio_stream.is_null() {
-            sdl3_sys::audio::SDL_DestroyAudioStream(ui.pak_audio_stream);
-            ui.pak_audio_stream = std::ptr::null_mut();
+        if !ui.event_audio_stream.is_null() {
+            sdl3_sys::audio::SDL_DestroyAudioStream(ui.event_audio_stream);
+            ui.event_audio_stream = std::ptr::null_mut();
        }
        sdl3_sys::audio::SDL_CloseAudioDevice(ui.audio_device);
        ui.audio_device = 0;
    }
 }

+pub fn play_netplay_audio(ui: &mut ui::Ui, error: u32) {
+    if ui.event_audio_stream.is_null() {
+        return;
+    }
+    let sound = match error {
+        netplay::NETPLAY_ERROR_DESYNC => &ui.event_audio.netplay_desync,
+        netplay::NETPLAY_ERROR_LOST_CONNECTION => &ui.event_audio.netplay_lost_connection,
+        netplay::NETPLAY_ERROR_PLAYER_1_DISCONNECTED => &ui.event_audio.netplay_disconnected[0],
+        netplay::NETPLAY_ERROR_PLAYER_2_DISCONNECTED => &ui.event_audio.netplay_disconnected[1],
+        netplay::NETPLAY_ERROR_PLAYER_3_DISCONNECTED => &ui.event_audio.netplay_disconnected[2],
+        netplay::NETPLAY_ERROR_PLAYER_4_DISCONNECTED => &ui.event_audio.netplay_disconnected[3],
+        _ => panic!("Invalid netplay error"),
+    };
+    if !unsafe {
+        sdl3_sys::audio::SDL_PutAudioStreamData(
+            ui.event_audio_stream,
+            sound.as_ptr() as *const std::ffi::c_void,
+            sound.len() as i32,
+        )
+    } {
+        panic!("Could not play audio");
+    }
+}
+
 pub fn play_pak_switch(ui: &mut ui::Ui, pak: device::controller::PakType) {
-    if ui.pak_audio_stream.is_null() {
+    if ui.event_audio_stream.is_null() {
        return;
    }

-    let sound;
-    if pak == device::controller::PakType::RumblePak {
-        sound = &ui.pak_audio.rumblepak;
-    } else if pak == device::controller::PakType::MemPak {
-        sound = &ui.pak_audio.mempak;
-    } else {
-        return;
-    }
+    let sound = match pak {
+        device::controller::PakType::RumblePak => &ui.event_audio.rumblepak,
+        device::controller::PakType::MemPak => &ui.event_audio.mempak,
+        device::controller::PakType::TransferPak => &ui.event_audio.transferpak,
+        _ => panic!("Invalid pak type"),
+    };
    if !unsafe {
        sdl3_sys::audio::SDL_PutAudioStreamData(
-            ui.pak_audio_stream,
+            ui.event_audio_stream,
            sound.as_ptr() as *const std::ffi::c_void,
            sound.len() as i32,
        )
@@ -1,13 +1,33 @@
 use crate::ui;

+#[derive(Copy, Clone, serde::Serialize, serde::Deserialize)]
+pub struct InputKeyButton {
+    pub enabled: bool,
+    pub id: i32,
+}
+
+#[derive(PartialEq, Copy, Clone, serde::Serialize, serde::Deserialize)]
+pub struct InputControllerAxis {
+    pub enabled: bool,
+    pub id: i32,
+    pub axis: i16,
+}
+
+#[derive(Copy, Clone, serde::Serialize, serde::Deserialize)]
+pub struct InputJoystickHat {
+    pub enabled: bool,
+    pub id: i32,
+    pub direction: u8,
+}
+
 #[derive(serde::Serialize, serde::Deserialize)]
 pub struct InputProfile {
-    pub keys: [(bool, i32); ui::input::PROFILE_SIZE],
-    pub controller_buttons: [(bool, i32); ui::input::PROFILE_SIZE],
-    pub controller_axis: [(bool, i32, i16); ui::input::PROFILE_SIZE],
-    pub joystick_buttons: [(bool, i32); ui::input::PROFILE_SIZE],
-    pub joystick_hat: [(bool, i32, u8); ui::input::PROFILE_SIZE],
-    pub joystick_axis: [(bool, i32, i16); ui::input::PROFILE_SIZE],
+    pub keys: [InputKeyButton; ui::input::PROFILE_SIZE],
+    pub controller_buttons: [InputKeyButton; ui::input::PROFILE_SIZE],
+    pub controller_axis: [InputControllerAxis; ui::input::PROFILE_SIZE],
+    pub joystick_buttons: [InputKeyButton; ui::input::PROFILE_SIZE],
+    pub joystick_hat: [InputJoystickHat; ui::input::PROFILE_SIZE],
+    pub joystick_axis: [InputControllerAxis; ui::input::PROFILE_SIZE],
    pub dinput: bool,
 }

@@ -21,7 +41,7 @@ pub struct Input {
 }
 #[derive(serde::Serialize, serde::Deserialize)]
 pub struct Video {
-    pub upscale: bool,
+    pub upscale: u32,
    pub integer_scaling: bool,
    pub fullscreen: bool,
 }
@@ -71,7 +91,7 @@ impl Config {
                emulate_vru: false,
            },
            video: Video {
-                upscale: false,
+                upscale: 1,
                integer_scaling: false,
                fullscreen: false,
            },
@@ -13,14 +13,13 @@ pub struct GopherEguiApp {
    input_profiles: Vec<String>,
    controller_enabled: [bool; 4],
    controller_paths: Vec<String>,
-    upscale: bool,
+    upscale: u32,
    integer_scaling: bool,
    fullscreen: bool,
    emulate_vru: bool,
    dinput: bool,
    show_vru_dialog: bool,
    vru_window_receiver: Option<tokio::sync::mpsc::Receiver<Vec<String>>>,
-    netplay_error_receiver: Option<tokio::sync::mpsc::Receiver<String>>,
    vru_word_notifier: Option<tokio::sync::mpsc::Sender<String>>,
    vru_word_list: Vec<String>,
    pub netplay: gui_netplay::GuiNetplay,
@@ -30,7 +29,7 @@ struct SaveConfig {
    selected_controller: [i32; 4],
    selected_profile: [String; 4],
    controller_enabled: [bool; 4],
-    upscale: bool,
+    upscale: u32,
    integer_scaling: bool,
    fullscreen: bool,
    emulate_vru: bool,
@@ -111,7 +110,6 @@ impl GopherEguiApp {
            show_vru_dialog: false,
            dinput: false,
            controller_paths,
-            netplay_error_receiver: None,
            vru_window_receiver: None,
            vru_word_notifier: None,
            vru_word_list: Vec::new(),
@@ -267,11 +265,6 @@ pub fn open_rom(app: &mut GopherEguiApp, ctx: &egui::Context) {
        player_number = Some(app.netplay.player_number);
    }

-    let (netplay_error_notifier, netplay_error_receiver): (
-        tokio::sync::mpsc::Sender<String>,
-        tokio::sync::mpsc::Receiver<String>,
-    ) = tokio::sync::mpsc::channel(1);
-
    let (vru_window_notifier, vru_window_receiver): (
        tokio::sync::mpsc::Sender<Vec<String>>,
        tokio::sync::mpsc::Receiver<Vec<String>>,
@@ -282,9 +275,6 @@ pub fn open_rom(app: &mut GopherEguiApp, ctx: &egui::Context) {
        tokio::sync::mpsc::Receiver<String>,
    ) = tokio::sync::mpsc::channel(1);

-    if netplay {
-        app.netplay_error_receiver = Some(netplay_error_receiver);
-    }
    if emulate_vru && !netplay {
        app.vru_window_receiver = Some(vru_window_receiver);
        app.vru_word_notifier = Some(vru_word_notifier);
@@ -336,8 +326,6 @@ pub fn open_rom(app: &mut GopherEguiApp, ctx: &egui::Context) {
                            peer_addr.unwrap(),
                            session.unwrap(),
                            player_number.unwrap(),
-                            netplay_error_notifier,
-                            gui_ctx,
                        ));
                        device.ui.fullscreen = fullscreen;
                        device::run_game(rom_contents, &mut device);
@@ -381,13 +369,6 @@ impl eframe::App for GopherEguiApp {
            gui_netplay::netplay_wait(self, ctx);
        }

-        if self.netplay_error_receiver.is_some() {
-            let result = self.netplay_error_receiver.as_mut().unwrap().try_recv();
-            if result.is_ok() {
-                self.netplay.error = result.unwrap();
-            }
-        }
-
        if !self.netplay.error.is_empty() {
            gui_netplay::netplay_error(self, ctx, self.netplay.error.clone());
        }
@@ -476,7 +457,24 @@ impl eframe::App for GopherEguiApp {
                }
            });
            ui.add_space(32.0);
-            ui.checkbox(&mut self.upscale, "High-Res Graphics");
+            let upscale_values = [1, 2, 4];
+            let mut slider_value = match self.upscale {
+                1 => 0,
+                2 => 1,
+                4 => 2,
+                _ => 0,
+            };
+            let display_text = format!("{}x Resolution", upscale_values[slider_value]);
+            if ui
+                .add(
+                    egui::Slider::new(&mut slider_value, 0..=2)
+                        .show_value(false)
+                        .text(display_text),
+                )
+                .changed()
+            {
+                self.upscale = upscale_values[slider_value];
+            };
            ui.checkbox(&mut self.integer_scaling, "Integer Scaling");
            ui.checkbox(&mut self.fullscreen, "Fullscreen (Esc closes game)");
            ui.add_space(32.0);
@@ -7,7 +7,19 @@ use sha2::{Digest, Sha256};
 const NETPLAY_VERSION: i32 = 17;
 const EMU_NAME: &str = "gopher64";

-type GameInfo = (String, String, String, Vec<u8>);
+#[derive(Default)]
+pub struct GameInfo {
+    pub md5: String,
+    pub game_name: String,
+    pub rom_label: String,
+    pub rom_contents: Vec<u8>,
+}
+
+#[derive(PartialEq, Default)]
+pub struct NetplayServer {
+    pub name: String,
+    pub ip: String,
+}

 #[derive(Default)]
 pub struct GuiNetplay {
@@ -21,7 +33,7 @@ pub struct GuiNetplay {
    pub create_rom_label: String,
    pub join_rom_label: String,
    pub send_chat: bool,
-    pub have_sessions: Option<(String, String)>,
+    pub have_sessions: Option<NetplayServer>,
    pub begin_game: bool,
    pub chat_log: String,
    pub chat_message: String,
@@ -33,10 +45,10 @@ pub struct GuiNetplay {
    pub rom_contents: Vec<u8>,
    pub player_number: u8,
    pub player_names: [String; 4],
-    pub server: (String, String),
+    pub server: NetplayServer,
    pub socket_waiting: bool,
    pub game_info: GameInfo,
-    pub servers: std::collections::HashMap<String, String>,
+    pub servers: Vec<NetplayServer>,
    pub waiting_session: Option<NetplayRoom>,
    pub socket:
        Option<tungstenite::WebSocket<tungstenite::stream::MaybeTlsStream<std::net::TcpStream>>>,
@@ -131,10 +143,14 @@ fn get_servers(app: &mut GopherEguiApp, ctx: &egui::Context) {
                serde_json::from_slice(&buffer[..amt]).unwrap();
            for server in data.iter() {
                let (server_name, server_ip) = server;
-                app.netplay
-                    .servers
-                    .insert(server_name.to_string(), server_ip.to_string());
-                app.netplay.server = (server.0.clone(), server.1.clone());
+                app.netplay.servers.push(NetplayServer {
+                    name: server_name.to_string(),
+                    ip: server_ip.to_string(),
+                });
+                app.netplay.server = NetplayServer {
+                    name: server.0.clone(),
+                    ip: server.1.clone(),
+                };
            }
            app.netplay.broadcast_socket = None;
        }
@@ -143,11 +159,19 @@ fn get_servers(app: &mut GopherEguiApp, ctx: &egui::Context) {
    if app.netplay.server_receiver.is_some() {
        let result = app.netplay.server_receiver.as_mut().unwrap().try_recv();
        if result.is_ok() {
-            app.netplay.servers.extend(result.unwrap());
+            for server in result.unwrap().iter() {
+                app.netplay.servers.push(NetplayServer {
+                    name: server.0.clone(),
+                    ip: server.1.clone(),
+                });
+            }
            app.netplay.server_receiver = None;
-            if app.netplay.server.0.is_empty() {
-                let first_server = app.netplay.servers.iter().next().unwrap();
-                app.netplay.server = (first_server.0.clone(), first_server.1.clone());
+            if app.netplay.server.name.is_empty() {
+                let first_server = app.netplay.servers.first().unwrap();
+                app.netplay.server = NetplayServer {
+                    name: first_server.name.clone(),
+                    ip: first_server.ip.clone(),
+                };
            }
        }
        ctx.request_repaint();
@@ -190,12 +214,12 @@ pub fn netplay_create(app: &mut GopherEguiApp, ctx: &egui::Context) {
                    if let Some(file) = file {
                        parse_rom_file(file, tx).await;
                    } else {
-                        tx.send((
-                            "".to_string(),
-                            "".to_string(),
-                            "Open ROM".to_string(),
-                            vec![],
-                        ))
+                        tx.send(GameInfo {
+                            md5: "".to_string(),
+                            game_name: "".to_string(),
+                            rom_label: "Open ROM".to_string(),
+                            rom_contents: vec![],
+                        })
                        .await
                        .unwrap();
                    }
@@ -221,25 +245,28 @@ pub fn netplay_create(app: &mut GopherEguiApp, ctx: &egui::Context) {
                if result.is_ok() {
                    app.netplay.game_info_receiver = None;
                    let data = result.unwrap();
-                    if !data.0.is_empty() {
+                    if !data.md5.is_empty() {
                        app.netplay.game_info = data;
-                        app.netplay.rom_contents = app.netplay.game_info.3.clone();
-                        app.netplay.create_rom_label = app.netplay.game_info.2.clone();
+                        app.netplay.rom_contents = app.netplay.game_info.rom_contents.clone();
+                        app.netplay.create_rom_label = app.netplay.game_info.rom_label.clone();
                    } else {
-                        app.netplay.create_rom_label = data.2;
+                        app.netplay.create_rom_label = data.rom_label;
                    }
                }
                ctx.request_repaint();
            }

            egui::ComboBox::from_id_salt("server-combobox")
-                .selected_text(app.netplay.server.0.to_string())
+                .selected_text(app.netplay.server.name.to_string())
                .show_ui(ui, |ui| {
                    for server in app.netplay.servers.iter() {
                        ui.selectable_value(
                            &mut app.netplay.server,
-                            (server.0.clone(), server.1.clone()),
-                            server.0,
+                            NetplayServer {
+                                name: server.name.clone(),
+                                ip: server.ip.clone(),
+                            },
+                            server.name.clone(),
                        );
                    }
                });
@@ -271,12 +298,12 @@ pub fn netplay_create(app: &mut GopherEguiApp, ctx: &egui::Context) {
                    app.netplay.error = "Player Name cannot be empty".to_string();
                } else if app.netplay.session_name.is_empty() {
                    app.netplay.error = "Session Name cannot be empty".to_string();
-                } else if app.netplay.game_info.0.is_empty() {
+                } else if app.netplay.game_info.md5.is_empty() {
                    app.netplay.error = "ROM not loaded".to_string();
                } else {
                    let now_utc = chrono::Utc::now().timestamp_millis().to_string();
                    let hasher = Sha256::new().chain_update(&now_utc).chain_update(EMU_NAME);
-                    let mut game_name = app.netplay.game_info.1.to_string();
+                    let mut game_name = app.netplay.game_info.game_name.to_string();
                    if game_name.is_empty() {
                        // If the ROM doesn't report a name, use the filename
                        game_name = app.netplay.create_rom_label.clone();
@@ -297,13 +324,13 @@ pub fn netplay_create(app: &mut GopherEguiApp, ctx: &egui::Context) {
                            room_name: Some(app.netplay.session_name.clone()),
                            password: Some(app.netplay.password.clone()),
                            game_name: Some(game_name),
-                            md5: Some(app.netplay.game_info.0.clone()),
+                            md5: Some(app.netplay.game_info.md5.clone()),
                            protected: None,
                            port: None,
                        }),
                    };
                    let (mut socket, _response) =
-                        tungstenite::connect(&app.netplay.server.1).expect("Can't connect");
+                        tungstenite::connect(&app.netplay.server.ip).expect("Can't connect");
                    socket
                        .send(tungstenite::Message::Binary(tungstenite::Bytes::from(
                            serde_json::to_vec(&netplay_message).unwrap(),
@@ -350,7 +377,7 @@ fn get_sessions(app: &mut GopherEguiApp, ctx: &egui::Context) {
    }
    if app.netplay.socket.is_none() {
        let (mut sock, _response) =
-            tungstenite::connect(&app.netplay.server.1).expect("Can't connect");
+            tungstenite::connect(&app.netplay.server.ip).expect("Can't connect");
        match sock.get_mut() {
            tungstenite::stream::MaybeTlsStream::Plain(stream) => {
                app.netplay.peer_addr = Some(stream.peer_addr().unwrap());
@@ -385,7 +412,10 @@ fn get_sessions(app: &mut GopherEguiApp, ctx: &egui::Context) {
                serde_json::to_vec(&request_rooms).unwrap(),
            )))
            .unwrap();
-        app.netplay.have_sessions = Some(app.netplay.server.clone());
+        app.netplay.have_sessions = Some(NetplayServer {
+            name: app.netplay.server.name.clone(),
+            ip: app.netplay.server.ip.clone(),
+        });
        app.netplay.socket_waiting = true;
        ctx.request_repaint();
    }
@@ -397,16 +427,21 @@ async fn parse_rom_file(file: rfd::FileHandle, tx: tokio::sync::mpsc::Sender<Gam
        let hash = device::cart::rom::calculate_hash(&rom_contents);
        let game_name = ui::storage::get_game_name(&rom_contents);

-        tx.send((hash, game_name, file.file_name(), rom_contents))
-            .await
-            .unwrap();
+        tx.send(GameInfo {
+            md5: hash,
+            game_name,
+            rom_label: file.file_name(),
+            rom_contents,
+        })
+        .await
+        .unwrap();
    } else {
-        tx.send((
-            "".to_string(),
-            "".to_string(),
-            "Invalid ROM".to_string(),
-            vec![],
-        ))
+        tx.send(GameInfo {
+            md5: "".to_string(),
+            game_name: "".to_string(),
+            rom_label: "Invalid ROM".to_string(),
+            rom_contents: vec![],
+        })
        .await
        .unwrap();
    }
@@ -442,9 +477,9 @@ pub fn netplay_join(app: &mut GopherEguiApp, ctx: &egui::Context) {
        if result.is_ok() {
            app.netplay.game_info_receiver = None;
            let data = result.unwrap();
-            if !data.0.is_empty() {
+            if !data.md5.is_empty() {
                app.netplay.game_info = data;
-                app.netplay.rom_contents = app.netplay.game_info.3.clone();
+                app.netplay.rom_contents = app.netplay.game_info.rom_contents.clone();

                let netplay_message = NetplayMessage {
                    message_type: "request_join_room".to_string(),
@@ -462,7 +497,7 @@ pub fn netplay_join(app: &mut GopherEguiApp, ctx: &egui::Context) {
                        room_name: None,
                        password: Some(app.netplay.password.clone()),
                        game_name: None,
-                        md5: Some(app.netplay.game_info.0.clone()),
+                        md5: Some(app.netplay.game_info.md5.clone()),
                        protected: None,
                        port: app.netplay.selected_session.as_ref().unwrap().port,
                    }),
@@ -476,7 +511,7 @@ pub fn netplay_join(app: &mut GopherEguiApp, ctx: &egui::Context) {

                app.netplay.socket_waiting = true;
            } else {
-                app.netplay.error = data.2;
+                app.netplay.error = data.rom_label;
                app.netplay.join_rom_label = "Join Session (Open ROM)".to_string();
            }
        }
@@ -501,19 +536,22 @@ pub fn netplay_join(app: &mut GopherEguiApp, ctx: &egui::Context) {
                    ctx.request_repaint();
                }
                egui::ComboBox::from_id_salt("server-combobox")
-                    .selected_text(app.netplay.server.0.to_string())
+                    .selected_text(app.netplay.server.name.to_string())
                    .show_ui(ui, |ui| {
                        for server in app.netplay.servers.iter() {
                            ui.selectable_value(
                                &mut app.netplay.server,
-                                (server.0.clone(), server.1.clone()),
-                                server.0,
+                                NetplayServer {
+                                    name: server.name.clone(),
+                                    ip: server.ip.clone(),
+                                },
+                                server.name.clone(),
                            );
                        }
                    });
            });
        });
-        if !app.netplay.server.0.is_empty() {
+        if !app.netplay.server.name.is_empty() {
            get_sessions(app, ctx);
        }
        ui.add_space(16.0);
@@ -590,12 +628,12 @@ pub fn netplay_join(app: &mut GopherEguiApp, ctx: &egui::Context) {
                            if let Some(file) = file {
                                parse_rom_file(file, tx).await;
                            } else {
-                                tx.send((
-                                    "".to_string(),
-                                    "".to_string(),
-                                    "No ROM selected".to_string(),
-                                    vec![],
-                                ))
+                                tx.send(GameInfo {
+                                    md5: "".to_string(),
+                                    game_name: "".to_string(),
+                                    rom_label: "No ROM selected".to_string(),
+                                    rom_contents: vec![],
+                                })
                                .await
                                .unwrap();
                            }
@@ -34,6 +34,11 @@ pub struct Controllers {
    pub joystick: *mut sdl3_sys::joystick::SDL_Joystick,
 }

+pub struct InputData {
+    pub data: u32,
+    pub pak_change_pressed: bool,
+}
+
 fn bound_axis(x: &mut f64, y: &mut f64) {
    let radius = 95.0; // this is roughly the maxium diagonal distance of the controller

@@ -54,35 +59,35 @@ fn set_axis_from_joystick(
 ) -> (f64, f64) {
    let mut x = 0.0;
    let mut y = 0.0;
-    if profile.joystick_axis[AXIS_LEFT].0 {
+    if profile.joystick_axis[AXIS_LEFT].enabled {
        let axis_position = unsafe {
-            sdl3_sys::joystick::SDL_GetJoystickAxis(joystick, profile.joystick_axis[AXIS_LEFT].1)
+            sdl3_sys::joystick::SDL_GetJoystickAxis(joystick, profile.joystick_axis[AXIS_LEFT].id)
        };
-        if axis_position as isize * profile.joystick_axis[AXIS_LEFT].2 as isize > 0 {
+        if axis_position as isize * profile.joystick_axis[AXIS_LEFT].axis as isize > 0 {
            x = axis_position as f64 * MAX_AXIS_VALUE / i16::MAX as f64;
        }
    }
-    if profile.joystick_axis[AXIS_RIGHT].0 {
+    if profile.joystick_axis[AXIS_RIGHT].enabled {
        let axis_position = unsafe {
-            sdl3_sys::joystick::SDL_GetJoystickAxis(joystick, profile.joystick_axis[AXIS_RIGHT].1)
+            sdl3_sys::joystick::SDL_GetJoystickAxis(joystick, profile.joystick_axis[AXIS_RIGHT].id)
        };
-        if axis_position as isize * profile.joystick_axis[AXIS_RIGHT].2 as isize > 0 {
+        if axis_position as isize * profile.joystick_axis[AXIS_RIGHT].axis as isize > 0 {
            x = axis_position as f64 * MAX_AXIS_VALUE / i16::MAX as f64;
        }
    }
-    if profile.joystick_axis[AXIS_DOWN].0 {
+    if profile.joystick_axis[AXIS_DOWN].enabled {
        let axis_position = unsafe {
-            sdl3_sys::joystick::SDL_GetJoystickAxis(joystick, profile.joystick_axis[AXIS_DOWN].1)
+            sdl3_sys::joystick::SDL_GetJoystickAxis(joystick, profile.joystick_axis[AXIS_DOWN].id)
        };
-        if axis_position as isize * profile.joystick_axis[AXIS_DOWN].2 as isize > 0 {
+        if axis_position as isize * profile.joystick_axis[AXIS_DOWN].axis as isize > 0 {
            y = (axis_position as f64 * MAX_AXIS_VALUE / i16::MAX as f64).neg();
        }
    }
-    if profile.joystick_axis[AXIS_UP].0 {
+    if profile.joystick_axis[AXIS_UP].enabled {
        let axis_position = unsafe {
-            sdl3_sys::joystick::SDL_GetJoystickAxis(joystick, profile.joystick_axis[AXIS_UP].1)
+            sdl3_sys::joystick::SDL_GetJoystickAxis(joystick, profile.joystick_axis[AXIS_UP].id)
        };
-        if axis_position as isize * profile.joystick_axis[AXIS_UP].2 as isize > 0 {
+        if axis_position as isize * profile.joystick_axis[AXIS_UP].axis as isize > 0 {
            y = (axis_position as f64 * MAX_AXIS_VALUE / i16::MAX as f64).neg();
        }
    }
@@ -128,47 +133,47 @@ fn set_axis_from_controller(
 ) -> (f64, f64) {
    let mut x = 0.0;
    let mut y = 0.0;
-    if profile.controller_axis[AXIS_LEFT].0 {
+    if profile.controller_axis[AXIS_LEFT].enabled {
        let axis_position = unsafe {
            sdl3_sys::gamepad::SDL_GetGamepadAxis(
                controller,
-                get_axis_from_i32(profile.controller_axis[AXIS_LEFT].1),
+                get_axis_from_i32(profile.controller_axis[AXIS_LEFT].id),
            )
        };
-        if axis_position as isize * profile.controller_axis[AXIS_LEFT].2 as isize > 0 {
+        if axis_position as isize * profile.controller_axis[AXIS_LEFT].axis as isize > 0 {
            x = axis_position as f64 * MAX_AXIS_VALUE / i16::MAX as f64;
        }
    }
-    if profile.controller_axis[AXIS_RIGHT].0 {
+    if profile.controller_axis[AXIS_RIGHT].enabled {
        let axis_position = unsafe {
            sdl3_sys::gamepad::SDL_GetGamepadAxis(
                controller,
-                get_axis_from_i32(profile.controller_axis[AXIS_RIGHT].1),
+                get_axis_from_i32(profile.controller_axis[AXIS_RIGHT].id),
            )
        };
-        if axis_position as isize * profile.controller_axis[AXIS_RIGHT].2 as isize > 0 {
+        if axis_position as isize * profile.controller_axis[AXIS_RIGHT].axis as isize > 0 {
            x = axis_position as f64 * MAX_AXIS_VALUE / i16::MAX as f64;
        }
    }
-    if profile.controller_axis[AXIS_DOWN].0 {
+    if profile.controller_axis[AXIS_DOWN].enabled {
        let axis_position = unsafe {
            sdl3_sys::gamepad::SDL_GetGamepadAxis(
                controller,
-                get_axis_from_i32(profile.controller_axis[AXIS_DOWN].1),
+                get_axis_from_i32(profile.controller_axis[AXIS_DOWN].id),
            )
        };
-        if axis_position as isize * profile.controller_axis[AXIS_DOWN].2 as isize > 0 {
+        if axis_position as isize * profile.controller_axis[AXIS_DOWN].axis as isize > 0 {
            y = (axis_position as f64 * MAX_AXIS_VALUE / i16::MAX as f64).neg();
        }
    }
-    if profile.controller_axis[AXIS_UP].0 {
+    if profile.controller_axis[AXIS_UP].enabled {
        let axis_position = unsafe {
            sdl3_sys::gamepad::SDL_GetGamepadAxis(
                controller,
-                get_axis_from_i32(profile.controller_axis[AXIS_UP].1),
+                get_axis_from_i32(profile.controller_axis[AXIS_UP].id),
            )
        };
-        if axis_position as isize * profile.controller_axis[AXIS_UP].2 as isize > 0 {
+        if axis_position as isize * profile.controller_axis[AXIS_UP].axis as isize > 0 {
            y = (axis_position as f64 * MAX_AXIS_VALUE / i16::MAX as f64).neg();
        }
    }
@@ -181,23 +186,23 @@ fn set_axis_from_keys(
 ) -> (f64, f64) {
    let mut x = 0.0;
    let mut y = 0.0;
-    if profile.keys[AXIS_LEFT].0
-        && unsafe { *keyboard_state.offset(profile.keys[AXIS_LEFT].1 as isize) }
+    if profile.keys[AXIS_LEFT].enabled
+        && unsafe { *keyboard_state.offset(profile.keys[AXIS_LEFT].id as isize) }
    {
        x = -MAX_AXIS_VALUE
    }
-    if profile.keys[AXIS_RIGHT].0
-        && unsafe { *keyboard_state.offset(profile.keys[AXIS_RIGHT].1 as isize) }
+    if profile.keys[AXIS_RIGHT].enabled
+        && unsafe { *keyboard_state.offset(profile.keys[AXIS_RIGHT].id as isize) }
    {
        x = MAX_AXIS_VALUE
    }
-    if profile.keys[AXIS_DOWN].0
-        && unsafe { *keyboard_state.offset(profile.keys[AXIS_DOWN].1 as isize) }
+    if profile.keys[AXIS_DOWN].enabled
+        && unsafe { *keyboard_state.offset(profile.keys[AXIS_DOWN].id as isize) }
    {
        y = -MAX_AXIS_VALUE
    }
-    if profile.keys[AXIS_UP].0
-        && unsafe { *keyboard_state.offset(profile.keys[AXIS_UP].1 as isize) }
+    if profile.keys[AXIS_UP].enabled
+        && unsafe { *keyboard_state.offset(profile.keys[AXIS_UP].id as isize) }
    {
        y = MAX_AXIS_VALUE
    }
@@ -211,26 +216,26 @@ fn set_buttons_from_joystick(
    keys: &mut u32,
 ) {
    let profile_joystick_button = profile.joystick_buttons[i];
-    if profile_joystick_button.0 {
+    if profile_joystick_button.enabled {
        *keys |= (unsafe {
-            sdl3_sys::joystick::SDL_GetJoystickButton(joystick, profile_joystick_button.1)
+            sdl3_sys::joystick::SDL_GetJoystickButton(joystick, profile_joystick_button.id)
        } as u32)
            << i;
    }

    let profile_joystick_hat = profile.joystick_hat[i];
-    if profile_joystick_hat.0
-        && unsafe { sdl3_sys::joystick::SDL_GetJoystickHat(joystick, profile_joystick_hat.1) }
-            == profile_joystick_hat.2
+    if profile_joystick_hat.enabled
+        && unsafe { sdl3_sys::joystick::SDL_GetJoystickHat(joystick, profile_joystick_hat.id) }
+            == profile_joystick_hat.direction
    {
        *keys |= 1 << i;
    }

    let profile_joystick_axis = profile.joystick_axis[i];
-    if profile_joystick_axis.0 {
+    if profile_joystick_axis.enabled {
        let axis_position =
-            unsafe { sdl3_sys::joystick::SDL_GetJoystickAxis(joystick, profile_joystick_axis.1) };
-        if axis_position as isize * profile_joystick_axis.2 as isize > 0
+            unsafe { sdl3_sys::joystick::SDL_GetJoystickAxis(joystick, profile_joystick_axis.id) };
+        if axis_position as isize * profile_joystick_axis.axis as isize > 0
            && axis_position.saturating_abs() > i16::MAX / 2
        {
            *keys |= 1 << i;
@@ -245,25 +250,25 @@ fn set_buttons_from_controller(
    keys: &mut u32,
 ) {
    let profile_controller_button = profile.controller_buttons[i];
-    if profile_controller_button.0 {
+    if profile_controller_button.enabled {
        *keys |= (unsafe {
            sdl3_sys::gamepad::SDL_GetGamepadButton(
                controller,
-                get_button_from_i32(profile_controller_button.1),
+                get_button_from_i32(profile_controller_button.id),
            )
        } as u32)
            << i;
    }

    let profile_controller_axis = profile.controller_axis[i];
-    if profile_controller_axis.0 {
+    if profile_controller_axis.enabled {
        let axis_position = unsafe {
            sdl3_sys::gamepad::SDL_GetGamepadAxis(
                controller,
-                get_axis_from_i32(profile_controller_axis.1),
+                get_axis_from_i32(profile_controller_axis.id),
            )
        };
-        if axis_position as isize * profile_controller_axis.2 as isize > 0
+        if axis_position as isize * profile_controller_axis.axis as isize > 0
            && axis_position.saturating_abs() > i16::MAX / 2
        {
            *keys |= 1 << i;
@@ -310,35 +315,46 @@ fn change_paks(
    let key = profile.keys[CHANGE_PAK];

    let mut pressed = false;
-    if controller_button.0 && !controller.is_null() {
+    if controller_button.enabled && !controller.is_null() {
        pressed = unsafe {
            sdl3_sys::gamepad::SDL_GetGamepadButton(
                controller,
-                get_button_from_i32(controller_button.1),
+                get_button_from_i32(controller_button.id),
            )
        };
-    } else if joystick_button.0 && !joystick.is_null() {
-        pressed = unsafe { sdl3_sys::joystick::SDL_GetJoystickButton(joystick, joystick_button.1) };
-    } else if joystick_hat.0 && !joystick.is_null() {
-        pressed = unsafe { sdl3_sys::joystick::SDL_GetJoystickHat(joystick, joystick_hat.1) }
-            == joystick_hat.2;
-    } else if key.0 {
-        pressed = unsafe { *keyboard_state.offset(key.1 as isize) };
+    } else if joystick_button.enabled && !joystick.is_null() {
+        pressed =
+            unsafe { sdl3_sys::joystick::SDL_GetJoystickButton(joystick, joystick_button.id) };
+    } else if joystick_hat.enabled && !joystick.is_null() {
+        pressed = unsafe { sdl3_sys::joystick::SDL_GetJoystickHat(joystick, joystick_hat.id) }
+            == joystick_hat.direction;
+    } else if key.enabled {
+        pressed = unsafe { *keyboard_state.offset(key.id as isize) };
    }
    pressed
 }

-pub fn get(ui: &mut ui::Ui, channel: usize) -> (u32, bool) {
+pub fn get(ui: &mut ui::Ui, channel: usize) -> InputData {
    let profile_name = ui.config.input.input_profile_binding[channel].clone();
    let profile = ui.config.input.input_profiles.get(&profile_name).unwrap();
    let mut keys = 0;
    let controller = ui.controllers[channel].game_controller;
    let joystick = ui.controllers[channel].joystick;
+
+    let alt_pressed = unsafe {
+        // ignore key presses if ALT is pressed
+        *ui.keyboard_state
+            .offset(i32::from(sdl3_sys::scancode::SDL_SCANCODE_LALT) as isize)
+            || *ui
+                .keyboard_state
+                .offset(i32::from(sdl3_sys::scancode::SDL_SCANCODE_RALT) as isize)
+    };
+
    for i in 0..14 {
        if profile_name != "default" || channel == 0 {
            let profile_key = profile.keys[i];
-            if profile_key.0 {
-                keys |= (unsafe { *ui.keyboard_state.offset(profile_key.1 as isize) } as u32) << i;
+            if profile_key.enabled && !alt_pressed {
+                keys |= (unsafe { *ui.keyboard_state.offset(profile_key.id as isize) } as u32) << i;
            }
        }

@@ -366,10 +382,10 @@ pub fn get(ui: &mut ui::Ui, channel: usize) -> (u32, bool) {
    keys |= (x.round() as i8 as u8 as u32) << X_AXIS_SHIFT;
    keys |= (y.round() as i8 as u8 as u32) << Y_AXIS_SHIFT;

-    (
-        keys,
-        change_paks(profile, joystick, controller, ui.keyboard_state),
-    )
+    InputData {
+        data: keys,
+        pak_change_pressed: change_paks(profile, joystick, controller, ui.keyboard_state),
+    }
 }

 pub fn assign_controller(ui: &mut ui::Ui, controller: i32, port: usize) {
@@ -487,14 +503,39 @@ pub fn configure_input_profile(ui: &mut ui::Ui, profile: String, dinput: bool) {
        ("Change Pak", CHANGE_PAK),
    ];

-    let mut new_keys = [(false, 0); PROFILE_SIZE];
-    let mut new_joystick_buttons = [(false, 0i32); PROFILE_SIZE];
-    let mut new_joystick_hat = [(false, 0i32, 0); PROFILE_SIZE];
-    let mut new_joystick_axis = [(false, 0i32, 0); PROFILE_SIZE];
-    let mut new_controller_buttons = [(false, 0i32); PROFILE_SIZE];
-    let mut new_controller_axis = [(false, 0i32, 0); PROFILE_SIZE];
+    let mut new_keys = [ui::config::InputKeyButton {
+        enabled: false,
+        id: 0,
+    }; PROFILE_SIZE];
+    let mut new_joystick_buttons = [ui::config::InputKeyButton {
+        enabled: false,
+        id: 0,
+    }; PROFILE_SIZE];
+    let mut new_joystick_hat = [ui::config::InputJoystickHat {
+        enabled: false,
+        id: 0,
+        direction: 0,
+    }; PROFILE_SIZE];
+    let mut new_joystick_axis = [ui::config::InputControllerAxis {
+        enabled: false,
+        id: 0,
+        axis: 0,
+    }; PROFILE_SIZE];
+    let mut new_controller_buttons = [ui::config::InputKeyButton {
+        enabled: false,
+        id: 0,
+    }; PROFILE_SIZE];
+    let mut new_controller_axis = [ui::config::InputControllerAxis {
+        enabled: false,
+        id: 0,
+        axis: 0,
+    }; PROFILE_SIZE];

-    let mut last_joystick_axis_result = (false, 0, 0);
+    let mut last_joystick_axis_result = ui::config::InputControllerAxis {
+        enabled: false,
+        id: 0,
+        axis: 0,
+    };
    for (key, value) in key_labels.iter() {
        let mut event: sdl3_sys::events::SDL_Event = Default::default();
        while unsafe { sdl3_sys::events::SDL_PollEvent(&mut event) } {} // clear events
@@ -514,19 +555,34 @@ pub fn configure_input_profile(ui: &mut ui::Ui, profile: String, dinput: bool) {
                    close_controllers(open_joysticks, open_controllers);
                    return;
                } else if event_type == u32::from(sdl3_sys::events::SDL_EVENT_KEY_DOWN) {
-                    new_keys[*value] = (true, i32::from(unsafe { event.key.scancode }));
-                    key_set = true
+                    if unsafe {
+                        !event.key.repeat
+                            && event.key.scancode != sdl3_sys::scancode::SDL_SCANCODE_LALT
+                            && event.key.scancode != sdl3_sys::scancode::SDL_SCANCODE_RALT
+                    } {
+                        new_keys[*value] = ui::config::InputKeyButton {
+                            enabled: true,
+                            id: i32::from(unsafe { event.key.scancode }),
+                        };
+                        key_set = true
+                    }
                } else if event_type == u32::from(sdl3_sys::events::SDL_EVENT_GAMEPAD_BUTTON_DOWN) {
                    if !open_controllers.is_empty() {
-                        new_controller_buttons[*value] =
-                            (true, i32::from(unsafe { event.gbutton.button }));
+                        new_controller_buttons[*value] = ui::config::InputKeyButton {
+                            enabled: true,
+                            id: i32::from(unsafe { event.gbutton.button }),
+                        };
                        key_set = true
                    }
                } else if event_type == u32::from(sdl3_sys::events::SDL_EVENT_GAMEPAD_AXIS_MOTION) {
                    let axis_value = unsafe { event.gaxis.value };
                    let axis = unsafe { event.gaxis.axis };
                    if !open_controllers.is_empty() && axis_value.saturating_abs() > i16::MAX / 2 {
-                        let result = (true, axis as i32, axis_value / axis_value.saturating_abs());
+                        let result = ui::config::InputControllerAxis {
+                            enabled: true,
+                            id: axis as i32,
+                            axis: axis_value / axis_value.saturating_abs(),
+                        };
                        if result != last_joystick_axis_result {
                            new_controller_axis[*value] = result;
                            last_joystick_axis_result = result;
@@ -536,15 +592,21 @@ pub fn configure_input_profile(ui: &mut ui::Ui, profile: String, dinput: bool) {
                } else if event_type == u32::from(sdl3_sys::events::SDL_EVENT_JOYSTICK_BUTTON_DOWN)
                {
                    if !open_joysticks.is_empty() {
-                        new_joystick_buttons[*value] =
-                            (true, i32::from(unsafe { event.jbutton.button }));
+                        new_joystick_buttons[*value] = ui::config::InputKeyButton {
+                            enabled: true,
+                            id: i32::from(unsafe { event.jbutton.button }),
+                        };
                        key_set = true
                    }
                } else if event_type == u32::from(sdl3_sys::events::SDL_EVENT_JOYSTICK_HAT_MOTION) {
                    let state = unsafe { event.jhat.value };
                    let hat = unsafe { event.jhat.hat };
                    if !open_joysticks.is_empty() && state != sdl3_sys::joystick::SDL_HAT_CENTERED {
-                        new_joystick_hat[*value] = (true, hat as i32, state);
+                        new_joystick_hat[*value] = ui::config::InputJoystickHat {
+                            enabled: true,
+                            id: hat as i32,
+                            direction: state,
+                        };
                        key_set = true
                    }
                } else if event_type == u32::from(sdl3_sys::events::SDL_EVENT_JOYSTICK_AXIS_MOTION)
@@ -552,7 +614,11 @@ pub fn configure_input_profile(ui: &mut ui::Ui, profile: String, dinput: bool) {
                    let axis_value = unsafe { event.jaxis.value };
                    let axis = unsafe { event.jaxis.axis };
                    if !open_joysticks.is_empty() && axis_value.saturating_abs() > i16::MAX / 2 {
-                        let result = (true, axis as i32, axis_value / axis_value.saturating_abs());
+                        let result = ui::config::InputControllerAxis {
+                            enabled: true,
+                            id: axis as i32,
+                            axis: axis_value / axis_value.saturating_abs(),
+                        };
                        if result != last_joystick_axis_result {
                            new_joystick_axis[*value] = result;
                            last_joystick_axis_result = result;
@@ -584,114 +650,200 @@ pub fn configure_input_profile(ui: &mut ui::Ui, profile: String, dinput: bool) {
 }

 pub fn get_default_profile() -> ui::config::InputProfile {
-    let mut default_controller_buttons = [(false, 0); PROFILE_SIZE];
-    let mut default_controller_axis = [(false, 0, 0); PROFILE_SIZE];
-    let mut default_keys = [(false, 0); PROFILE_SIZE];
-    default_keys[R_DPAD] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_D));
-    default_keys[L_DPAD] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_A));
-    default_keys[D_DPAD] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_S));
-    default_keys[U_DPAD] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_W));
-    default_keys[START_BUTTON] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_RETURN));
-    default_keys[Z_TRIG] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_Z));
-    default_keys[B_BUTTON] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_LCTRL));
-    default_keys[A_BUTTON] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_LSHIFT));
-    default_keys[R_CBUTTON] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_L));
-    default_keys[L_CBUTTON] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_J));
-    default_keys[D_CBUTTON] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_K));
-    default_keys[U_CBUTTON] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_I));
-    default_keys[R_TRIG] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_C));
-    default_keys[L_TRIG] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_X));
-    default_keys[AXIS_LEFT] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_LEFT));
-    default_keys[AXIS_RIGHT] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_RIGHT));
-    default_keys[AXIS_UP] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_UP));
-    default_keys[AXIS_DOWN] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_DOWN));
-    default_keys[CHANGE_PAK] = (true, i32::from(sdl3_sys::scancode::SDL_SCANCODE_COMMA));
+    let mut default_controller_buttons = [ui::config::InputKeyButton {
+        enabled: false,
+        id: 0,
+    }; PROFILE_SIZE];
+    let mut default_controller_axis = [ui::config::InputControllerAxis {
+        enabled: false,
+        id: 0,
+        axis: 0,
+    }; PROFILE_SIZE];
+    let mut default_keys = [ui::config::InputKeyButton {
+        enabled: false,
+        id: 0,
+    }; PROFILE_SIZE];
+    default_keys[R_DPAD] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_D),
+    };
+    default_keys[L_DPAD] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_A),
+    };
+    default_keys[D_DPAD] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_S),
+    };
+    default_keys[U_DPAD] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_W),
+    };
+    default_keys[START_BUTTON] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_RETURN),
+    };
+    default_keys[Z_TRIG] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_Z),
+    };
+    default_keys[B_BUTTON] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_LCTRL),
+    };
+    default_keys[A_BUTTON] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_LSHIFT),
+    };
+    default_keys[R_CBUTTON] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_L),
+    };
+    default_keys[L_CBUTTON] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_J),
+    };
+    default_keys[D_CBUTTON] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_K),
+    };
+    default_keys[U_CBUTTON] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_I),
+    };
+    default_keys[R_TRIG] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_C),
+    };
+    default_keys[L_TRIG] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_X),
+    };
+    default_keys[AXIS_LEFT] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_LEFT),
+    };
+    default_keys[AXIS_RIGHT] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_RIGHT),
+    };
+    default_keys[AXIS_UP] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_UP),
+    };
+    default_keys[AXIS_DOWN] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_DOWN),
+    };
+    default_keys[CHANGE_PAK] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::scancode::SDL_SCANCODE_COMMA),
+    };

-    default_controller_buttons[R_DPAD] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_DPAD_RIGHT),
-    );
-    default_controller_buttons[L_DPAD] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_DPAD_LEFT),
-    );
-    default_controller_buttons[D_DPAD] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_DPAD_DOWN),
-    );
-    default_controller_buttons[U_DPAD] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_DPAD_UP),
-    );
-    default_controller_buttons[START_BUTTON] =
-        (true, i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_START));
-    default_controller_axis[Z_TRIG] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_LEFT_TRIGGER),
-        1,
-    );
-    default_controller_buttons[B_BUTTON] =
-        (true, i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_WEST));
-    default_controller_buttons[A_BUTTON] =
-        (true, i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_SOUTH));
-    default_controller_axis[R_CBUTTON] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_RIGHTX),
-        1,
-    );
-    default_controller_axis[L_CBUTTON] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_RIGHTX),
-        -1,
-    );
-    default_controller_axis[D_CBUTTON] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_RIGHTY),
-        1,
-    );
-    default_controller_axis[U_CBUTTON] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_RIGHTY),
-        -1,
-    );
-    default_controller_buttons[R_TRIG] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER),
-    );
-    default_controller_buttons[L_TRIG] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_LEFT_SHOULDER),
-    );
-    default_controller_axis[AXIS_LEFT] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_LEFTX),
-        -1,
-    );
-    default_controller_axis[AXIS_RIGHT] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_LEFTX),
-        1,
-    );
-    default_controller_axis[AXIS_UP] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_LEFTY),
-        -1,
-    );
-    default_controller_axis[AXIS_DOWN] = (
-        true,
-        i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_LEFTY),
-        1,
-    );
-    default_controller_buttons[CHANGE_PAK] =
-        (true, i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_BACK));
+    default_controller_buttons[R_DPAD] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_DPAD_RIGHT),
+    };
+    default_controller_buttons[L_DPAD] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_DPAD_LEFT),
+    };
+    default_controller_buttons[D_DPAD] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_DPAD_DOWN),
+    };
+    default_controller_buttons[U_DPAD] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_DPAD_UP),
+    };
+    default_controller_buttons[START_BUTTON] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_START),
+    };
+    default_controller_axis[Z_TRIG] = ui::config::InputControllerAxis {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_LEFT_TRIGGER),
+        axis: 1,
+    };
+    default_controller_buttons[B_BUTTON] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_WEST),
+    };
+    default_controller_buttons[A_BUTTON] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_SOUTH),
+    };
+    default_controller_axis[R_CBUTTON] = ui::config::InputControllerAxis {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_RIGHTX),
+        axis: 1,
+    };
+    default_controller_axis[L_CBUTTON] = ui::config::InputControllerAxis {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_RIGHTX),
+        axis: -1,
+    };
+    default_controller_axis[D_CBUTTON] = ui::config::InputControllerAxis {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_RIGHTY),
+        axis: 1,
+    };
+    default_controller_axis[U_CBUTTON] = ui::config::InputControllerAxis {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_RIGHTY),
+        axis: -1,
+    };
+    default_controller_buttons[R_TRIG] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER),
+    };
+    default_controller_buttons[L_TRIG] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_LEFT_SHOULDER),
+    };
+    default_controller_axis[AXIS_LEFT] = ui::config::InputControllerAxis {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_LEFTX),
+        axis: -1,
+    };
+    default_controller_axis[AXIS_RIGHT] = ui::config::InputControllerAxis {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_LEFTX),
+        axis: 1,
+    };
+    default_controller_axis[AXIS_UP] = ui::config::InputControllerAxis {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_LEFTY),
+        axis: -1,
+    };
+    default_controller_axis[AXIS_DOWN] = ui::config::InputControllerAxis {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_AXIS_LEFTY),
+        axis: 1,
+    };
+    default_controller_buttons[CHANGE_PAK] = ui::config::InputKeyButton {
+        enabled: true,
+        id: i32::from(sdl3_sys::gamepad::SDL_GAMEPAD_BUTTON_BACK),
+    };

    ui::config::InputProfile {
        keys: default_keys,
        controller_buttons: default_controller_buttons,
        controller_axis: default_controller_axis,
-        joystick_buttons: Default::default(),
-        joystick_hat: Default::default(),
-        joystick_axis: Default::default(),
+        joystick_buttons: [ui::config::InputKeyButton {
+            enabled: false,
+            id: 0,
+        }; PROFILE_SIZE],
+        joystick_hat: [ui::config::InputJoystickHat {
+            enabled: false,
+            id: 0,
+            direction: 0,
+        }; PROFILE_SIZE],
+        joystick_axis: [ui::config::InputControllerAxis {
+            enabled: false,
+            id: 0,
+            axis: 0,
+        }; PROFILE_SIZE],
        dinput: false,
    }
 }
@@ -705,7 +857,7 @@ pub fn init(ui: &mut ui::Ui) {
    let mut taken = [false; 4];
    for i in 0..4 {
        let controller_assignment = &ui.config.input.controller_assignment[i];
-        if controller_assignment.is_some() {
+        if controller_assignment.is_some() && ui.config.input.controller_enabled[i] {
            let mut joystick_id = 0;
            let assigned_path = controller_assignment.as_ref().unwrap();

@@ -25,14 +25,26 @@ pub struct Paths {

 // the bool indicates whether the save has been written to
 // if that is the case, it will be flushed to the disk when the program closes
+#[derive(serde::Serialize, serde::Deserialize)]
+pub struct Save {
+    pub data: Vec<u8>,
+    pub written: bool,
+}
+
+#[derive(serde::Serialize, serde::Deserialize)]
+pub struct RomSave {
+    pub data: std::collections::HashMap<u32, u8>,
+    pub written: bool,
+}
+
 #[derive(serde::Serialize, serde::Deserialize)]
 pub struct Saves {
-    pub eeprom: (Vec<u8>, bool),
-    pub sram: (Vec<u8>, bool),
-    pub flash: (Vec<u8>, bool),
-    pub mempak: (Vec<u8>, bool),
-    pub sdcard: (Vec<u8>, bool),
-    pub romsave: (std::collections::HashMap<u32, u8>, bool),
+    pub eeprom: Save,
+    pub sram: Save,
+    pub flash: Save,
+    pub mempak: Save,
+    pub sdcard: Save,
+    pub romsave: RomSave,
 }

 fn get_save_type(rom: &[u8], game_id: &str) -> Vec<SaveTypes> {
@@ -175,27 +187,27 @@ pub fn load_saves(ui: &mut ui::Ui, netplay: &mut Option<netplay::Netplay>) {
    if netplay.is_none() || netplay.as_ref().unwrap().player_number == 0 {
        let eep = std::fs::read(&mut ui.paths.eep_file_path);
        if eep.is_ok() {
-            ui.saves.eeprom.0 = eep.unwrap();
+            ui.saves.eeprom.data = eep.unwrap();
        }
        let sra = std::fs::read(&mut ui.paths.sra_file_path);
        if sra.is_ok() {
-            ui.saves.sram.0 = sra.unwrap();
+            ui.saves.sram.data = sra.unwrap();
        }
        let fla = std::fs::read(&mut ui.paths.fla_file_path);
        if fla.is_ok() {
-            ui.saves.flash.0 = fla.unwrap();
+            ui.saves.flash.data = fla.unwrap();
        }
        let mempak = std::fs::read(&mut ui.paths.pak_file_path);
        if mempak.is_ok() {
-            ui.saves.mempak.0 = mempak.unwrap();
+            ui.saves.mempak.data = mempak.unwrap();
        }
        let sdcard = std::fs::read(&mut ui.paths.sdcard_file_path);
        if sdcard.is_ok() {
-            ui.saves.sdcard.0 = sdcard.unwrap();
+            ui.saves.sdcard.data = sdcard.unwrap();
        }
        let romsave = std::fs::read(&mut ui.paths.romsave_file_path);
        if romsave.is_ok() {
-            ui.saves.romsave.0 = postcard::from_bytes(romsave.unwrap().as_ref()).unwrap();
+            ui.saves.romsave.data = postcard::from_bytes(romsave.unwrap().as_ref()).unwrap();
        }
    }

@@ -204,31 +216,31 @@ pub fn load_saves(ui: &mut ui::Ui, netplay: &mut Option<netplay::Netplay>) {
            netplay::send_save(
                netplay.as_mut().unwrap(),
                "eep",
-                &ui.saves.eeprom.0,
-                ui.saves.eeprom.0.len(),
+                &ui.saves.eeprom.data,
+                ui.saves.eeprom.data.len(),
            );
            netplay::send_save(
                netplay.as_mut().unwrap(),
                "sra",
-                &ui.saves.sram.0,
-                ui.saves.sram.0.len(),
+                &ui.saves.sram.data,
+                ui.saves.sram.data.len(),
            );
            netplay::send_save(
                netplay.as_mut().unwrap(),
                "fla",
-                &ui.saves.flash.0,
-                ui.saves.flash.0.len(),
+                &ui.saves.flash.data,
+                ui.saves.flash.data.len(),
            );
            netplay::send_save(
                netplay.as_mut().unwrap(),
                "mpk",
-                &ui.saves.mempak.0,
-                ui.saves.mempak.0.len(),
+                &ui.saves.mempak.data,
+                ui.saves.mempak.data.len(),
            );

            let mut compressed_sd = Vec::new();
-            if !ui.saves.sdcard.0.is_empty() {
-                compressed_sd = compress_file(&[(&ui.saves.sdcard.0, "save")]);
+            if !ui.saves.sdcard.data.is_empty() {
+                compressed_sd = compress_file(&[(&ui.saves.sdcard.data, "save")]);
            }
            netplay::send_save(
                netplay.as_mut().unwrap(),
@@ -238,9 +250,11 @@ pub fn load_saves(ui: &mut ui::Ui, netplay: &mut Option<netplay::Netplay>) {
            );

            let mut compressed_romsave = Vec::new();
-            if !ui.saves.romsave.0.is_empty() {
-                compressed_romsave =
-                    compress_file(&[(&postcard::to_stdvec(&ui.saves.romsave.0).unwrap(), "save")]);
+            if !ui.saves.romsave.data.is_empty() {
+                compressed_romsave = compress_file(&[(
+                    &postcard::to_stdvec(&ui.saves.romsave.data).unwrap(),
+                    "save",
+                )]);
            }
            netplay::send_save(
                netplay.as_mut().unwrap(),
@@ -249,22 +263,22 @@ pub fn load_saves(ui: &mut ui::Ui, netplay: &mut Option<netplay::Netplay>) {
                compressed_romsave.len(),
            );
        } else {
-            netplay::receive_save(netplay.as_mut().unwrap(), "eep", &mut ui.saves.eeprom.0);
-            netplay::receive_save(netplay.as_mut().unwrap(), "sra", &mut ui.saves.sram.0);
-            netplay::receive_save(netplay.as_mut().unwrap(), "fla", &mut ui.saves.flash.0);
-            netplay::receive_save(netplay.as_mut().unwrap(), "mpk", &mut ui.saves.mempak.0);
+            netplay::receive_save(netplay.as_mut().unwrap(), "eep", &mut ui.saves.eeprom.data);
+            netplay::receive_save(netplay.as_mut().unwrap(), "sra", &mut ui.saves.sram.data);
+            netplay::receive_save(netplay.as_mut().unwrap(), "fla", &mut ui.saves.flash.data);
+            netplay::receive_save(netplay.as_mut().unwrap(), "mpk", &mut ui.saves.mempak.data);

            let mut compressed_sd = Vec::new();
            netplay::receive_save(netplay.as_mut().unwrap(), "img", &mut compressed_sd);
            if !compressed_sd.is_empty() {
-                ui.saves.sdcard.0 = decompress_file(&compressed_sd, "save");
+                ui.saves.sdcard.data = decompress_file(&compressed_sd, "save");
            }

            let mut compressed_romsave = Vec::new();
            netplay::receive_save(netplay.as_mut().unwrap(), "rom", &mut compressed_romsave);
            if !compressed_romsave.is_empty() {
                let romsave_bytes = decompress_file(&compressed_romsave, "save");
-                ui.saves.romsave.0 = postcard::from_bytes(&romsave_bytes).unwrap();
+                ui.saves.romsave.data = postcard::from_bytes(&romsave_bytes).unwrap();
            }
        }
    }
@@ -299,28 +313,28 @@ pub fn compress_file(data: &[(&[u8], &str)]) -> Vec<u8> {
 }

 fn write_rom_save(ui: &ui::Ui) {
-    let data = postcard::to_stdvec(&ui.saves.romsave.0).unwrap();
+    let data = postcard::to_stdvec(&ui.saves.romsave.data).unwrap();
    std::fs::write(ui.paths.romsave_file_path.clone(), data).unwrap();
 }

 pub fn write_saves(ui: &ui::Ui, netplay: &Option<netplay::Netplay>) {
    if netplay.is_none() || netplay.as_ref().unwrap().player_number == 0 {
-        if ui.saves.eeprom.1 {
+        if ui.saves.eeprom.written {
            write_save(ui, SaveTypes::Eeprom16k)
        }
-        if ui.saves.sram.1 {
+        if ui.saves.sram.written {
            write_save(ui, SaveTypes::Sram)
        }
-        if ui.saves.flash.1 {
+        if ui.saves.flash.written {
            write_save(ui, SaveTypes::Flash)
        }
-        if ui.saves.mempak.1 {
+        if ui.saves.mempak.written {
            write_save(ui, SaveTypes::Mempak)
        }
-        if ui.saves.sdcard.1 {
+        if ui.saves.sdcard.written {
            write_save(ui, SaveTypes::Sdcard)
        }
-        if ui.saves.romsave.1 {
+        if ui.saves.romsave.written {
            write_save(ui, SaveTypes::Romsave)
        }
    }
@@ -332,23 +346,23 @@ fn write_save(ui: &ui::Ui, save_type: SaveTypes) {
    match save_type {
        SaveTypes::Eeprom4k | SaveTypes::Eeprom16k => {
            path = ui.paths.eep_file_path.as_ref();
-            data = ui.saves.eeprom.0.as_ref();
+            data = ui.saves.eeprom.data.as_ref();
        }
        SaveTypes::Sram => {
            path = ui.paths.sra_file_path.as_ref();
-            data = ui.saves.sram.0.as_ref();
+            data = ui.saves.sram.data.as_ref();
        }
        SaveTypes::Flash => {
            path = ui.paths.fla_file_path.as_ref();
-            data = ui.saves.flash.0.as_ref();
+            data = ui.saves.flash.data.as_ref();
        }
        SaveTypes::Mempak => {
            path = ui.paths.pak_file_path.as_ref();
-            data = ui.saves.mempak.0.as_ref();
+            data = ui.saves.mempak.data.as_ref();
        }
        SaveTypes::Sdcard => {
            path = ui.paths.sdcard_file_path.as_ref();
-            data = ui.saves.sdcard.0.as_ref();
+            data = ui.saves.sdcard.data.as_ref();
        }
        SaveTypes::Romsave => {
            write_rom_save(ui);
@@ -14,15 +14,24 @@ pub fn init(device: &mut device::Device) {
    } else {
        flags |= sdl3_sys::video::SDL_WINDOW_RESIZABLE;
    }
+    flags |= sdl3_sys::video::SDL_WINDOW_INPUT_FOCUS;

-    device.ui.window =
-        unsafe { sdl3_sys::video::SDL_CreateWindow(title.as_ptr(), 640, 480, flags) };
+    let mut window_width = 640;
+    let mut window_height = 480;
+    if device.cart.pal {
+        window_width = 768;
+        window_height = 576;
+    }
+    device.ui.window = unsafe {
+        sdl3_sys::video::SDL_CreateWindow(title.as_ptr(), window_width, window_height, flags)
+    };
    if device.ui.window.is_null() {
        panic!("Could not create window");
    }
    if !unsafe { sdl3_sys::video::SDL_ShowWindow(device.ui.window) } {
        panic!("Could not show window");
    }
+    unsafe { sdl3_sys::everything::SDL_HideCursor() };

    let gfx_info = GFX_INFO {
        RDRAM: device.rdram.mem.as_mut_ptr(),
@@ -32,6 +41,7 @@ pub fn init(device: &mut device::Device) {
        DPC_START_REG: &mut device.rdp.regs_dpc[device::rdp::DPC_START_REG as usize],
        DPC_END_REG: &mut device.rdp.regs_dpc[device::rdp::DPC_END_REG as usize],
        DPC_STATUS_REG: &mut device.rdp.regs_dpc[device::rdp::DPC_STATUS_REG as usize],
+        PAL: device.cart.pal,
    };

    unsafe {
@@ -57,6 +67,14 @@ pub fn update_screen() {
    unsafe { rdp_update_screen() }
 }

+pub fn check_framebuffers(address: u32) {
+    unsafe { rdp_check_framebuffers(address) }
+}
+
+pub fn full_sync() {
+    unsafe { rdp_full_sync() }
+}
+
 pub fn load_state(device: &mut device::Device) {
    let gfx_info = GFX_INFO {
        RDRAM: device.rdram.mem.as_mut_ptr(),
@@ -66,6 +84,7 @@ pub fn load_state(device: &mut device::Device) {
        DPC_START_REG: &mut device.rdp.regs_dpc[device::rdp::DPC_START_REG as usize],
        DPC_END_REG: &mut device.rdp.regs_dpc[device::rdp::DPC_END_REG as usize],
        DPC_STATUS_REG: &mut device.rdp.regs_dpc[device::rdp::DPC_STATUS_REG as usize],
+        PAL: device.cart.pal,
    };
    unsafe {
        rdp_new_processor(gfx_info, device.ui.config.video.upscale);
@@ -81,6 +100,7 @@ pub fn check_callback(device: &mut device::Device) {
        } else if callback.load_state {
            device.load_state = true;
        }
+        device.vi.enable_speed_limiter = callback.enable_speedlimiter;
    }
 }
Author	SHA1	Message	Date
Logan McNaughton	b6c805a27d	update cargo packages	2025-02-20 18:21:15 +01:00
Logan McNaughton	b7509a2425	use rust 2024 edition (#268 )	2025-02-20 18:20:55 +01:00
Logan McNaughton	6ecedde329	add note about building on linux	2025-02-20 16:12:31 +01:00
Logan McNaughton	09dfd69283	use better data struct for netplay servers (#269 ) * use better data struct for netplay servers * more	2025-02-20 12:46:44 +01:00
Logan McNaughton	d262567084	use struct in netplay code (#265 ) * use struct in netplay code * more	2025-02-19 20:57:03 +01:00
Logan McNaughton	c363e78fbb	add slider for resolution (#264 ) * add slider for resolution * more	2025-02-19 14:48:36 +01:00
Logan McNaughton	792a3a6476	reduce binary size (#263 )	2025-02-19 11:26:55 +01:00
Logan McNaughton	5bdb54a911	Update README.md	2025-02-19 10:52:26 +01:00
Logan McNaughton	b01c2d1885	use key down for input	2025-02-18 14:25:24 +01:00
Logan McNaughton	bb2da243b3	fix hotkeys	2025-02-18 13:38:38 +01:00
Logan McNaughton	938a99caa9	clean up data struct (#262 ) * clean up data struct * add check * more * more * more	2025-02-18 10:05:48 +01:00
dependabot[bot]	f7bfcfccba	Bump clap from 4.5.29 to 4.5.30 (#261 ) Bumps [clap](https://github.com/clap-rs/clap) from 4.5.29 to 4.5.30. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.29...clap_complete-v4.5.30) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-02-18 05:42:01 +01:00
Logan McNaughton	656e390171	track RDP RDRAM writes (#259 ) * track RDP RDRAM writes * more * more * more * more * more	2025-02-17 22:13:45 +01:00
Logan McNaughton	17990dfebc	toggle speed limiter (#260 )	2025-02-17 13:40:25 +01:00
Logan McNaughton	671a961789	Use struct instead of tuple (#258 ) * Use struct instead of tuple * more	2025-02-17 09:19:25 +01:00
Logan McNaughton	aac68a4a1b	rename artifacts (#257 )	2025-02-16 11:35:28 +01:00
Logan McNaughton	dc5a78a75e	use audio for netplay messages (#256 ) * use audio for netplay messages * more	2025-02-16 11:04:59 +01:00
Logan McNaughton	91a5483452	bump to 1.0.8 (#255 )	2025-02-15 23:11:38 +01:00
Logan McNaughton	baee7ffb82	update cargo packages	2025-02-15 23:10:04 +01:00
Logan McNaughton	c2780c78b3	Transferpak stub (#254 ) * transferpak support * more * more	2025-02-15 18:32:36 +01:00
Logan McNaughton	ba006ddd53	add transferpak wav	2025-02-15 15:54:25 +01:00
Logan McNaughton	e04a151d49	set DPC_PIPEBUSY_REG (#253 ) * set DPC_PIPEBUSY_REG * revert hidden rdram change * more	2025-02-15 08:29:37 +01:00
Logan McNaughton	8566eee906	fix possible crash in is viewer	2025-02-14 22:20:15 +01:00
Logan McNaughton	a1c2ac21be	fix hidden rdram size	2025-02-14 21:32:11 +01:00
Logan McNaughton	b7d194e12d	alt_return to toggle fullscreen (#252 ) * alt_return to toggle fullscreen * more	2025-02-14 12:29:49 +01:00
Logan McNaughton	df9ad377d3	add cycles for rsp mfc0 (#251 ) * add cycles for rsp mfc0 * more	2025-02-14 10:07:58 +01:00
Logan McNaughton	8f20abe813	update_screen after speed limiter (#250 )	2025-02-13 22:09:17 +01:00
Logan McNaughton	3aca3c1664	bump to 1.0.7 (#249 )	2025-02-13 21:28:47 +01:00
Logan McNaughton	500b4bb505	only try to assign enabled controllers (#248 )	2025-02-13 21:05:22 +01:00
Logan McNaughton	b01bbaa82f	update cargo packages	2025-02-13 21:04:15 +01:00
Logan McNaughton	2010b82c8e	remove dead code	2025-02-13 11:57:16 +01:00
Logan McNaughton	74c65750a3	add some sdl window flags (#247 )	2025-02-13 11:40:06 +01:00
Logan McNaughton	2d09425ca1	fix rsp reserved commands (#246 )	2025-02-12 22:04:30 +01:00
Logan McNaughton	d0965c03e1	dynamically calculate speed limit frequency (#245 ) * dynamically calculate speed limit frequency * dynamically calculate speed limit frequency * dynamically calculate speed limit frequency * more	2025-02-12 21:18:54 +01:00
Logan McNaughton	6ee55ce4ca	add a way to show internal FPS (#244 )	2025-02-12 17:53:17 +01:00
Logan McNaughton	63b2ed69e4	don't modify cart.rom (#243 ) * don't modify cart.rom * don't modify cart.rom * don't modify cart.rom * more * more	2025-02-12 16:09:42 +01:00
Logan McNaughton	0faf33fcfa	PAL aspect ratio adjustment (#242 )	2025-02-12 10:14:06 +01:00
Logan McNaughton	b67268ff62	fix PAL aspect ratio (#241 )	2025-02-12 09:19:39 +01:00
dependabot[bot]	bda50f8d9d	Bump clap from 4.5.28 to 4.5.29 (#240 ) Bumps [clap](https://github.com/clap-rs/clap) from 4.5.28 to 4.5.29. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.28...clap_complete-v4.5.29) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-02-12 06:13:45 +01:00
Logan McNaughton	ea012b4587	bump to 1.0.6 (#239 )	2025-02-11 15:48:46 +01:00