From 66a148af9fea2a7029f5aae362e80b440686064e Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sat, 9 Sep 2017 18:33:29 -0500
Subject: let's not mess around with typedefs now

---
 include/script.h      | 5 ++---
 include/script_menu.h | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/script.h b/include/script.h
index 74f22584e..25c7649b4 100644
--- a/include/script.h
+++ b/include/script.h
@@ -3,7 +3,6 @@
 
 struct ScriptContext;
 
-typedef bool8 (*NativeScriptFunc)(void);
 typedef bool8 (*ScrCmdFunc)(struct ScriptContext *);
 typedef u8 Script[];
 
@@ -12,7 +11,7 @@ struct ScriptContext
     u8 stackDepth;
     u8 mode;
     u8 comparisonResult;
-    NativeScriptFunc nativePtr;
+    bool8 (*nativePtr)(void);
     const u8 *scriptPtr;
     const u8 *stack[20];
     ScrCmdFunc *cmdTable;
@@ -24,7 +23,7 @@ struct ScriptContext
 
 void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd);
 u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr);
-void SetupNativeScript(struct ScriptContext *ctx, NativeScriptFunc ptr);
+void SetupNativeScript(struct ScriptContext *ctx, bool8 (*ptr)(void));
 void StopScript(struct ScriptContext *ctx);
 u8 RunScriptCommand(struct ScriptContext *ctx);
 u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr);
diff --git a/include/script_menu.h b/include/script_menu.h
index 8e88877f6..e621b32a4 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -14,6 +14,6 @@ bool8 ScriptMenu_TryCreatePCMenu(void);
 void ScriptMenu_CreatePCMenu(void);
 void ScriptMenu_DisplayPCStartupPrompt(void);
 bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
-NativeScriptFunc ScriptMenu_GetPicboxWaitFunc(void);
+bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
 
 #endif
-- 
cgit v1.2.3