From 95f856c39e81e2b723065e757b4dcf577441c558 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sat, 9 Sep 2017 18:17:09 -0500
Subject: more script_menu refactoring

---
 include/script.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'include/script.h')

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);
-- 
cgit v1.2.3


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 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'include/script.h')

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);
-- 
cgit v1.2.3


From a185f8a26dc5e5a04908c272ab54bede7af8a10c Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 12 Sep 2017 16:53:04 -0500
Subject: lots more relabeling

---
 include/script.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'include/script.h')

diff --git a/include/script.h b/include/script.h
index 25c7649b4..5a899cf4a 100644
--- a/include/script.h
+++ b/include/script.h
@@ -42,16 +42,12 @@ void ScriptContext1_SetupScript(const u8 *ptr);
 void ScriptContext1_Stop(void);
 void EnableBothScriptContexts(void);
 void ScriptContext2_RunNewScript(const u8 *ptr);
-u8 *mapheader_get_tagged_pointer(u8 tag);
-void mapheader_run_script_by_tag(u8 tag);
-u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag);
 void mapheader_run_script_with_tag_x1(void);
 void mapheader_run_script_with_tag_x3(void);
 void mapheader_run_script_with_tag_x5(void);
 void mapheader_run_script_with_tag_x6(void);
 bool8 mapheader_run_first_tag2_script_list_match(void);
 void mapheader_run_first_tag4_script_list_match(void);
-u32 CalculateRamScriptChecksum(void);
 void ClearRamScript(void);
 bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId);
 u8 *GetRamScript(u8 objectId, u8 *script);
-- 
cgit v1.2.3