major refactor of cpu code

1 files changed, 56 insertions, 56 deletions

diff --git a/src/cpu/instructions.h b/src/cpu/instructions.h
index 705cc0d..4bf93b3 100644
--- a/src/cpu/instructions.h
+++ b/src/cpu/instructions.h
@@ -5,79 +5,79 @@
 #include"6502.h"
 
 // Load and Store Instructions
-void fLDA(Addressing);
-void fLDX(Addressing);
-void fLDY(Addressing);
-void fSTA(Addressing);
-void fSTX(Addressing);
-void fSTY(Addressing);
+void LDA(Addressing);
+void LDX(Addressing);
+void LDY(Addressing);
+void STA(Addressing);
+void STX(Addressing);
+void STY(Addressing);
 
 // Arithmetic Instructions
-void fADC(Addressing);
-void fSBC(Addressing);
+void ADC(Addressing);
+void SBC(Addressing);
 
 //Increment and Decrement Instructions
-void fINC(Addressing);
-void fINX(Addressing);
-void fINY(Addressing);
-void fDEC(Addressing);
-void fDEX(Addressing);
-void fDEY(Addressing);
+void INC(Addressing);
+void INX(Addressing);
+void INY(Addressing);
+void DEC(Addressing);
+void DEX(Addressing);
+void DEY(Addressing);
 
 // Logical Instructions
-void fAND(Addressing);
-void fORA(Addressing);
-void fEOR(Addressing);
+void AND(Addressing);
+void ORA(Addressing);
+void EOR(Addressing);
 
 // Jump, Branch, Compare, and Test Bits
-void fJMP(Addressing);
-void fBCC(Addressing);
-void fBCS(Addressing);
-void fBEQ(Addressing);
-void fBNE(Addressing);
-void fBMI(Addressing);
-void fBPL(Addressing);
-void fBVS(Addressing);
-void fBVC(Addressing);
-void fCMP(Addressing);
-void fCPX(Addressing);
-void fCPY(Addressing);
-void fBIT(Addressing);
+void JMP(Addressing);
+void BCC(Addressing);
+void BCS(Addressing);
+void BEQ(Addressing);
+void BNE(Addressing);
+void BMI(Addressing);
+void BPL(Addressing);
+void BVS(Addressing);
+void BVC(Addressing);
+void CMP(Addressing);
+void CPX(Addressing);
+void CPY(Addressing);
+void BIT(Addressing);
 
 // Shift and Rotate Instructions
-void fASL(Addressing);
-void fLSR(Addressing);
-void fROL(Addressing);
-void fROR(Addressing);
+void ASL(Addressing);
+void LSR(Addressing);
+void ROL(Addressing);
+void ROR(Addressing);
 
 // Transfer Instructions
-void fTAX(Addressing);
-void fTAY(Addressing);
-void fTXA(Addressing);
-void fTYA(Addressing);
+void TAX(Addressing);
+void TAY(Addressing);
+void TXA(Addressing);
+void TYA(Addressing);
 
 // Stack Instructions
-void fTSX(Addressing);
-void fTXS(Addressing);
-void fPHA(Addressing);
-void fPHP(Addressing);
-void fPLA(Addressing);
-void fPLP(Addressing);
+void TSX(Addressing);
+void TXS(Addressing);
+void PHA(Addressing);
+void PHP(Addressing);
+void PLA(Addressing);
+void PLP(Addressing);
 
 // Subroutine Instructions
-void fJSR(Addressing);
-void fRTS(Addressing);
-void fRTI(Addressing);
+void JSR(Addressing);
+void RTS(Addressing);
+void RTI(Addressing);
 
 // Set/Reset Insutrctions
-void fCLC(Addressing);
-void fCLD(Addressing);
-void fCLI(Addressing);
-void fCLV(Addressing);
-void fSEC(Addressing);
-void fSED(Addressing);
-void fSEI(Addressing);
+void CLC(Addressing);
+void CLD(Addressing);
+void CLI(Addressing);
+void CLV(Addressing);
+void SEC(Addressing);
+void SED(Addressing);
+void SEI(Addressing);
 
 // NOP/BRK Instructions
-void fNOP(Addressing);
-void fBRK(Addressing);
+void NOP(Addressing);
+void BRK(Addressing);