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

Conflicts:
	main.asm

1 files changed, 0 insertions, 37 deletions

diff --git a/music/pokeredmusicdisasm/Modulation.h b/music/pokeredmusicdisasm/Modulation.h
deleted file mode 100644
index 38c84791..00000000
--- a/music/pokeredmusicdisasm/Modulation.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef MODULATION_H

-#define MODULATION_H

-

-#include "AbstractData.h"

-

-//Represents 1 modulation value

-class Modulation : public AbstractData

-{

-public:

-	// Constructors

-	Modulation();

-	Modulation(unsigned char* byte); // Parse Immidiately

-    Modulation(unsigned char delay, unsigned char depth, unsigned char rate, bool); // Set value

-

-	// Direct Getter/Setter Functions

-    unsigned char GetDelay();

-    void SetDelay(unsigned char value);

-

-	unsigned char GetDepth();

-    void SetDepth(unsigned char value);

-

-	unsigned char GetRate();

-    void SetRate(unsigned char value);

-

-	// Re-implemented

-	virtual std::string GenAsm();

-	virtual bool IsValid(unsigned char* byte);

-	virtual bool Parse(unsigned char* byte);

-	virtual unsigned int Arguments();

-

-private:

-	unsigned char delay;

-	unsigned char depth;

-	unsigned char rate;

-};

-

-#endif
\ No newline at end of file