major refactor; doesn't compile (see ToDo)

1 files changed, 1 insertions, 26 deletions

diff --git a/src/cpu/addressing.h b/src/cpu/addressing.h
index d0320b8..c520535 100644
--- a/src/cpu/addressing.h
+++ b/src/cpu/addressing.h
@@ -5,32 +5,7 @@
 #define ADDRESSING_H
 
 #include"core.h"
-
-enum Addressing {
-	eImmediate,
-	eAccumulator,
-	eZeroPage,
-	eZeroPageIndexedX,
-	eZeroPageIndexedY,
-	eAbsolute,
-	eAbsoluteIndexedX,
-	eAbsoluteIndexedY,
-	eIndexedIndirect,
-	eIndirectIndexed,
-	eImplied,
-	eIndirectAbsolute,
-	eRelative
-};
-
-typedef int Addressing;
-
-typedef struct AddData{
-	int cycles;
-	int length;
-	address add;
-	byte value;
-} AddData;
-
+#include"6502.h"
 #include"instructions.h"
 
 //Holds address of current instruction.