Merge branch 'master' into cleanup_declarations

6 files changed, 26 insertions, 29 deletions

diff --git a/include/entity.h b/include/entity.h
index e40b281f..dc09ecd7 100644
--- a/include/entity.h
+++ b/include/entity.h
@@ -92,7 +92,7 @@ typedef struct Entity {
     /*0x1e*/ u8 frameIndex;
     /*0x1f*/ u8 lastFrameIndex;
     /*0x20*/ s32 field_0x20;
-    /*0x24*/ s16 nonPlanarMovement;
+    /*0x24*/ s16 speed;
     /*0x26*/ u8 spriteAnimation[3];
     /*0x29*/ struct {
     /*    */     u8 b0 : 3; // 1-4
diff --git a/include/functions.h b/include/functions.h
index 08e8c90e..48bcdd13 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -66,12 +66,9 @@ extern u32 sub_080045D4(s16, s16, u32, u32);
 extern void sub_0806F69C(Entity*);
 extern void sub_0805E3A0(void*, u32);
 extern void sub_0806D0B0(Entity*);
-extern void sub_0807DD64(Entity*);
-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 s32 sub_0806ED9C(Entity*, u32, u32);
 extern void sub_0807000C(Entity*);
 extern void sub_0805E47C(Entity*);
@@ -251,7 +248,7 @@ extern u32 sub_08052734(); // has Dungeon Map?
 extern u32 sub_08052764(); // has Dungeon Compass?
 extern u32 sub_0805279C(); // has Dungeon Big Key?
 extern u32 sub_080527CC(); // num Dungeon small keys?
-extern u32 sub_08053FE0();
+extern u32 GetItemPrice();
 extern void sub_08078790(Entity*, u32);
 extern void sub_080788E0(Entity*);
 extern void sub_08078AA8(u32, u32);
diff --git a/include/greatFairy.h b/include/greatFairy.h
index e9c5dfb9..6afb06dd 100644
--- a/include/greatFairy.h
+++ b/include/greatFairy.h
@@ -27,9 +27,4 @@ extern u8 gUnk_0812079C[8];
 extern s16 gSineTable[];
 extern s8 gUnk_081207AC[];
 
-typedef struct {
-    s32 unk0;
-    s32 unk4;
-} struct_08087424;
-
 #endif
diff --git a/include/manager.h b/include/manager.h
index f292baf2..d86f203c 100644
--- a/include/manager.h
+++ b/include/manager.h
@@ -26,7 +26,7 @@ typedef struct Manager {
     /*0x11*/ u8 unk_11[3];
     /*0x14*/ struct Manager* parent;
     /*0x18*/ u8 unk_18[0x8];
-    // union SplitHWord unk_20;
+    // union SplitHWord y;
     // u16 unk_22;
     // u16 unk_24;
     // u16 unk_26;
diff --git a/include/script.h b/include/script.h
index 9abc5291..cfc2c180 100644
--- a/include/script.h
+++ b/include/script.h
@@ -3,34 +3,39 @@
 
 #include "global.h"
 
-typedef struct {
-    u16* unk_00;
-    u32 unk_04;
-    u32 unk_08;
+typedef struct ScriptExecutionContext {
+    u16* scriptInstructionPointer;
+    u32 intVariable;
+    u32 postScriptActions;
     u8 unk_0C[0x4]; // unused
-    u16 unk_10;
+    u16 wait;
     u16 unk_12;
-    u32 unk_14;
+    u32 condition;
     u8 unk_18;
     u8 unk_19;
     u8 unk_1A;
     u8 unk_1B; // unused
-    union SplitWord unk_1C;
-    union SplitWord unk_20;
+    union SplitWord x;
+    union SplitWord y;
 } ScriptExecutionContext;
 
-extern void ExecuteScriptCommandSet(Entity*, ScriptExecutionContext*);
+void ExecuteScript(Entity* entity, ScriptExecutionContext* context);
 
 extern u32 GetNextScriptCommandHalfword(u16*);
 extern u32 GetNextScriptCommandWord(u16*);
 extern u32 GetNextScriptCommandWordAfterCommandMetadata(u16*);
 extern u32 GetNextScriptCommandHalfwordAfterCommandMetadata(u16*);
 
-extern void StartPlayerScript(u16*);
+void UnloadCutsceneData(Entity* entity);
+void StartPlayerScript(u16*);
 
-extern void sub_0807DEDC(Entity*, ScriptExecutionContext*, u32, u32);
+void sub_0807DD50(Entity* entity);
+void sub_0807DD64(Entity* entity);
+void sub_0807DD80(Entity* entity, u16* script);
+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*));
+ScriptExecutionContext* StartCutscene(Entity* entity, u16* script);
+void ExecuteScriptForEntity(Entity* entity, void (*postScriptCallback)(Entity*, ScriptExecutionContext*));
+void HandleEntity0x82Actions(Entity* entity);
+void sub_0807DD94(Entity*, void (*function)(Entity*, ScriptExecutionContext*));
 #endif
diff --git a/include/structures.h b/include/structures.h
index 66c2a6b6..52b725fc 100644
--- a/include/structures.h
+++ b/include/structures.h
@@ -120,13 +120,13 @@ extern struct_02024490 gUnk_02024490;
 
 typedef struct {
     u32 unk_00;
-    u16 unk_04;
-    u8 unk_06;
-    u8 unk_07;
+    u16 commandIndex;
+    u8 commandSize;
+    u8 flags;
     u8 unk_08;
 } struct_02033280;
 
-extern struct_02033280 gUnk_02033280;
+extern struct_02033280 gActiveScriptInfo;
 
 typedef struct {
     u16 unk_00;