2 files changed, 29 insertions, 3 deletions

diff --git a/include/scrcmd.h b/include/scrcmd.h
index 5ebec947..0aa3fd75 100644
--- a/include/scrcmd.h
+++ b/include/scrcmd.h
@@ -1,6 +1,32 @@
 #ifndef POKEDIAMOND_SCRCMD_H
 #define POKEDIAMOND_SCRCMD_H
 
-BOOL ScrCmd_givemon(struct ScriptContext* ctx);
+#include "global.h"
+#include "script.h"
+
+//scrcmd.c
+BOOL ScrCmd_Nop(struct ScriptContext* ctx);
+BOOL ScrCmd_Dummy(struct ScriptContext* ctx);
+BOOL ScrCmd_End(struct ScriptContext* ctx);
+BOOL ScrCmd_Wait(struct ScriptContext* ctx);
+BOOL ScrCmd_DebugWatch(struct ScriptContext* ctx);
+BOOL ScrCmd_LoadByte(struct ScriptContext* ctx);
+BOOL ScrCmd_LoadWord(struct ScriptContext* ctx);
+BOOL ScrCmd_LoadByteFromAddr(struct ScriptContext* ctx);
+BOOL ScrCmd_WriteByteToAddr(struct ScriptContext* ctx);
+BOOL ScrCmd_SetPtrByte(struct ScriptContext* ctx);
+BOOL ScrCmd_CopyLocal(struct ScriptContext* ctx);
+BOOL ScrCmd_CopyByte(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareLocalToLocal(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareLocalToValue(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareLocalToAddr(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareAddrToLocal(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareAddrToValue(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareAddrToAddr(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareVarToValue(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareVarToVar(struct ScriptContext* ctx);
+
+//scrcmd_18.c
+BOOL ScrCmd_GiveMon(struct ScriptContext* ctx);
 
 #endif //POKEDIAMOND_SCRCMD_H
diff --git a/include/script.h b/include/script.h
index 8fd7696f..c25751e4 100644
--- a/include/script.h
+++ b/include/script.h
@@ -15,7 +15,7 @@ struct ScriptContext
     u8 stackDepth;

     u8 mode;

     u8 comparisonResult;

-    u8 (*nativePtr)(struct ScriptContext *);

+    BOOL (*nativePtr)(struct ScriptContext *);

     const u8 *scriptPtr;

     const u8 *stack[20];

     ScrCmdFunc *cmdTable;

@@ -31,7 +31,7 @@ struct ScriptContext
 

 void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, u32 cmdCount);

 u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr);

-void SetupNativeScript(struct ScriptContext *ctx, u8 (*ptr)(struct ScriptContext *));

+void SetupNativeScript(struct ScriptContext *ctx, BOOL (*ptr)(struct ScriptContext *));

 void StopScript(struct ScriptContext *ctx);

 void FUN_02038B6C(struct ScriptContext *ctx, s32 r1);

 u8 RunScriptCommand(struct ScriptContext *ctx);