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

Conflicts:
	main.asm

1 files changed, 0 insertions, 37 deletions

diff --git a/music/pokeredmusicdisasm/AbstractData.cpp b/music/pokeredmusicdisasm/AbstractData.cpp
deleted file mode 100644
index 542922fe..00000000
--- a/music/pokeredmusicdisasm/AbstractData.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "AbstractData.h"

-using namespace std;

-

-AbstractData::AbstractData()

-{

-    error = false;

-}

-

-// This method must always return "" if true but can return

-// any other value for false

-string AbstractData::GenAsm()

-{

-    if(error) return ";#Error";

-    else return "";

-}

-

-bool AbstractData::IsValid(unsigned char* byte)

-{

-	return true;

-}

-

-bool AbstractData::Parse(unsigned char* byte)

-{

-    // If it's not valid, don't even bother parsing

-    if(!IsValid(byte)) return false;

-    return true;

-}

-

-unsigned int AbstractData::Arguments()

-{

-	return 0;

-}

-

-bool AbstractData::GetError()

-{

-    return error;

-}
\ No newline at end of file