scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

housekeeping

Browse Source
This commit is contained in:
scawful
2023-08-24 23:46:17 -04:00
parent 5beb2ae4f6
commit 25c43cbaaa
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/constants.h
View File

@@ -167,7 +167,6 @@ class VersionConstants<Z3_Version::JP> {
static constexpr uint32_t overworldTilesType = 0x7FD94; static constexpr uint32_t overworldTilesType = 0x7FD94;
}; };
// ============================================================================ // ============================================================================
// Magic numbers // Magic numbers
// ============================================================================ // ============================================================================
@@ -669,7 +668,6 @@ static const absl::string_view SecretItemNames[] = {
"Hole", "Warp", "Staircase", "Bombable", "Switch"}; "Hole", "Warp", "Staircase", "Bombable", "Switch"};
static const absl::string_view TileTypeNames[] = { static const absl::string_view TileTypeNames[] = {
"$00 Nothing (standard floor)", "$00 Nothing (standard floor)",
"$01 Collision", "$01 Collision",

16
src/app/emu/cpu.cc
View File

@@ -1342,7 +1342,7 @@ void CPU::CLV() { status &= ~0x40; }
// n Set if MSB of result is set; else cleared // n Set if MSB of result is set; else cleared
// z Set if result is zero; else cleared // z Set if result is zero; else cleared
// c Set if no borrow; else cleared // c Set if no borrow; else cleared
void CPU::CMP(uint8_t value, bool isImmediate = false) { void CPU::CMP(uint16_t value, bool isImmediate) {
if (GetAccumulatorSize()) { // 8-bit if (GetAccumulatorSize()) { // 8-bit
uint8_t result = isImmediate ? A - value : A - memory.ReadByte(value); uint8_t result = isImmediate ? A - value : A - memory.ReadByte(value);
SetZeroFlag(result == 0); SetZeroFlag(result == 0);
@@ -1371,7 +1371,7 @@ void CPU::COP() {
} }
// CPX: Compare X register // CPX: Compare X register
void CPU::CPX(uint16_t value, bool isImmediate = false) { void CPU::CPX(uint16_t value, bool isImmediate) {
if (GetIndexSize()) { // 8-bit if (GetIndexSize()) { // 8-bit
uint8_t memory_value = isImmediate ? value : memory.ReadByte(value); uint8_t memory_value = isImmediate ? value : memory.ReadByte(value);
compare(X, memory_value); compare(X, memory_value);
@@ -1382,7 +1382,7 @@ void CPU::CPX(uint16_t value, bool isImmediate = false) {
} }
// CPY: Compare Y register // CPY: Compare Y register
void CPU::CPY(uint16_t value, bool isImmediate = false) { void CPU::CPY(uint16_t value, bool isImmediate) {
if (GetIndexSize()) { // 8-bit if (GetIndexSize()) { // 8-bit
uint8_t memory_value = isImmediate ? value : memory.ReadByte(value); uint8_t memory_value = isImmediate ? value : memory.ReadByte(value);
compare(Y, memory_value); compare(Y, memory_value);
@@ -1436,7 +1436,7 @@ void CPU::DEY() {
} }
// EOR: Exclusive OR TESTMEs // EOR: Exclusive OR TESTMEs
void CPU::EOR(uint16_t address, bool isImmediate = false) { void CPU::EOR(uint16_t address, bool isImmediate) {
if (GetAccumulatorSize()) { if (GetAccumulatorSize()) {
A ^= isImmediate ? address : memory.ReadByte(address); A ^= isImmediate ? address : memory.ReadByte(address);
SetZeroFlag(A == 0); SetZeroFlag(A == 0);
@@ -1520,7 +1520,7 @@ void CPU::JSL(uint32_t address) {
} }
// LDA: Load accumulator // LDA: Load accumulator
void CPU::LDA(uint16_t address, bool isImmediate = false) { void CPU::LDA(uint16_t address, bool isImmediate ) {
if (GetAccumulatorSize()) { if (GetAccumulatorSize()) {
A = isImmediate ? address : memory.ReadByte(address); A = isImmediate ? address : memory.ReadByte(address);
SetZeroFlag(A == 0); SetZeroFlag(A == 0);
@@ -1533,7 +1533,7 @@ void CPU::LDA(uint16_t address, bool isImmediate = false) {
} }
// LDX: Load X register // LDX: Load X register
void CPU::LDX(uint16_t address, bool isImmediate = false) { void CPU::LDX(uint16_t address, bool isImmediate ) {
if (GetIndexSize()) { if (GetIndexSize()) {
X = isImmediate ? address : memory.ReadByte(address); X = isImmediate ? address : memory.ReadByte(address);
SetZeroFlag(X == 0); SetZeroFlag(X == 0);
@@ -1546,7 +1546,7 @@ void CPU::LDX(uint16_t address, bool isImmediate = false) {
} }
// LDY: Load Y register // LDY: Load Y register
void CPU::LDY(uint16_t address, bool isImmediate = false) { void CPU::LDY(uint16_t address, bool isImmediate ) {
if (GetIndexSize()) { if (GetIndexSize()) {
Y = isImmediate ? address : memory.ReadByte(address); Y = isImmediate ? address : memory.ReadByte(address);
SetZeroFlag(Y == 0); SetZeroFlag(Y == 0);
@@ -1577,7 +1577,7 @@ void CPU::NOP() {
} }
// ORA: Logical OR // ORA: Logical OR
void CPU::ORA(uint16_t address, bool isImmediate = false) { void CPU::ORA(uint16_t address, bool isImmediate ) {
if (GetAccumulatorSize()) { if (GetAccumulatorSize()) {
A |= isImmediate ? address : memory.ReadByte(address); A |= isImmediate ? address : memory.ReadByte(address);
SetZeroFlag(A == 0); SetZeroFlag(A == 0);

6
src/app/emu/cpu.h
View File

@@ -492,13 +492,13 @@ class CPU : public Memory, public Loggable {
void ORA(uint16_t address, bool isImmediate = false); void ORA(uint16_t address, bool isImmediate = false);
// PEA: Push effective absolute address // PEA: Push effective absolute address
void PEA(uint16_t address); void PEA();
// PEI: Push effective indirect address // PEI: Push effective indirect address
void PEI(uint16_t address); void PEI();
// PER: Push effective relative address // PER: Push effective relative address
void PER(uint16_t address); void PER();
// PHA: Push accumulator // PHA: Push accumulator
void PHA(); void PHA();