moved script related functions from functions.h to script.h

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*);

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

src/npc/beedle.c

@@ -4,6 +4,7 @@
 #include "textbox.h"
 #include "player.h"
 #include "room.h"
+#include "script.h"
 
 typedef struct {
     u32 unk_00;

src/npc/bigGoron.c

@@ -3,6 +3,7 @@
 #include "player.h"
 #include "structures.h"
 #include "functions.h"
+#include "script.h"
 
 extern void (*gUnk_081140D4[])(Entity*);
 

src/npc/bladeBrothers.c

@@ -6,6 +6,7 @@
 #include "room.h"
 #include "textbox.h"
 #include "save.h"
+#include "script.h"
 
 extern void (*gUnk_081115C0[])(Entity*);
 extern void (*gUnk_081115D0[])(Entity*);
@@ -126,7 +127,7 @@ void FUN_08068b2c(Entity* this) {
         InitAnimationForceUpdate(this, uVar1);
         sub_0806F118(this);
     } else {
-        sub_0807DD94(this, 0);
+        sub_0807DD94(this, NULL);
     }
 }
 

src/npc/festari.c

@@ -3,6 +3,7 @@
 #include "functions.h"
 #include "npc.h"
 #include "player.h"
+#include "script.h"
 
 extern u32 sub_0801E99C(Entity*);
 extern void sub_08078784(Entity*, u32);
@@ -37,7 +38,7 @@ void sub_0805FE48(Entity* this) {
         InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)));
         sub_0806F118(this);
     } else {
-        ExecuteScriptCommandSet(this, *(void**)&this->cutsceneBeh);
+        ExecuteScriptCommandSet(this, *(ScriptExecutionContext **)&this->cutsceneBeh);
         sub_0805FF2C(this, *(void**)&this->cutsceneBeh);
         uVar4 = this->field_0x80.HWORD;
         if (uVar4 < 8) {

src/npc/forestMinish.c

@@ -7,6 +7,7 @@
 #include "structures.h"
 #include "functions.h"
 #include "save.h"
+#include "script.h"
 
 extern void sub_0807DD50(Entity*);
 extern void sub_0806F118(Entity*);

src/npc/goron.c

@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "functions.h"
 #include "textbox.h"
+#include "script.h"
 
 extern void (*gUnk_08111A80[])(Entity*);
 extern void (*gUnk_08111A8C[])(Entity*);
@@ -61,7 +62,7 @@ void sub_080693C4(Entity* this) {
 void sub_08069428(Entity* this, s32 offsetX, bool32 createFx65);
 
 void sub_080693D0(Entity* this) {
-    sub_0807DD94(this, 0);
+    sub_0807DD94(this, NULL);
     if (this->animIndex == 8) {
         u32 var0 = this->field_0x82.HWORD & 0xF;
         bool32 createFx65 = BOOLCAST(var0); // = !var0

src/npc/goronMerchant.c

@@ -5,6 +5,7 @@
 #include "textbox.h"
 #include "room.h"
 #include "flags.h"
+#include "script.h"
 
 extern u32 sub_080696BC(Entity*);
 
@@ -70,7 +71,7 @@ void sub_0806963C(Entity* this) {
 }
 
 void sub_08069654(Entity* this) {
-    sub_0807DD94(this, 0);
+    sub_0807DD94(this, NULL);
 }
 
 void sub_08069660(Entity* this) {

src/npc/librari.c

@@ -4,6 +4,7 @@
 #include "flags.h"
 #include "textbox.h"
 #include "functions.h"
+#include "script.h"
 
 extern u16 gUnk_08112D48[];
 
@@ -24,7 +25,7 @@ void Librari(Entity* this) {
                 this->interactType = 0;
                 sub_0806F118(this);
             } else {
-                sub_0807DDAC(this, 0);
+                sub_0807DDAC(this, NULL);
                 sub_0807DDE4(this);
                 UpdateAnimationSingleFrame(this);
             }

src/npc/malon.c

@@ -1,6 +1,7 @@
 #include "global.h"
 #include "functions.h"
 #include "entity.h"
+#include "script.h"
 
 extern Entity gPlayerEntity;
 
@@ -44,7 +45,7 @@ void sub_080658BC(Entity* this) {
         InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)));
         sub_0806F118(this);
     } else {
-        sub_0807DD94(this, 0);
+        sub_0807DD94(this, NULL);
     }
 }
 

src/npc/mayorHagen.c

@@ -9,6 +9,7 @@
 #include "structures.h"
 #include "functions.h"
 #include "save.h"
+#include "script.h"
 
 extern void sub_0807DD50(Entity*);
 extern u32 sub_0806F5A4(u32);

src/npc/melari.c

@@ -3,6 +3,7 @@
 #include "npc.h"
 #include "textbox.h"
 #include "functions.h"
+#include "script.h"
 
 extern void sub_08068780(Entity*);
 extern void sub_08078778(Entity*);

src/npc/mutoh.c

@@ -7,6 +7,7 @@
 #include "structures.h"
 #include "functions.h"
 #include "save.h"
+#include "script.h"
 
 extern void sub_0807DD50(Entity*);
 extern u32 GetFacingDirection(Entity*, Entity*);

src/npc/percy.c

@@ -4,6 +4,7 @@
 #include "textbox.h"
 #include "functions.h"
 #include "flags.h"
+#include "script.h"
 
 extern void sub_0806B41C(Entity*);
 extern void sub_0806B3CC(Entity*);

src/npc/rem.c

@@ -1,6 +1,7 @@
 #include "global.h"
 #include "functions.h"
 #include "entity.h"
+#include "script.h"
 
 extern void sub_0807DDE4(Entity*);
 extern void PlaySFX(u32);

src/npc/simon.c

@@ -3,6 +3,7 @@
 #include "functions.h"
 #include "room.h"
 #include "flags.h"
+#include "script.h"
 
 typedef struct {
     u8 filler[4];

src/npc/smith.c

@@ -3,6 +3,7 @@
 #include "textbox.h"
 #include "functions.h"
 #include "save.h"
+#include "script.h"
 
 extern u32 GetFacingDirection(Entity*, Entity*);
 extern u32 sub_0806F5A4(u32);

src/npc/stamp.c

@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "textbox.h"
 #include "functions.h"
+#include "script.h"
 
 extern void sub_08078778(Entity*);
 extern void sub_0805E47C(Entity*);

src/npc/talon.c

@@ -3,6 +3,7 @@
 #include "textbox.h"
 #include "functions.h"
 #include "player.h"
+#include "script.h"
 
 extern void (*gUnk_0810FEC4[])(Entity* this);
 extern void (*gUnk_0810FEBC[])(Entity* this);

src/npc/teachers.c

@@ -3,6 +3,7 @@
 #include "player.h"
 #include "functions.h"
 #include "save.h"
+#include "script.h"
 
 extern SpriteLoadData gUnk_08113910[];
 extern void sub_0807DD50(Entity*);

src/npc/townMinish.c

@@ -5,6 +5,7 @@
 #include "textbox.h"
 #include "flags.h"
 #include "save.h"
+#include "script.h"
 
 extern void InitializeAnimation(Entity*, u32);
 extern u32 LoadExtraSpriteData(Entity*, SpriteLoadData*);

src/npc/townsperson.c

@@ -7,6 +7,7 @@
 #include "structures.h"
 #include "functions.h"
 #include "save.h"
+#include "script.h"
 
 typedef struct {
     u8 frame1;

src/npc/windTribespeople.c

@@ -6,6 +6,7 @@
 #include "structures.h"
 #include "functions.h"
 #include "save.h"
+#include "script.h"
 
 extern u32 LoadExtraSpriteData(Entity*, SpriteLoadData*);
 extern void sub_0807DD50(Entity*);

src/npc/zelda.c

@@ -3,6 +3,7 @@
 #include "functions.h"
 #include "room.h"
 #include "flags.h"
+#include "script.h"
 
 extern void PrependEntityToList(Entity*, u32);
 extern void sub_0807DD50(Entity*);

src/object/houseDoorExterior.c

@@ -3,6 +3,7 @@
 #include "flags.h"
 #include "functions.h"
 #include "room.h"
+#include "script.h"
 
 typedef struct {
     /*0x00*/ u16 unk0;

src/object/windcrest.c

@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "functions.h"
 #include "save.h"
+#include "script.h"
 
 extern void sub_0807DD64(Entity*);
 extern void sub_0807DDE4(Entity*);