Lots of changes and too much dragging my feet on this. But I think this is going in the right direction now.

includes/opcodes.h

@@ -6,17 +6,18 @@
 #include <stdio.h>
 
 typedef enum {
-    R1 = 0, R2, R3, R4, R5, R6, R7, R8 = 7
+    R1 = 1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16, R17, R18, R19,
+    R20, R21, R22, R23, R24, R25, R26, R27, R28, R29, R30, R31, R32, RBP, RSP, RIP
 } Registers;
 
 typedef enum {
     ADD = 0x01, SUB, MUL, DIV, MOV, AND, OR, XOR, NOT, SHL, SHR, NOP, CMP, JMP, JZ, JG, JL, 
     OUTB, INB, HLT, CLI, ENI, INT, LIVT, PUSHA, POPA, CALL, RET, PUSH, POP
-} Mnemonic;
+} Mnemonics;
 
-int IsOpcode(const char*, Mnemonic*);
+int IsOpcode(const char*, Mnemonics*);
 int IsRegister(const char*, Registers*);
-void GetMnemonicText(Mnemonic mnemonic, char buffer[12]);
-void GetRegisterText(Registers reg, char buffer[4]);
+void GetMnemonicText(Mnemonics mnemonic, char buffer[12]);
+void GetRegisterText(Registers reg, char buffer[5]);
 
 #endif