Merge branch 'master' of https://github.com/iimarckus/pokered

Conflicts:
	main.asm

1 files changed, 0 insertions, 23 deletions

diff --git a/music/pokeredmusicdisasm/AbstractData.h b/music/pokeredmusicdisasm/AbstractData.h
deleted file mode 100644
index 0b49255d..00000000
--- a/music/pokeredmusicdisasm/AbstractData.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef ABSTRACTDATA_H

-#define ABSTRACTDATA_H

-

-#include <string>

-

-// All information types inherit from here

-class AbstractData

-{

-public:

-    AbstractData();

-

-    virtual std::string GenAsm(); // Generate Assembly Output

-    virtual bool Parse(unsigned char* byte); // Parse Given Data

-	virtual bool GetError(); // Get Error (No Write, Error is read only)

-

-	virtual bool IsValid(unsigned char* byte); // Check for byte validity

-    virtual unsigned int Arguments(); // Number of arguments taken

-

-protected:

-    bool error; // Whether there's an error in parsing or not

-};

-

-#endif
\ No newline at end of file