Remove GTK+2 support.

Although it had HIRO_GTK==3 sections, hiro/gtk/monitor.cpp was actually using deprecated GTK+2 APIs on GTK3, and the GTK3 code was broken and wouldn't compile.
Add FreeBSD build to GitHub Actions
2025-09-11 04:00:56 +02:00 · 2025-09-03 19:31:42 +10:00 · 2025-09-02 18:13:34 +10:00 · 2025-09-02 18:09:42 +10:00 · 2025-09-02 18:09:42 +10:00 · 2025-09-02 18:09:42 +10:00
1028 changed files with 229902 additions and 9503 deletions
--- a/.assets/bahamut-lagoon.png
+++ b/.assets/bahamut-lagoon.png
--- a/.assets/tengai-makyou-zero.png
+++ b/.assets/tengai-makyou-zero.png
--- a/.assets/user-interface.png
+++ b/.assets/user-interface.png
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,81 +0,0 @@
-linux-x86_64-binaries_task:
-    container:
-        image: ubuntu:latest
-
-    setup_script:
-        - apt-get update && apt-get -y install build-essential libgtk2.0-dev libpulse-dev mesa-common-dev libgtksourceview2.0-dev libcairo2-dev libsdl2-dev libxv-dev libao-dev libopenal-dev libudev-dev zip
-
-    compile_script:
-        - make -C bsnes local=false
-
-    package_script:
-        - mkdir bsnes-nightly
-        - mkdir bsnes-nightly/Database
-        - mkdir bsnes-nightly/Firmware
-        - cp -a bsnes/out/bsnes bsnes-nightly/bsnes
-        - cp -a bsnes/Database/* bsnes-nightly/Database
-        - cp -a GPLv3.txt bsnes-nightly
-        - zip -r bsnes-nightly.zip bsnes-nightly
-
-    bsnes-nightly_artifacts:
-        path: "bsnes-nightly.zip"
-
-freebsd-x86_64-binaries_task:
-    freebsd_instance:
-        image: freebsd-12-0-release-amd64
-
-    setup_script:
-        - pkg install --yes gmake gdb gcc8 pkgconf sdl2 openal-soft gtksourceview2 libXv zip
-
-    compile_script:
-        - gmake -C bsnes local=false
-
-    package_script:
-        - mkdir bsnes-nightly
-        - mkdir bsnes-nightly/Database
-        - mkdir bsnes-nightly/Firmware
-        - cp -a bsnes/out/bsnes bsnes-nightly/bsnes
-        - cp -a bsnes/Database/* bsnes-nightly/Database
-        - cp -a GPLv3.txt bsnes-nightly
-        - zip -r bsnes-nightly.zip bsnes-nightly
-
-    bsnes-nightly_artifacts:
-        path: "bsnes-nightly.zip"
-
-windows-x86_64-binaries_task:
-    container:
-        image: ubuntu:latest
-
-    setup_script:
-        - apt-get update && apt-get -y install build-essential mingw-w64 zip
-
-    compile_script:
-        - make -C bsnes local=false platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres"
-
-    package_script:
-        - mkdir bsnes-nightly
-        - mkdir bsnes-nightly/Database
-        - mkdir bsnes-nightly/Firmware
-        - cp -a bsnes/out/bsnes bsnes-nightly/bsnes.exe
-        - cp -a bsnes/Database/* bsnes-nightly/Database
-        - cp -a GPLv3.txt bsnes-nightly
-        - zip -r bsnes-nightly.zip bsnes-nightly
-
-    bsnes-nightly_artifacts:
-        path: "bsnes-nightly.zip"
-
-macOS-x86_64-binaries_task:
-    osx_instance:
-        image: mojave-base
-
-    compile_script:
-        - make -C bsnes local=false
-
-    package_script:
-        - mkdir bsnes-nightly
-        - cp -a bsnes/out/bsnes.app bsnes-nightly
-        - cp -a GPLv3.txt bsnes-nightly
-        - zip -r bsnes-nightly.zip bsnes-nightly
-
-    bsnes-nightly_artifacts:
-        path: "bsnes-nightly.zip"
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.fs linguist-detectable=false
+*.vs linguist-detectable=false
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +0,0 @@
-patreon: byuu
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,158 @@
+name: Build
+on:
+  push:
+    branches: [ master ]
+    tags: [ 'v*' ]
+  pull_request:
+    branches: [ master ]
+permissions:
+  contents: write
+jobs:
+  build:
+    strategy:
+      matrix:
+        os:
+        - name: ubuntu
+          version: latest
+        - name: windows
+          version: latest
+        - name: macos
+          version: latest
+    runs-on: ${{ matrix.os.name }}-${{ matrix.os.version }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      if: matrix.os.name == 'ubuntu'
+      run: |
+        sudo apt-get update -y -qq
+        sudo apt-get install libsdl2-dev libgtk-3-dev gtksourceview-3.0 libao-dev libopenal-dev
+    - name: Make
+      run: make -j4 -C bsnes local=false
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: bsnes-${{ matrix.os.name }}
+        path: bsnes/out/bsnes*
+
+  build-freebsd:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: vmactions/freebsd-vm@v1
+      with:
+        release: "14.3"
+        usesh: true
+        prepare: |
+          pkg install --yes gmake gdb gcc14 pkgconf sdl2 openal-soft gtk3 gtksourceview3 libXv zip
+        run: |
+          gmake -j4 -C bsnes local=false
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: bsnes-freebsd
+        path: bsnes/out/bsnes*
+
+  release:
+    if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')
+    # Prevent multiple conflicting release jobs from running at once.
+    concurrency: release-${{ github.ref == 'refs/heads/master' && 'nightly' || github.ref }}
+    runs-on: ubuntu-latest
+    needs:
+    - build
+    - build-freebsd
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        path: 'src'
+    - name: Download Artifacts
+      uses: actions/download-artifact@v4.1.7
+      with:
+        path: 'bin'
+    - name: Package Artifacts
+      run: |
+        set -eu
+        case ${GITHUB_REF} in
+          refs/tags/*) suffix="-${GITHUB_REF#refs/tags/}" ;;
+          refs/heads/master) suffix="-nightly" ;;
+          *) suffix="" ;;
+        esac
+
+        srcdir="${GITHUB_WORKSPACE}/src"
+        bindir="${GITHUB_WORKSPACE}/bin"
+
+        # Hack: Workaround for GitHub artifacts losing attributes.
+        for program in bsnes
+        do
+          chmod +x ${bindir}/${program}-ubuntu/${program}
+          chmod +x ${bindir}/${program}-macos/${program}.app/Contents/MacOS/${program}
+        done
+
+        for os in ubuntu windows macos freebsd
+        do
+          mkdir "${os}"
+          cd "${os}"
+
+          # Package bsnes.
+          outdir=bsnes${suffix}
+          mkdir ${outdir}
+          mkdir ${outdir}/Database
+          mkdir ${outdir}/Firmware
+          cp -ar ${bindir}/bsnes-${os}/* ${outdir}
+          cp -a ${srcdir}/bsnes/Database/* ${outdir}/Database
+          cp -a ${srcdir}/shaders ${outdir}/Shaders
+          cp -a ${srcdir}/GPLv3.txt ${outdir}
+          cp -a ${srcdir}/extras/* ${outdir}
+          zip -r ../bsnes-${os}.zip ${outdir}
+
+          cd -
+        done
+    - name: Calculate release info
+      id: relinfo
+      run: |
+        echo "datetime=$(date -u +"%Y-%m-%d %T %Z")" >> $GITHUB_OUTPUT
+        echo "date=$(date +"%Y-%m-%d")" >> $GITHUB_OUTPUT
+    - name: Delete old nightly release
+      uses: actions/github-script@v7
+      id: release
+      if: ${{!startsWith(github.ref, 'refs/tags/')}}
+      with:
+        retries: 3
+        script: |
+          const {owner, repo} = context.repo;
+          try {
+            const release = await github.rest.repos.getReleaseByTag({owner, repo, tag: "nightly"});
+            if (release && release.status === 200) {
+              await github.rest.repos.deleteRelease({owner, repo, release_id: release.data.id});
+            }
+          } catch (e) {
+            console.log(`error deleting old release: ${e}`);
+          }
+          try {
+            await github.rest.git.deleteRef({owner, repo, ref: "tags/nightly"});
+          } catch (e) {
+            console.log(`error trying to delete ref: ${e}`);
+          }
+          await github.rest.git.createTag({
+            owner,
+            repo,
+            tag: "nightly",
+            message: "nightly release",
+            object: context.sha,
+            type: "commit",
+          })
+    - name: Create nightly release
+      uses: softprops/action-gh-release@v1
+      if: ${{!startsWith(github.ref, 'refs/tags/')}}
+      with:
+        tag_name: nightly
+        name: bsnes nightly ${{steps.relinfo.outputs.date}}
+        body: Auto-generated nightly release on ${{steps.relinfo.outputs.datetime}}
+        files: bsnes*.zip
+        prerelease: true
+    - name: Create version release
+      uses: softprops/action-gh-release@v1
+      if: ${{startsWith(github.ref, 'refs/tags/')}}
+      with:
+        name: bsnes ${{github.ref_name}}
+        body: This is bsnes ${{github.ref_name}}, released on ${{steps.relinfo.outputs.date}}.
+        files: bsnes*.zip
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+hiro/qt/qt.moc
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -0,0 +1,59 @@
+bsnes was originally developed by byuu, and is now a group project.
+
+This software would not be where it is today without the help and support of the following individuals:
+
+  - Andreas Naive
+  - Ange Albertini
+  - anomie
+  - AWJ
+  - BearOso
+  - Bisqwit
+  - blargg
+  - byuu
+  - Łukasz Krawczyk
+  - Danish
+  - DerKoun
+  - DMV27
+  - Dr. Decapitator
+  - endrift
+  - Fatbag
+  - FitzRoy
+  - gekkio
+  - GIGO
+  - Hendricks266
+  - hex_usr
+  - ikari_01
+  - jchadwick
+  - Jonas Quinn
+  - kode54
+  - krom
+  - Lioncash
+  - Lord Nightmare
+  - lowkey
+  - Matthew Callis
+  - Max833
+  - MerryMage
+  - mightymo
+  - Nach
+  - ncbncb
+  - neviksti
+  - OV2
+  - Overload
+  - p4plus2
+  - quequotion
+  - qwertymodo
+  - RedDwarf
+  - Richard Bannister
+  - Ryphecha
+  - segher
+  - Sintendo
+  - SuperMikeMan
+  - Talarubi
+  - tetsuo55
+  - TmEE
+  - TRAC
+  - wareya
+  - zones
+
+If you feel you are missing from this list, please submit a pull request and we will be happy to add your name here!
+
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,14 +1,14 @@
 ----------------------------------------------------------------------
 bsnes - Super Nintendo emulator

-  Copyright © 2004-2019 byuu
+  Copyright © 2004-2020 byuu et al

-  https://byuu.org
+  https://byuu.org/bsnes/

 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, specifically version 3 of the License
-and no other version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.

 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,7 +25,7 @@ nall  - C++ template library
 ruby  - Hardware abstraction library
 hiro  - User interface library

-  Copyright © 2006-2019 byuu
+  Copyright © 2006-2020 byuu et al

 Permission to use, copy, modify, and/or distribute this software for
 any purpose with or without fee is hereby granted, provided that the
--- a/README.md
+++ b/README.md
@@ -1,29 +1,15 @@
 bsnes
 =====

-bsnes is a multi-platform Super Nintendo (Super Famicom) emulator that focuses
-on performance, features, and ease of use.
+![bsnes logo](bsnes/target-bsnes/resource/logo.png)

-bsnes currently enjoys 100% known, bug-free compatibility with the entire SNES
-library when configured to its most accurate settings, giving it the same
-accuracy level as higan. Accuracy can also optionally be traded for performance,
-allowing bsnes to operate more than 300% faster than higan while still remaining
-almost as accurate.
-
-Development
-----------
-
-Git is used for the development of new releases, and represents a staging
-environment. As bsnes is rather mature, things should generally be quite stable.
-However, bugs will exist, regressions will occur, so proceed at your own risk.
-
-If stability is required, please download the latest stable release from the
-[official website.](https://bsnes.byuu.org)
+bsnes is a multi-platform Super Nintendo (Super Famicom) emulator, originally
+developed by Near, which focuses on performance,
+features, and ease of use.

 Unique Features
 ---------------

-  - 100% (known) bug-free compatibility with the entire officially licensed SNES games library
  - True Super Game Boy emulation (using the SameBoy core by Lior Halphon)
  - HD mode 7 graphics with optional supersampling (by DerKoun)
  - Low-level emulation of all SNES coprocessors (DSP-n, ST-01n, Cx4)
@@ -32,12 +18,11 @@ Unique Features
  - Built-in games database with thousands of game entries
  - Built-in cheat code database for hundreds of popular games (by mightymo)
  - Built-in save state manager with screenshot previews and naming capabilities
-  - Support for ASIO low-latency audio
  - Customizable per-byte game mappings to support any cartridges, including prototype games
  - 7-zip decompression support
  - Extensive Satellaview emulation, including BS Memory flash write and wear-leveling emulation
-  - 30-bit color output support (where supported)
  - Optional higan game folder support (standard game ROM files are also fully supported!)
+  - Advanced mapping system allowing multiple bindings to every emulated input

 Standard Features
 -----------------
@@ -49,6 +34,7 @@ Standard Features
  - Several built-in software filters, including HQ2x (by MaxSt) and snes_ntsc (by blargg)
  - Adaptive sync and dynamic rate control for perfect audio/video synchronization
  - Just-in-time input polling for minimal input latency
+  - Run-ahead support for removing internal game engine input latency
  - Support for Direct3D exclusive mode video
  - Support for WASAPI exclusive mode audio
  - Periodic auto-saving of game saves
@@ -56,6 +42,7 @@ Standard Features
  - Sprite limit disable support
  - Cubic audio interpolation support
  - Optional high-level emulation of most SNES coprocessors
+  - Optional emulation of flaws in older emulators for compatibility with older unofficial software
  - CPU, SA1, and SuperFX overclocking support
  - Frame advance support
  - Screenshot support
@@ -63,19 +50,26 @@ Standard Features
  - Movie recording and playback support
  - Rewind support
  - HiDPI support
+  - Multi-monitor support
+  - Turbo support for controller inputs

 Links
 -----

-  - [Official website](https://bsnes.byuu.org)
-  - [Official git repository](https://github.com/byuu/bsnes)
-  - [Donations](https://patreon.com/byuu)
+  - [Official git repository](https://github.com/bsnes-emu/bsnes)
+  - [Official Discord](https://discord.gg/B27hf27ZVf)

 Nightly Builds
 --------------

-  - [Download](https://cirrus-ci.com/github/byuu/bsnes/master)
-  - ![Build status](https://api.cirrus-ci.com/github/byuu/bsnes.svg?task=windows-x86_64-binaries)
-  - ![Build status](https://api.cirrus-ci.com/github/byuu/bsnes.svg?task=macOS-x86_64-binaries)
-  - ![Build status](https://api.cirrus-ci.com/github/byuu/bsnes.svg?task=linux-x86_64-binaries)
-  - ![Build status](https://api.cirrus-ci.com/github/byuu/bsnes.svg?task=freebsd-x86_64-binaries)
+  - [Windows](https://github.com/bsnes-emu/bsnes/releases/download/nightly/bsnes-windows.zip)
+  - [macOS](https://github.com/bsnes-emu/bsnes/releases/download/nightly/bsnes-macos.zip)
+  - [Linux](https://github.com/bsnes-emu/bsnes/releases/download/nightly/bsnes-ubuntu.zip)
+  - [FreeBSD](https://api.cirrus-ci.com/v1/artifact/github/bsnes-emu/bsnes/freebsd-x86_64-binaries/bsnes-nightly/bsnes-nightly.zip)
+
+Preview
+-------
+
+![bsnes user interface](.assets/user-interface.png)
+![bsnes running Bahamut Lagoon](.assets/bahamut-lagoon.png)
+![bsnes running Tengai Makyou Zero](.assets/tengai-makyou-zero.png)
--- a/bsnes/Database/BS
+++ b/bsnes/Database/BS
@@ -1,5 +1,5 @@
 database
-  revision: 2018-09-20
+  revision: 2020-01-01

 //BS Memory (JPN)

--- a/bsnes/Database/Sufami
+++ b/bsnes/Database/Sufami
@@ -1,5 +1,5 @@
 database
-  revision: 2018-09-20
+  revision: 2020-01-01

 //Sufami Turbo (JPN)

--- a/bsnes/Database/Super
+++ b/bsnes/Database/Super
@@ -1,5 +1,5 @@
 database
-  revision: 2018-09-20
+  revision: 2020-01-21

 //Prototypes (JPN)

@@ -125,7 +125,7 @@ game
 //Super Famicom (JPN)

 database
-  revision: 2018-09-20
+  revision: 2020-01-21

 game
  sha256:   5c4e283efc338958b8dd45ebd6daf133a9eb280420a98e2e1df358ae0242c366
@@ -171,6 +171,22 @@ game
      size: 0x8000
      content: Save

+game
+  sha256:   a98eb5f0521746e6ce6d208591e86d366b6e0479d96474bfff43856fe8cfec12
+  label:    バハムートラグーン
+  name:     Bahamut Lagoon
+  region:   SHVC-AXBJ-JPN
+  revision: SHVC-AXBJ-0
+  board:    SHVC-1J3M-20
+    memory
+      type: ROM
+      size: 0x300000
+      content: Program
+    memory
+      type: RAM
+      size: 0x2000
+      content: Save
+
 game
  sha256:   47779500c43a0c2e75d7684078489a17baea31170a123063b8ece6ce77359413
  label:    ボール・ブレット・ガン
@@ -1277,7 +1293,7 @@ game
      size: 0x100
      content: Boot
      manufacturer: Nintendo
-      architecture: LR35902
+      architecture: SM83
      identifier: SGB1

 game
@@ -1296,7 +1312,7 @@ game
      size: 0x100
      content: Boot
      manufacturer: Nintendo
-      architecture: LR35902
+      architecture: SM83
      identifier: SGB2
    oscillator
      frequency: 20971520
@@ -1465,6 +1481,22 @@ game
      size: 0x2000
      content: Save

+game
+  sha256:   77b2d5450ce3c87185f913c2584673530c13dfbe8cc433b1e9fe5e9a653bf7d5
+  label:    テイルズオブファンタジア
+  name:     Tales of Phantasia
+  region:   SHVC-ATVJ-JPN
+  revision: SHVC-ATVJ-0
+  board:    SHVC-LJ3M-01
+    memory
+      type: ROM
+      size: 0x600000
+      content: Program
+    memory
+      type: RAM
+      size: 0x2000
+      content: Save
+
 game
  sha256:   c9002e77bcc656e033c35e2574ee6067c4c0d070943359a850806c123a558949
  label:    戦え原始人3 主役はやっぱりジョーアンドマック
@@ -1705,7 +1737,7 @@ game
 //Super Nintendo (ESP)

 database
-  revision: 2018-04-14
+  revision: 2018-09-21

 game
  sha256:   bd5e7a6bc08f64d39c54204b82c6c156f144c03e13c890128588c5faa560659c
@@ -1767,6 +1799,50 @@ game
      size: 0x200000
      content: Program

+game
+  sha256:   bd7e98db82d6b52307be1f3e1fd171e1e7204dc1f8810a95ee2cc64757087e4a
+  label:    The Lost Vikings
+  name:     Lost Vikings, The
+  region:   SNSP-LV-ESP
+  revision: SESP-LV-0
+  board:    SHVC-1A0N-20
+    memory
+      type: ROM
+      size: 0x100000
+      content: Program
+
+game
+  sha256:   6eecabd46305ac95d9cf3a17e1392c24a1b68a7a313173ef0c5b5a3a24cf3353
+  label:    Lufia
+  name:     Lufia
+  region:   SNSP-ANIS-ESP
+  revision: SPAL-ANIS-0
+  board:    SHVC-1A3M-30
+    memory
+      type: ROM
+      size: 0x300000
+      content: Program
+    memory
+      type: RAM
+      size: 0x2000
+      content: Save
+
+game
+  sha256:   d70bc7916ed5132c3b0053f2adbb5004d78ccb986210c9440fedf642cac68554
+  label:    MechWarrior
+  name:     MechWarrior
+  region:   SNSP-WM-ESP
+  revision: SESP-WM-0
+  board:    SHVC-1A1M-10
+    memory
+      type: ROM
+      size: 0x100000
+      content: Program
+    memory
+      type: RAM
+      size: 0x800
+      content: Save
+
 game
  sha256:   d2233d6310522bbf183b6ca9bbe3e2afaf24de0cc4304bff6d0d547d678aed6f
  label:    Sonic Blast Man
@@ -1779,6 +1855,18 @@ game
      size: 0x100000
      content: Program

+game
+  sha256:   a20d346da18ddabf70dc43f5095c4189c4a646ca8e6d4ed6c68c20e380f50332
+  label:    Super Battletank 2
+  name:     Super Battletank 2
+  region:   SNSP-2X-ESP
+  revision: SESP-2X-0
+  board:    SHVC-1A0N-20
+    memory
+      type: ROM
+      size: 0x200000
+      content: Program
+
 game
  sha256:   9eaf1c46d8a068c910d66f582e23b1155882ddfa4b9fd0813819fc5c008167e2
  label:    Super James Pond
@@ -1803,6 +1891,46 @@ game
      size: 0x100000
      content: Program

+game
+  sha256:   7f731f4bb620e682132660da39641dda5762211dca4732f8192dd2411211b822
+  label:    Terranigma
+  name:     Terranigma
+  region:   SNSP-AQTS-ESP
+  revision: SPAL-AQTS-0
+  board:    SHVC-1J3M-20
+    memory
+      type: ROM
+      size: 0x400000
+      content: Program
+    memory
+      type: RAM
+      size: 0x2000
+      content: Save
+
+game
+  sha256:   981128c93f0753dec7af29ec084f13e704cc5d02414be55bb477fc4b2fef5e58
+  label:    Tiny Toon Adventures: Buster Busts Loose!
+  name:     Tiny Toon Adventures - Buster Busts Loose!
+  region:   SNSP-TA-ESP
+  revision: SESP-TA-0
+  board:    SHVC-1A0N-20
+    memory
+      type: ROM
+      size: 0x100000
+      content: Program
+
+game
+  sha256:   ce2445ecd0a43f6025dc80857d91dae7c46d33f7821bf98232c2894ca1959da2
+  label:    Turn and Burn: No-Fly Zone
+  name:     Turn and Burn - No-Fly Zone
+  region:   SNSP-ZN-ESP
+  revision: SESP-ZN-0
+  board:    SHVC-1A0N-20
+    memory
+      type: ROM
+      size: 0x200000
+      content: Program
+
 game
  sha256:   9ed876a632aa699047e9efba8a64ab57abc55086a0aab6b5fa67d87ea4647f3f
  label:    Whirlo
@@ -1846,7 +1974,7 @@ game
 //Super Nintendo (EUR)

 database
-  revision: 2018-05-06
+  revision: 2018-09-21

 game
  sha256:   ec3e81d628a293514e303b44e3b1ac03461ddd1da32764b10b7fab1e507602df
@@ -2904,6 +3032,18 @@ game
      size: 0x100000
      content: Program

+game
+  sha256:   4ad736a9e1c7f34740afaa7777b8f1a31da4bb4a021e7ae341d1dafd74fa0acc
+  label:    True Lies
+  name:     True Lies
+  region:   SNSP-ATLP-EUR
+  revision: SPAL-ATLP-0
+  board:    SHVC-1A0N-30
+    memory
+      type: ROM
+      size: 0x200000
+      content: Program
+
 game
  sha256:   dbf11d4c77b9aa3416f687201d57d71a23bb8fb0b8fe5e9e8212db3fac036631
  label:    Turbo Toons
@@ -2942,7 +3082,7 @@ game

 game
  sha256:   1217ddf2fe475661a54f50e111864102faf854397ce5aceea4297204ebd6cbb6
-  label:    Val d'isére Championship
+  label:    Val d'isère Championship
  name:     Val d'isere Championship
  region:   SNSP-8Z-EUR
  revision: SPAL-8Z-0
@@ -3016,7 +3156,7 @@ game
 //Super Nintendo (FAH)

 database
-  revision: 2018-04-14
+  revision: 2018-09-21

 game
  sha256:   0aafd04a43ae29266e43920a7f9954d4a49f6fe43a5abffecc9c2fd5ad7d6cea
@@ -3110,6 +3250,18 @@ game
      size: 0x800
      content: Save

+game
+  sha256:   826a328f401cdf5a9ee87aaa7a2784cbb21813b165a6c7ca3f702fe6ba8c0804
+  label:    Eric Cantona: Football Challenge
+  name:     Eric Cantona - Football Challenge
+  region:   SNSP-EC-FAH
+  revision: SPAL-EC-0
+  board:    SHVC-1A0N-20
+    memory
+      type: ROM
+      size: 0x80000
+      content: Program
+
 game
  sha256:   ce09743d44a54f64862d8c53c11c2c84f2f861ec74c778bd8b05b0a3b07708d6
  label:    FIFA International Soccer
@@ -3423,10 +3575,22 @@ game
      size: 0x180000
      content: Program

+game
+  sha256:   5a9103b04b9246f63af9018cbbd7934c6b79076dd9b0062887bd16077cd37c81
+  label:    Val d'Isère Championship
+  name:     Val d'Isere Championship
+  region:   SNSP-8V-FAH
+  revision: SPAL-8V-0
+  board:    SHVC-1A0N-20
+    memory
+      type: ROM
+      size: 0x100000
+      content: Program
+
 //Super Nintendo (FRA)

 database
-  revision: 2018-04-14
+  revision: 2018-09-21

 game
  sha256:   65df600780021f13ced52e7fbc507b7b2e6491b2c5c25fe78d0515dcbe669403
@@ -3660,6 +3824,22 @@ game
      size: 0x180000
      content: Program

+game
+  sha256:   b730adcbb34a19f8fd1c2abe27455cc3256329a9b8a021291e3009ea33004127
+  label:    Secret of Mana
+  name:     Secret of Mana
+  region:   SNSP-K2-FRA
+  revision: SFRA-K2-1
+  board:    SHVC-1J3M-11
+    memory
+      type: ROM
+      size: 0x200000
+      content: Program
+    memory
+      type: RAM
+      size: 0x2000
+      content: Save
+
 game
  sha256:   f73e6da9e979c839c7c22ec487bea6667d3e65e7d8f9fcc97a2bcdeb4487cddf
  label:    SimCity
@@ -3676,6 +3856,38 @@ game
      size: 0x8000
      content: Save

+game
+  sha256:   1f226553ba05fe738d085a88154469bbc9f9058f7dfc320a327259d84ae5f393
+  label:    Soul Blazer
+  name:     Soul Blazer
+  region:   SNSP-SO-FRA
+  revision: SFRA-SO-0
+  board:    SHVC-1J3M-20
+    memory
+      type: ROM
+      size: 0x100000
+      content: Program
+    memory
+      type: RAM
+      size: 0x2000
+      content: Save
+
+game
+  sha256:   5d0a234a2fcb343d169206d9d7d578507c44f800ead9cc9ccfa0b1d4cb1cc9e5
+  label:    Terranigma
+  name:     Terranigma
+  region:   SNSP-AQTF-FRA
+  revision: SPAL-AQTF-0
+  board:    SHVC-1J3M-20
+    memory
+      type: ROM
+      size: 0x400000
+      content: Program
+    memory
+      type: RAM
+      size: 0x2000
+      content: Save
+
 //Super Nintendo (FRG)

 database
@@ -3762,7 +3974,23 @@ game
 //Super Nintendo (ITA)

 database
-  revision: 2018-04-14
+  revision: 2018-09-21
+
+game
+  sha256:   deab7aad7c168423e43eae14e9e31efa29c7341ab84f936be508911ce508b372
+  label:    MechWarrior
+  name:     MechWarrior
+  region:   SNSP-WM-ITA
+  revision: SITA-WM-0
+  board:    SHVC-1A1M-01
+    memory
+      type: ROM
+      size: 0x100000
+      content: Program
+    memory
+      type: RAM
+      size: 0x800
+      content: Save

 game
  sha256:   aafbae4c2a7a5a35c81a183df0470027b4b5690f836592af21c15af6b259328d
@@ -3796,7 +4024,7 @@ game
 //Super Nintendo (NOE)

 database
-  revision: 2018-04-14
+  revision: 2020-01-01

 game
  sha256:   b342d12d71729edebc1911725ea23d58c1a397b27253a5c8cd96cfb58af242a9
@@ -4394,6 +4622,18 @@ game
      size: 0x80000
      content: Program

+game
+  sha256:   09299d142e485ba2fcdbd9b3a6d1a5acfbc7fc70b06cf22be28479686419a7a9
+  label:    Jimmy Connors Pro Tennis Tour
+  name:     Jimmy Connors Pro Tennis Tour
+  region:   SNSP-JC-NOE
+  revision: SFRG-JC-0
+  board:    SHVC-1A0N-20
+    memory
+      type: ROM
+      size: 0x80000
+      content: Program
+
 game
  sha256:   74c55ea3c9733bf263628a260df7492fc840d7de1c3fceebb7bcf6d99a8c81d6
  label:    Joe & Mac: Caveman Ninja
@@ -4470,6 +4710,18 @@ game
      size: 0x100000
      content: Program

+game
+  sha256:   4a7444780a750f97943d974589586d4cf89d8957e396cc5a7ad565cd4c1b70a7
+  label:    The Legend of the Mystical Ninja
+  name:     Legend of the Mystical Ninja, The
+  region:   SNSP-GG-NOE
+  revision: SFRG-GG-0
+  board:    SHVC-1A0N-20
+    memory
+      type: ROM
+      size: 0x100000
+      content: Program
+
 game
  sha256:   5ec66298ddb579b35cc5d3df5bfeeee05bdf71347565c7c5f5f3869bf4f1e469
  label:    Looney Tunes Basketball
@@ -4820,7 +5072,7 @@ game
      size: 0x100
      content: Boot
      manufacturer: Nintendo
-      architecture: LR35902
+      architecture: SM83
      identifier: SGB1

 game
@@ -4975,6 +5227,18 @@ game
      size: 0x100000
      content: Program

+game
+  sha256:   94e6fe78bb1a1d89ccfd74ad92e2a489f8e2e257d6dfe62404155741763f962f
+  label:    True Lies
+  name:     True Lies
+  region:   SNSP-ATLD-NOE
+  revision: SPAL-ATLD-0
+  board:    SHVC-1A0N-30
+    memory
+      type: ROM
+      size: 0x200000
+      content: Program
+
 game
  sha256:   a1105819d48c04d680c8292bbfa9abbce05224f1bc231afd66af43b7e0a1fd4e
  label:    Unirally
@@ -5054,7 +5318,7 @@ game
 //Super Nintendo (SCN)

 database
-  revision: 2018-04-14
+  revision: 2018-09-21

 game
  sha256:   beb379ba48f63561c0f939ecd8f623ec06c1b5e06976eef9887e5c62f3df2766
@@ -5080,6 +5344,22 @@ game
      size: 0x300000
      content: Program

+game
+  sha256:   4fb9eb8fa4d9c3a0b6c24bac5b0a0b0f079f083f5e6dfa937a161c8f4bcde853
+  label:    Shadowrun
+  name:     Shadowrun
+  region:   SNSP-WR-SCN
+  revision: SSWE-WR-0
+  board:    SHVC-1A3M-20
+    memory
+      type: ROM
+      size: 0x100000
+      content: Program
+    memory
+      type: RAM
+      size: 0x2000
+      content: Save
+
 game
  sha256:   e15247495311e91db9431d61777a264d4b42def011291d512b273fc8acd1cbfa
  label:    Soul Blazer
@@ -5096,6 +5376,18 @@ game
      size: 0x2000
      content: Save

+game
+  sha256:   687c4f9a14cc16605f5e92aa0fe33bf083fe8e39ba781676259fadf932480890
+  label:    Tintin i Tibet
+  name:     Tintin i Tibet
+  region:   SNSP-AT6X-SCN
+  revision: SPAL-AT6X-0
+  board:    SHVC-2A0N-20
+    memory
+      type: ROM
+      size: 0x180000
+      content: Program
+
 game
  sha256:   a6297356fb06f1575b432fae463171f53e3b786fd77b841557547a9117fb52fe
  label:    X-Zone
@@ -5761,7 +6053,7 @@ game
 //Super Nintendo (USA)

 database
-  revision: 2018-09-20
+  revision: 2020-01-01

 game
  sha256:   2ffe8828480f943056fb1ab5c3c84d48a0bf8cbe3ed7c9960b349b59adb07f3b
@@ -6555,8 +6847,8 @@ game
  sha256:   6fa6b8a8804ff6544bdedf94339a86ba64ce0b6dbf059605abb1cd6f102d3483
  label:    Bill Laimbeer's Combat Basketball
  name:     Bill Laimbeer's Combat Basketball
-  region:   SNS-C8-USA
-  revision: SNS-C8-0
+  region:   SNS-CB-USA
+  revision: SNS-CB-0
  board:    SHVC-1A3B-12
    memory
      type: ROM
@@ -13628,7 +13920,7 @@ game
      size: 0x100
      content: Boot
      manufacturer: Nintendo
-      architecture: LR35902
+      architecture: SM83
      identifier: SGB1

 game
@@ -14516,8 +14808,8 @@ game
  sha256:   3cdebbd8adc4bb6773a7995f542fdac49adefca71cba583255a1c1bf37ac3946
  label:    Tetris & Dr. Mario
  name:     Tetris & Dr. Mario
-  region:   SNS-AFTE-USA
-  revision: SNS-AFTE-0
+  region:   SNS-ATFE-USA
+  revision: SNS-ATFE-0
  board:    SHVC-1A0N-30
    memory
      type: ROM
--- a/bsnes/GNUmakefile
+++ b/bsnes/GNUmakefile
@@ -42,8 +42,6 @@ else ifneq ($(filter $(platform),linux bsd),)
    flags += -fPIC
    options += -shared
  endif
-else
-  $(error "unsupported platform")
 endif

 objects := libco emulator filter lzma
--- a/bsnes/README.md
+++ b/bsnes/README.md
@@ -0,0 +1,53 @@
+bsnes source code
+=================
+
+A guide to what all these directories are for:
+
+  - [Database](./Database/)
+    contains the databases bsnes uses
+    to figure out what circuit board a game expects,
+    and also the database of pre-made game cheats
+  - [emulator](./emulator/)
+    contains the interface
+    that the emulation core in [sfc](./sfc/) implements
+      - It comes from higan v106,
+        which has many emulation cores
+        that all implement the same interface —
+        bsnes only has one,
+        but the interface is still a good abstraction,
+        so it's still here.
+  - [filter](./filter/)
+    contains classic CPU-based image upscaling filters,
+    like HQ2x and Super Eagle
+  - [gb](./gb/)
+    contains the SameBoy emulator code
+    used for Super Game Boy emulation
+  - [heuristics](./heuristics/)
+    contains the logic that guesses
+    which memory map a particular game expects
+    and what extra hardware it assumes is present,
+    when a game cannot be found in the database
+  - [Locale](./Locale/)
+    contains translation databases
+    that bsnes can use to display its user interface
+    in a different language
+  - [lzma](./lzma/)
+    contains the 7-Zip SDK
+    allowing bsnes to understad `.7z` archives
+  - [processor](./processor/)
+    contains all the CPU emulation cores
+    used by the hardware bsnes emulates
+      - Another holdover from higan v106,
+        where different supported systems
+        happen to use the same model CPU,
+        so the CPU emulation cores
+        are not specific to a system
+  - [sfc](./sfc/)
+    contains Super Famicom (SNES) emulation code
+  - [target-bsnes](./target-bsnes/)
+    contains the normal bsnes user interface
+  - [target-libretro](./target-libretro/)
+    implements the "libretro" API
+    on top of bsnes' native
+    [emulator](./emulator/) API,
+    so bsnes can be used with libretro-based frontends
--- a/bsnes/emulator/audio/audio.cpp
+++ b/bsnes/emulator/audio/audio.cpp
@@ -1,5 +1,3 @@
-#define double float
-
 namespace Emulator {

 #include "stream.cpp"
--- a/bsnes/emulator/audio/audio.hpp
+++ b/bsnes/emulator/audio/audio.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#define double float

 #include <nall/dsp/iir/dc-removal.hpp>
 #include <nall/dsp/iir/one-pole.hpp>
@@ -55,14 +54,16 @@ struct Filter {

 struct Stream {
  auto reset(uint channels, double inputFrequency, double outputFrequency) -> void;
+  auto reset() -> void;

+  auto frequency() const -> double;
  auto setFrequency(double inputFrequency, maybe<double> outputFrequency = nothing) -> void;

  auto addDCRemovalFilter() -> void;
  auto addLowPassFilter(double cutoffFrequency, Filter::Order order, uint passes = 1) -> void;
  auto addHighPassFilter(double cutoffFrequency, Filter::Order order, uint passes = 1) -> void;

-  auto pending() const -> bool;
+  auto pending() const -> uint;
  auto read(double samples[]) -> uint;
  auto write(const double samples[]) -> void;

@@ -71,6 +72,8 @@ struct Stream {
    write(samples);
  }

+  auto serialize(serializer&) -> void;
+
 private:
  struct Channel {
    vector<Filter> filters;
--- a/bsnes/emulator/audio/stream.cpp
+++ b/bsnes/emulator/audio/stream.cpp
@@ -9,6 +9,16 @@ auto Stream::reset(uint channelCount, double inputFrequency, double outputFreque
  setFrequency(inputFrequency, outputFrequency);
 }

+auto Stream::reset() -> void {
+  for(auto& channel : channels) {
+    channel.resampler.reset(this->inputFrequency, this->outputFrequency);
+  }
+}
+
+auto Stream::frequency() const -> double {
+  return inputFrequency;
+}
+
 auto Stream::setFrequency(double inputFrequency, maybe<double> outputFrequency) -> void {
  this->inputFrequency = inputFrequency;
  if(outputFrequency) this->outputFrequency = outputFrequency();
@@ -77,8 +87,9 @@ auto Stream::addHighPassFilter(double cutoffFrequency, Filter::Order order, uint
  }
 }

-auto Stream::pending() const -> bool {
-  return channels && channels[0].resampler.pending();
+auto Stream::pending() const -> uint {
+  if(!channels) return 0;
+  return channels[0].resampler.pending();
 }

 auto Stream::read(double samples[]) -> uint {
@@ -104,3 +115,11 @@ auto Stream::write(const double samples[]) -> void {

  audio.process();
 }
+
+auto Stream::serialize(serializer& s) -> void {
+  for(auto& channel : channels) {
+    channel.resampler.serialize(s);
+  }
+  s.real(inputFrequency);
+  s.real(outputFrequency);
+}
--- a/bsnes/emulator/emulator.hpp
+++ b/bsnes/emulator/emulator.hpp
@@ -1,5 +1,7 @@
 #pragma once

+#include <libco/libco.h>
+
 #include <nall/platform.hpp>
 #include <nall/adaptive-array.hpp>
 #include <nall/any.hpp>
@@ -20,22 +22,20 @@
 #include <nall/hash/sha256.hpp>
 using namespace nall;

-#include <libco/libco.h>
-
 #include <emulator/types.hpp>
 #include <emulator/memory/readable.hpp>
 #include <emulator/memory/writable.hpp>
 #include <emulator/audio/audio.hpp>

 namespace Emulator {
-  static const string Name    = "bsnes";
-  static const string Version = "110";
-  static const string Author  = "byuu";
-  static const string License = "GPLv3";
-  static const string Website = "https://byuu.org";
+  static const string Name      = "bsnes";
+  static const string Version   = "115";
+  static const string Copyright = "bsnes team";
+  static const string License   = "GPLv3 or later";
+  static const string Website   = "https://github.com/bsnes-emu/bsnes/";

  //incremented only when serialization format changes
-  static const string SerializerVersion = "110";
+  static const string SerializerVersion = "115.1";

  namespace Constants {
    namespace Colorburst {
--- a/bsnes/emulator/interface.hpp
+++ b/bsnes/emulator/interface.hpp
@@ -81,7 +81,7 @@ struct Interface {
  virtual auto synchronize(uint64 timestamp = 0) -> void {}

  //state functions
-  virtual auto serialize() -> serializer { return {}; }
+  virtual auto serialize(bool synchronize = true) -> serializer { return {}; }
  virtual auto unserialize(serializer&) -> bool { return false; }

  //cheat functions
@@ -101,6 +101,9 @@ struct Interface {

  virtual auto frameSkip() -> uint { return 0; }
  virtual auto setFrameSkip(uint frameSkip) -> void {}
+
+  virtual auto runAhead() -> bool { return false; }
+  virtual auto setRunAhead(bool runAhead) -> void {}
 };

 }
--- a/bsnes/emulator/platform.hpp
+++ b/bsnes/emulator/platform.hpp
@@ -17,7 +17,7 @@ struct Platform {
  virtual auto open(uint id, string name, vfs::file::mode mode, bool required = false) -> shared_pointer<vfs::file> { return {}; }
  virtual auto load(uint id, string name, string type, vector<string> options = {}) -> Load { return {}; }
  virtual auto videoFrame(const uint16* data, uint pitch, uint width, uint height, uint scale) -> void {}
-  virtual auto audioFrame(const float* samples, uint channels) -> void {}
+  virtual auto audioFrame(const double* samples, uint channels) -> void {}
  virtual auto inputPoll(uint port, uint device, uint input) -> int16 { return 0; }
  virtual auto inputRumble(uint port, uint device, uint input, bool enable) -> void {}
  virtual auto dipSettings(Markup::Node node) -> uint { return 0; }
--- a/bsnes/gb/.gitattributes
+++ b/bsnes/gb/.gitattributes
@@ -0,0 +1,11 @@
+# Always use LF line endings for shaders
+*.fsh text eol=lf
+*.metal text eol=lf
+
+HexFiend/* linguist-vendored
+*.inc linguist-language=C
+Core/*.h linguist-language=C
+SDL/*.h linguist-language=C
+Windows/*.h linguist-language=C
+XdgThumbnailer/*.h linguist-language=C
+Cocoa/*.h linguist-language=Objective-C
--- a/bsnes/gb/.github/FUNDING.yml
+++ b/bsnes/gb/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: LIJI32
--- a/bsnes/gb/.github/actions/LICENSE
+++ b/bsnes/gb/.github/actions/LICENSE
@@ -0,0 +1,25 @@
+Blargg's Test ROMs by Shay Green <gblargg@gmail.com>
+
+Acid2 tests by Matt Currie under MIT:
+
+MIT License
+
+Copyright (c) 2020 Matt Currie
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/bsnes/gb/.github/actions/cgb-acid2.gbc
+++ b/bsnes/gb/.github/actions/cgb-acid2.gbc
--- a/bsnes/gb/.github/actions/cgb_sound.gb
+++ b/bsnes/gb/.github/actions/cgb_sound.gb
--- a/bsnes/gb/.github/actions/dmg-acid2.gb
+++ b/bsnes/gb/.github/actions/dmg-acid2.gb
--- a/bsnes/gb/.github/actions/dmg_sound-2.gb
+++ b/bsnes/gb/.github/actions/dmg_sound-2.gb
--- a/bsnes/gb/.github/actions/install_deps.sh
+++ b/bsnes/gb/.github/actions/install_deps.sh
@@ -0,0 +1,36 @@
+case `echo $1 | cut -d '-' -f 1` in
+        ubuntu)
+                sudo apt-get -qq update
+                sudo apt-get install -yq bison libpng-dev pkg-config libsdl2-dev libgdk-pixbuf2.0-dev
+                (
+                cd `mktemp -d`
+                curl -L https://github.com/rednex/rgbds/archive/v0.6.0.zip > rgbds.zip
+                unzip rgbds.zip
+                cd rgbds-*
+                make -sj
+                sudo make install
+                cd ..
+                rm -rf *
+                )
+                
+                (
+                cd `mktemp -d`
+                curl -L https://github.com/BR903/cppp/archive/refs/heads/master.zip > cppp.zip
+                unzip cppp.zip
+                cd cppp-*
+                make -sj
+                sudo make install
+                cd ..
+                rm -rf *
+                )
+                
+                
+                ;;
+        macos)
+                brew install rgbds sdl2 cppp
+                ;;
+        *)
+                echo "Unsupported OS"
+                exit 1
+                ;;
+esac
--- a/bsnes/gb/.github/actions/oam_bug-2.gb
+++ b/bsnes/gb/.github/actions/oam_bug-2.gb
--- a/bsnes/gb/.github/actions/sanity_tests.sh
+++ b/bsnes/gb/.github/actions/sanity_tests.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+set -e
+
+./build/bin/tester/sameboy_tester --jobs 5 \
+      --length 45 .github/actions/cgb_sound.gb \
+      --length 10  .github/actions/cgb-acid2.gbc \
+      --length 10  .github/actions/dmg-acid2.gb \
+--dmg --length 45 .github/actions/dmg_sound-2.gb \
+--dmg --length 20 .github/actions/oam_bug-2.gb
+
+mv .github/actions/dmg-acid2.bmp .github/actions/dmg-mode-acid2.bmp
+
+./build/bin/tester/sameboy_tester \
+--dmg --length 10  .github/actions/dmg-acid2.gb 
+
+set +e
+
+FAILED_TESTS=`
+shasum .github/actions/*.bmp | grep -E -v \(\
+64c3fd9a5fe9aee40fe15f3371029c0d2f20f5bc\ \ .github/actions/cgb-acid2.bmp\|\
+dbcc438dcea13b5d1b80c5cd06bda2592cc5d9e0\ \ .github/actions/cgb_sound.bmp\|\
+0caadf9634e40247ae9c15ff71992e8f77bbf89e\ \ .github/actions/dmg-acid2.bmp\|\
+fbdb5e342bfdd2edda3ea5601d35d0ca60d18034\ \ .github/actions/dmg-mode-acid2.bmp\|\
+c9e944b7e01078bdeba1819bc2fa9372b111f52d\ \ .github/actions/dmg_sound-2.bmp\|\
+f0172cc91867d3343fbd113a2bb98100074be0de\ \ .github/actions/oam_bug-2.bmp\
+\)`
+
+if [ -n "$FAILED_TESTS" ] ; then
+    echo "Failed the following tests:"
+    echo $FAILED_TESTS | tr " " "\n" | grep -o -E "[^/]+\.bmp" | sed s/.bmp// | sort
+    exit 1
+fi
+
+echo Passed all tests
--- a/bsnes/gb/.github/actions/update_libretro.sh
+++ b/bsnes/gb/.github/actions/update_libretro.sh
@@ -0,0 +1,30 @@
+set -ex
+
+git fetch --tags
+LATEST=$(git tag --sort=-creatordate | grep "^v" | grep -v libretro | head -n 1)
+
+if [ $(git tag -l "$LATEST"-libretro) ]; then
+    echo "The libretro branch is already up-to-date"
+    exit 0
+fi
+
+git config --global --add --bool push.autoSetupRemote true
+git config --global user.name 'Libretro Updater'
+git config --global user.email '<>'
+
+cp libretro/gitlab-ci.yml .gitlab-ci.yml
+
+echo "Switching to tag $LATEST"
+git branch --delete libretro || true
+git checkout tags/$LATEST -b libretro
+
+echo "Building boot ROMs..."
+make -j bootroms
+
+echo "Updating branch"
+mv build/bin/BootROMs BootROMs/prebuilt
+git add BootROMs/prebuilt/* .gitlab-ci.yml
+git commit -m "Update libretro branch to $LATEST"
+git tag "$LATEST"-libretro
+git push --force
+git push --tags
--- a/bsnes/gb/.github/workflows/libretro.yml
+++ b/bsnes/gb/.github/workflows/libretro.yml
@@ -0,0 +1,28 @@
+name: "libretro branch update"
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  libretro-prebuilt-update:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+        name: Checkout
+        with:
+          repository: LIJI32/SameBoy
+          token: ${{ secrets.WEBSITETOKEN }}
+          submodules: false
+      - name: Install Deps
+        shell: bash
+        run: |
+          ./.github/actions/install_deps.sh ${{ matrix.os }}
+      - name: Build Boot ROMs and Push
+        run: |
+          ./.github/actions/update_libretro.sh
--- a/bsnes/gb/.github/workflows/sanity.yml
+++ b/bsnes/gb/.github/workflows/sanity.yml
@@ -0,0 +1,44 @@
+name: "Bulidability and Sanity"
+on:
+  push:
+    branches:
+      - master
+      - '*'
+      - '!libretro'
+
+jobs:
+  sanity:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, ubuntu-latest, ubuntu-22.04]
+        cc: [gcc, clang]
+        include:
+        - os: macos-latest
+          cc: clang
+          extra_targets: cocoa ios-ipa ios-deb
+        exclude:
+        - os: macos-latest
+          cc: gcc
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install deps
+        shell: bash
+        run: |
+          ./.github/actions/install_deps.sh ${{ matrix.os }}
+      - name: Build
+        run: |
+          ${{ matrix.cc }} -v; (make -j all CONF=release CC=${{ matrix.cc }} || (echo "==== Build Failed ==="; make all CONF=release CC=${{ matrix.cc }}))
+      - name: Sanity tests
+        shell: bash
+        run: |
+          ./.github/actions/sanity_tests.sh
+      - name: Upload binaries
+        uses: actions/upload-artifact@v4
+        with:
+          name: sameboy-canary-${{ matrix.os }}-${{ matrix.cc }}
+          path: |
+            build/bin
+            build/lib
+            build/include
--- a/bsnes/gb/.gitignore
+++ b/bsnes/gb/.gitignore
@@ -0,0 +1 @@
+build
--- a/bsnes/gb/AppleCommon/GBAudioClient.h
+++ b/bsnes/gb/AppleCommon/GBAudioClient.h
@@ -0,0 +1,12 @@
+#import <Foundation/Foundation.h>
+#import <Core/gb.h>
+
+@interface GBAudioClient : NSObject
+@property (nonatomic, strong) void (^renderBlock)(UInt32 sampleRate, UInt32 nFrames, GB_sample_t *buffer);
+@property (nonatomic, readonly) UInt32 rate;
+@property (nonatomic, readonly, getter=isPlaying) bool playing;
+- (void)start;
+- (void)stop;
+- (id)initWithRendererBlock:(void (^)(UInt32 sampleRate, UInt32 nFrames, GB_sample_t *buffer)) block
+              andSampleRate:(UInt32) rate;
+@end
--- a/bsnes/gb/AppleCommon/GBAudioClient.m
+++ b/bsnes/gb/AppleCommon/GBAudioClient.m
@@ -0,0 +1,134 @@
+#import <Foundation/Foundation.h>
+#import <AudioToolbox/AudioToolbox.h>
+#import "GBAudioClient.h"
+
+static OSStatus render(
+                    GBAudioClient *self,
+                    AudioUnitRenderActionFlags *ioActionFlags,
+                    const AudioTimeStamp *inTimeStamp,
+                    UInt32 inBusNumber,
+                    UInt32 inNumberFrames,
+                    AudioBufferList *ioData)
+
+{
+    GB_sample_t *buffer = (GB_sample_t *)ioData->mBuffers[0].mData;
+
+    self.renderBlock(self.rate, inNumberFrames, buffer);
+    
+    return noErr;
+}
+
+@implementation GBAudioClient
+{
+    AudioComponentInstance audioUnit;
+}
+
+- (id)initWithRendererBlock:(void (^)(UInt32 sampleRate, UInt32 nFrames, GB_sample_t *buffer)) block
+              andSampleRate:(UInt32) rate
+{
+    if (!(self = [super init])) { 
+        return nil;
+    }
+
+    // Configure the search parameters to find the default playback output unit
+    // (called the kAudioUnitSubType_RemoteIO on iOS but
+    // kAudioUnitSubType_DefaultOutput on Mac OS X)
+    AudioComponentDescription defaultOutputDescription;
+    defaultOutputDescription.componentType = kAudioUnitType_Output;
+#if TARGET_OS_IPHONE
+    defaultOutputDescription.componentSubType = kAudioUnitSubType_RemoteIO;
+#else
+    defaultOutputDescription.componentSubType = kAudioUnitSubType_DefaultOutput;
+#endif
+    defaultOutputDescription.componentManufacturer = kAudioUnitManufacturer_Apple;
+    defaultOutputDescription.componentFlags = 0;
+    defaultOutputDescription.componentFlagsMask = 0;
+
+    // Get the default playback output unit
+    AudioComponent defaultOutput = AudioComponentFindNext(NULL, &defaultOutputDescription);
+    if (!defaultOutput) {
+        NSLog(@"Can't find default output");
+        return nil;
+    }
+
+    // Create a new unit based on this that we'll use for output
+    OSErr err = AudioComponentInstanceNew(defaultOutput, &audioUnit);
+    if (!audioUnit) {
+        NSLog(@"Error creating unit: %hd", err);
+        return nil;
+    }
+
+    // Set our tone rendering function on the unit
+    AURenderCallbackStruct input;
+    input.inputProc = (void*)render;
+    input.inputProcRefCon = (__bridge void *)(self);
+    err = AudioUnitSetProperty(audioUnit,
+                               kAudioUnitProperty_SetRenderCallback,
+                               kAudioUnitScope_Input,
+                               0,
+                               &input,
+                               sizeof(input));
+    if (err) {
+        NSLog(@"Error setting callback: %hd", err);
+        return nil;
+    }
+
+    AudioStreamBasicDescription streamFormat;
+    streamFormat.mSampleRate = rate;
+    streamFormat.mFormatID = kAudioFormatLinearPCM;
+    streamFormat.mFormatFlags =
+    kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked | kAudioFormatFlagsNativeEndian;
+    streamFormat.mBytesPerPacket = 4;
+    streamFormat.mFramesPerPacket = 1;
+    streamFormat.mBytesPerFrame = 4;
+    streamFormat.mChannelsPerFrame = 2;
+    streamFormat.mBitsPerChannel = 2 * 8;
+    err = AudioUnitSetProperty (audioUnit,
+                                kAudioUnitProperty_StreamFormat,
+                                kAudioUnitScope_Input,
+                                0,
+                                &streamFormat,
+                                sizeof(AudioStreamBasicDescription));
+    
+    if (err) {
+        NSLog(@"Error setting stream format: %hd", err);
+        return nil;
+    }
+    err = AudioUnitInitialize(audioUnit);
+    if (err) {
+        NSLog(@"Error initializing unit: %hd", err);
+        return nil;
+    }
+
+    self.renderBlock = block;
+    _rate = rate;
+
+    return self;
+}
+
+-(void) start
+{
+    OSErr err = AudioOutputUnitStart(audioUnit);
+    if (err) {
+        NSLog(@"Error starting unit: %hd", err);
+        return;
+    }
+    _playing = true;
+
+}
+
+
+-(void) stop
+{
+    AudioOutputUnitStop(audioUnit);
+    _playing = false;
+}
+
+-(void) dealloc 
+{
+    [self stop];
+    AudioUnitUninitialize(audioUnit);
+    AudioComponentInstanceDispose(audioUnit);
+}
+
+@end
--- a/bsnes/gb/AppleCommon/GBViewBase.h
+++ b/bsnes/gb/AppleCommon/GBViewBase.h
@@ -0,0 +1,36 @@
+#import <TargetConditionals.h>
+
+#if TARGET_OS_IPHONE
+#define NSView UIView
+#import <UIKit/UIKit.h>
+#else
+#import <Cocoa/Cocoa.h>
+#endif
+
+#import <Core/gb.h>
+
+typedef enum {
+    GB_FRAME_BLENDING_MODE_DISABLED,
+    GB_FRAME_BLENDING_MODE_SIMPLE,
+    GB_FRAME_BLENDING_MODE_ACCURATE,
+    GB_FRAME_BLENDING_MODE_ACCURATE_EVEN = GB_FRAME_BLENDING_MODE_ACCURATE,
+    GB_FRAME_BLENDING_MODE_ACCURATE_ODD,
+} GB_frame_blending_mode_t;
+
+@interface GBViewBase : NSView
+{
+    @public
+    GB_gameboy_t *_gb;
+}
+
+@property (nonatomic) GB_gameboy_t *gb;
+@property (nonatomic) GB_frame_blending_mode_t frameBlendingMode;
+@property (nonatomic, strong) NSView *internalView;
+- (void) flip;
+- (uint32_t *) pixels;
+- (void)screenSizeChanged;
+- (void) createInternalView;
+- (uint32_t *)currentBuffer;
+- (uint32_t *)previousBuffer;
+- (instancetype)mirroredView;
+@end
--- a/bsnes/gb/AppleCommon/GBViewBase.m
+++ b/bsnes/gb/AppleCommon/GBViewBase.m
@@ -0,0 +1,121 @@
+#import "GBViewBase.h"
+
+@implementation GBViewBase
+{
+    uint32_t *_imageBuffers[3];
+    unsigned _currentBuffer;
+    GB_frame_blending_mode_t _frameBlendingMode;
+    bool _oddFrame;
+    GBViewBase *_parent;
+    __weak GBViewBase *_child;
+}
+
+- (void)screenSizeChanged
+{
+    if (_parent) return;
+    if (_imageBuffers[0]) free(_imageBuffers[0]);
+    if (_imageBuffers[1]) free(_imageBuffers[1]);
+    if (_imageBuffers[2]) free(_imageBuffers[2]);
+    
+    size_t buffer_size = sizeof(_imageBuffers[0][0]) * GB_get_screen_width(_gb) * GB_get_screen_height(_gb);
+    
+    _imageBuffers[0] = calloc(1, buffer_size);
+    _imageBuffers[1] = calloc(1, buffer_size);
+    _imageBuffers[2] = calloc(1, buffer_size);
+}
+
+- (void)flip
+{
+    if (_parent) return;
+    _currentBuffer = (_currentBuffer + 1) % self.numberOfBuffers;
+    _oddFrame = GB_is_odd_frame(_gb);
+    [_child flip];
+}
+
+- (unsigned) numberOfBuffers
+{
+    assert(!_parent);
+    return _frameBlendingMode? 3 : 2;
+}
+
+- (void) createInternalView
+{
+    assert(false && "createInternalView must not be inherited");
+}
+
+- (uint32_t *)currentBuffer
+{
+    if (GB_unlikely(_parent)) {
+        return [_parent currentBuffer];
+    }
+    return _imageBuffers[_currentBuffer];
+}
+
+- (uint32_t *)previousBuffer
+{
+    if (GB_unlikely(_parent)) {
+        return [_parent previousBuffer];
+    }
+    return _imageBuffers[(_currentBuffer + 2) % self.numberOfBuffers];
+}
+
+- (uint32_t *) pixels
+{
+    assert(!_parent);
+    return _imageBuffers[(_currentBuffer + 1) % self.numberOfBuffers];
+}
+
+- (void) setFrameBlendingMode:(GB_frame_blending_mode_t)frameBlendingMode
+{
+    _frameBlendingMode = frameBlendingMode;
+    [self setNeedsDisplay];
+    [_child setNeedsDisplay];
+}
+
+- (GB_frame_blending_mode_t)frameBlendingMode
+{
+    if (GB_unlikely(_parent)) {
+        return [_parent frameBlendingMode];
+    }
+    if (_frameBlendingMode == GB_FRAME_BLENDING_MODE_ACCURATE) {
+        if (!_gb || GB_is_sgb(_gb)) {
+            return GB_FRAME_BLENDING_MODE_SIMPLE;
+        }
+        return _oddFrame ? GB_FRAME_BLENDING_MODE_ACCURATE_ODD : GB_FRAME_BLENDING_MODE_ACCURATE_EVEN;
+    }
+    return _frameBlendingMode;
+}
+
+- (void)dealloc
+{
+    if (_parent) return;
+    free(_imageBuffers[0]);
+    free(_imageBuffers[1]);
+    free(_imageBuffers[2]);
+}
+
+#if !TARGET_OS_IPHONE
+- (void)setNeedsDisplay
+{
+    [self setNeedsDisplay:true];
+}
+#endif
+
+- (void)setGb:(GB_gameboy_t *)gb
+{
+    assert(!_parent);
+    _gb = gb;
+    if (_child) {
+        _child->_gb = gb;
+    }
+}
+
+- (instancetype)mirroredView
+{
+    if (_child) return _child;
+    GBViewBase *ret = [[self.class alloc] initWithFrame:self.bounds];
+    ret->_parent = self;
+    ret->_gb = _gb;
+    return _child = ret;
+}
+@end
--- a/bsnes/gb/AppleCommon/GBViewMetal.h
+++ b/bsnes/gb/AppleCommon/GBViewMetal.h
@@ -0,0 +1,11 @@
+#import <TargetConditionals.h>
+#import <MetalKit/MetalKit.h>
+#if TARGET_OS_IPHONE
+#import "../iOS/GBView.h"
+#else
+#import "../Cocoa/GBView.h"
+#endif
+
+@interface GBViewMetal : GBView<MTKViewDelegate>
+ (bool) isSupported;
+@end
--- a/bsnes/gb/AppleCommon/GBViewMetal.m
+++ b/bsnes/gb/AppleCommon/GBViewMetal.m
@@ -0,0 +1,266 @@
+#import <CoreImage/CoreImage.h>
+#import "GBViewMetal.h"
+#pragma clang diagnostic ignored "-Wpartial-availability"
+#if !TARGET_OS_IPHONE
+#import "../Cocoa/NSObject+DefaultsObserver.h"
+#endif
+
+static const vector_float2 rect[] =
+{
+    {-1, -1},
+    { 1, -1},
+    {-1,  1},
+    { 1,  1},
+};
+
+@implementation GBViewMetal
+{
+    id<MTLDevice> _device;
+    id<MTLTexture> _texture, _previousTexture;
+    id<MTLBuffer> _vertices;
+    id<MTLRenderPipelineState> _pipelineState;
+    id<MTLCommandQueue> _commandQueue;
+    id<MTLBuffer> _frameBlendingModeBuffer;
+    id<MTLBuffer> _outputResolutionBuffer;
+    vector_float2 _outputResolution;
+    id<MTLCommandBuffer> _commandBuffer;
+    bool _waitedForFrame;
+    _Atomic unsigned _pendingFrames;
+}
+
+ (bool)isSupported
+{
+#if TARGET_OS_IPHONE
+    return true;
+#else
+    if (MTLCopyAllDevices) {
+        return [MTLCopyAllDevices() count];
+    }
+    return false;
+#endif
+}
+- (void) allocateTextures
+{
+    if (!_device) return;
+    
+    MTLTextureDescriptor *texture_descriptor = [[MTLTextureDescriptor alloc] init];
+    
+    texture_descriptor.pixelFormat = MTLPixelFormatRGBA8Unorm;
+    
+    texture_descriptor.width = GB_get_screen_width(self.gb);
+    texture_descriptor.height = GB_get_screen_height(self.gb);
+    
+    _texture = [_device newTextureWithDescriptor:texture_descriptor];
+    _previousTexture = [_device newTextureWithDescriptor:texture_descriptor];
+
+}
+
+- (void)createInternalView
+{
+    MTKView *view = [[MTKView alloc] initWithFrame:self.frame device:(_device = MTLCreateSystemDefaultDevice())];
+    view.delegate = self;
+    self.internalView = view;
+    view.paused = true;
+    view.enableSetNeedsDisplay = true;
+    view.framebufferOnly = false;
+    
+    _vertices = [_device newBufferWithBytes:rect
+                                   length:sizeof(rect)
+                                  options:MTLResourceStorageModeShared];
+    
+    static const GB_frame_blending_mode_t default_blending_mode = GB_FRAME_BLENDING_MODE_DISABLED;
+    _frameBlendingModeBuffer = [_device newBufferWithBytes:&default_blending_mode
+                                          length:sizeof(default_blending_mode)
+                                         options:MTLResourceStorageModeShared];
+    
+    _outputResolutionBuffer = [_device newBufferWithBytes:&_outputResolution
+                                                   length:sizeof(_outputResolution)
+                                                  options:MTLResourceStorageModeShared];
+    
+    _outputResolution = (simd_float2){view.drawableSize.width, view.drawableSize.height};
+    /* TODO: NSObject+DefaultsObserver can replace the less flexible `addDefaultObserver` in iOS */
+#if TARGET_OS_IPHONE
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loadShader) name:@"GBFilterChanged" object:nil];
+    [self loadShader];
+#else
+    [self observeStandardDefaultsKey:@"GBFilter" selector:@selector(loadShader)];
+#endif
+}
+
+- (void)loadShader
+{
+    NSError *error = nil;
+    NSString *shader_source = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"MasterShader"
+                                                                                                 ofType:@"metal"
+                                                                                            inDirectory:@"Shaders"]
+                                                        encoding:NSUTF8StringEncoding
+                                                           error:nil];
+    
+    NSString *shader_name = [[NSUserDefaults standardUserDefaults] objectForKey:@"GBFilter"];
+    NSString *scaler_source = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:shader_name
+                                                                                                 ofType:@"fsh"
+                                                                                            inDirectory:@"Shaders"]
+                                                        encoding:NSUTF8StringEncoding
+                                                           error:nil];
+    
+    shader_source = [shader_source stringByReplacingOccurrencesOfString:@"{filter}"
+                                                             withString:scaler_source];
+
+    MTLCompileOptions *options = [[MTLCompileOptions alloc] init];
+    options.fastMathEnabled = true;
+    id<MTLLibrary> library = [_device newLibraryWithSource:shader_source
+                                                   options:options
+                                                     error:&error];
+    if (error) {
+        NSLog(@"Error: %@", error);
+        if (!library) {
+            return;
+        }
+    }
+    
+    id<MTLFunction> vertex_function = [library newFunctionWithName:@"vertex_shader"];
+    id<MTLFunction> fragment_function = [library newFunctionWithName:@"fragment_shader"];
+    
+    // Set up a descriptor for creating a pipeline state object
+    MTLRenderPipelineDescriptor *pipeline_state_descriptor = [[MTLRenderPipelineDescriptor alloc] init];
+    pipeline_state_descriptor.vertexFunction = vertex_function;
+    pipeline_state_descriptor.fragmentFunction = fragment_function;
+    pipeline_state_descriptor.colorAttachments[0].pixelFormat = ((MTKView *)self.internalView).colorPixelFormat;
+    
+    error = nil;
+    _pipelineState = [_device newRenderPipelineStateWithDescriptor:pipeline_state_descriptor
+                                                             error:&error];
+    if (error)  {
+        NSLog(@"Failed to created pipeline state, error %@", error);
+        return;
+    }
+    
+    _commandQueue = [_device newCommandQueue];
+}
+
+- (void)mtkView:(MTKView *)view drawableSizeWillChange:(CGSize)size
+{
+    _outputResolution = (vector_float2){size.width, size.height};
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [(MTKView *)self.internalView draw];
+    });
+}
+
+- (void)drawInMTKView:(MTKView *)view
+{
+#if !TARGET_OS_IPHONE
+    if (!(view.window.occlusionState & NSWindowOcclusionStateVisible)) return;
+#endif
+    if (!self.gb) return;
+    if (_texture.width  != GB_get_screen_width(self.gb) ||
+        _texture.height != GB_get_screen_height(self.gb)) {
+        [self allocateTextures];
+    }
+    
+    MTLRegion region = {
+        {0, 0, 0},         // MTLOrigin
+        {_texture.width, _texture.height, 1} // MTLSize
+    };
+    
+    /* Don't start rendering if the previous frame hasn't finished yet. Either wait, or skip the frame */
+    if (_commandBuffer && _commandBuffer.status != MTLCommandBufferStatusCompleted) {
+        if (_waitedForFrame) return;
+        [_commandBuffer waitUntilCompleted];
+        _waitedForFrame = true;
+    }
+    else {
+        _waitedForFrame = false;
+    }
+
+    GB_frame_blending_mode_t mode = [self frameBlendingMode];
+    
+    [_texture replaceRegion:region
+               mipmapLevel:0
+                 withBytes:[self currentBuffer]
+               bytesPerRow:_texture.width * 4];
+
+    if (mode) {
+        [_previousTexture replaceRegion:region
+                            mipmapLevel:0
+                              withBytes:[self previousBuffer]
+                            bytesPerRow:_texture.width * 4];
+    }
+        
+    MTLRenderPassDescriptor *renderPassDescriptor = view.currentRenderPassDescriptor;
+    _commandBuffer = [_commandQueue commandBuffer];
+
+    if (renderPassDescriptor) {
+        *(GB_frame_blending_mode_t *)[_frameBlendingModeBuffer contents] = mode;
+        *(vector_float2 *)[_outputResolutionBuffer contents] = _outputResolution;
+
+        id<MTLRenderCommandEncoder> renderEncoder =
+            [_commandBuffer renderCommandEncoderWithDescriptor:renderPassDescriptor];
+        
+        [renderEncoder setViewport:(MTLViewport){0.0, 0.0,
+            _outputResolution.x,
+            _outputResolution.y,
+            -1.0, 1.0}];
+        
+        [renderEncoder setRenderPipelineState:_pipelineState];
+        
+        [renderEncoder setVertexBuffer:_vertices
+                                 offset:0
+                                atIndex:0];
+        
+        [renderEncoder setFragmentBuffer:_frameBlendingModeBuffer
+                                   offset:0
+                                  atIndex:0];
+        
+        [renderEncoder setFragmentBuffer:_outputResolutionBuffer
+                                   offset:0
+                                  atIndex:1];
+        
+        [renderEncoder setFragmentTexture:_texture
+                                  atIndex:0];
+        
+        [renderEncoder setFragmentTexture:_previousTexture
+                                   atIndex:1];
+        
+        [renderEncoder drawPrimitives:MTLPrimitiveTypeTriangleStrip
+                          vertexStart:0
+                          vertexCount:4];
+        
+        [renderEncoder endEncoding];
+        
+        [_commandBuffer presentDrawable:view.currentDrawable];
+    }
+    
+    
+    [_commandBuffer commit];
+}
+
+- (void)flip
+{
+    [super flip];
+    if (_pendingFrames == 2) return;
+    _pendingFrames++;
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [(MTKView *)self.internalView draw];
+        _pendingFrames--;
+    });
+}
+
+#if !TARGET_OS_IPHONE
+- (NSImage *)renderToImage
+{
+    CIImage *ciImage = [CIImage imageWithMTLTexture:[[(MTKView *)self.internalView currentDrawable] texture]
+                                            options:@{
+                                                kCIImageColorSpace: (__bridge_transfer id)CGColorSpaceCreateDeviceRGB(),
+                                                kCIImageProperties: [NSNull null]
+                                            }];
+    ciImage = [ciImage imageByApplyingTransform:CGAffineTransformTranslate(CGAffineTransformMakeScale(1, -1),
+                                                                           0, ciImage.extent.size.height)];
+    CIContext *context = [CIContext context];
+    CGImageRef cgImage = [context createCGImage:ciImage fromRect:ciImage.extent];
+    NSImage *ret = [[NSImage alloc] initWithCGImage:cgImage size:self.internalView.bounds.size];
+    CGImageRelease(cgImage);
+    return ret;
+}
+#endif
+
+@end
--- a/bsnes/gb/BESS.md
+++ b/bsnes/gb/BESS.md
@@ -0,0 +1,259 @@
+# BESS – Best Effort Save State 1.0
+
+## Motivation
+
+BESS is a save state format specification designed to allow different emulators, as well as majorly different versions of the same emulator, to import save states from other BESS-compliant save states. BESS works by appending additional, implementation-agnostic information about the emulation state. This allows a single save state file to be read as both a fully-featured, implementation specific save state which includes detailed timing information; and as a portable "best effort" save state that represents a state accurately enough to be restored in casual use-cases.
+
+## Specification
+
+Every integer used in the BESS specification is stored in Little Endian encoding.
+
+### BESS footer
+
+BESS works by appending a detectable footer at the end of an existing save state format. The footer uses the following format:
+
+| Offset from end of file | Content                                               |
+|-------------------------|-------------------------------------------------------|
+| -8                      | Offset to the first BESS Block, from the file's start |
+| -4                      | The ASCII string 'BESS'                               |
+
+### BESS blocks
+
+BESS uses a block format where each block contains the following header:
+
+| Offset | Content                               |
+|--------|-----------------------------------------------------------|
+| 0      | A four-letter ASCII identifier                            |
+| 4      | Length of the block as a 32-bit integer, excluding header |
+
+Every block is followed by another block, until the END block is reached. If an implementation encounters an unsupported block, it should be completely ignored (Should not have any effect and should not trigger a failure). 
+
+#### NAME block
+
+The NAME block uses the `'NAME'` identifier, and is an optional block that contains the name of the emulator that created this save state. While optional, it is highly recommended to be included in every implementation – it allows the user to know which emulator and version is compatible with the native save state format contained in this file. When used, this block should come first.
+
+The length of the NAME block is variable, and it only contains the name and version of the originating emulator in ASCII.
+
+
+#### INFO block
+
+The INFO block uses the `'INFO'` identifier, and is an optional block that contains information about the ROM this save state originates from. When used, this block should come before `CORE` but after `NAME`. This block is 0x12 bytes long, and it follows this structure:
+
+| Offset | Content                                          |
+|--------|--------------------------------------------------|
+| 0x00   | Bytes 0x134-0x143 from the ROM (Title)           |
+| 0x10   | Bytes 0x14E-0x14F from the ROM (Global checksum) |
+
+#### CORE block
+
+The CORE block uses the `'CORE'` identifier, and is a required block that contains both core state information, as well as basic information about the BESS version used. This block must be the first block, unless the `NAME` or `INFO` blocks exist then it must come directly after them. An implementation should not enforce block order on blocks unknown to it for future compatibility.
+
+The length of the CORE block is 0xD0 bytes, but implementations are expected to ignore any excess bytes. Following the BESS block header, the structure is as follows:
+
+| Offset | Content                                |
+|--------|----------------------------------------|
+| 0x00   | Major BESS version as a 16-bit integer |
+| 0x02   | Minor BESS version as a 16-bit integer |
+
+Both major and minor versions should be 1. Implementations are expected to reject incompatible majors, but still attempt to read newer minor versions.
+
+| Offset | Content                                |
+|--------|----------------------------------------|
+| 0x04   | A four-character ASCII model identifier |
+
+BESS uses a four-character string to identify Game Boy models:
+
+ * The first letter represents mutually-incompatible families of models and is required. The allowed values are `'G'` for the original Game Boy family, `'S'` for the Super Game Boy family, and `'C'` for the Game Boy Color and Advance family.
+* The second letter represents a specific model within the family, and is optional (If an implementation does not distinguish between specific models in a family, a space character may be used). The allowed values for family G are `'D'` for DMG and `'M'` for MGB; the allowed values for family S are `'N'` for NTSC, `'P'` for PAL, and `'2'` for SGB2; and the allowed values for family C are `'C'` for CGB, and `'A'` for the various GBA line models.
+* The third letter represents a specific CPU revision within a model, and is optional (If an implementation does not distinguish between revisions, a space character may be used). The allowed values for model GD (DMG) are `'0'` and `'A'`, through `'C'`; the allowed values for model CC (CGB) are `'0'` and `'A'`, through `'E'`; the allowed values for model CA (AGB, AGS, GBP) are `'0'`, `'A'` and `'B'`; and for every other model this value must be a space character.
+* The last character is used for padding and must be a space character.
+
+For example; `'GD  '` represents a DMG of an unspecified revision, `'S   '` represents some model of the SGB family, and `'CCE '` represent a CGB using CPU revision E.
+
+| Offset | Content                                                |
+|--------|--------------------------------------------------------|
+| 0x08   | The value of the PC register                           |
+| 0x0A   | The value of the AF register                           |
+| 0x0C   | The value of the BC register                           |
+| 0x0E   | The value of the DE register                           |
+| 0x10   | The value of the HL register                           |
+| 0x12   | The value of the SP register                           |
+| 0x14   | The value of IME (0 or 1)                              |
+| 0x15   | The value of the IE register                           |
+| 0x16   | Execution state (0 = running; 1 = halted; 2 = stopped) |
+| 0x17   | Reserved, must be 0                                    |
+| 0x18   | The values of every memory-mapped register (128 bytes) |
+
+The values of memory-mapped registers should be written 'as-is' to memory as if the actual ROM wrote them, with the following exceptions and note:
+* Unused registers have Don't-Care values which should be ignored
+* Unused register bits have Don't-Care values which should be ignored
+* If the model is CGB or newer, the value of KEY0 (FF4C) must be valid as it determines DMG mode
+    * Bit 2 determines DMG mode. A value of 0x04 usually denotes DMG mode, while a value of `0x80` usually denotes CGB mode.
+* Object priority is derived from KEY0 (FF4C) instead of OPRI (FF6C) because OPRI can be modified after booting, but only the value of OPRI during boot ROM execution takes effect
+* If a register doesn't exist on the emulated model (For example, KEY0 (FF4C) on a DMG), its value should be ignored.
+* BANK (FF50) should be 0 if the boot ROM is still mapped, and 1 otherwise, and must be valid.
+* Implementations should not start a serial transfer when writing the value of SB
+* Similarly, no value of NRx4 should trigger a sound pulse on save state load
+* And similarly again, implementations should not trigger DMA transfers when writing the values of DMA or HDMA5
+* The value store for DIV will be used to set the internal divisor to `DIV << 8`
+* Implementation should apply care when ordering the write operations (For example, writes to NR52 must come before writes to the other APU registers)
+
+| Offset | Content                                                            |
+|--------|--------------------------------------------------------------------|
+| 0x98   | The size of RAM (32-bit integer)                                   |
+| 0x9C   | The offset of RAM from file start (32-bit integer)                 |
+| 0xA0   | The size of VRAM (32-bit integer)                                  |
+| 0xA4   | The offset of VRAM from file start (32-bit integer)                |
+| 0xA8   | The size of MBC RAM (32-bit integer)                               |
+| 0xAC   | The offset of MBC RAM from file start (32-bit integer)             |
+| 0xB0   | The size of OAM (=0xA0, 32-bit integer)                            |
+| 0xB4   | The offset of OAM from file start (32-bit integer)                 |
+| 0xB8   | The size of HRAM (=0x7F, 32-bit integer)                           |
+| 0xBC   | The offset of HRAM from file start (32-bit integer)                |
+| 0xC0   | The size of background palettes (=0x40 or 0, 32-bit integer)       |
+| 0xC4   | The offset of background palettes from file start (32-bit integer) |
+| 0xC8   | The size of object palettes (=0x40 or 0, 32-bit integer)           |
+| 0xCC   | The offset of object palettes from file start (32-bit integer)     |
+
+The contents of large buffers are stored outside of BESS structure so data from an implementation's native save state format can be reused. The offsets are absolute offsets from the save state file's start. Background and object palette sizes must be 0 for models prior to Game Boy Color.
+
+An implementation needs handle size mismatches gracefully. For example, if too large MBC RAM size is specified, the superfluous data should be ignored. On the other hand, if a too small VRAM size is specified (For example, if it's a save state from an emulator emulating a CGB in DMG mode, and it didn't save the second CGB VRAM bank), the implementation is expected to set that extra bank to all zeros.
+
+#### XOAM block
+
+The XOAM block uses the `'XOAM'` identifier, and is an optional block that contains the data of extra OAM (addresses `0xFEA0-0xFEFF`). This block length must be `0x60`. Implementations that do not emulate this extra range are free to ignore the excess bytes, and to not create this block.
+
+
+#### MBC block
+
+The MBC block uses the `'MBC '` identifier, and is an optional block that is only used when saving states of ROMs that use an MBC. The length of this block is variable and must be divisible by 3.
+
+This block contains an MBC-specific number of 3-byte-long pairs that represent the values of each MBC register. For example, for MBC5 the contents would look like:
+
+| Offset | Content                               |
+|--------|---------------------------------------|
+| 0x0    | The value 0x0000 as a 16-bit integer  |
+| 0x2    | 0x0A if RAM is enabled, 0 otherwise   |
+| 0x3    | The value 0x2000 as a 16-bit integer  |
+| 0x5    | The lower 8 bits of the ROM bank      |
+| 0x6    | The value 0x3000 as a 16-bit integer  |
+| 0x8    | The bit 9 of the ROM bank             |
+| 0x9    | The value 0x4000 as a 16-bit integer  |
+| 0xB    | The current RAM bank                  |
+
+An implementation should parse this block as a series of writes to be made. Values outside the `0x0000-0x7FFF` and `0xA000-0xBFFF`  ranges are not allowed. Implementations must perform the writes in order (i.e. not reverse, sorted, or any other transformation on their order)
+
+#### RTC block
+The RTC block uses the `'RTC '` identifier, and is an optional block that is used while emulating an MBC3 with an RTC. The contents of this block are identical to 64-bit RTC saves from VBA, which are also used by SameBoy and different emulators such as BGB.
+
+The length of this block is 0x30 bytes long and it follows the following structure:
+
+| Offset | Content                                                                |
+|--------|------------------------------------------------------------------------|
+| 0x00   | Current seconds (1 byte), followed by 3 bytes of padding               |
+| 0x04   | Current minutes (1 byte), followed by 3 bytes of padding               |
+| 0x08   | Current hours (1 byte), followed by 3 bytes of padding                 |
+| 0x0C   | Current days (1 byte), followed by 3 bytes of padding                  |
+| 0x10   | Current high/overflow/running (1 byte), followed by 3 bytes of padding |
+| 0x14   | Latched seconds (1 byte), followed by 3 bytes of padding               |
+| 0x18   | Latched minutes (1 byte), followed by 3 bytes of padding               |
+| 0x1C   | Latched hours (1 byte), followed by 3 bytes of padding                 |
+| 0x20   | Latched days (1 byte), followed by 3 bytes of padding                  |
+| 0x24   | Latched high/overflow/running (1 byte), followed by 3 bytes of padding |
+| 0x28   | UNIX timestamp at the time of the save state (64-bit)                  |
+
+#### HUC3 block
+The HUC3 block uses the `'HUC3'` identifier, and is an optional block that is used while emulating an HuC3 cartridge to store RTC and alarm information. The contents of this block are identical to HuC3 RTC saves from SameBoy.
+
+The length of this block is 0x11 bytes long and it follows the following structure:
+
+| Offset | Content                                               |
+|--------|-------------------------------------------------------|
+| 0x00   | UNIX timestamp at the time of the save state (64-bit) |
+| 0x08   | RTC minutes (16-bit)                                  |
+| 0x0A   | RTC days (16-bit)                                     |
+| 0x0C   | Scheduled alarm time minutes (16-bit)                 |
+| 0x0E   | Scheduled alarm time days (16-bit)                    |
+| 0x10   | Alarm enabled flag (8-bits, either 0 or 1)            |
+
+#### TPP1 block
+The TPP1 block uses the `'TPP1'` identifier, and is an optional block that is used while emulating a TPP1 cartridge to store RTC information. This block can be omitted if the ROM header does not specify the inclusion of a RTC.
+
+The length of this block is 0x11 bytes long and it follows the following structure:
+
+| Offset | Content                                               |
+|--------|-------------------------------------------------------|
+| 0x00   | UNIX timestamp at the time of the save state (64-bit) |
+| 0x08   | The current RTC data (4 bytes)                        |
+| 0x0C   | The latched RTC data (4 bytes)                        |
+| 0x10   | The value of the MR4 register (8-bits)                |
+
+
+#### MBC7 block
+The MBC7 block uses the `'MBC7'` identifier, and is an optional block that is used while emulating an MBC7 cartridge to store the EEPROM communication state and motion control state.
+
+The length of this block is 0xA bytes long and it follows the following structure:
+
+| Offset | Content                                               |
+|--------|-------------------------------------------------------|
+| 0x00   | Flags (8-bits)                                        |
+| 0x01   | Argument bits left (8-bits)                           |
+| 0x02   | Current EEPROM command (16-bits)                      |
+| 0x04   | Pending bits to read (16-bits)                        |
+| 0x06   | Latched gyro X value (16-bits)                        |
+| 0x08   | Latched gyro Y value (16-bits)                        |
+
+The meaning of the individual bits in flags are:
+ * Bit 0: Latch ready; set after writing `0x55` to `0xAX0X` and reset after writing `0xAA` to `0xAX1X`
+ * Bit 1: EEPROM DO line
+ * Bit 2: EEPROM DI line
+ * Bit 3: EEPROM CLK line
+ * Bit 4: EEPROM CS line
+ * Bit 5: EEPROM write enable; set after an `EWEN` command, reset after an `EWDS` command
+ * Bits 6-7: Unused.
+
+The current EEPROM command field has bits pushed to its LSB first, padded with zeros. For example, if the ROM clocked a single `1` bit, this field should contain `0b1`; if the ROM later clocks a `0` bit, this field should contain `0b10`.
+
+If the currently transmitted command has an argument, the "Argument bits left" field should contain the number argument bits remaining. Otherwise, it should contain 0.
+
+The "Pending bits to read" field contains the pending bits waiting to be shifted into the DO signal, MSB first, padded with ones.
+
+#### SGB block
+
+The SGB block uses the `'SGB '` identifier, and is an optional block that is only used while emulating an SGB or SGB2 *and* SGB commands enabled. Implementations must not save this block on other models or when SGB commands are disabled, and should assume SGB commands are disabled if this block is missing.
+
+The length of this block is 0x39 bytes, but implementations should allow and ignore excess data in this block for extensions. The block follows the following structure:
+
+| Offset | Content                                                                                                                  |
+|--------|--------------------------------------------------------------------------------------------------------------------------|
+| 0x00   | The size of the border tile data (=0x2000, 32-bit integer)                                                               |
+| 0x04   | The offset of the border tile data (SNES tile format, 32-bit integer)                                                    |
+| 0x08   | The size of the border tilemap (=0x800, 32-bit integer)                                                                  |
+| 0x0C   | The offset of the border tilemap (LE 16-bit sequences, 32-bit integer)                                                   |
+| 0x10   | The size of the border palettes (=0x80, 32-bit integer)                                                                  |
+| 0x14   | The offset of the border palettes (LE 16-bit sequences, 32-bit integer)                                                  |
+| 0x18   | The size of active colorization palettes (=0x20, 32-bit integer)                                                         |
+| 0x1C   | The offset of the active colorization palettes (LE 16-bit sequences, 32-bit integer)                                     |
+| 0x20   | The size of RAM colorization palettes (=0x1000, 32-bit integer)                                                          |
+| 0x24   | The offset of the RAM colorization palettes (LE 16-bit sequences, 32-bit integer)                                        |
+| 0x28   | The size of the attribute map (=0x168, 32-bit integer)                                                                   |
+| 0x2C   | The offset of the attribute map (32-bit integer)                                                                         |
+| 0x30   | The size of the attribute files (=0xfd2, 32-bit integer)                                                                 |
+| 0x34   | The offset of the attribute files (32-bit integer)                                                                       |
+| 0x38   | Multiplayer status (1 byte); high nibble is player count (1, 2 or 4), low nibble is current player (Where Player 1 is 0) |
+
+If only some of the size-offset pairs are available (for example, partial HLE SGB implementation), missing fields are allowed to have 0 as their size, and implementations are expected to fall back to a sane default.
+
+#### END block
+The END block uses the `'END '` identifier, and is a required block that marks the end of BESS data. Naturally, it must be the last block. The length of the END block must be 0.
+
+## Validation and Failures
+
+Other than previously specified required fail conditions, an implementation is free to decide what format errors should abort the loading of a save file. Structural errors (e.g. a block with an invalid length, a file offset that is outside the file's range, or a missing END block) should be considered as irrecoverable errors. Other errors that are considered fatal by SameBoy's implementation:
+* Duplicate CORE block
+* A known block, other than NAME, appearing before CORE
+* An invalid length for the XOAM, RTC, SGB or HUC3 blocks
+* An invalid length of MBC (not a multiple of 3)
+* A write outside the $0000-$7FFF and $A000-$BFFF ranges in the MBC block
+* An SGB block on a save state targeting another model
+* An END block with non-zero length
--- a/bsnes/gb/BootROMs/SameBoyLogo.png
+++ b/bsnes/gb/BootROMs/SameBoyLogo.png
--- a/bsnes/gb/BootROMs/agb_boot.asm
+++ b/bsnes/gb/BootROMs/agb_boot.asm
@@ -0,0 +1,2 @@
+DEF AGB = 1
+include "cgb_boot.asm"
--- a/bsnes/gb/BootROMs/cgb0_boot.asm
+++ b/bsnes/gb/BootROMs/cgb0_boot.asm
@@ -0,0 +1,2 @@
+DEF CGB0 = 1
+include "cgb_boot.asm"
--- a/bsnes/gb/BootROMs/cgb_boot.asm
+++ b/bsnes/gb/BootROMs/cgb_boot.asm
--- a/bsnes/gb/BootROMs/cgb_boot_fast.asm
+++ b/bsnes/gb/BootROMs/cgb_boot_fast.asm
@@ -0,0 +1,2 @@
+DEF FAST = 1
+include "cgb_boot.asm"
--- a/bsnes/gb/BootROMs/dmg_boot.asm
+++ b/bsnes/gb/BootROMs/dmg_boot.asm
@@ -0,0 +1,196 @@
+; SameBoy DMG bootstrap ROM
+
+include "sameboot.inc"
+
+SECTION "BootCode", ROM0[$0000]
+Start:
+; Init stack pointer
+    ld sp, $FFFE
+
+; Clear memory VRAM
+    ld hl, _VRAM
+    xor a
+
+.clearVRAMLoop
+    ldi [hl], a
+    bit 5, h
+    jr z, .clearVRAMLoop
+
+; Init Audio
+    ld a, AUDENA_ON
+    ldh [rNR52], a
+    assert AUDENA_ON == AUDLEN_DUTY_50
+    ldh [rNR11], a
+    ld a, $F3
+    ldh [rNR12], a ; Envelope $F, decreasing, sweep $3
+    ldh [rNR51], a ; Channels 1+2+3+4 left, channels 1+2 right
+    ld a, $77
+    ldh [rNR50], a ; Volume $7, left and right
+
+; Init BG palette
+    ld a, %01_01_01_00
+    ldh [rBGP], a
+
+; Load logo from ROM.
+; A nibble represents a 4-pixels line, 2 bytes represent a 4x4 tile, scaled to 8x8.
+; Tiles are ordered left to right, top to bottom.
+    ld de, NintendoLogo
+    ld hl, _VRAM + $10 ; This is where we load the tiles in VRAM
+
+.loadLogoLoop
+    ld a, [de] ; Read 2 rows
+    ld b, a
+    call DoubleBitsAndWriteRow
+    call DoubleBitsAndWriteRow
+    inc de
+    ld a, e
+    xor LOW(NintendoLogoEnd)
+    jr nz, .loadLogoLoop
+
+; Load trademark symbol
+    ld de, TrademarkSymbol
+    ld c, TrademarkSymbolEnd - TrademarkSymbol
+.loadTrademarkSymbolLoop:
+    ld a, [de]
+    inc de
+    ldi [hl], a
+    inc hl
+    dec c
+    jr nz, .loadTrademarkSymbolLoop
+
+; Set up tilemap
+    ld a, $19                           ; Trademark symbol tile ID
+    ld [_SCRN0 + 8 * SCRN_VX_B + 16], a ; ... put in the superscript position
+    ld hl, _SCRN0 + 9 * SCRN_VX_B + 15  ; Bottom right corner of the logo
+    ld c, 12                            ; Tiles in a logo row
+.tilemapLoop
+    dec a
+    jr z, .tilemapDone
+    ldd [hl], a
+    dec c
+    jr nz, .tilemapLoop
+    ld l, $0F ; Jump to top row
+    jr .tilemapLoop
+.tilemapDone
+
+    ld a, 30
+    ldh [rSCY], a
+
+    ; Turn on LCD
+    ld a, LCDCF_ON | LCDCF_BLK01 | LCDCF_BGON
+    ldh [rLCDC], a
+
+    ld d, LOW(-119)
+    ld c, 15
+
+.animate
+    call WaitFrame
+    ld a, d
+    sra a
+    sra a
+    ldh [rSCY], a
+    ld a, d
+    add c
+    ld d, a
+    ld a, c
+    cp 8
+    jr nz, .noPaletteChange
+    ld a, %10_10_10_00
+    ldh [rBGP], a
+.noPaletteChange
+    dec c
+    jr nz, .animate
+    ld a, %11_11_11_00
+    ldh [rBGP], a
+
+    ; Play first sound
+    ld a, $83
+    call PlaySound
+    ld b, 5
+    call WaitBFrames
+    ; Play second sound
+    ld a, $C1
+    call PlaySound
+
+
+
+; Wait ~1 second
+    ld b, 60
+    call WaitBFrames
+
+; Set registers to match the original DMG boot
+IF DEF(MGB)
+    lb hl, BOOTUP_A_MGB, %10110000
+ELSE
+    lb hl, BOOTUP_A_DMG, %10110000
+ENDC
+    push hl
+    pop af
+    ld hl, HeaderChecksum
+    lb bc, 0, LOW(rNR13) ; $0013
+    lb de, 0, $D8        ; $00D8
+
+; Boot the game
+    jp BootGame
+
+
+DoubleBitsAndWriteRow:
+; Double the most significant 4 bits, b is shifted by 4
+    ld a, 4
+    ld c, 0
+.doubleCurrentBit
+    sla b
+    push af
+    rl c
+    pop af
+    rl c
+    dec a
+    jr nz, .doubleCurrentBit
+    ld a, c
+; Write as two rows
+    ldi [hl], a
+    inc hl
+    ldi [hl], a
+    inc hl
+    ret
+
+WaitFrame:
+    push hl
+    ld hl, rIF
+    res 0, [hl]
+.wait
+    bit 0, [hl]
+    jr z, .wait
+    pop hl
+    ret
+
+WaitBFrames:
+    call WaitFrame
+    dec b
+    jr nz, WaitBFrames
+    ret
+
+PlaySound:
+    ldh [rNR13], a
+    ld a, AUDHIGH_RESTART | $7
+    ldh [rNR14], a
+    ret
+
+
+TrademarkSymbol:
+    pusho
+    opt b.X
+    db %..XXXX..
+    db %.X....X.
+    db %X.XXX..X
+    db %X.X..X.X
+    db %X.XXX..X
+    db %X.X..X.X
+    db %.X....X.
+    db %..XXXX..
+    popo
+TrademarkSymbolEnd:
+
+SECTION "BootGame", ROM0[$00FE]
+BootGame:
+    ldh [rBANK], a ; unmap boot ROM
--- a/bsnes/gb/BootROMs/hardware.inc
+++ b/bsnes/gb/BootROMs/hardware.inc
--- a/bsnes/gb/BootROMs/mgb_boot.asm
+++ b/bsnes/gb/BootROMs/mgb_boot.asm
@@ -0,0 +1,2 @@
+DEF MGB = 1
+include "dmg_boot.asm"
--- a/bsnes/gb/BootROMs/pb12.c
+++ b/bsnes/gb/BootROMs/pb12.c
@@ -0,0 +1,102 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <assert.h>
+
+static void opts(uint8_t byte, uint8_t *options)
+{
+    *(options++) = byte | ((byte << 1) & 0xff);
+    *(options++) = byte & (byte << 1);
+    *(options++) = byte | ((byte >> 1) & 0xff);
+    *(options++) = byte & (byte >> 1);
+}
+
+static void write_all(int fd, const void *buf, size_t count) {
+    while (count) {
+        ssize_t written = write(fd, buf, count);
+        if (written < 0) {
+            fprintf(stderr, "write");
+            exit(1);
+        }
+        count -= written;
+        buf += written;
+    }
+}
+
+int main(void)
+{
+    static uint8_t source[0x4000];
+    size_t size = read(STDIN_FILENO, &source, sizeof(source));
+    unsigned pos = 0;
+    assert(size <= 0x4000);
+    while (size && source[size - 1] == 0) {
+        size--;
+    }
+    
+    uint8_t literals[8];
+    size_t literals_size = 0;
+    unsigned bits = 0;
+    unsigned control = 0;
+    unsigned prev[2] = {-1, -1}; // Unsigned to allow "not set" values
+    
+    while (true) {
+
+        uint8_t byte = 0;
+        if (pos == size){
+            if (bits == 0) break;
+        }
+        else {
+            byte = source[pos++];
+        }
+        
+        if (byte == prev[0] || byte == prev[1]) {
+            bits += 2;
+            control <<= 1;
+            control |= 1;
+            control <<= 1;
+            if (byte == prev[1]) {
+                control |= 1;
+            }
+        }
+        else {
+            bits += 2;
+            control <<= 2;
+            uint8_t options[4];
+            opts(prev[1], options);
+            bool found = false;
+            for (unsigned i = 0; i < 4; i++) {
+                if (options[i] == byte) {
+                    // 01 = modify
+                    control |= 1;
+                    
+                    bits += 2;
+                    control <<= 2;
+                    control |= i;
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                literals[literals_size++] = byte;
+            }
+        }
+        
+        prev[0] = prev[1];
+        prev[1] = byte;
+        if (bits >= 8) {
+            uint8_t outctl = control >> (bits - 8);
+            assert(outctl != 1); // 1 is reserved as the end byte
+            write_all(STDOUT_FILENO, &outctl, 1);
+            write_all(STDOUT_FILENO, literals, literals_size);
+            bits -= 8;
+            control &= (1 << bits) - 1;
+            literals_size = 0;
+        }
+    }
+    uint8_t end_byte = 1;
+    write_all(STDOUT_FILENO, &end_byte, 1);
+
+    return 0;
+}
--- a/bsnes/gb/BootROMs/sameboot.inc
+++ b/bsnes/gb/BootROMs/sameboot.inc
@@ -0,0 +1,40 @@
+IF !DEF(SAMEBOY_INC)
+DEF SAMEBOY_INC EQU 1
+
+include "hardware.inc"
+
+DEF rKEY0 EQU $FF4C
+DEF rBANK EQU $FF50
+
+DEF rJOYP EQU rP1
+
+
+MACRO lb ; r16, high, low
+    ld \1, LOW(\2) << 8 | LOW(\3)
+ENDM
+
+
+MACRO header_section ; name, address
+    PUSHS
+    SECTION "\1", ROM0[\2]
+    \1:
+    POPS
+ENDM
+    header_section EntryPoint,       $0100
+    header_section NintendoLogo,     $0104
+    header_section NintendoLogoEnd,  $0134
+    header_section Title,            $0134
+    header_section ManufacturerCode, $013F
+    header_section CGBFlag,          $0143
+    header_section NewLicenseeCode,  $0144
+    header_section SGBFlag,          $0146
+    header_section CartridgeType,    $0147
+    header_section ROMSize,          $0148
+    header_section RAMSize,          $0149
+    header_section DestinationCode,  $014A
+    header_section OldLicenseeCode,  $014B
+    header_section MaskRomVersion,   $014C
+    header_section HeaderChecksum,   $014D
+    header_section GlobalChecksum,   $014E
+
+ENDC
--- a/bsnes/gb/BootROMs/sgb2_boot.asm
+++ b/bsnes/gb/BootROMs/sgb2_boot.asm
@@ -0,0 +1,2 @@
+DEF SGB2 = 1
+include "sgb_boot.asm"
--- a/bsnes/gb/BootROMs/sgb_boot.asm
+++ b/bsnes/gb/BootROMs/sgb_boot.asm
@@ -0,0 +1,235 @@
+; SameBoy SGB bootstrap ROM
+
+include "sameboot.inc"
+
+SECTION "BootCode", ROM0[$0000]
+Start:
+; Init stack pointer
+    ld sp, $FFFE
+
+; Clear memory VRAM
+    ld hl, _VRAM
+    xor a
+
+.clearVRAMLoop
+    ldi [hl], a
+    bit 5, h
+    jr z, .clearVRAMLoop
+
+; Init Audio
+    ld a, AUDENA_ON
+    ldh [rNR52], a
+    assert AUDENA_ON == AUDLEN_DUTY_50
+    ldh [rNR11], a
+    ld a, $F3
+    ldh [rNR12], a ; Envelope $F, decreasing, sweep $3
+    ldh [rNR51], a ; Channels 1+2+3+4 left, channels 1+2 right
+    ld a, $77
+    ldh [rNR50], a ; Volume $7, left and right
+
+; Init BG palette to white
+    ld a, %00_00_00_00
+    ldh [rBGP], a
+
+; Load logo from ROM.
+; A nibble represents a 4-pixels line, 2 bytes represent a 4x4 tile, scaled to 8x8.
+; Tiles are ordered left to right, top to bottom.
+    ld de, NintendoLogo
+    ld hl, _VRAM + $10 ; This is where we load the tiles in VRAM
+
+.loadLogoLoop
+    ld a, [de] ; Read 2 rows
+    ld b, a
+    call DoubleBitsAndWriteRow
+    call DoubleBitsAndWriteRow
+    inc de
+    ld a, e
+    xor LOW(NintendoLogoEnd)
+    jr nz, .loadLogoLoop
+
+; Load trademark symbol
+    ld de, TrademarkSymbol
+    ld c, TrademarkSymbolEnd - TrademarkSymbol
+.loadTrademarkSymbolLoop:
+    ld a, [de]
+    inc de
+    ldi [hl], a
+    inc hl
+    dec c
+    jr nz, .loadTrademarkSymbolLoop
+
+; Set up tilemap
+    ld a, $19                           ; Trademark symbol tile ID
+    ld [_SCRN0 + 8 * SCRN_VX_B + 16], a ; ... put in the superscript position
+    ld hl, _SCRN0 + 9 * SCRN_VX_B + 15  ; Bottom right corner of the logo
+    ld c, 12                            ; Tiles in a logo row
+.tilemapLoop
+    dec a
+    jr z, .tilemapDone
+    ldd [hl], a
+    dec c
+    jr nz, .tilemapLoop
+    ld l, $0F ; Jump to top row
+    jr .tilemapLoop
+.tilemapDone
+
+    ; Turn on LCD
+    ld a, LCDCF_ON | LCDCF_BLK01 | LCDCF_BGON
+    ldh [rLCDC], a
+
+    ld a, $F1 ; Packet magic, increases by 2 for every packet
+    ldh [hCommand], a
+    ld hl, NintendoLogo ; Header start
+
+    xor a
+    ld c, a ; JOYP
+
+.sendCommand
+    xor a
+    ldh [c], a
+    ld a, $30
+    ldh [c], a
+
+    ldh a, [hCommand]
+    call SendByte
+    push hl
+
+    ld b, 14
+    ld d, 0
+.checksumLoop
+    call ReadHeaderByte
+    add d
+    ld d, a
+    dec b
+    jr nz, .checksumLoop
+
+    ; Send checksum
+    call SendByte
+    pop hl
+
+    ld b, 14
+.sendLoop
+    call ReadHeaderByte
+    call SendByte
+    dec b
+    jr nz, .sendLoop
+
+    ; Done bit
+    ld a, $20
+    ldh [c], a
+    ld a, $30
+    ldh [c], a
+
+    ; Wait 4 frames
+    ld e, 4
+    ld a, 1
+    ldh [rIE], a
+    xor a
+.waitLoop
+    ldh [rIF], a
+    halt
+    nop
+    dec e
+    jr nz, .waitLoop
+    ldh [rIE], a
+
+    ; Update command
+    ldh a, [hCommand]
+    add 2
+    ldh [hCommand], a
+
+    ld a, $58
+    cp l
+    jr nz, .sendCommand
+
+    ; Write to sound registers for DMG compatibility
+    ld c, LOW(rNR13)
+    ld a, $C1
+    ldh [c], a
+    inc c
+    ld a, $7
+    ldh [c], a
+
+    ; Init BG palette
+    ld a, %11_11_11_00
+    ldh [rBGP], a
+
+; Set registers to match the original SGB boot
+IF DEF(SGB2)
+    ld a, BOOTUP_A_MGB
+ELSE
+    ld a, BOOTUP_A_DMG
+ENDC
+    ld hl, $C060
+
+; Boot the game
+    jp BootGame
+
+ReadHeaderByte:
+    ld a, $4F
+    cp l
+    jr c, .zero
+    ld a, [hli]
+    ret
+.zero:
+    inc hl
+    xor a
+    ret
+
+SendByte:
+    ld e, a
+    ld d, 8
+.loop
+    ld a, $10
+    rr e
+    jr c, .zeroBit
+    add a ; 10 -> 20
+.zeroBit
+    ldh [c], a
+    ld a, $30
+    ldh [c], a
+    dec d
+    ret z
+    jr .loop
+
+DoubleBitsAndWriteRow:
+; Double the most significant 4 bits, b is shifted by 4
+    ld a, 4
+    ld c, 0
+.doubleCurrentBit
+    sla b
+    push af
+    rl c
+    pop af
+    rl c
+    dec a
+    jr nz, .doubleCurrentBit
+    ld a, c
+; Write as two rows
+    ldi [hl], a
+    inc hl
+    ldi [hl], a
+    inc hl
+    ret
+
+TrademarkSymbol:
+    pusho
+    opt b.X
+    db %..XXXX..
+    db %.X....X.
+    db %X.XXX..X
+    db %X.X..X.X
+    db %X.XXX..X
+    db %X.X..X.X
+    db %.X....X.
+    db %..XXXX..
+    popo
+TrademarkSymbolEnd:
+
+SECTION "BootGame", ROM0[$00FE]
+BootGame:
+    ldh [rBANK], a
+
+SECTION "HRAM", HRAM[_HRAM]
+hCommand:
+    ds 1
--- a/bsnes/gb/CHANGES.md
+++ b/bsnes/gb/CHANGES.md
@@ -0,0 +1 @@
+See https://sameboy.github.io/changelog/
--- a/bsnes/gb/CONTRIBUTING.md
+++ b/bsnes/gb/CONTRIBUTING.md
@@ -0,0 +1,79 @@
+# SameBoy Coding and Contribution Guidelines
+
+## Issues
+
+GitHub Issues are the most effective way to report a bug or request a feature in SameBoy. When reporting a bug, make sure you use the latest stable release, and make sure you mention the SameBoy frontend (Cocoa, SDL, Libretro) and operating system you're using. If you're using Linux/BSD/etc, or you build your own copy of SameBoy for another reason, give as much details as possible on your environment.
+
+If your bug involves a crash, please attach a crash log or a core dump. If you're using Linux/BSD/etc, or if you're using the Libretro core, please attach the `sameboy` binary (or `libretro_sameboy` library) in that case.
+
+If your bug is a regression, it'd be extremely helpful if you can report the the first affected version. You get extra credits if you use `git bisect` to point the exact breaking commit.
+
+If your bug is an emulation bug (Such as a failing test ROM), and you have access to a Game Boy you can test on, please confirm SameBoy is indeed behaving differently from hardware, and report both the emulated model and revision in SameBoy, and the hardware revision you're testing on.
+
+If your issue is a feature request, demonstrating use cases can help me better prioritize it.
+
+## Pull Requests
+
+To allow quicker integration into SameBoy's master branch, contributors are asked to follow SameBoy's style and coding guidelines. Keep in mind that despite the seemingly strict guidelines, all pull requests are welcome – not following the guidelines does not mean your pull request will not be accepted, but it will require manual tweaks from my side for integrating.
+
+### Languages and Compilers
+
+SameBoy's core, SDL frontend, Libretro frontend, and automatic tester (Folders `Core`, `SDL` & `OpenDialog`, `libretro`, and `Tester`; respectively) are all written in C11. The Cocoa frontend, SameBoy's fork of Hex Fiend, JoyKit and the Quick Look previewer (Folders `Cocoa`, `HexFiend`, `JoyKit` and `QuickLook`; respectively) are all written in ARC-enabled Objective-C. The SameBoot ROMs (Under `BootROMs`) are written in rgbds-flavor SM83 assembly, with build tools in C11. The shaders (inside `Shaders`) are written in a polyglot GLSL and Metal style, with a few GLSL- and Metal-specific sources. The build system uses standalone Make, in the GNU flavor. Avoid adding new languages (C++, Swift, Python, CMake...) to any of the existing sub-projects.
+
+SameBoy's main target compiler is Clang, but GCC is also supported when targeting Linux and Libretro. Other compilers (e.g. MSVC) are not supported, and unless there's a good reason, there's no need to go out of your way to add specific support for them. Extensions that are supported by both compilers (Such as `typeof`) may be used if it makes sense. It's OK if you can't test one of these compilers yourself; once you push a commit, the CI bot will let you know if you broke something.
+
+### Third Party Libraries and Tools
+
+Avoid adding new required dependencies; run-time and compile-time dependencies alike. Most importantly, avoid linking against GPL licensed libraries (LGPL libraries are fine), so SameBoy can retain its Expat license.
+
+### Spacing, Indentation and Formatting
+
+In all files and languages (Other than Makefiles when required), 4 spaces are used for indentation. Unix line endings (`\n`) are used exclusively, even in Windows-specific source files. (`\r` and `\t` shouldn't appear in any source file). Opening braces belong on the same line as their control flow directive, and on their own line when following a function prototype. The `else` keyword always starts on its own line. The `case` keyword is indented relative to its `switch` block, and the code inside a `case` is indented relative to its label. A control flow keyword should have a space between it and the following `(`, commas should follow a space, and operator (except `.` and `->`) should be surrounded by spaces.
+
+Control flow statements must use `{}`, with the exception of `if` statements that only contain a single `break`, `continue`, or trivial `return` statements. If `{}`s are omitted, the statement must be on the same line as the `if` condition. Functions that do not have any argument must be specified as `(void)`, as mandated by the C standard. The `sizeof` and `typeof` operators should be used as if they're functions (With `()`). `*`, when used to declare pointer types (including functions that return pointers), and when used to dereference a pointer, is attached to the right side (The variable name) – not to the left, and not with spaces on both sides.
+
+No strict limitations on a line's maximum width, but use your best judgement if you think a statement would benefit from an additional line break.
+
+Well formatted code example:
+
+```
+static void my_function(void)
+{
+    GB_something_t *thing = GB_function(&gb, GB_FLAG_ONE | GB_FLAG_TWO, sizeof(thing));
+    if (GB_is_thing(thing)) return;
+    
+    switch (*thing) {
+        case GB_QUACK:
+            // Something
+        case GB_DUCK:
+            // Something else
+    }
+}
+```
+
+Badly formatted code example:
+```
+static void my_function(){
+        GB_something_t* thing=GB_function(&gb , GB_FLAG_ONE|GB_FLAG_TWO , sizeof thing);
+        if( GB_is_thing ( thing ) )
+                return;
+
+        switch(* thing)
+        {
+        case GB_QUACK:
+                // Something
+        case GB_DUCK:
+                // Something else
+        }
+}
+```
+
+### Other Coding Conventions
+
+The primitive types to be used in SameBoy are `unsigned` and `signed` (Without the `int` keyword), the `(u)int*_t` types, `char *` for UTF-8 strings, `double` for non-integer numbers, and `bool` for booleans (Including in Objective-C code, avoid `BOOL`). As long as it's not mandated by a 3rd-party API (e.g. `int` when using file descriptors), avoid using other primitive types. Use `const` whenever possible. 
+
+Most C names should be `lower_case_snake_case`. Constants and macros use `UPPER_CASE_SNAKE_CASE`. Type definitions use a `_t` suffix. Type definitions, as well as non-static (exported) core symbols, should be prefixed with `GB_` (SameBoy's core is intended to be used as a library, so it shouldn't contaminate the global namespace without prefixes). Exported symbols that are only meant to be used by other parts of the core should still get the `GB_` prefix, but their header definition should be inside `#ifdef GB_INTERNAL`.
+
+For Objective-C naming conventions, use Apple's conventions (Some old Objective-C code mixes these with the C naming convention; new code should use Apple's convention exclusively). The name prefix for SameBoy classes and constants is `GB`. JoyKit's prefix is `JOY`, and Hex Fiend's prefix is `HF`.
+
+In all languages, prefer long, unambiguous names over short ambiguous ones.
--- a/bsnes/gb/Cocoa/AppIcon.icns
+++ b/bsnes/gb/Cocoa/AppIcon.icns
--- a/bsnes/gb/Cocoa/Assets.car
+++ b/bsnes/gb/Cocoa/Assets.car
--- a/bsnes/gb/Cocoa/AudioRecordingAccessoryView.xib
+++ b/bsnes/gb/Cocoa/AudioRecordingAccessoryView.xib
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14868" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14868"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="Document">
+            <connections>
+                <outlet property="audioFormatButton" destination="knX-AW-zt5" id="fKt-eI-H0y"/>
+                <outlet property="audioRecordingAccessoryView" destination="c22-O7-iKe" id="XD8-Gi-qOC"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe">
+            <rect key="frame" x="0.0" y="0.0" width="354" height="36"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Atq-RE-328">
+                    <rect key="frame" x="18" y="10" width="56" height="16"/>
+                    <autoresizingMask key="autoresizingMask"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Format:" id="dso-NS-JlD">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="knX-AW-zt5">
+                    <rect key="frame" x="81" y="4" width="256" height="25"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <popUpButtonCell key="cell" type="push" title="Apple AIFF" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" selectedItem="M3Z-UN-VKZ" id="tLM-Di-Dy3">
+                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                        <menu key="menu" id="gqn-SL-AA5">
+                            <items>
+                                <menuItem title="Apple AIFF" state="on" tag="1" id="M3Z-UN-VKZ"/>
+                                <menuItem title="RIFF WAVE" tag="2" id="zA0-Np-4XD"/>
+                                <menuItem title="Raw PCM (Stereo 96KHz, 16-bit LE)" id="r9J-4k-XH5"/>
+                            </items>
+                        </menu>
+                    </popUpButtonCell>
+                    <connections>
+                        <action selector="audioFormatChanged:" target="-2" id="I1k-d9-afp"/>
+                    </connections>
+                </popUpButton>
+            </subviews>
+            <point key="canvasLocation" x="75" y="19"/>
+        </customView>
+    </objects>
+</document>
--- a/bsnes/gb/Cocoa/BackstepTemplate.png
+++ b/bsnes/gb/Cocoa/BackstepTemplate.png
--- a/bsnes/gb/Cocoa/BackstepTemplate@2x.png
+++ b/bsnes/gb/Cocoa/BackstepTemplate@2x.png
--- a/bsnes/gb/Cocoa/BigSurToolbar.h
+++ b/bsnes/gb/Cocoa/BigSurToolbar.h
@@ -0,0 +1,26 @@
+#import <Cocoa/Cocoa.h>
+
+/* Backport the toolbarStyle property to allow compilation with older SDKs*/
+#ifndef __MAC_10_16
+typedef NS_ENUM(NSInteger, NSWindowToolbarStyle) {
+    // The default value. The style will be determined by the window's given configuration
+    NSWindowToolbarStyleAutomatic,
+    // The toolbar will appear below the window title
+    NSWindowToolbarStyleExpanded,
+    // The toolbar will appear below the window title and the items in the toolbar will attempt to have equal widths when possible
+    NSWindowToolbarStylePreference,
+    // The window title will appear inline with the toolbar when visible
+    NSWindowToolbarStyleUnified,
+    // Same as NSWindowToolbarStyleUnified, but with reduced margins in the toolbar allowing more focus to be on the contents of the window
+    NSWindowToolbarStyleUnifiedCompact
+} API_AVAILABLE(macos(11.0));
+
+@interface NSWindow (toolbarStyle)
+@property (nonatomic) NSWindowToolbarStyle toolbarStyle API_AVAILABLE(macos(11.0));
+@end
+
+@interface NSImage (SFSymbols)
+ (instancetype)imageWithSystemSymbolName:(NSString *)symbolName accessibilityDescription:(NSString *)description API_AVAILABLE(macos(11.0));
+@end
+
+#endif
--- a/bsnes/gb/Cocoa/CPU.png
+++ b/bsnes/gb/Cocoa/CPU.png
--- a/bsnes/gb/Cocoa/CPU@2x.png
+++ b/bsnes/gb/Cocoa/CPU@2x.png
--- a/bsnes/gb/Cocoa/CPU~solid.png
+++ b/bsnes/gb/Cocoa/CPU~solid.png
--- a/bsnes/gb/Cocoa/CPU~solid@2x.png
+++ b/bsnes/gb/Cocoa/CPU~solid@2x.png
--- a/bsnes/gb/Cocoa/CPU~solid~dark.png
+++ b/bsnes/gb/Cocoa/CPU~solid~dark.png
--- a/bsnes/gb/Cocoa/CPU~solid~dark@2x.png
+++ b/bsnes/gb/Cocoa/CPU~solid~dark@2x.png
--- a/bsnes/gb/Cocoa/Cartridge.icns
+++ b/bsnes/gb/Cocoa/Cartridge.icns
--- a/bsnes/gb/Cocoa/CheatSearch.xib
+++ b/bsnes/gb/Cocoa/CheatSearch.xib
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.7"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="GBCheatSearchController">
+            <connections>
+                <outlet property="addCheatButton" destination="o1I-5D-V4k" id="lRE-uQ-vul"/>
+                <outlet property="conditionField" destination="XN7-BO-THS" id="vzh-y2-CcN"/>
+                <outlet property="conditionTypeButton" destination="6RO-h8-lZ8" id="5wx-NY-lbK"/>
+                <outlet property="dataTypeButton" destination="5Db-vP-S60" id="wdR-m7-fEI"/>
+                <outlet property="operandField" destination="Q42-Vu-TJW" id="hRn-67-UmU"/>
+                <outlet property="resultsLabel" destination="wbN-MX-lEy" id="gJB-fD-eKK"/>
+                <outlet property="tableView" destination="fSU-85-fVM" id="1kO-kP-yBb"/>
+                <outlet property="window" destination="QvC-M9-y7g" id="g09-DO-GsE"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="Cheat Search" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="GBPanel">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <rect key="contentRect" x="196" y="240" width="480" height="372"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <value key="minSize" type="size" width="480" height="372"/>
+            <value key="maxSize" type="size" width="480" height="99999"/>
+            <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
+                <rect key="frame" x="0.0" y="0.0" width="480" height="372"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="24" horizontalPageScroll="10" verticalLineScroll="24" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fvf-Co-5Ga">
+                        <rect key="frame" x="-1" y="155" width="482" height="218"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <clipView key="contentView" drawsBackground="NO" id="1kJ-HR-keu">
+                            <rect key="frame" x="1" y="1" width="480" height="216"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <subviews>
+                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" tableStyle="plain" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="24" headerView="oyv-sh-ulk" id="fSU-85-fVM">
+                                    <rect key="frame" x="0.0" y="0.0" width="480" height="188"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <size key="intercellSpacing" width="17" height="0.0"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                    <tableColumns>
+                                        <tableColumn identifier="AutomaticTableColumnIdentifier.0" editable="NO" width="143" minWidth="40" maxWidth="1000" id="8z0-o5-dNI">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Address">
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" controlSize="large" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" title="Text Cell" id="bmG-fw-HDR" customClass="GBCenteredTextCell">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                        </tableColumn>
+                                        <tableColumn identifier="AutomaticTableColumnIdentifier.1" editable="NO" width="143" minWidth="40" maxWidth="1000" id="mBc-yv-f00">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Previous Value">
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" controlSize="large" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" title="Text Cell" id="BSe-S3-KNH" customClass="GBCenteredTextCell">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                        </tableColumn>
+                                        <tableColumn width="143" minWidth="10" maxWidth="3.4028234663852886e+38" id="F7j-ck-3H0">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Current Value">
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" controlSize="large" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="wjH-Ei-6hv" customClass="GBCenteredTextCell">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                        </tableColumn>
+                                    </tableColumns>
+                                    <connections>
+                                        <outlet property="dataSource" destination="-2" id="Yqt-V5-OkG"/>
+                                        <outlet property="delegate" destination="-2" id="TRM-gh-TG4"/>
+                                    </connections>
+                                </tableView>
+                            </subviews>
+                            <nil key="backgroundColor"/>
+                        </clipView>
+                        <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="ZbQ-IG-kyP">
+                            <rect key="frame" x="1" y="201" width="480" height="16"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="wK3-8v-kAQ">
+                            <rect key="frame" x="224" y="17" width="15" height="102"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <tableHeaderView key="headerView" wantsLayer="YES" id="oyv-sh-ulk">
+                            <rect key="frame" x="0.0" y="0.0" width="480" height="28"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </tableHeaderView>
+                    </scrollView>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KdM-lW-WbP">
+                        <rect key="frame" x="371" y="24" width="96" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="Search" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="t4Y-Ud-mJm">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="search:" target="-2" id="7pG-JY-vEF"/>
+                        </connections>
+                    </button>
+                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fTv-nr-5FT">
+                        <rect key="frame" x="6" y="95" width="124" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" alignment="right" title="Search Condition:" id="9C2-Xp-JIA">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vMd-zb-8jT">
+                        <rect key="frame" x="6" y="64" width="124" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" alignment="right" title="Expression:" id="Jgg-sA-jjs">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Db-vP-S60">
+                        <rect key="frame" x="133" y="120" width="197" height="25"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <popUpButtonCell key="cell" type="push" title="8-Bit" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="al4-Jb-OJB" id="dkg-V5-wsX">
+                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="message"/>
+                            <menu key="menu" id="e5r-qR-pg7">
+                                <items>
+                                    <menuItem title="8-Bit" state="on" id="al4-Jb-OJB"/>
+                                    <menuItem title="16-Bit" tag="1" id="G2m-fU-8Lt"/>
+                                    <menuItem title="16-Bit (Big Endian)" tag="3" id="JRa-DB-dyG"/>
+                                </items>
+                            </menu>
+                        </popUpButtonCell>
+                    </popUpButton>
+                    <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6RO-h8-lZ8">
+                        <rect key="frame" x="133" y="89" width="197" height="25"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <popUpButtonCell key="cell" type="push" title="Is Equal To…" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="Vfb-Dg-Jkb" id="DPm-QO-c64">
+                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="message"/>
+                            <menu key="menu" id="Kg9-Rd-1GQ">
+                                <items>
+                                    <menuItem title="Any" id="cEg-eI-4hb"/>
+                                    <menuItem title="Is Equal To…" state="on" id="Vfb-Dg-Jkb"/>
+                                    <menuItem title="Is Different From…" id="JDg-d9-5Ux"/>
+                                    <menuItem title="Is Greater Than…" id="Rir-w0-737"/>
+                                    <menuItem title="Is Equal or Greater Than…" id="Lvo-pV-Syt"/>
+                                    <menuItem title="Is Less Than…" id="VUW-DY-2cI"/>
+                                    <menuItem title="Is Equal or Less Than…" id="rDN-UF-tIo"/>
+                                    <menuItem title="Did Change" id="JdI-CW-E8H"/>
+                                    <menuItem title="Did Not Change" id="sWc-Yz-Cve"/>
+                                    <menuItem title="Did Increase" id="LHF-Lf-7tK"/>
+                                    <menuItem title="Did Decrease" id="8s2-8n-aQO"/>
+                                    <menuItem title="Custom…" id="8xc-2v-YQj"/>
+                                </items>
+                            </menu>
+                        </popUpButtonCell>
+                        <connections>
+                            <action selector="conditionChanged:" target="-2" id="KF9-vz-yNC"/>
+                        </connections>
+                    </popUpButton>
+                    <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Q42-Vu-TJW">
+                        <rect key="frame" x="334" y="93" width="126" height="21"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" title="$0" drawsBackground="YES" usesSingleLineMode="YES" id="WDs-GG-7Lc">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            <allowedInputSourceLocales>
+                                <string>NSAllRomanInputSourcesLocaleIdentifier</string>
+                            </allowedInputSourceLocales>
+                        </textFieldCell>
+                        <connections>
+                            <action selector="search:" target="-2" id="BDa-5j-qEz"/>
+                            <outlet property="delegate" destination="-2" id="1bO-hp-igc"/>
+                        </connections>
+                    </textField>
+                    <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XN7-BO-THS">
+                        <rect key="frame" x="136" y="62" width="324" height="21"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" borderStyle="bezel" title="new == ($0)" drawsBackground="YES" usesSingleLineMode="YES" id="Krh-8w-4ug">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            <allowedInputSourceLocales>
+                                <string>NSAllRomanInputSourcesLocaleIdentifier</string>
+                            </allowedInputSourceLocales>
+                        </textFieldCell>
+                        <connections>
+                            <action selector="search:" target="-2" id="sv5-eX-Kb9"/>
+                        </connections>
+                    </textField>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tBa-6c-9AY">
+                        <rect key="frame" x="13" y="24" width="96" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="Reset" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Pge-SU-Y1n">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="reset:" target="-2" id="KCy-Ob-tlg"/>
+                        </connections>
+                    </button>
+                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wbN-MX-lEy">
+                        <rect key="frame" x="-3" y="4" width="486" height="14"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" alignment="center" title="Status" id="CM3-4U-qao">
+                            <font key="font" metaFont="smallSystem"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="o1I-5D-V4k">
+                        <rect key="frame" x="264" y="24" width="110" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="Add Cheat" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="GGV-nm-ASn">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="addCheat:" target="-2" id="7ax-kM-TeV"/>
+                        </connections>
+                    </button>
+                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="veO-Qn-0Sz">
+                        <rect key="frame" x="6" y="126" width="124" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Data Type:" id="KuT-rz-eHm">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                </subviews>
+            </view>
+            <contentBorderThickness minY="22"/>
+            <point key="canvasLocation" x="161" y="182"/>
+        </window>
+    </objects>
+</document>
--- a/bsnes/gb/Cocoa/ColorCartridge.icns
+++ b/bsnes/gb/Cocoa/ColorCartridge.icns
--- a/bsnes/gb/Cocoa/ContinueTemplate.png
+++ b/bsnes/gb/Cocoa/ContinueTemplate.png
--- a/bsnes/gb/Cocoa/ContinueTemplate@2x.png
+++ b/bsnes/gb/Cocoa/ContinueTemplate@2x.png
--- a/bsnes/gb/Cocoa/Display.png
+++ b/bsnes/gb/Cocoa/Display.png
--- a/bsnes/gb/Cocoa/Display@2x.png
+++ b/bsnes/gb/Cocoa/Display@2x.png
--- a/bsnes/gb/Cocoa/Display~solid.png
+++ b/bsnes/gb/Cocoa/Display~solid.png
--- a/bsnes/gb/Cocoa/Display~solid@2x.png
+++ b/bsnes/gb/Cocoa/Display~solid@2x.png
--- a/bsnes/gb/Cocoa/Display~solid~dark.png
+++ b/bsnes/gb/Cocoa/Display~solid~dark.png
--- a/bsnes/gb/Cocoa/Display~solid~dark@2x.png
+++ b/bsnes/gb/Cocoa/Display~solid~dark@2x.png
--- a/bsnes/gb/Cocoa/Document.h
+++ b/bsnes/gb/Cocoa/Document.h
@@ -0,0 +1,98 @@
+#import <Cocoa/Cocoa.h>
+#import "GBView.h"
+#import "GBImageView.h"
+#import "GBSplitView.h"
+#import "GBVisualizerView.h"
+#import "GBCPUView.h"
+#import "GBOSDView.h"
+#import "GBDebuggerButton.h"
+
+enum model {
+    MODEL_NONE,
+    MODEL_DMG,
+    MODEL_CGB,
+    MODEL_AGB,
+    MODEL_SGB,
+    MODEL_MGB,
+    MODEL_AUTO,
+    
+    MODEL_QUICK_RESET = -1,
+};
+
+@class GBCheatWindowController;
+@class GBPaletteView;
+@class GBObjectView;
+
+@interface Document : NSDocument <NSWindowDelegate, GBImageViewDelegate, NSSplitViewDelegate>
+@property (readonly) GB_gameboy_t *gb;
+@property IBOutlet GBView *view;
+@property IBOutlet NSTextView *consoleOutput;
+@property IBOutlet NSPanel *consoleWindow;
+@property IBOutlet NSTextField *consoleInput;
+@property IBOutlet NSWindow *mainWindow;
+@property IBOutlet NSView *memoryView;
+@property IBOutlet NSPanel *memoryWindow;
+@property (readonly) GB_gameboy_t *gameboy;
+@property IBOutlet NSTextField *memoryBankInput;
+@property IBOutlet NSToolbarItem *memoryBankItem;
+@property IBOutlet NSPopUpButton *memorySpaceButton;
+@property IBOutlet GBImageView *tilesetImageView;
+@property IBOutlet NSPopUpButton *tilesetPaletteButton;
+@property IBOutlet GBImageView *tilemapImageView;
+@property IBOutlet NSPopUpButton *tilemapPaletteButton;
+@property IBOutlet NSPopUpButton *tilemapMapButton;
+@property IBOutlet NSPopUpButton *TilemapSetButton;
+@property IBOutlet NSButton *gridButton;
+@property IBOutlet NSTabView *vramTabView;
+@property IBOutlet NSPanel *vramWindow;
+@property IBOutlet NSTextField *vramStatusLabel;
+@property IBOutlet GBPaletteView *paletteView;
+@property IBOutlet GBObjectView *objectView;
+@property IBOutlet NSPanel *printerFeedWindow;
+@property IBOutlet NSProgressIndicator *printerSpinner;
+@property IBOutlet NSImageView *feedImageView;
+@property IBOutlet NSTextView *debuggerSideViewInput;
+@property IBOutlet NSTextView *debuggerSideView;
+@property IBOutlet GBSplitView *debuggerSplitView;
+@property IBOutlet NSBox *debuggerVerticalLine;
+@property IBOutlet NSPanel *cheatsWindow;
+@property IBOutlet GBCheatWindowController *cheatWindowController;
+@property (readonly) Document *partner;
+@property (readonly) bool isSlave;
+@property IBOutlet NSView *gbsPlayerView;
+@property IBOutlet NSTextField *gbsTitle;
+@property IBOutlet NSTextField *gbsAuthor;
+@property IBOutlet NSTextField *gbsCopyright;
+@property IBOutlet NSPopUpButton *gbsTracks;
+@property IBOutlet NSButton *gbsPlayPauseButton;
+@property IBOutlet NSButton *gbsRewindButton;
+@property IBOutlet NSSegmentedControl *gbsNextPrevButton;
+@property IBOutlet GBVisualizerView *gbsVisualizer;
+@property IBOutlet GBOSDView *osdView;
+@property (readonly) GB_oam_info_t *oamInfo;
+@property uint8_t oamCount;
+@property uint8_t oamHeight;
+@property IBOutlet NSView *audioRecordingAccessoryView;
+@property IBOutlet NSPopUpButton *audioFormatButton;
+@property IBOutlet NSVisualEffectView *debuggerSidebarEffectView API_AVAILABLE(macos(10.10));
+
+@property IBOutlet GBDebuggerButton *debuggerContinueButton;
+@property IBOutlet GBDebuggerButton *debuggerNextButton;
+@property IBOutlet GBDebuggerButton *debuggerStepButton;
+@property IBOutlet GBDebuggerButton *debuggerFinishButton;
+@property IBOutlet GBDebuggerButton *debuggerBackstepButton;
+
+@property IBOutlet NSScrollView *debuggerScrollView;
+@property IBOutlet NSView *debugBar;
+
+@property IBOutlet GBCPUView *cpuView;
+@property IBOutlet NSTextField *cpuCounter;
+
+ (NSImage *) imageFromData:(NSData *)data width:(NSUInteger) width height:(NSUInteger) height scale:(double) scale;
+- (void) performAtomicBlock: (void (^)())block;
+- (void) connectLinkCable:(NSMenuItem *)sender;
+- (int)loadStateFile:(const char *)path noErrorOnNotFound:(bool)noErrorOnFileNotFound;
+- (NSString *)captureOutputForBlock: (void (^)())block;
+- (NSFont *)debuggerFontOfSize:(unsigned)size;
+@end
+
--- a/bsnes/gb/Cocoa/Document.m
+++ b/bsnes/gb/Cocoa/Document.m
--- a/bsnes/gb/Cocoa/Document.xib
+++ b/bsnes/gb/Cocoa/Document.xib
--- a/bsnes/gb/Cocoa/FinishTemplate.png
+++ b/bsnes/gb/Cocoa/FinishTemplate.png
--- a/bsnes/gb/Cocoa/FinishTemplate@2x.png
+++ b/bsnes/gb/Cocoa/FinishTemplate@2x.png
--- a/bsnes/gb/Cocoa/GBApp.h
+++ b/bsnes/gb/Cocoa/GBApp.h
@@ -0,0 +1,27 @@
+#import <Cocoa/Cocoa.h>
+#import <WebKit/WebKit.h>
+#import <JoyKit/JoyKit.h>
+
+@interface GBApp : NSApplication <NSApplicationDelegate, NSUserNotificationCenterDelegate, NSMenuDelegate, WebUIDelegate, WebPolicyDelegate, WebFrameLoadDelegate, JOYListener>
+
+@property (nonatomic, strong) IBOutlet NSWindow *preferencesWindow;
+@property (nonatomic, strong) IBOutlet NSView *graphicsTab;
+@property (nonatomic, strong) IBOutlet NSView *emulationTab;
+@property (nonatomic, strong) IBOutlet NSView *audioTab;
+@property (nonatomic, strong) IBOutlet NSView *controlsTab;
+@property (nonatomic, strong) IBOutlet NSView *updatesTab;
+- (IBAction)showPreferences: (id) sender;
+- (IBAction)toggleDeveloperMode:(id)sender;
+- (IBAction)switchPreferencesTab:(id)sender;
+@property (nonatomic, weak) IBOutlet NSMenuItem *linkCableMenuItem;
+@property (nonatomic, strong) IBOutlet NSWindow *updateWindow;
+@property (nonatomic, strong) IBOutlet WebView *updateChanges;
+@property (nonatomic, strong) IBOutlet NSProgressIndicator *updatesSpinner;
+@property (strong) IBOutlet NSButton *updatesButton;
+@property (strong) IBOutlet NSTextField *updateProgressLabel;
+@property (strong) IBOutlet NSButton *updateProgressButton;
+@property (strong) IBOutlet NSWindow *updateProgressWindow;
+@property (strong) IBOutlet NSProgressIndicator *updateProgressSpinner;
+- (void)updateThemesDefault:(bool)overwrite;
+@end
+
--- a/bsnes/gb/Cocoa/GBApp.m
+++ b/bsnes/gb/Cocoa/GBApp.m
@@ -0,0 +1,817 @@
+#import "GBApp.h"
+#import "GBButtons.h"
+#import "GBView.h"
+#import "Document.h"
+#import "GBJoyConManager.h"
+#import <Core/gb.h>
+#import <Carbon/Carbon.h>
+#import <JoyKit/JoyKit.h>
+#import <WebKit/WebKit.h>
+#import <mach-o/dyld.h>
+#include <sys/mount.h>
+#include <sys/xattr.h>
+
+#define UPDATE_SERVER "https://sameboy.github.io"
+
+@interface NSToolbarItem(private)
+- (NSButton *)_view;
+@end
+
+static uint32_t color_to_int(NSColor *color)
+{
+    color = [color colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
+    return (((unsigned)(color.redComponent * 0xFF)) << 16) |
+           (((unsigned)(color.greenComponent * 0xFF)) << 8) |
+           ((unsigned)(color.blueComponent * 0xFF));
+}
+
+@implementation GBApp
+{
+    NSArray<NSView *> *_preferencesTabs;
+    NSString *_lastVersion;
+    NSString *_updateURL;
+    NSURLSessionDownloadTask *_updateTask;
+    enum {
+        UPDATE_DOWNLOADING,
+        UPDATE_EXTRACTING,
+        UPDATE_WAIT_INSTALL,
+        UPDATE_INSTALLING,
+        UPDATE_FAILED,
+    } _updateState;
+    NSString *_downloadDirectory;
+    AuthorizationRef _auth;
+    bool _simulatingMenuEvent;
+}
+
+- (void) applicationDidFinishLaunching:(NSNotification *)notification
+{
+    // Refresh icon if launched via a software update
+    if (@available(macOS 26.0, *)) {
+        // Severely broken on macOS 26
+    }
+    else {
+        NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:[[NSBundle mainBundle] bundlePath]];
+        icon.size = [NSApplication sharedApplication].applicationIconImage.size;
+        [NSApplication sharedApplication].applicationIconImage = icon;
+    }
+    
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    for (unsigned i = 0; i < GBKeyboardButtonCount; i++) {
+        if ([[defaults objectForKey:button_to_preference_name(i, 0)] isKindOfClass:[NSString class]]) {
+            [defaults removeObjectForKey:button_to_preference_name(i, 0)];
+        }
+    }
+    
+    bool hasSFMono = false;
+    if (@available(macOS 10.15, *)) {
+        hasSFMono = [[NSFont monospacedSystemFontOfSize:12 weight:NSFontWeightRegular].displayName containsString:@"SF"];
+    }
+    [[NSUserDefaults standardUserDefaults] registerDefaults:@{
+                                                              @"GBRight": @(kVK_RightArrow),
+                                                              @"GBLeft": @(kVK_LeftArrow),
+                                                              @"GBUp": @(kVK_UpArrow),
+                                                              @"GBDown": @(kVK_DownArrow),
+
+                                                              @"GBA": @(kVK_ANSI_X),
+                                                              @"GBB": @(kVK_ANSI_Z),
+                                                              @"GBSelect": @(kVK_Delete),
+                                                              @"GBStart": @(kVK_Return),
+
+                                                              @"GBTurbo": @(kVK_Space),
+                                                              @"GBRewind": @(kVK_Tab),
+                                                              @"GBSlow-Motion": @(kVK_Shift),
+
+                                                              @"GBFilter": @"NearestNeighbor",
+                                                              @"GBColorCorrection": @(GB_COLOR_CORRECTION_MODERN_BALANCED),
+                                                              @"GBHighpassFilter": @(GB_HIGHPASS_ACCURATE),
+                                                              @"GBRewindLength": @(120),
+                                                              @"GBFrameBlendingMode": @([defaults boolForKey:@"DisableFrameBlending"]? GB_FRAME_BLENDING_MODE_DISABLED : GB_FRAME_BLENDING_MODE_ACCURATE),
+                                                              
+                                                              @"GBDMGModel": @(GB_MODEL_DMG_B),
+                                                              @"GBCGBModel": @(GB_MODEL_CGB_E),
+                                                              @"GBAGBModel": @(GB_MODEL_AGB_A),
+                                                              @"GBSGBModel": @(GB_MODEL_SGB2),
+                                                              @"GBRumbleMode": @(GB_RUMBLE_CARTRIDGE_ONLY),
+                                                              
+                                                              @"GBVolume": @(1.0),
+                                                              
+                                                              @"GBMBC7JoystickOverride": @NO,
+                                                              @"GBMBC7AllowMouse": @YES,
+                                                              
+                                                              @"GBJoyConAutoPair": @YES,
+                                                              @"GBJoyConsDefaultsToHorizontal": @YES,
+                                                              
+                                                              @"GBEmulatedModel": @(MODEL_AUTO),
+                                                              
+                                                              @"GBDebuggerFont": hasSFMono? @"SF Mono" : @"Menlo",
+                                                              @"GBDebuggerFontSize": @12,
+                                                              
+                                                              @"GBColorPalette": @1,
+                                                              @"GBTurboCap": @0,
+                                                              
+                                                              // Default themes
+                                                              @"GBThemes": @{
+                                                                      @"Canyon": @{
+                                                                              @"BrightnessBias": @0.1227009965823247,
+                                                                              @"Colors": @[@0xff0c1e20, @0xff122b91, @0xff466aa2, @0xfff1efae, @0xfff1efae],
+                                                                              @"DisabledLCDColor": @NO,
+                                                                              @"HueBias": @0.01782661816105247,
+                                                                              @"HueBiasStrength": @1,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                                      @"Desert": @{
+                                                                              @"BrightnessBias": @0.0,
+                                                                              @"Colors": @[@0xff302f3e, @0xff576674, @0xff839ba4, @0xffb1d0d2, @0xffb7d7d8],
+                                                                              @"DisabledLCDColor": @YES,
+                                                                              @"HueBias": @0.10087773904382469,
+                                                                              @"HueBiasStrength": @0.062142056772908363,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                                      @"Evening": @{
+                                                                              @"BrightnessBias": @-0.10168700106441975,
+                                                                              @"Colors": @[@0xff362601, @0xff695518, @0xff899853, @0xffa6e4ae, @0xffa9eebb],
+                                                                              @"DisabledLCDColor": @YES,
+                                                                              @"HueBias": @0.60027079191058874,
+                                                                              @"HueBiasStrength": @0.33816297305747867,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                                      @"Fog": @{
+                                                                              @"BrightnessBias": @0.0,
+                                                                              @"Colors": @[@0xff373c34, @0xff737256, @0xff9da386, @0xffc3d2bf, @0xffc7d8c6],
+                                                                              @"DisabledLCDColor": @YES,
+                                                                              @"HueBias": @0.55750435756972117,
+                                                                              @"HueBiasStrength": @0.18424738545816732,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                                      @"Green Slate": @{
+                                                                              @"BrightnessBias": @0.2210012227296829,
+                                                                              @"Colors": @[@0xff343117, @0xff6a876f, @0xff98b4a1, @0xffc3daca, @0xffc8decf],
+                                                                              @"DisabledLCDColor": @YES,
+                                                                              @"HueBias": @0.1887667975388467,
+                                                                              @"HueBiasStrength": @0.1272283345460892,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                                      @"Green Tea": @{
+                                                                              @"BrightnessBias": @-0.4946326622596153,
+                                                                              @"Colors": @[@0xff1a1d08, @0xff1d5231, @0xff3b9774, @0xff97e4c6, @0xffa9eed1],
+                                                                              @"DisabledLCDColor": @YES,
+                                                                              @"HueBias": @0.1912955007245464,
+                                                                              @"HueBiasStrength": @0.3621708039314516,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                                      @"Lavender": @{
+                                                                              @"BrightnessBias": @0.10072476038566,
+                                                                              @"Colors": @[@0xff2b2a3a, @0xff8c507c, @0xffbf82a8, @0xffe9bcce, @0xffeec3d3],
+                                                                              @"DisabledLCDColor": @YES,
+                                                                              @"HueBias": @0.7914529587142169,
+                                                                              @"HueBiasStrength": @0.2498168498277664,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                                      @"Magic Eggplant": @{
+                                                                              @"BrightnessBias": @0.0,
+                                                                              @"Colors": @[@0xff3c2136, @0xff942e84, @0xffc7699d, @0xfff1e4b0, @0xfff6f9b2],
+                                                                              @"DisabledLCDColor": @YES,
+                                                                              @"HueBias": @0.87717878486055778,
+                                                                              @"HueBiasStrength": @0.65018052788844627,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                                      @"Mystic Blue": @{
+                                                                              @"BrightnessBias": @-0.3291049897670746,
+                                                                              @"Colors": @[@0xff3b2306, @0xffa27807, @0xffd1b523, @0xfff6ebbe, @0xfffaf1e4],
+                                                                              @"DisabledLCDColor": @YES,
+                                                                              @"HueBias": @0.5282051088288426,
+                                                                              @"HueBiasStrength": @0.7699633836746216,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                                      @"Pink Pop": @{
+                                                                              @"BrightnessBias": @0.624908447265625,
+                                                                              @"Colors": @[@0xff28140a, @0xff7c42cb, @0xffaa83de, @0xffd1ceeb, @0xffd5d8ec],
+                                                                              @"DisabledLCDColor": @YES,
+                                                                              @"HueBias": @0.9477411056868732,
+                                                                              @"HueBiasStrength": @0.80024421215057373,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                                      @"Radioactive Pea": @{
+                                                                              @"BrightnessBias": @-0.48079556772908372,
+                                                                              @"Colors": @[@0xff215200, @0xff1f7306, @0xff169e34, @0xff03ceb8, @0xff00d4d1],
+                                                                              @"DisabledLCDColor": @YES,
+                                                                              @"HueBias": @0.3795131972111554,
+                                                                              @"HueBiasStrength": @0.34337649402390436,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                                      @"Rose": @{
+                                                                              @"BrightnessBias": @0.2727272808551788,
+                                                                              @"Colors": @[@0xff001500, @0xff4e1fae, @0xff865ac4, @0xffb7e6d3, @0xffbdffd4],
+                                                                              @"DisabledLCDColor": @YES,
+                                                                              @"HueBias": @0.9238900924101472,
+                                                                              @"HueBiasStrength": @0.9957716464996338,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                                      @"Seaweed": @{
+                                                                              @"BrightnessBias": @-0.28532744023904377,
+                                                                              @"Colors": @[@0xff3f0015, @0xff426532, @0xff58a778, @0xff95e0df, @0xffa0e7ee],
+                                                                              @"DisabledLCDColor": @YES,
+                                                                              @"HueBias": @0.2694067480079681,
+                                                                              @"HueBiasStrength": @0.51565612549800799,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                                      @"Twilight": @{
+                                                                              @"BrightnessBias": @-0.091789093625498031,
+                                                                              @"Colors": @[@0xff3f0015, @0xff461286, @0xff6254bd, @0xff97d3e9, @0xffa0e7ee],
+                                                                              @"DisabledLCDColor": @YES,
+                                                                              @"HueBias": @0.0,
+                                                                              @"HueBiasStrength": @0.49710532868525897,
+                                                                              @"Manual": @NO,
+                                                                      },
+                                                              },
+                                                              
+                                                              @"NSToolbarItemForcesStandardSize": @YES, // Forces Monterey to resepect toolbar item sizes
+                                                              @"NSToolbarItemWarnOnMinMaxSize": @NO, // Not going to use Constraints, Apple
+                                                              }];
+    
+    [JOYController startOnRunLoop:[NSRunLoop currentRunLoop] withOptions:@{
+        JOYAxes2DEmulateButtonsKey: @YES,
+        JOYHatsEmulateButtonsKey: @YES,
+    }];
+    
+    [GBJoyConManager sharedInstance]; // Starts handling Joy-Cons
+    
+    [JOYController registerListener:self];
+    
+    if ([[NSUserDefaults standardUserDefaults] boolForKey:@"GBNotificationsUsed"]) {
+        [NSUserNotificationCenter defaultUserNotificationCenter].delegate = self;
+    }
+    
+    [self askAutoUpdates];
+    
+    if ([[NSUserDefaults standardUserDefaults] boolForKey:@"GBAutoUpdatesEnabled"]) {
+        [self checkForUpdates];
+    }
+    
+    if ([[NSProcessInfo processInfo].arguments containsObject:@"--update-launch"]) {
+        [NSApp activateIgnoringOtherApps:true];
+    }
+    
+    if (![[[NSUserDefaults standardUserDefaults] stringForKey:@"GBThemesVersion"] isEqualToString:@(GB_VERSION)]) {
+        [self updateThemesDefault:false];
+        [[NSUserDefaults standardUserDefaults] setObject:@(GB_VERSION) forKey:@"GBThemesVersion"];
+    }
+}
+
+- (void)updateThemesDefault:(bool)overwrite
+{
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    NSMutableDictionary *currentThemes = [defaults dictionaryForKey:@"GBThemes"].mutableCopy;
+    [defaults removeObjectForKey:@"GBThemes"];
+    NSMutableDictionary *defaultThemes = [defaults dictionaryForKey:@"GBThemes"].mutableCopy;
+    if (![[NSUserDefaults standardUserDefaults] stringForKey:@"GBThemesVersion"]) {
+        // Force update the Pink Pop theme, it was glitchy in 1.0
+        [currentThemes removeObjectForKey:@"Pink Pop"];
+    }
+    if (overwrite) {
+        [currentThemes addEntriesFromDictionary:defaultThemes];
+        [defaults setObject:currentThemes forKey:@"GBThemes"];
+    }
+    else {
+        [defaultThemes addEntriesFromDictionary:currentThemes];
+        [defaults setObject:defaultThemes forKey:@"GBThemes"];
+    }
+}
+
+- (IBAction)toggleDeveloperMode:(id)sender
+{
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setBool:![defaults boolForKey:@"DeveloperMode"] forKey:@"DeveloperMode"];
+}
+
+- (IBAction)switchPreferencesTab:(id)sender
+{
+    for (NSView *view in _preferencesTabs) {
+        [view removeFromSuperview];
+    }
+    NSView *tab = _preferencesTabs[[sender tag]];
+    NSRect old = [_preferencesWindow frame];
+    NSRect new = [_preferencesWindow frameRectForContentRect:tab.frame];
+    new.origin.x = old.origin.x;
+    new.origin.y = old.origin.y + (old.size.height - new.size.height);
+    [_preferencesWindow setFrame:new display:true animate:_preferencesWindow.visible];
+    [_preferencesWindow.contentView addSubview:tab];
+}
+
+- (BOOL)validateMenuItem:(NSMenuItem *)anItem
+{
+    if ([anItem action] == @selector(toggleDeveloperMode:)) {
+        [(NSMenuItem *)anItem setState:[[NSUserDefaults standardUserDefaults] boolForKey:@"DeveloperMode"]];
+    }
+    
+    if (anItem == self.linkCableMenuItem) {
+        return [[NSDocumentController sharedDocumentController] documents].count > 1;
+    }
+    return true;
+}
+
+- (void)menuNeedsUpdate:(NSMenu *)menu
+{
+    NSMutableArray *items = [NSMutableArray array];
+    NSDocument *currentDocument = [[NSDocumentController sharedDocumentController] currentDocument];
+    
+    for (NSDocument *document in [[NSDocumentController sharedDocumentController] documents]) {
+        if (document == currentDocument) continue;
+        NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:document.displayName action:@selector(connectLinkCable:) keyEquivalent:@""];
+        item.representedObject = document;
+        item.image = [[NSWorkspace sharedWorkspace] iconForFile:document.fileURL.path];
+        [item.image setSize:NSMakeSize(16, 16)];
+        [items addObject:item];
+    }
+    [menu removeAllItems];
+    for (NSMenuItem *item in items) {
+        [menu addItem:item];
+    }
+}
+
+- (IBAction) showPreferences: (id) sender
+{
+    NSArray *objects;
+    if (!_preferencesWindow) {
+        [[NSBundle mainBundle] loadNibNamed:@"Preferences" owner:self topLevelObjects:&objects];
+        NSToolbarItem *first_toolbar_item = [_preferencesWindow.toolbar.items firstObject];
+        _preferencesWindow.toolbar.selectedItemIdentifier = [first_toolbar_item itemIdentifier];
+        _preferencesTabs = @[self.emulationTab, self.graphicsTab, self.audioTab, self.controlsTab, self.updatesTab];
+        [self switchPreferencesTab:first_toolbar_item];
+        [_preferencesWindow center];
+#ifndef UPDATE_SUPPORT
+        [_preferencesWindow.toolbar removeItemAtIndex:4];
+#endif
+        for (unsigned i = _preferencesWindow.toolbar.items.count; i--;) {
+            [_preferencesWindow.toolbar.items[i] _view].imageScaling = NSImageScaleNone;
+        }
+    }
+    [_preferencesWindow makeKeyAndOrderFront:self];
+}
+
+- (BOOL)applicationOpenUntitledFile:(NSApplication *)sender
+{
+    [self askAutoUpdates];
+    /* Bring an existing panel to the foreground */
+    for (NSWindow *window in [[NSApplication sharedApplication] windows]) {
+        if ([window isKindOfClass:[NSOpenPanel class]]) {
+            [(NSOpenPanel *)window makeKeyAndOrderFront:nil];
+            return true;
+        }
+    }
+    [[NSDocumentController sharedDocumentController] openDocument:self];
+    return true;
+}
+
+- (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification
+{
+    [[NSDocumentController sharedDocumentController] openDocumentWithContentsOfFile:notification.identifier display:true];
+}
+
+- (void)updateFound
+{
+    [[[NSURLSession sharedSession] dataTaskWithURL:[NSURL URLWithString:@UPDATE_SERVER "/raw_changes"] completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+        
+        NSColor *linkColor = [NSColor colorWithRed:0.125 green:0.325 blue:1.0 alpha:1.0];
+        if (@available(macOS 10.10, *)) {
+            linkColor = [NSColor linkColor];
+        }
+        
+        NSString *changes = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+        NSRange cutoffRange = [changes rangeOfString:@"<!--(" GB_VERSION ")-->"];
+        if (cutoffRange.location != NSNotFound) {
+            changes = [changes substringToIndex:cutoffRange.location];
+        }
+        
+        NSString *html = [NSString stringWithFormat:@"<!DOCTYPE html><html><head><title></title>"
+                          "<style>html {background-color:transparent; color: #%06x; line-height:1.5} a:link, a:visited{color:#%06x; text-decoration:none}</style>"
+                          "</head><body>%@</body></html>",
+                          color_to_int([NSColor textColor]),
+                          color_to_int(linkColor),
+                          changes];
+        
+        if ([(NSHTTPURLResponse *)response statusCode] == 200) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                NSArray *objects;
+                [[NSBundle mainBundle] loadNibNamed:@"UpdateWindow" owner:self topLevelObjects:&objects];
+                if (@available(macOS 10.11, *)) {
+                    self.updateChanges.preferences.standardFontFamily = @"-apple-system";
+                }
+                else if (@available(macOS 10.10, *)) {
+                    self.updateChanges.preferences.standardFontFamily = @"Helvetica Neue";
+                }
+                else {
+                    self.updateChanges.preferences.standardFontFamily = @"Lucida Grande";
+                }
+                if (@available(macOS 10.15, *)) {
+                    self.updateChanges.preferences.fixedFontFamily = [NSFont monospacedSystemFontOfSize:12 weight:NSFontWeightRegular].displayName;
+                }
+                else {
+                    self.updateChanges.preferences.fixedFontFamily = @"Menlo";
+                }
+                self.updateChanges.drawsBackground = false;
+                [self.updateChanges.mainFrame loadHTMLString:html baseURL:nil];
+            });
+        }
+    }] resume];
+}
+
+- (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems
+{
+    // Disable reload context menu
+    if ([defaultMenuItems count] <= 2) {
+        return nil;
+    }
+    return defaultMenuItems;
+}
+
+- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
+{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sender.mainFrame.frameView.documentView.enclosingScrollView.drawsBackground = true;
+        sender.mainFrame.frameView.documentView.enclosingScrollView.backgroundColor = [NSColor textBackgroundColor];
+        sender.policyDelegate = self;
+        [self.updateWindow center];
+        [self.updateWindow makeKeyAndOrderFront:nil];
+    });
+}
+
+- (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary *)actionInformation request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener
+{
+    [listener ignore];
+    [[NSWorkspace sharedWorkspace] openURL:[request URL]];
+}
+
+- (void)checkForUpdates
+{
+#ifdef UPDATE_SUPPORT
+    [[[NSURLSession sharedSession] dataTaskWithURL:[NSURL URLWithString:@UPDATE_SERVER "/latest_version"] completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self.updatesSpinner stopAnimation:nil];
+            [self.updatesButton setEnabled:true];
+        });
+        if ([(NSHTTPURLResponse *)response statusCode] == 200) {
+            NSString *string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+            NSArray <NSString *> *components = [string componentsSeparatedByString:@"|"];
+            if (components.count != 2) return;
+            _lastVersion = components[0];
+            _updateURL = components[1];
+            if (![@GB_VERSION isEqualToString:_lastVersion] &&
+                ![[[NSUserDefaults standardUserDefaults] stringForKey:@"GBSkippedVersion"] isEqualToString:_lastVersion]) {
+                [self updateFound];
+            }
+        }
+    }] resume];
+#endif
+}
+
+- (IBAction)userCheckForUpdates:(id)sender
+{
+    if (self.updateWindow) {
+        [self.updateWindow makeKeyAndOrderFront:sender];
+    }
+    else {
+        [[NSUserDefaults standardUserDefaults] setObject:nil forKey:@"GBSkippedVersion"];
+        [self checkForUpdates];
+        [sender setEnabled:false];
+        [self.updatesSpinner startAnimation:sender];
+    }
+}
+
+- (void)askAutoUpdates
+{
+#ifdef UPDATE_SUPPORT
+    if (![[NSUserDefaults standardUserDefaults] boolForKey:@"GBAskedAutoUpdates"]) {
+        NSAlert *alert = [[NSAlert alloc] init];
+        alert.messageText = @"Should SameBoy check for updates when launched?";
+        alert.informativeText = @"SameBoy is frequently updated with new features, accuracy improvements, and bug fixes. This setting can always be changed in the preferences window.";
+        [alert addButtonWithTitle:@"Check on Launch"];
+        [alert addButtonWithTitle:@"Don't Check on Launch"];
+        
+        [[NSUserDefaults standardUserDefaults] setBool:[alert runModal] == NSAlertFirstButtonReturn forKey:@"GBAutoUpdatesEnabled"];
+        [[NSUserDefaults standardUserDefaults] setBool:true forKey:@"GBAskedAutoUpdates"];
+    }
+#endif
+}
+
+- (IBAction)skipVersion:(id)sender
+{
+    [[NSUserDefaults standardUserDefaults] setObject:_lastVersion forKey:@"GBSkippedVersion"];
+    [self.updateWindow performClose:sender];
+}
+
+- (bool)executePath:(NSString *)path withArguments:(NSArray <NSString *> *)arguments
+{
+    if (!_auth) {
+        NSTask *task = [[NSTask alloc] init];
+        task.launchPath = path;
+        task.arguments = arguments;
+        [task launch];
+        [task waitUntilExit];
+        return task.terminationStatus == 0 && task.terminationReason == NSTaskTerminationReasonExit;
+    }
+    
+    char *argv[arguments.count + 1];
+    argv[arguments.count] = NULL;
+    for (unsigned i = 0; i < arguments.count; i++) {
+        argv[i] = (char *)arguments[i].UTF8String;
+    }
+    
+    return AuthorizationExecuteWithPrivileges(_auth, path.UTF8String, kAuthorizationFlagDefaults, argv, NULL) == errAuthorizationSuccess;
+}
+
+- (void)deauthorize
+{
+    if (_auth) {
+        AuthorizationFree(_auth, kAuthorizationFlagDefaults);
+        _auth = nil;
+    }
+}
+
+- (IBAction)installUpdate:(id)sender
+{
+    bool needsAuthorization = false;
+    if ([self executePath:@"/usr/sbin/spctl" withArguments:@[@"--status"]]) { // Succeeds when GateKeeper is on
+        // GateKeeper is on, we need to --add ourselves as root, else we might get a GateKeeper crash
+        needsAuthorization = true;
+    }
+    else if (access(_dyld_get_image_name(0), W_OK)) {
+        // We don't have write access, so we need authorization to update as root
+        needsAuthorization = true;
+    }
+    
+    if (needsAuthorization && !_auth) {
+        AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagPreAuthorize | kAuthorizationFlagInteractionAllowed, &_auth);
+        // Make sure we can modify the bundle
+        if (![self executePath:@"/usr/sbin/chown" withArguments:@[@"-R", [NSString stringWithFormat:@"%d:%d", getuid(), getgid()], [NSBundle mainBundle].bundlePath]]) {
+            [self deauthorize];
+            return;
+        }
+    }
+    
+    [self.updateProgressSpinner startAnimation:nil];
+    self.updateProgressButton.title = @"Cancel";
+    self.updateProgressButton.enabled = true;
+    self.updateProgressLabel.stringValue = @"Downloading update…";
+    _updateState = UPDATE_DOWNLOADING;
+    _updateTask = [[NSURLSession sharedSession] downloadTaskWithURL: [NSURL URLWithString:_updateURL] completionHandler:^(NSURL *location, NSURLResponse *response, NSError *error) {
+        _updateTask = nil;
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            self.updateProgressButton.enabled = false;
+            self.updateProgressLabel.stringValue = @"Extracting update…";
+            _updateState = UPDATE_EXTRACTING;
+        });
+        
+        _downloadDirectory = [[[NSFileManager defaultManager] URLForDirectory:NSItemReplacementDirectory
+                                                                     inDomain:NSUserDomainMask
+                                                            appropriateForURL:[[NSBundle mainBundle] bundleURL]
+                                                                       create:true
+                                                                        error:nil] path];
+        if (!_downloadDirectory) {
+            [self deauthorize];
+            dispatch_sync(dispatch_get_main_queue(), ^{
+                self.updateProgressButton.enabled = false;
+                self.updateProgressLabel.stringValue = @"Failed to extract update.";
+                _updateState = UPDATE_FAILED;
+                self.updateProgressButton.title = @"Close";
+                self.updateProgressButton.enabled = true;
+                [self.updateProgressSpinner stopAnimation:nil];
+            });
+            return;
+        }
+        
+        NSTask *unzipTask;
+        unzipTask = [[NSTask alloc] init];
+        unzipTask.launchPath = @"/usr/bin/unzip";
+        unzipTask.arguments = @[location.path, @"-d", _downloadDirectory];
+        [unzipTask launch];
+        [unzipTask waitUntilExit];
+        if (unzipTask.terminationStatus != 0 || unzipTask.terminationReason != NSTaskTerminationReasonExit) {
+            [self deauthorize];
+            [[NSFileManager defaultManager] removeItemAtPath:_downloadDirectory error:nil];
+            dispatch_sync(dispatch_get_main_queue(), ^{
+                self.updateProgressButton.enabled = false;
+                self.updateProgressLabel.stringValue = @"Failed to extract update.";
+                _updateState = UPDATE_FAILED;
+                self.updateProgressButton.title = @"Close";
+                self.updateProgressButton.enabled = true;
+                [self.updateProgressSpinner stopAnimation:nil];
+            });
+            return;
+        }
+        
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            self.updateProgressButton.enabled = false;
+            self.updateProgressLabel.stringValue = @"Update ready, save your game progress and click Install.";
+            _updateState = UPDATE_WAIT_INSTALL;
+            self.updateProgressButton.title = @"Install";
+            self.updateProgressButton.enabled = true;
+            [self.updateProgressSpinner stopAnimation:nil];
+        });
+    }];
+    [_updateTask resume];
+    
+    self.updateProgressWindow.preventsApplicationTerminationWhenModal = false;
+    [self.updateWindow beginSheet:self.updateProgressWindow completionHandler:^(NSModalResponse returnCode) {
+        [self.updateWindow close];
+    }];
+}
+
+- (void)performUpgrade
+{
+    self.updateProgressButton.enabled = false;
+    self.updateProgressLabel.stringValue = @"Instaling update…";
+    _updateState = UPDATE_INSTALLING;
+    self.updateProgressButton.enabled = false;
+    [self.updateProgressSpinner startAnimation:nil];
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        NSString *executablePath = [[NSBundle mainBundle] executablePath];
+        NSString *contentsPath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"Contents"];
+        NSString *contentsTempPath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"TempContents"];
+        NSString *updateContentsPath = [_downloadDirectory stringByAppendingPathComponent:@"SameBoy.app/Contents"];
+        NSError *error = nil;
+        [[NSFileManager defaultManager] moveItemAtPath:contentsPath toPath:contentsTempPath error:&error];
+        if (error) {
+            [self deauthorize];
+            [[NSFileManager defaultManager] removeItemAtPath:_downloadDirectory error:nil];
+            _downloadDirectory = nil;
+            dispatch_sync(dispatch_get_main_queue(), ^{
+                self.updateProgressButton.enabled = false;
+                self.updateProgressLabel.stringValue = @"Failed to install update.";
+                _updateState = UPDATE_FAILED;
+                self.updateProgressButton.title = @"Close";
+                self.updateProgressButton.enabled = true;
+                [self.updateProgressSpinner stopAnimation:nil];
+            });
+            return;
+        }
+        [[NSFileManager defaultManager] moveItemAtPath:updateContentsPath toPath:contentsPath error:&error];
+        if (error) {
+            [self deauthorize];
+            [[NSFileManager defaultManager] moveItemAtPath:contentsTempPath toPath:contentsPath error:nil];
+            [[NSFileManager defaultManager] removeItemAtPath:_downloadDirectory error:nil];
+            _downloadDirectory = nil;
+            dispatch_sync(dispatch_get_main_queue(), ^{
+                self.updateProgressButton.enabled = false;
+                self.updateProgressLabel.stringValue = @"Failed to install update.";
+                _updateState = UPDATE_FAILED;
+                self.updateProgressButton.title = @"Close";
+                self.updateProgressButton.enabled = true;
+                [self.updateProgressSpinner stopAnimation:nil];
+            });
+            return;
+        }
+        [[NSFileManager defaultManager] removeItemAtPath:_downloadDirectory error:nil];
+        [[NSFileManager defaultManager] removeItemAtPath:contentsTempPath error:nil];
+        
+        // Remove the quarantine flag so we don't have to escape translocation
+        NSString *bundlePath = [NSBundle mainBundle].bundlePath;
+        removexattr(bundlePath.UTF8String, "com.apple.quarantine", 0);
+        for (NSString *path in [[NSFileManager defaultManager] enumeratorAtPath:bundlePath]) {
+            removexattr([bundlePath stringByAppendingPathComponent:path].UTF8String, "com.apple.quarantine", 0);
+        };
+        
+        _downloadDirectory = nil;
+        atexit_b(^{
+            execl(executablePath.UTF8String, executablePath.UTF8String, "--update-launch", NULL);
+        });
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [NSApp terminate:nil];
+        });
+    });
+}
+
+- (IBAction)updateAction:(id)sender
+{
+    switch (_updateState) {
+        case UPDATE_DOWNLOADING:
+            [_updateTask cancelByProducingResumeData:nil];
+            _updateTask = nil;
+            [self.updateProgressWindow close];
+            break;
+        case UPDATE_WAIT_INSTALL:
+            [self performUpgrade];
+            break;
+        case UPDATE_EXTRACTING:
+        case UPDATE_INSTALLING:
+            break;
+        case UPDATE_FAILED:
+            [self.updateProgressWindow close];
+            break;
+    }
+}
+
+- (void)orderFrontAboutPanel:(id)sender
+{
+    // NSAboutPanelOptionApplicationIcon is not available prior to 10.13, but the key is still there and working.
+    [[NSApplication sharedApplication] orderFrontStandardAboutPanelWithOptions:@{
+        @"ApplicationIcon": [NSImage imageNamed:@"Icon"]
+    }];
+}
+
+- (void)controller:(JOYController *)controller buttonChangedState:(JOYButton *)button
+{
+    if (!button.isPressed) return;
+    NSDictionary *mapping = [[NSUserDefaults standardUserDefaults] dictionaryForKey:@"JoyKitInstanceMapping"][controller.uniqueID];
+    if (!mapping) {
+        mapping = [[NSUserDefaults standardUserDefaults] dictionaryForKey:@"JoyKitNameMapping"][controller.deviceName];
+    }
+    
+    JOYButtonUsage usage = ((JOYButtonUsage)[mapping[n2s(button.uniqueID)] unsignedIntValue]) ?: -1;
+    if (!mapping && usage >= JOYButtonUsageGeneric0) {
+        usage = GB_inline_const(JOYButtonUsage[], {JOYButtonUsageY, JOYButtonUsageA, JOYButtonUsageB, JOYButtonUsageX})[(usage - JOYButtonUsageGeneric0) & 3];
+    }
+    
+    if (usage == GBJoyKitHotkey1 || usage == GBJoyKitHotkey2) {
+        if (_preferencesWindow && self.keyWindow == _preferencesWindow) {
+            return;
+        }
+        if (![[NSUserDefaults standardUserDefaults] boolForKey:@"GBAllowBackgroundControllers"] && !self.keyWindow) {
+            return;
+        }
+
+        NSString *keyEquivalent = [[NSUserDefaults standardUserDefaults] stringForKey:usage == GBJoyKitHotkey1? @"GBJoypadHotkey1" : @"GBJoypadHotkey2"];
+        NSEventModifierFlags flags = NSEventModifierFlagCommand;
+        if ([keyEquivalent hasPrefix:@"^"]) {
+            flags |= NSEventModifierFlagShift;
+            [keyEquivalent substringFromIndex:1];
+        }
+        _simulatingMenuEvent = true;
+        [[NSApplication sharedApplication] sendEvent:[NSEvent keyEventWithType:NSEventTypeKeyDown
+                                                                                 location:(NSPoint){0,}
+                                                                            modifierFlags:flags
+                                                                                timestamp:0
+                                                                             windowNumber:0
+                                                                                  context:NULL
+                                                                               characters:keyEquivalent
+                                                              charactersIgnoringModifiers:keyEquivalent
+                                                                                isARepeat:false
+                                                                                  keyCode:0]];
+        _simulatingMenuEvent = false;
+    }
+}
+
+- (NSWindow *)keyWindow
+{
+    NSWindow *ret = [super keyWindow];
+    if (!ret && _simulatingMenuEvent) {
+        ret = [(Document *)self.orderedDocuments.firstObject mainWindow];
+    }
+    return ret;
+}
+
+- (NSWindow *)mainWindow
+{
+    NSWindow *ret = [super mainWindow];
+    if (!ret && _simulatingMenuEvent) {
+        ret = [(Document *)self.orderedDocuments.firstObject mainWindow];
+    }
+    return ret;
+}
+
+- (IBAction)openDebuggerHelp:(id)sender
+{
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://sameboy.github.io/debugger/"]];
+}
+
+- (IBAction)openSponsor:(id)sender
+{
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://github.com/sponsors/LIJI32"]];
+}
+
+- (void)dealloc
+{
+    if (_downloadDirectory) {
+        [[NSFileManager defaultManager] removeItemAtPath:_downloadDirectory error:nil];
+    }
+}
+
+- (IBAction)nop:(id)sender
+{
+}
+
+/* This runs before C constructors. If we need to escape translocation, we should
+   do it ASAP to minimize our launch time. */
+
+ (void)load
+{
+    if (@available(macOS 10.12, *)) {
+        /* Detect and escape translocation so we can safely update ourselves */
+        if ([[[NSBundle mainBundle] bundlePath] containsString:@"/AppTranslocation/"]) {
+            const char *mountPath = [[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByDeletingLastPathComponent].UTF8String;
+            struct statfs *mntbuf;
+            int mntsize = getmntinfo(&mntbuf, MNT_NOWAIT);
+            for (unsigned i = 0; i < mntsize; i++) {
+                if (strcmp(mntbuf[i].f_mntonname, mountPath) == 0) {
+                    NSBundle *origBundle = [NSBundle bundleWithPath:@(mntbuf[i].f_mntfromname)];
+                    
+                    execl(origBundle.executablePath.UTF8String, origBundle.executablePath.UTF8String, NULL);
+                    break;
+                }
+            }
+        }
+    }
+}
+@end
--- a/bsnes/gb/Cocoa/GBBorderView.h
+++ b/bsnes/gb/Cocoa/GBBorderView.h
@@ -0,0 +1,5 @@
+#import <Cocoa/Cocoa.h>
+
+@interface GBBorderView : NSView
+
+@end
--- a/bsnes/gb/Cocoa/GBBorderView.m
+++ b/bsnes/gb/Cocoa/GBBorderView.m
@@ -0,0 +1,26 @@
+#import "GBBorderView.h"
+
+@implementation GBBorderView
+
+
+- (void)awakeFromNib
+{
+    self.wantsLayer = true;
+}
+
+- (BOOL)wantsUpdateLayer
+{
+    return true;
+}
+
+- (void)updateLayer
+{
+    /* Wonderful, wonderful windowserver(?) bug. Using 0,0,0 here would cause it to render garbage
+       on fullscreen windows on some High Sierra machines. Any other value, including the one used
+       here (which is rendered exactly the same due to rounding) works around this bug. */
+    self.layer.backgroundColor = [NSColor colorWithCalibratedRed:0
+                                                           green:0
+                                                            blue:1.0 / 1024.0
+                                                           alpha:1.0].CGColor;
+}
+@end
--- a/bsnes/gb/Cocoa/GBButtons.h
+++ b/bsnes/gb/Cocoa/GBButtons.h
@@ -0,0 +1,40 @@
+typedef enum {
+    GBRight,
+    GBLeft,
+    GBUp,
+    GBDown,
+    GBA,
+    GBB,
+    GBSelect,
+    GBStart,
+    GBRapidA,
+    GBRapidB,
+    GBTurbo,
+    GBRewind,
+    GBUnderclock,
+    GBHotkey1,
+    GBHotkey2,
+    GBTotalButtonCount,
+    GBKeyboardButtonCount =  GBUnderclock + 1,
+    GBPerPlayerButtonCount = GBRapidB + 1,
+} GBButton;
+
+#define GBJoyKitHotkey1 JOYButtonUsageGeneric0 + 0x100
+#define GBJoyKitHotkey2 JOYButtonUsageGeneric0 + 0x101
+#define GBJoyKitRapidA JOYButtonUsageGeneric0 + 0x102
+#define GBJoyKitRapidB JOYButtonUsageGeneric0 + 0x103
+
+extern NSString const *GBButtonNames[GBTotalButtonCount];
+
+static inline NSString *n2s(uint64_t number)
+{
+    return [NSString stringWithFormat:@"%llx", number];
+}
+
+static inline NSString *button_to_preference_name(GBButton button, unsigned player)
+{
+    if (player) {
+        return [NSString stringWithFormat:@"GBPlayer%d%@", player + 1, GBButtonNames[button]];
+    }
+    return [NSString stringWithFormat:@"GB%@", GBButtonNames[button]];
+}
--- a/bsnes/gb/Cocoa/GBButtons.m
+++ b/bsnes/gb/Cocoa/GBButtons.m
@@ -0,0 +1,4 @@
+#import <Foundation/Foundation.h>
+#import "GBButtons.h"
+
+NSString const *GBButtonNames[] = {@"Right", @"Left", @"Up", @"Down", @"A", @"B", @"Select", @"Start", @"Rapid A", @"Rapid B", @"Turbo", @"Rewind", @"Slow-Motion", @"Hotkey 1", @"Hotkey 2"};
--- a/bsnes/gb/Cocoa/GBCPUView.h
+++ b/bsnes/gb/Cocoa/GBCPUView.h
@@ -0,0 +1,5 @@
+#import <Cocoa/Cocoa.h>
+
+@interface GBCPUView : NSView
+- (void)addSample:(double)sample;
+@end
--- a/bsnes/gb/Cocoa/GBCPUView.m
+++ b/bsnes/gb/Cocoa/GBCPUView.m
@@ -0,0 +1,126 @@
+#import "GBCPUView.h"
+
+#define SAMPLE_COUNT 0x100 // ~4 seconds
+
+@implementation GBCPUView
+{
+    double _samples[SAMPLE_COUNT];
+    size_t _position;
+}
+
+- (void)drawRect:(NSRect)dirtyRect
+{
+    CGRect bounds = self.bounds;
+    NSSize size = bounds.size;
+    unsigned factor = [[self.window screen] backingScaleFactor];
+    
+    NSBitmapImageRep *maskBitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
+                                                                           pixelsWide:(unsigned)size.width * factor
+                                                                           pixelsHigh:(unsigned)size.height * factor
+                                                                        bitsPerSample:8
+                                                                      samplesPerPixel:2
+                                                                             hasAlpha:true
+                                                                             isPlanar:false
+                                                                       colorSpaceName:NSDeviceWhiteColorSpace
+                                                                          bytesPerRow:size.width * 2 * factor
+                                                                         bitsPerPixel:16];
+    
+
+    
+    NSGraphicsContext *mainContext = [NSGraphicsContext currentContext];
+    
+    
+    NSColor *greenColor, *redColor;
+    if (@available(macOS 10.10, *)) {
+        greenColor = [NSColor systemGreenColor];
+        redColor = [NSColor systemRedColor];
+    }
+    else {
+        greenColor = [NSColor colorWithRed:3.0 / 16 green:0.5 blue:5.0 / 16 alpha:1.0];
+        redColor = [NSColor colorWithRed:13.0 / 16 green:0.25 blue:0.25 alpha:1.0];
+    }
+    
+
+    NSBitmapImageRep *colorBitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
+                                                                            pixelsWide:SAMPLE_COUNT
+                                                                            pixelsHigh:1
+                                                                         bitsPerSample:8
+                                                                       samplesPerPixel:3
+                                                                              hasAlpha:false
+                                                                              isPlanar:false
+                                                                        colorSpaceName:NSDeviceRGBColorSpace
+                                                                           bytesPerRow:SAMPLE_COUNT * 4
+                                                                          bitsPerPixel:32];
+
+    unsigned lastFill = 0;
+    NSBezierPath *line = [NSBezierPath bezierPath];
+    bool isRed = false;
+    {
+        double sample = _samples[_position % SAMPLE_COUNT];
+        [line moveToPoint:NSMakePoint(0,
+                                      (sample * (size.height - 1) + 0.5) * factor)];
+        isRed = sample == 1;
+    }
+    
+    
+    [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:colorBitmap]];
+    for (unsigned i = 1; i < SAMPLE_COUNT; i++) {
+        double sample = _samples[(i + _position) % SAMPLE_COUNT];
+        [line lineToPoint:NSMakePoint(size.width * i * factor / (SAMPLE_COUNT - 1),
+                                      (sample * (size.height - 1) + 0.5) * factor)];
+        
+        if (isRed != (sample == 1)) {
+            // Color changed
+            [(isRed? redColor : greenColor) setFill];
+            NSRectFill(CGRectMake(lastFill, 0, i - lastFill, 1));
+            lastFill = i;
+            
+            isRed ^= true;
+        }
+    }
+    [(isRed? redColor : greenColor) setFill];
+    NSRectFill(CGRectMake(lastFill, 0, SAMPLE_COUNT - lastFill, 1));
+    
+    NSBezierPath *fill = [line copy];
+    [fill lineToPoint:NSMakePoint(size.width * factor, 0)];
+    [fill lineToPoint:NSMakePoint(0, 0)];
+    
+    NSColor *strokeColor = [NSColor whiteColor];
+    NSColor *fillColor = [strokeColor colorWithAlphaComponent:1 / 3.0];
+    
+    [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:maskBitmap]];
+    [fillColor setFill];
+    [fill fill];
+    
+    [strokeColor setStroke];
+    [line setLineWidth:factor];
+    [line stroke];
+    
+    CGContextRef maskContext = CGContextRetain([NSGraphicsContext currentContext].graphicsPort);
+    [NSGraphicsContext setCurrentContext:mainContext];
+    CGContextSaveGState(mainContext.graphicsPort);
+    
+    CGImageRef maskImage = CGBitmapContextCreateImage(maskContext);
+    CGContextClipToMask(mainContext.graphicsPort, bounds, maskImage);
+    CGImageRelease(maskImage);
+    
+    NSImage *colors = [[NSImage alloc] initWithSize:NSMakeSize(SAMPLE_COUNT, 1)];
+    [colors addRepresentation:colorBitmap];
+    [colors drawInRect:bounds];
+    
+    CGContextRestoreGState(mainContext.graphicsPort);
+    CGContextRelease(maskContext);
+    
+    
+    [super drawRect:dirtyRect];
+}
+
+- (void)addSample:(double)sample
+{
+    _samples[_position++] = sample;
+    if (_position == SAMPLE_COUNT) {
+        _position = 0;
+    }
+}
+
+@end
--- a/bsnes/gb/Cocoa/GBCenteredTextCell.h
+++ b/bsnes/gb/Cocoa/GBCenteredTextCell.h
@@ -0,0 +1,5 @@
+#import <Cocoa/Cocoa.h>
+
+@interface GBCenteredTextCell : NSTextFieldCell
+
+@end
--- a/bsnes/gb/Cocoa/GBCenteredTextCell.m
+++ b/bsnes/gb/Cocoa/GBCenteredTextCell.m
@@ -0,0 +1,29 @@
+#import "GBCenteredTextCell.h"
+
+@implementation GBCenteredTextCell
+- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
+{
+    double height = round([self.attributedStringValue size].height);
+    cellFrame.origin.y += (cellFrame.size.height - height) / 2;
+    cellFrame.size.height = height;
+    [super drawInteriorWithFrame:cellFrame inView:controlView];
+}
+
+
+- (void)selectWithFrame:(NSRect)rect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)delegate start:(NSInteger)selStart length:(NSInteger)selLength
+{
+    double height = round([self.attributedStringValue size].height);
+    rect.origin.y += (rect.size.height - height) / 2;
+    rect.size.height = height;
+    [super selectWithFrame:rect inView:controlView editor:textObj delegate:delegate start:selStart length:selLength];
+}
+
+- (void)editWithFrame:(NSRect)rect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)delegate event:(NSEvent *)event
+{
+    double height = round([self.attributedStringValue size].height);
+    rect.origin.y += (rect.size.height - height) / 2;
+    rect.size.height = height;
+    [super editWithFrame:rect inView:controlView editor:textObj delegate:delegate event:event];
+
+}
+@end
--- a/bsnes/gb/Cocoa/GBCheatSearchController.h
+++ b/bsnes/gb/Cocoa/GBCheatSearchController.h
@@ -0,0 +1,8 @@
+#import <AppKit/AppKit.h>
+#import "Document.h"
+
+@interface GBCheatSearchController<NSTableViewDelegate, NSTableViewDataSource, NSControlTextEditingDelegate> : NSObject
+@property IBOutlet NSWindow *window;
+@property IBOutlet NSTableView *tableView;
+ (instancetype)controllerWithDocument:(Document *)document;
+@end
--- a/bsnes/gb/Cocoa/GBCheatSearchController.m
+++ b/bsnes/gb/Cocoa/GBCheatSearchController.m
@@ -0,0 +1,234 @@
+#import "GBCheatSearchController.h"
+#import "GBWarningPopover.h"
+#import "GBCheatWindowController.h"
+#import "GBPanel.h"
+
+@interface GBCheatSearchController() <NSTableViewDelegate, NSTableViewDataSource>
+@property IBOutlet NSPopUpButton *dataTypeButton;
+@property IBOutlet NSPopUpButton *conditionTypeButton;
+@property IBOutlet NSTextField *operandField;
+@property IBOutlet NSTextField *conditionField;
+@property IBOutlet NSTextField *resultsLabel;
+@property (strong) IBOutlet NSButton *addCheatButton;
+@end
+
+@implementation GBCheatSearchController
+{
+    __weak Document *_document;
+    size_t _resultCount;
+    GB_cheat_search_result_t *_results;
+    GBPanel *_window;
+}
+
+ (instancetype)controllerWithDocument:(Document *)document
+{
+    GBCheatSearchController *ret = [[self alloc] init];
+    ret->_document = document;
+    NSArray *objects;
+    [[NSBundle mainBundle] loadNibNamed:@"CheatSearch" owner:ret topLevelObjects:&objects];
+    ret->_resultsLabel.stringValue = @"";
+    ret->_resultsLabel.cell.backgroundStyle = NSBackgroundStyleRaised;
+    ret->_window.ownerWindow = document.mainWindow;
+    return ret;
+}
+
+- (IBAction)reset:(id)sender
+{
+    _dataTypeButton.enabled = true;
+    [_document performAtomicBlock:^{
+        GB_cheat_search_reset(_document.gb);
+    }];
+    _resultCount = 0;
+    if (_results) {
+        free(_results);
+        _results = NULL;
+    }
+    [_tableView reloadData];
+    _resultsLabel.stringValue = @"";
+}
+
+- (IBAction)search:(id)sender
+{
+    // Dispatch to work around firstResponder oddities
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if ([sender isKindOfClass:[NSTextField class]]) {
+            // Action sent by losing focus rather than pressing enter
+            if (![sender currentEditor]) return;
+        }
+        _dataTypeButton.enabled = false;
+        [_document performAtomicBlock:^{
+            __block bool success = false;
+            NSString *error = [_document captureOutputForBlock:^{
+                success = GB_cheat_search_filter(_document.gb, _conditionField.stringValue.UTF8String, _dataTypeButton.selectedTag);
+            }];
+            if (!success) {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [GBWarningPopover popoverWithContents:error onView:_conditionField];
+                    NSBeep();
+                });
+                return;
+            }
+            _resultCount = GB_cheat_search_result_count(_document.gb);
+            _results = malloc(sizeof(*_results) * _resultCount);
+            GB_cheat_search_get_results(_document.gb, _results);
+        }];
+        if (_resultCount == 0) {
+            _dataTypeButton.enabled = true;
+            _resultsLabel.stringValue = @"No results.";
+        }
+        else {
+            _resultsLabel.stringValue = [NSString stringWithFormat:@"%@ result%s",
+                                         [NSNumberFormatter localizedStringFromNumber:@(_resultCount)
+                                                                          numberStyle:NSNumberFormatterDecimalStyle],
+                                         _resultCount > 1? "s" : ""];
+        }
+        [_tableView reloadData];
+    });
+}
+
+- (IBAction)conditionChanged:(id)sender
+{
+    unsigned index = [_conditionTypeButton indexOfSelectedItem];
+    _conditionField.enabled = index == 11;
+    _operandField.enabled = index >= 1 && index <= 6;
+    switch ([_conditionTypeButton indexOfSelectedItem]) {
+        case 0: _conditionField.stringValue = @"1"; break;
+        case 1: _conditionField.stringValue = [NSString stringWithFormat:@"new == (%@)", _operandField.stringValue]; break;
+        case 2: _conditionField.stringValue = [NSString stringWithFormat:@"new != (%@)", _operandField.stringValue]; break;
+        case 3: _conditionField.stringValue = [NSString stringWithFormat:@"new > (%@)", _operandField.stringValue]; break;
+        case 4: _conditionField.stringValue = [NSString stringWithFormat:@"new >= (%@)", _operandField.stringValue]; break;
+        case 5: _conditionField.stringValue = [NSString stringWithFormat:@"new < (%@)", _operandField.stringValue]; break;
+        case 6: _conditionField.stringValue = [NSString stringWithFormat:@"new <= (%@)", _operandField.stringValue]; break;
+        case 7: _conditionField.stringValue = @"new != old"; break;
+        case 8: _conditionField.stringValue = @"new == old"; break;
+        case 9: _conditionField.stringValue = @"new > old"; break;
+        case 10: _conditionField.stringValue = @"new < old"; break;
+    }
+}
+
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView
+{
+    return _resultCount;
+}
+
+- (uint8_t *)addressForRow:(unsigned)row
+{
+    uint8_t *base;
+    uint32_t offset;
+    if (_results[row].addr < 0xc000) {
+        base = GB_get_direct_access(_document.gb, GB_DIRECT_ACCESS_CART_RAM, NULL, NULL);
+        offset = (_results[row].addr & 0x1FFF) + _results[row].bank * 0x2000;
+    }
+    else if (_results[row].addr < 0xe000) {
+        base = GB_get_direct_access(_document.gb, GB_DIRECT_ACCESS_RAM, NULL, NULL);
+        offset = (_results[row].addr & 0xFFF) + _results[row].bank * 0x1000;
+    }
+    else {
+        base = GB_get_direct_access(_document.gb, GB_DIRECT_ACCESS_HRAM, NULL, NULL);
+        offset = (_results[row].addr & 0x7F);
+    }
+    return base + offset;
+}
+
+- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
+{
+    switch ([[tableView tableColumns] indexOfObject:tableColumn]) {
+        case 0:
+            return [NSString stringWithFormat:@"$%02x:$%04x", _results[row].bank, _results[row].addr];
+        case 1:
+            if (_dataTypeButton.selectedTag & GB_CHEAT_SEARCH_DATA_TYPE_16BIT) {
+                return [NSString stringWithFormat:@"$%04x", _results[row].value];
+            }
+            return [NSString stringWithFormat:@"$%02x", _results[row].value];
+        default: {
+            const uint8_t *data = [self addressForRow:row];
+            GB_cheat_search_data_type_t dataType = _dataTypeButton.selectedTag;
+            uint16_t value = data[0];
+            if (!(dataType & GB_CHEAT_SEARCH_DATA_TYPE_16BIT)) {
+                return [NSString stringWithFormat:@"$%02x", value];
+            }
+            value |= data[1] << 8;
+            if ((dataType & GB_CHEAT_SEARCH_DATA_TYPE_BE_BIT)) {
+                value = __builtin_bswap16(value);
+            }
+            return [NSString stringWithFormat:@"$%04x", value];
+        }
+    }
+}
+
+- (void)tableView:(NSTableView *)tableView setObjectValue:(NSString *)object forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
+{
+    [_document performAtomicBlock:^{
+        __block bool success = false;
+        __block uint16_t value;
+        NSString *error = [_document captureOutputForBlock:^{
+            success = !GB_debugger_evaluate(_document.gb, object.UTF8String, &value, NULL);
+        }];
+        if (!success) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [GBWarningPopover popoverWithContents:error onView:tableView];
+                NSBeep();
+            });
+            return;
+        }
+        uint8_t *dest = [self addressForRow:row];
+        GB_cheat_search_data_type_t dataType = _dataTypeButton.selectedTag;
+        if (dataType & GB_CHEAT_SEARCH_DATA_TYPE_BE_BIT) {
+            value = __builtin_bswap16(value);
+        }
+        dest[0] = value;
+        if (dataType & GB_CHEAT_SEARCH_DATA_TYPE_16BIT) {
+            dest[1] = value >> 8;
+        }
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [tableView reloadData];
+        });
+    }];
+}
+
+- (void)controlTextDidChange:(NSNotification *)obj
+{
+    [self conditionChanged:nil];
+}
+
+- (IBAction)addCheat:(id)sender
+{
+    GB_cheat_search_result_t *result = _results + _tableView.selectedRow;
+    uint8_t *data = [self addressForRow:_tableView.selectedRow];
+    GB_cheat_search_data_type_t dataType = _dataTypeButton.selectedTag;
+    size_t rowToSelect = 0;
+    GB_get_cheats(_document.gb, &rowToSelect);
+    [_document performAtomicBlock:^{
+        GB_add_cheat(_document.gb,
+                     (dataType & GB_CHEAT_SEARCH_DATA_TYPE_16BIT)? "New Cheat (Part 1)" : "New Cheat",
+                     result->addr, result->bank,
+                     *data,
+                     0, false,
+                     true);
+        if (dataType & GB_CHEAT_SEARCH_DATA_TYPE_16BIT) {
+            GB_add_cheat(_document.gb,
+                         (dataType & GB_CHEAT_SEARCH_DATA_TYPE_16BIT)? "New Cheat (Part 2)" : "New Cheat",
+                         result->addr + 1, result->bank,
+                         data[1],
+                         0, false,
+                         true);
+        }
+        GB_set_cheats_enabled(_document.gb, true);
+    }];
+    [_document.cheatsWindow makeKeyAndOrderFront:nil];
+    [_document.cheatWindowController.cheatsTable reloadData];
+    [_document.cheatWindowController.cheatsTable selectRow:rowToSelect byExtendingSelection:false];
+    [_document.cheatWindowController.cheatsTable.delegate tableViewSelectionDidChange:nil];
+}
+
+- (void)tableViewSelectionDidChange:(NSNotification *)notification
+{
+    _addCheatButton.enabled = _tableView.numberOfSelectedRows != 0;
+}
+
+- (void)dealloc
+{
+    if (_results) free(_results);
+}
+
+@end
--- a/bsnes/gb/Cocoa/GBCheatTextFieldCell.h
+++ b/bsnes/gb/Cocoa/GBCheatTextFieldCell.h
@@ -0,0 +1,5 @@
+#import <Cocoa/Cocoa.h>
+
+@interface GBCheatTextFieldCell : NSTextFieldCell
+@property (nonatomic) bool usesAddressFormat;
+@end
--- a/bsnes/gb/Cocoa/GBCheatTextFieldCell.m
+++ b/bsnes/gb/Cocoa/GBCheatTextFieldCell.m
@@ -0,0 +1,123 @@
+#import "GBCheatTextFieldCell.h"
+
+@interface GBCheatTextView : NSTextView
+@property bool usesAddressFormat;
+@end
+
+@implementation GBCheatTextView
+
+- (bool)_internalInsertText:(NSString *)string replacementRange:(NSRange)range
+{
+    if (range.location == NSNotFound) {
+        range = self.selectedRange;
+    }
+    
+    NSString *new = [self.string stringByReplacingCharactersInRange:range withString:string];
+    if (!self.usesAddressFormat) {
+        NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"^(\\$[0-9A-Fa-f]{1,2}|[0-9]{1,3})$" options:0 error:NULL];
+        if ([regex numberOfMatchesInString:new options:0 range:NSMakeRange(0, new.length)]) {
+            [super insertText:string replacementRange:range];
+            return true;
+        }
+        if ([regex numberOfMatchesInString:[@"$" stringByAppendingString:new] options:0 range:NSMakeRange(0, new.length + 1)]) {
+            [super insertText:string replacementRange:range];
+            [super insertText:@"$" replacementRange:NSMakeRange(0, 0)];
+            return true;
+        }
+        if ([new isEqualToString:@"$"] || [string length] == 0) {
+            self.string = @"$00";
+            self.selectedRange = NSMakeRange(1, 2);
+            return true;
+        }
+    }
+    else {
+        NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"^(\\$[0-9A-Fa-f]{1,3}:)?\\$[0-9a-fA-F]{1,4}$" options:0 error:NULL];
+        if ([regex numberOfMatchesInString:new options:0 range:NSMakeRange(0, new.length)]) {
+            [super insertText:string replacementRange:range];
+            return true;
+        }
+        if ([string length] == 0) {
+            NSUInteger index = [new rangeOfString:@":"].location;
+            if (index != NSNotFound) {
+                if (range.location > index) {
+                    self.string = [[new componentsSeparatedByString:@":"] firstObject];
+                    self.selectedRange = NSMakeRange(self.string.length, 0);
+                    return true;
+                }
+                self.string = [[new componentsSeparatedByString:@":"] lastObject];
+                self.selectedRange = NSMakeRange(0, 0);
+                return true;
+            }
+            else if ([[self.string substringWithRange:range] isEqualToString:@":"]) {
+                self.string = [[self.string componentsSeparatedByString:@":"] lastObject];
+                self.selectedRange = NSMakeRange(0, 0);
+                return true;
+            }
+        }
+        if ([new isEqualToString:@"$"] || [string length] == 0) {
+            self.string = @"$0000";
+            self.selectedRange = NSMakeRange(1, 4);
+            return true;
+        }
+        if (([string isEqualToString:@"$"] || [string isEqualToString:@":"]) && range.length == 0 && range.location == 0) {
+            if ([self _internalInsertText:@"$00:" replacementRange:range]) {
+                self.selectedRange = NSMakeRange(1, 2);
+                return true;
+            }
+        }
+        if ([string isEqualToString:@":"] && range.length + range.location == self.string.length) {
+            if ([self _internalInsertText:@":$0" replacementRange:range]) {
+                self.selectedRange = NSMakeRange(self.string.length - 2, 2);
+                return true;
+            }
+        }
+        if ([string isEqualToString:@"$"]) {
+            if ([self _internalInsertText:@"$0" replacementRange:range]) {
+                self.selectedRange = NSMakeRange(range.location + 1, 1);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+- (NSUndoManager *)undoManager
+{
+    return nil;
+}
+
+- (void)insertText:(id)string replacementRange:(NSRange)replacementRange
+{
+    if (![self _internalInsertText:string replacementRange:replacementRange]) {
+        if (![self _internalInsertText:[@"$" stringByAppendingString:string] replacementRange:replacementRange]) {
+            NSBeep();
+        }
+    }
+}
+
+/* Private API, don't tell the police! */
+- (void)_userReplaceRange:(NSRange)range withString:(NSString *)string
+{
+    [self insertText:string replacementRange:range];
+}
+
+@end
+
+@implementation GBCheatTextFieldCell
+{
+    bool _drawing, _editing;
+    GBCheatTextView *_fieldEditor;
+}
+
+- (NSTextView *)fieldEditorForView:(NSView *)controlView
+{
+    if (_fieldEditor) {
+        _fieldEditor.usesAddressFormat = self.usesAddressFormat;
+        return _fieldEditor;
+    }
+    _fieldEditor = [[GBCheatTextView alloc] initWithFrame:controlView.frame];
+    _fieldEditor.fieldEditor = true;
+    _fieldEditor.usesAddressFormat = self.usesAddressFormat;
+    return _fieldEditor;
+}
+@end
--- a/bsnes/gb/Cocoa/GBCheatWindowController.h
+++ b/bsnes/gb/Cocoa/GBCheatWindowController.h
@@ -0,0 +1,16 @@
+#import <Foundation/Foundation.h>
+#import <AppKit/AppKit.h>
+#import "Document.h"
+
+@interface GBCheatWindowController : NSObject <NSTableViewDelegate, NSTableViewDataSource, NSTextFieldDelegate>
+@property (nonatomic, weak) IBOutlet NSTableView *cheatsTable;
+@property (nonatomic, weak) IBOutlet NSTextField *addressField;
+@property (nonatomic, weak) IBOutlet NSTextField *valueField;
+@property (nonatomic, weak) IBOutlet NSTextField *oldValueField;
+@property (nonatomic, weak) IBOutlet NSButton *oldValueCheckbox;
+@property (nonatomic, weak) IBOutlet NSTextField *descriptionField;
+@property (nonatomic, weak) IBOutlet NSTextField *importCodeField;
+@property (nonatomic, weak) IBOutlet NSTextField *importDescriptionField;
+@property (nonatomic, weak) IBOutlet Document *document;
+- (void)cheatsUpdated;
+@end
--- a/Show More
+++ b/Show More