From 1a2ec353be647d3da7e300d6a93cd68729ea5c51 Mon Sep 17 00:00:00 2001
From: byuu <byuu@byuu.org>
Date: Fri, 24 Jul 2020 21:18:00 +0000
Subject: [PATCH] Update to ares v115 release.

[No official changelog available for this version. -Ed.]
---
 ares/ares/information.hpp    |  8 ++++----
 ares/ngp/cpu/io.cpp          |  2 +-
 ares/ngp/system/controls.cpp | 20 ++++++++++----------
 ares/ngp/system/system.hpp   |  2 +-
 lucia/GNUmakefile            |  3 +--
 luna/GNUmakefile             |  2 +-
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/ares/ares/information.hpp b/ares/ares/information.hpp
index 3a0467302..f64aa0b28 100644
--- a/ares/ares/information.hpp
+++ b/ares/ares/information.hpp
@@ -2,13 +2,13 @@
 
 namespace ares {
   static const string Name       = "ares";
-  static const string Version    = "114.25";
+  static const string Version    = "115";
   static const string Copyright  = "ares team";
-  static const string License    = "BY-NC-ND 4.0";
-  static const string LicenseURI = "https://creativecommons.org/licenses/by-nc-nd/4.0/";
+  static const string License    = "ISC";
+  static const string LicenseURI = "https://opensource.org/licenses/ISC";
   static const string Website    = "ares.dev";
   static const string WebsiteURI = "https://ares.dev";
 
   //incremented only when serialization format changes
-  static const string SerializerVersion = "114";
+  static const string SerializerVersion = "115";
 }
diff --git a/ares/ngp/cpu/io.cpp b/ares/ngp/cpu/io.cpp
index 3b02f57fd..4b8dd0699 100644
--- a/ares/ngp/cpu/io.cpp
+++ b/ares/ngp/cpu/io.cpp
@@ -465,7 +465,7 @@ auto CPU::readIO(uint8 address) -> uint8 {
     data.bit(4) = system.controls.a->value();
     data.bit(5) = system.controls.b->value();
     data.bit(6) = system.controls.option->value();
-    data.bit(7) = system.controls.debug->value();
+    data.bit(7) = system.controls.debugger->value();
     return data;
 
   case 0xb1:
diff --git a/ares/ngp/system/controls.cpp b/ares/ngp/system/controls.cpp
index 98a3297a2..9bade879b 100644
--- a/ares/ngp/system/controls.cpp
+++ b/ares/ngp/system/controls.cpp
@@ -1,15 +1,15 @@
 auto System::Controls::load(Node::Object parent) -> void {
   node = parent->append<Node::Object>("Controls");
 
-  up     = node->append<Node::Button>("Up");
-  down   = node->append<Node::Button>("Down");
-  left   = node->append<Node::Button>("Left");
-  right  = node->append<Node::Button>("Right");
-  a      = node->append<Node::Button>("A");
-  b      = node->append<Node::Button>("B");
-  option = node->append<Node::Button>("Option");
-  debug  = node->append<Node::Button>("Debug");
-  power  = node->append<Node::Button>("Power");
+  up       = node->append<Node::Button>("Up");
+  down     = node->append<Node::Button>("Down");
+  left     = node->append<Node::Button>("Left");
+  right    = node->append<Node::Button>("Right");
+  a        = node->append<Node::Button>("A");
+  b        = node->append<Node::Button>("B");
+  option   = node->append<Node::Button>("Option");
+  debugger = node->append<Node::Button>("Debugger");
+  power    = node->append<Node::Button>("Power");
 }
 
 auto System::Controls::poll() -> void {
@@ -20,7 +20,7 @@ auto System::Controls::poll() -> void {
   platform->input(a);
   platform->input(b);
   platform->input(option);
-  platform->input(debug);
+  platform->input(debugger);
 
   if(!(up->value() & down->value())) {
     yHold = 0, upLatch = up->value(), downLatch = down->value();
diff --git a/ares/ngp/system/system.hpp b/ares/ngp/system/system.hpp
index 25311a141..141173e99 100644
--- a/ares/ngp/system/system.hpp
+++ b/ares/ngp/system/system.hpp
@@ -11,7 +11,7 @@ struct System {
     Node::Button a;
     Node::Button b;
     Node::Button option;
-    Node::Button debug;
+    Node::Button debugger;
     Node::Button power;
 
     //controls.cpp
diff --git a/lucia/GNUmakefile b/lucia/GNUmakefile
index 725abfd01..9aaf3045a 100644
--- a/lucia/GNUmakefile
+++ b/lucia/GNUmakefile
@@ -22,8 +22,7 @@ hiro.resource := resource/lucia.rc
 include $(hiro.path)/GNUmakefile
 
 profile := performance
-cores := fc sfc n64 sg ms md pce msx gb gba ws ngp
-cores += ps1
+cores := fc sfc n64 sg ms md ps1 pce msx gb gba ws ngp
 
 ares.path := ../ares
 include $(ares.path)/GNUmakefile
diff --git a/luna/GNUmakefile b/luna/GNUmakefile
index 037e64131..0f998bde7 100644
--- a/luna/GNUmakefile
+++ b/luna/GNUmakefile
@@ -22,7 +22,7 @@ hiro.resource := $(ui)/resource/luna.rc
 include $(hiro.path)/GNUmakefile
 
 profile := accuracy
-cores := fc sfc n64 sg ms md pce msx cv gb gba ws ngp
+cores := fc sfc n64 sg ms md ps1 pce msx cv gb gba ws ngp
 
 ares.path := ../ares
 include $(ares.path)/GNUmakefile