From ed943b1e536524c02501e3b462acfc3664347315 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Mon, 15 Feb 2021 08:59:47 +0100
Subject: change type of gUnk_02034490

---
 include/structures.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/structures.h b/include/structures.h
index 534f0d98..9f4b32bf 100644
--- a/include/structures.h
+++ b/include/structures.h
@@ -176,6 +176,6 @@ static_assert(sizeof(BG3Buffer) == 0x1000);
 */
 
 extern u8 gUnk_02022740[];
-extern u8 gUnk_02034490;
+extern u8 gUnk_02034490[];
 
 #endif
-- 
cgit v1.2.3


From 7faadfd5226090b2eaf2cf1445970413f811be1e Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Tue, 16 Feb 2021 18:02:17 +0100
Subject: nonmatch sub_0807D20C

---
 include/functions.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/functions.h b/include/functions.h
index 407641c0..4866a847 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -222,7 +222,7 @@ extern void sub_080B1520(u32);
 extern struct_0807D1C4* sub_0807D1C4(u32);
 extern u32 sub_0807D24C(u32, const char*, u32);
 extern void sub_0807CF68(u32);
-extern void sub_0807D20C(u32, const char*, u32);
+extern u32 sub_0807D20C(u32, const char*, u32);
 extern u32 sub_0807CF88(u32, u8*);
 extern void sub_0807D184(u32, const char*);
 extern u32 sub_0806F520();
-- 
cgit v1.2.3


From f475bd9fa097437c478c9afd3e1a888ad12222f7 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Thu, 18 Feb 2021 17:58:42 +0100
Subject: nonmatch sub_0807CF88

---
 include/functions.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/functions.h b/include/functions.h
index 4866a847..e6be13bc 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -224,7 +224,7 @@ extern u32 sub_0807D24C(u32, const char*, u32);
 extern void sub_0807CF68(u32);
 extern u32 sub_0807D20C(u32, const char*, u32);
 extern u32 sub_0807CF88(u32, u8*);
-extern void sub_0807D184(u32, const char*);
+extern u32 sub_0807D184(u32, const char*);
 extern u32 sub_0806F520();
 extern void sub_0806F4E8(Entity*);
 extern u32 sub_0806F3E4(Entity*);
-- 
cgit v1.2.3


From b404b02bc2fffdef953935a33fb6f38098a23585 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Fri, 19 Feb 2021 05:32:39 +0100
Subject: cleaned some usage of ExecuteScriptCommandSet

---
 include/functions.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/functions.h b/include/functions.h
index e6be13bc..7f5b9cc1 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -9,6 +9,7 @@
 #include "player.h"
 #include "structures.h"
 #include "room.h"
+#include "script.h"
 
 // Identified - to be sorted into header files
 extern u32 Random(void);
@@ -43,7 +44,6 @@ extern void UpdateAnimationVariableFrames(Entity*, u32);
 extern void CopyPositionAndSpriteOffset(Entity*, Entity*);
 extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32);
 extern u32 LoadFixedGFX(Entity*, u32);
-extern void ExecuteScriptCommandSet();
 extern void _DmaFill32(u32, void*, u32);
 extern Entity* CreateItemEntity(u32, u32, u32);
 void _DmaCopy(const void* src, void* dst, u32 size);
-- 
cgit v1.2.3


From 2fda11f20c830a77e73be272897351b75ba7b816 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Fri, 19 Feb 2021 05:43:57 +0100
Subject: use proper function pointer in sub_0807DDAC

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

(limited to 'include')

diff --git a/include/functions.h b/include/functions.h
index 7f5b9cc1..d53ca901 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -86,13 +86,13 @@ extern void sub_0806F69C(Entity*);
 extern void sub_0805E3A0(void*, u32);
 extern void sub_0806D0B0(Entity*);
 extern void sub_0807DD64(Entity*);
-extern void sub_0807DDAC(Entity*, u32);
+extern void sub_0807DDAC(Entity*, void(*function)(Entity*, ScriptExecutionContext*));
 extern void sub_0807DDE4(Entity*);
 extern void sub_0806D02C(Entity*);
 extern u32 sub_0806F5A4(u32);
 extern void sub_08078784(Entity*, u32);
 extern void sub_0807DD50(Entity*);
-extern void sub_0807DD94(Entity*, u32);
+extern void sub_0807DD94(Entity*, void(*function)(Entity*, ScriptExecutionContext*));
 extern s32 sub_0806ED9C(Entity*, u32, u32);
 extern void sub_0807000C(Entity*);
 extern void sub_0805E47C(Entity*);
@@ -106,7 +106,6 @@ extern void sub_0806FD3C(Entity*);
 extern u32 sub_0801E99C(Entity*);
 extern void sub_0807DD50(Entity*);
 extern void sub_0806F118(Entity*);
-extern void sub_0807DD94(Entity*, u32);
 extern void sub_0805ED14(u32*);
 extern void sub_080A7C18(u32, u32, u32);
 extern void sub_08068BEC(Entity*, u32);
-- 
cgit v1.2.3


From aaea9b89f6916be97e39920a57ad589e9a412a6b Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Fri, 19 Feb 2021 06:31:07 +0100
Subject: improved signature of StartCutscene

---
 include/functions.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/functions.h b/include/functions.h
index d53ca901..7015294b 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -24,7 +24,7 @@ extern u32 CheckKinstoneFused(u32);
 extern void ForceEquipItem(u8, u8);
 extern void LoadRoomEntityList();
 void CopyPosition(Entity*, Entity*);
-extern u32* StartCutscene(Entity*, u8*);
+extern ScriptExecutionContext* StartCutscene(Entity*, u16*);
 extern void ResolveEntityOnTop(Entity*, Entity*);
 extern void EnemyFunctionHandler(Entity*, void (*const funcs[])(Entity*));
 extern u32 GetAnimationState(Entity*);
-- 
cgit v1.2.3


From 126feb121ff4409668f51a4a089fc87c25bb545c Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Fri, 19 Feb 2021 06:33:34 +0100
Subject: improved signature of StartPlayerScript

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

(limited to 'include')

diff --git a/include/script.h b/include/script.h
index 73d860e1..a3f29c84 100644
--- a/include/script.h
+++ b/include/script.h
@@ -4,17 +4,17 @@
 #include "global.h"
 
 typedef struct {
-    u16 * unk_00;
+    u16* unk_00;
     u32 unk_04;
     u32 unk_08;
-    u8 unk_0C[0x4];//unused
+    u8 unk_0C[0x4]; // unused
     u16 unk_10;
     u16 unk_12;
     u32 unk_14;
     u8 unk_18;
     u8 unk_19;
     u8 unk_1A;
-    u8 unk_1B;//unused
+    u8 unk_1B; // unused
     union SplitWord unk_1C;
     union SplitWord unk_20;
 } ScriptExecutionContext;
@@ -26,7 +26,7 @@ extern u32 GetNextScriptCommandWord(u16*);
 extern u32 GetNextScriptCommandWordAfterCommandMetadata(u16*);
 extern u32 GetNextScriptCommandHalfwordAfterCommandMetadata(u16*);
 
-extern void StartPlayerScript(u32);
+extern void StartPlayerScript(u16*);
 
 extern void sub_0807DEDC(Entity*, ScriptExecutionContext*, u32, u32);
 
-- 
cgit v1.2.3


From b2a06931667217640c1df4ff71e41d4d065c66a2 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Fri, 19 Feb 2021 10:33:19 +0100
Subject: moved script related functions from functions.h to script.h

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

(limited to 'include')

diff --git a/include/functions.h b/include/functions.h
index 7015294b..f2ced8b0 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -9,7 +9,6 @@
 #include "player.h"
 #include "structures.h"
 #include "room.h"
-#include "script.h"
 
 // Identified - to be sorted into header files
 extern u32 Random(void);
@@ -24,7 +23,6 @@ extern u32 CheckKinstoneFused(u32);
 extern void ForceEquipItem(u8, u8);
 extern void LoadRoomEntityList();
 void CopyPosition(Entity*, Entity*);
-extern ScriptExecutionContext* StartCutscene(Entity*, u16*);
 extern void ResolveEntityOnTop(Entity*, Entity*);
 extern void EnemyFunctionHandler(Entity*, void (*const funcs[])(Entity*));
 extern u32 GetAnimationState(Entity*);
@@ -86,13 +84,11 @@ extern void sub_0806F69C(Entity*);
 extern void sub_0805E3A0(void*, u32);
 extern void sub_0806D0B0(Entity*);
 extern void sub_0807DD64(Entity*);
-extern void sub_0807DDAC(Entity*, void(*function)(Entity*, ScriptExecutionContext*));
 extern void sub_0807DDE4(Entity*);
 extern void sub_0806D02C(Entity*);
 extern u32 sub_0806F5A4(u32);
 extern void sub_08078784(Entity*, u32);
 extern void sub_0807DD50(Entity*);
-extern void sub_0807DD94(Entity*, void(*function)(Entity*, ScriptExecutionContext*));
 extern s32 sub_0806ED9C(Entity*, u32, u32);
 extern void sub_0807000C(Entity*);
 extern void sub_0805E47C(Entity*);
diff --git a/include/script.h b/include/script.h
index a3f29c84..93b7554c 100644
--- a/include/script.h
+++ b/include/script.h
@@ -30,4 +30,7 @@ extern void StartPlayerScript(u16*);
 
 extern void sub_0807DEDC(Entity*, ScriptExecutionContext*, u32, u32);
 
+extern ScriptExecutionContext* StartCutscene(Entity*, u16*);
+extern void sub_0807DDAC(Entity*, void(*function)(Entity*, ScriptExecutionContext*));
+extern void sub_0807DD94(Entity*, void(*function)(Entity*, ScriptExecutionContext*));
 #endif
-- 
cgit v1.2.3