Merge branch 'master' of github.com:nba-emu/NanoBoyAdvance into stabl…

…e-release

README.md

@@ -19,6 +19,7 @@ improved audio quality.<br>
 - Loading ROMs from archives (Zip, 7z, Tar and limited RAR[^1] support)
 - RTC emulation
 - Solar Sensor emulation (for example: for Boktai - The Sun is in Your Hand)
+- Debug tools: PPU palette, tile, background and sprite viewers
 
 [^1]: RAR 5.0 is currently not supported.
 

docs/ACCURACY.md

@@ -3,24 +3,22 @@
 
 Comparison of NBA and other emulators on the [mGBA test suite](https://github.com/mgba-emu/suite) by endrift:
 
-Testname      | Test Count | NanoBoyAdvance 1.7 | mGBA 0.10.1 |    VBA-M 2.1.5 | Ares v135 | SkyEmu V2  |
+Testname      | Test Count | NanoBoyAdvance 1.8 | mGBA 0.10.3 |    VBA-M 2.1.9 | Ares v135 | SkyEmu V3  |
 --------------|------------|--------------------|-------------|----------------|-----------|------------|
 Memory        |       1552 |               1552 |        1552 |           1426 |      1552 |       1552 |
-IO read       |        130 |                130 |         120 |            100 |       130 |        125 |
+IO read       |        130 |                130 |         120 |            100 |       130 |        130 |
 Timing        |       2020 |               2020 |        1768 |           1024 |      1608 |       2020 |
-Timer         |        936 |                936 |         744 |            440 |       465 |        587 |
+Timer         |        936 |                936 |         744 |            440 |       465 |        706 |
 Timer IRQ     |         90 |                 90 |          70 |              8 |         0 |         90 |
 Shifter       |        140 |                140 |         140 |            132 |       140 |        140 |
 Carry         |         93 |                 93 |          93 |             93 |        93 |         93 |
 Multiply Long |         72 |                 52 |          52 |             52 |        52 |         52 |
 BIOS math     |        615 |                615 |         615 |            615 |       615 |        615 |
 DMA tests     |       1256 |               1256 |        1232 |           1068 |      1212 |       1256 |
-Misc Edge Case|     10[^1] |                  9 |           4 |              7 |         1 |          3 |
+Misc Edge Case|         10 |                  9 |           4 |              8 |         1 |          4 |
 Layer Toggle  |          1 |               pass |        fail |           pass |      fail |       pass |
 OAM Update    |          1 |               pass |        fail |           fail |      fail |       pass |
 
-[^1]: Real hardware passes 9/10 tests.
-
 Passing these tests does not necessarily translate to compatibility or *overall* accuracy.
 But they give a good indication of how truthful an emulator is to hardware in certain areas, such as timing and DMA.
 
@@ -46,4 +44,4 @@ Some of these issues are minor visual bugs, that do not affect gameplay, others
 
 ## Known broken
 
-- currently none
+- Futari wa Precure - Ariennai! Yume no Sono wa Daimeikyuu: slight audio inaccuracies (see: https://github.com/nba-emu/NanoBoyAdvance/issues/325)

src/nba/include/nba/core.hpp

@@ -28,8 +28,8 @@ enum class Key : u8 {
   Left = 5,
   Up = 6,
   Down = 7,
-  L = 8,
-  R = 9,
+  R = 8,
+  L = 9,
   Count = 10
 };
 

src/platform/qt/src/config.cpp

@@ -39,8 +39,8 @@ void QtConfig::LoadCustomData(toml::value const& data) {
           input.gba[5] = get_map(gba, "left");
           input.gba[6] = get_map(gba, "up");
           input.gba[7] = get_map(gba, "down");
-          input.gba[8] = get_map(gba, "l");
-          input.gba[9] = get_map(gba, "r");
+          input.gba[8] = get_map(gba, "r");
+          input.gba[9] = get_map(gba, "l");
         }
       }
     }
@@ -80,8 +80,8 @@ void QtConfig::SaveCustomData(
   data["input"]["gba"]["left"] = input.gba[5].Array();
   data["input"]["gba"]["up"] = input.gba[6].Array();
   data["input"]["gba"]["down"] = input.gba[7].Array();
-  data["input"]["gba"]["l"] = input.gba[8].Array();
-  data["input"]["gba"]["r"] = input.gba[9].Array();
+  data["input"]["gba"]["r"] = input.gba[8].Array();
+  data["input"]["gba"]["l"] = input.gba[9].Array();
 
   data["window"]["scale"] = window.scale;
   data["window"]["maximum_scale"] = window.maximum_scale;

src/platform/qt/src/config.hpp

@@ -59,8 +59,8 @@ struct QtConfig final : nba::PlatformConfig {
       {Qt::Key_Left},
       {Qt::Key_Up},
       {Qt::Key_Down},
-      {Qt::Key_D},
-      {Qt::Key_F}
+      {Qt::Key_F},
+      {Qt::Key_D}
     };
 
     Map fast_forward = {Qt::Key_Space};