diff --git a/ares/n64/aleck64/aleck64.hpp b/ares/n64/aleck64/aleck64.hpp index 47feb964a..e20ec2367 100644 --- a/ares/n64/aleck64/aleck64.hpp +++ b/ares/n64/aleck64/aleck64.hpp @@ -9,12 +9,12 @@ struct Aleck64 : Memory::RCP { template auto writeBurst(u32 address, u32 *value, const char *peripheral) -> void { address = address & 0x00ff'ffff; - if (address >= size) return; + if(address >= size) return; Memory::Writable::write(address | 0x00, value[0]); Memory::Writable::write(address | 0x04, value[1]); Memory::Writable::write(address | 0x08, value[2]); Memory::Writable::write(address | 0x0c, value[3]); - if (Size == ICache) { + if(Size == ICache) { Memory::Writable::write(address | 0x10, value[4]); Memory::Writable::write(address | 0x14, value[5]); Memory::Writable::write(address | 0x18, value[6]); @@ -25,9 +25,9 @@ struct Aleck64 : Memory::RCP { template auto readBurst(u32 address, u32 *value, const char *peripheral) -> void { address = address & 0x00ff'ffff; - if (address >= size) { + if(address >= size) { value[0] = value[1] = value[2] = value[3] = 0; - if (Size == ICache) + if(Size == ICache) value[4] = value[5] = value[6] = value[7] = 0; return; } @@ -35,7 +35,7 @@ struct Aleck64 : Memory::RCP { value[1] = Memory::Writable::read(address | 0x04); value[2] = Memory::Writable::read(address | 0x08); value[3] = Memory::Writable::read(address | 0x0c); - if (Size == ICache) { + if(Size == ICache) { value[4] = Memory::Writable::read(address | 0x10); value[5] = Memory::Writable::read(address | 0x14); value[6] = Memory::Writable::read(address | 0x18); @@ -48,7 +48,6 @@ struct Aleck64 : Memory::RCP { auto unload() -> void; auto power(bool reset) -> void; auto save() -> void; - auto applyGameSpecificSettings(string name) -> void; //io.cpp auto readWord(u32 address, Thread& thread) -> u32; diff --git a/ares/n64/aleck64/controls.cpp b/ares/n64/aleck64/controls.cpp index b1b166452..2bd369d59 100644 --- a/ares/n64/aleck64/controls.cpp +++ b/ares/n64/aleck64/controls.cpp @@ -2,55 +2,55 @@ auto Aleck64::Controls::load(Node::Object parent) -> void { node = parent->append("Controls"); service = node->append("Service"); - test = node->append("Test"); + test = node->append("Test"); - p1x = node->append("Player 1 X-Axis"); - p1y = node->append("Player 1 Y-Axis"); - p1up = node->append("Player 1 Up"); - p1down = node->append("Player 1 Down"); - p1left = node->append("Player 1 Left"); + p1x = node->append("Player 1 X-Axis"); + p1y = node->append("Player 1 Y-Axis"); + p1up = node->append("Player 1 Up"); + p1down = node->append("Player 1 Down"); + p1left = node->append("Player 1 Left"); p1right = node->append("Player 1 Right"); p1start = node->append("Player 1 Start"); - p1coin = node->append("Player 1 Coin"); + p1coin = node->append("Player 1 Coin"); - for (auto n: range(9)) { + for(auto n: range(9)) { string name = {"Player 1 Button ", 1 + n}; p1[n] = node->append(name); } - p2x = node->append("Player 2 X-Axis"); - p2y = node->append("Player 2 Y-Axis"); - p2up = node->append("Player 2 Up"); - p2down = node->append("Player 2 Down"); - p2left = node->append("Player 2 Left"); + p2x = node->append("Player 2 X-Axis"); + p2y = node->append("Player 2 Y-Axis"); + p2up = node->append("Player 2 Up"); + p2down = node->append("Player 2 Down"); + p2left = node->append("Player 2 Left"); p2right = node->append("Player 2 Right"); p2start = node->append("Player 2 Start"); - p2coin = node->append("Player 2 Coin"); + p2coin = node->append("Player 2 Coin"); - for (auto n: range(9)) { + for(auto n: range(9)) { string name = {"Player 2 Button ", 1 + n}; p2[n] = node->append(name); } - mahjongA = node->append("Mahjong A"); - mahjongB = node->append("Mahjong B"); - mahjongC = node->append("Mahjong C"); - mahjongD = node->append("Mahjong D"); - mahjongE = node->append("Mahjong E"); - mahjongF = node->append("Mahjong F"); - mahjongG = node->append("Mahjong G"); - mahjongH = node->append("Mahjong H"); - mahjongI = node->append("Mahjong I"); - mahjongJ = node->append("Mahjong J"); - mahjongK = node->append("Mahjong K"); - mahjongL = node->append("Mahjong L"); - mahjongM = node->append("Mahjong M"); - mahjongN = node->append("Mahjong N"); - mahjongKan = node->append("Mahjong カン"); - mahjongPon = node->append("Mahjong ポン"); - mahjongChi = node->append("Mahjong チー"); + mahjongA = node->append("Mahjong A"); + mahjongB = node->append("Mahjong B"); + mahjongC = node->append("Mahjong C"); + mahjongD = node->append("Mahjong D"); + mahjongE = node->append("Mahjong E"); + mahjongF = node->append("Mahjong F"); + mahjongG = node->append("Mahjong G"); + mahjongH = node->append("Mahjong H"); + mahjongI = node->append("Mahjong I"); + mahjongJ = node->append("Mahjong J"); + mahjongK = node->append("Mahjong K"); + mahjongL = node->append("Mahjong L"); + mahjongM = node->append("Mahjong M"); + mahjongN = node->append("Mahjong N"); + mahjongKan = node->append("Mahjong カン"); + mahjongPon = node->append("Mahjong ポン"); + mahjongChi = node->append("Mahjong チー"); mahjongReach = node->append("Mahjong リーチ"); - mahjongRon = node->append("Mahjong ロン"); + mahjongRon = node->append("Mahjong ロン"); } auto Aleck64::Controls::poll() -> void {