Skip to content

Commit

Permalink
Update to ares v115 release.
Browse files Browse the repository at this point in the history
[No official changelog available for this version. -Ed.]
  • Loading branch information
byuu committed Jul 24, 2020
1 parent 8db2289 commit 1a2ec35
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
8 changes: 4 additions & 4 deletions ares/ares/information.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
2 changes: 1 addition & 1 deletion ares/ngp/cpu/io.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 10 additions & 10 deletions ares/ngp/system/controls.cpp
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion ares/ngp/system/system.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions lucia/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion luna/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1a2ec35

Please sign in to comment.