diff --git a/.cirrus.yml b/.cirrus.yml index 3ba01927..d3ca995e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -70,10 +70,9 @@ windows-x86_64-binaries_task: bsnes-nightly_artifacts: path: "bsnes-nightly.zip" -macOS-x86_64-binaries_task: - osx_instance: - image: mojave-base - +macOS-aarch64-binaries_task: + macos_instance: + image: ghcr.io/cirruslabs/macos-ventura-base:latest compile_script: - make -C bsnes local=false diff --git a/bsnes/target-bsnes/resource/resource.cpp b/bsnes/target-bsnes/resource/resource.cpp index 57386d6a..f8554e74 100644 --- a/bsnes/target-bsnes/resource/resource.cpp +++ b/bsnes/target-bsnes/resource/resource.cpp @@ -2713,7 +2713,7 @@ const unsigned char Boards[32230] = { 97,112,32,97,100,100,114,101,115,115,61,55,48,45,55,100,44,102,48,45,102,102,58,48,48,48,48,45,55,102,102,102, 32,109,97,115,107,61,48,120,56,48,48,48,10,10,98,111,97,114,100,58,32,76,79,82,79,77,45,82,65,77,35,65, 10,32,32,109,101,109,111,114,121,32,116,121,112,101,61,82,79,77,32,99,111,110,116,101,110,116,61,80,114,111,103,114, - 97,109,10,32,32,32,32,109,97,112,32,97,100,100,114,101,115,115,61,48,48,45,51,102,44,56,48,45,98,102,58,56, + 97,109,10,32,32,32,32,109,97,112,32,97,100,100,114,101,115,115,61,48,48,45,54,102,44,56,48,45,101,102,58,56, 48,48,48,45,102,102,102,102,32,109,97,115,107,61,48,120,56,48,48,48,10,32,32,109,101,109,111,114,121,32,116,121, 112,101,61,82,65,77,32,99,111,110,116,101,110,116,61,83,97,118,101,10,32,32,32,32,109,97,112,32,97,100,100,114, 101,115,115,61,55,48,45,55,100,44,102,48,45,102,102,58,48,48,48,48,45,102,102,102,102,32,109,97,115,107,61,48, diff --git a/bsnes/target-bsnes/resource/system/boards.bml b/bsnes/target-bsnes/resource/system/boards.bml index d0cbe9ec..b40029b4 100644 --- a/bsnes/target-bsnes/resource/system/boards.bml +++ b/bsnes/target-bsnes/resource/system/boards.bml @@ -827,7 +827,7 @@ board: LOROM-RAM board: LOROM-RAM#A memory type=ROM content=Program - map address=00-3f,80-bf:8000-ffff mask=0x8000 + map address=00-6f,80-ef:8000-ffff mask=0x8000 memory type=RAM content=Save map address=70-7d,f0-ff:0000-ffff mask=0x8000 diff --git a/bsnes/target-libretro/resources.hpp b/bsnes/target-libretro/resources.hpp index 7f4dfac8..7675e744 100644 --- a/bsnes/target-libretro/resources.hpp +++ b/bsnes/target-libretro/resources.hpp @@ -848,7 +848,7 @@ const unsigned char Boards[32230] = { 97,112,32,97,100,100,114,101,115,115,61,55,48,45,55,100,44,102,48,45,102,102,58,48,48,48,48,45,55,102,102,102, 32,109,97,115,107,61,48,120,56,48,48,48,10,10,98,111,97,114,100,58,32,76,79,82,79,77,45,82,65,77,35,65, 10,32,32,109,101,109,111,114,121,32,116,121,112,101,61,82,79,77,32,99,111,110,116,101,110,116,61,80,114,111,103,114, - 97,109,10,32,32,32,32,109,97,112,32,97,100,100,114,101,115,115,61,48,48,45,51,102,44,56,48,45,98,102,58,56, + 97,109,10,32,32,32,32,109,97,112,32,97,100,100,114,101,115,115,61,48,48,45,54,102,44,56,48,45,101,102,58,56, 48,48,48,45,102,102,102,102,32,109,97,115,107,61,48,120,56,48,48,48,10,32,32,109,101,109,111,114,121,32,116,121, 112,101,61,82,65,77,32,99,111,110,116,101,110,116,61,83,97,118,101,10,32,32,32,32,109,97,112,32,97,100,100,114, 101,115,115,61,55,48,45,55,100,44,102,48,45,102,102,58,48,48,48,48,45,102,102,102,102,32,109,97,115,107,61,48, diff --git a/nall/arithmetic/natural.hpp b/nall/arithmetic/natural.hpp index fcc902b8..cc1bd907 100644 --- a/nall/arithmetic/natural.hpp +++ b/nall/arithmetic/natural.hpp @@ -1,3 +1,5 @@ +#include + #define ConcatenateType(Size) uint##Size##_t #define DeclareType(Size) ConcatenateType(Size)