2 files changed, 9 insertions, 18 deletions
diff --git a/include/script.h b/include/script.h
index 2a738698c..74f22584e 100644
--- a/include/script.h
+++ b/include/script.h
@@ -3,6 +3,7 @@
 
 struct ScriptContext;
 
+typedef bool8 (*NativeScriptFunc)(void);
 typedef bool8 (*ScrCmdFunc)(struct ScriptContext *);
 typedef u8 Script[];
 
@@ -11,7 +12,7 @@ struct ScriptContext
     u8 stackDepth;
     u8 mode;
     u8 comparisonResult;
-    u8 (*nativePtr)(void);
+    NativeScriptFunc nativePtr;
     const u8 *scriptPtr;
     const u8 *stack[20];
     ScrCmdFunc *cmdTable;
@@ -23,7 +24,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, void *ptr);
+void SetupNativeScript(struct ScriptContext *ctx, NativeScriptFunc ptr);
 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 e8b45108e..8e88877f6 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -7,23 +7,13 @@ extern const u8 *const gUnknown_083CE048[];
 
 bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4);
 bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5);
-u16 GetStringWidthInTilesForScriptMenu(const u8 *str);
-void DrawMultichoiceMenu(u8, u8, u8, const struct MenuAction *list, u8, u8);
-void StartScriptMenuTask(u8, u8, u8, u8, u8, u8);
-void Task_HandleMenuInput(u8);
 bool8 Multichoice(u8 var1, u8 var2, u8 var3, u8 var4);
-void sub_80B53B4(u8, u8, u8, const struct MenuAction *list, u8);
 bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
-bool8 IsScriptActive(void); // unused
-void task_yes_no_maybe(u8);
-bool8 sub_80B5578(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
-void sub_80B5684(u8);
-bool8 TryCreatePCMenu(void);
-void CreatePCMenu(void);
-void sub_80B5838(void);
-void task_picbox(u8 taskId);
-bool8 sub_80B58C4(u16 var1, u8 var2, u8 var3);
-void *picbox_close(void);
-bool8 sub_80B59AC(void);
+bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
+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);
 
 #endif