let's not mess around with typedefs now

5 files changed, 10 insertions, 11 deletions

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
diff --git a/src/scrcmd.c b/src/scrcmd.c
index ace15c056..28379d2f2 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -109,8 +109,8 @@ bool8 ScrCmd_end(struct ScriptContext *ctx)
 
 bool8 ScrCmd_jumpasm(struct ScriptContext *ctx)
 {
-    u32 addr = ScriptReadWord(ctx);
-    SetupNativeScript(ctx, (void *)addr);
+    bool8 (*addr)(void) = (bool8 (*)(void))ScriptReadWord(ctx);
+    SetupNativeScript(ctx, addr);
     return TRUE;
 }
 
@@ -1313,10 +1313,10 @@ bool8 ScrCmd_showpokepic(struct ScriptContext *ctx)
 
 bool8 ScrCmd_hidepokepic(struct ScriptContext *ctx)
 {
-    void *func = ScriptMenu_GetPicboxWaitFunc();
-    if (!func)
-        return FALSE;
+    bool8 (*func)(void) = ScriptMenu_GetPicboxWaitFunc();
 
+    if (func == NULL)
+        return FALSE;
     SetupNativeScript(ctx, func);
     return TRUE;
 }
diff --git a/src/script.c b/src/script.c
index 18abb6e84..394085d4a 100644
--- a/src/script.c
+++ b/src/script.c
@@ -40,7 +40,7 @@ u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr)
     return 1;
 }
 
-void SetupNativeScript(struct ScriptContext *ctx, NativeScriptFunc ptr)
+void SetupNativeScript(struct ScriptContext *ctx, bool8 (*ptr)(void))
 {
     ctx->mode = 2;
     ctx->nativePtr = ptr;
diff --git a/src/script_menu.c b/src/script_menu.c
index dc63f9f4a..253157b47 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1153,7 +1153,7 @@ bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y)
     }
 }  
 
-NativeScriptFunc ScriptMenu_GetPicboxWaitFunc(void)
+bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void)
 {
     u8 taskId = FindTaskIdByFunc(Task_PokemonPicWindow);