Merge pull request #119 from Henny022p/master

Decompiled code_0807CC3C

3 files changed, 8 insertions, 7 deletions

diff --git a/src/object/cloud.c b/src/object/cloud.c
index 8a133c2e..631e6605 100644
--- a/src/object/cloud.c
+++ b/src/object/cloud.c
@@ -4,6 +4,7 @@
 #include "player.h"
 #include "flags.h"
 #include "functions.h"
+#include "structures.h"
 
 extern void sub_0809F7BC(Entity*);
 extern void PlaySFX(u32);
@@ -22,7 +23,6 @@ extern Entity* CreateObject(u32, u32, u32);
 extern void PositionEntityOnTop(Entity*, Entity*);
 extern void sub_0807BB68(u32*, u32, u32);
 
-extern u8 gUnk_02034490;
 extern void* gUnk_080DD750;
 extern Entity gPlayerEntity;
 extern PlayerState gPlayerState;
@@ -48,7 +48,7 @@ void sub_0809F514(Entity* this) {
     this->spriteSettings.b.draw = 0;
     this->field_0x68.HALF.LO = 12;
     gRoomControls.cameraTarget = this;
-    gUnk_02034490 = 255;
+    gUnk_02034490[0] = 255;
     sub_0809F7BC(this);
 }
 
diff --git a/src/object/houseDoorExterior.c b/src/object/houseDoorExterior.c
index cdee3afe..ddf5b87e 100644
--- a/src/object/houseDoorExterior.c
+++ b/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;
@@ -64,7 +65,7 @@ void sub_080866D8(Entity* this) {
                 UpdateSpriteForCollisionLayer(entity);
                 *((u32*)(&this->field_0x68)) |= mask;
                 if (prop->unk8) {
-                    *((u32**)(&entity->cutsceneBeh)) = StartCutscene(entity, prop->unk8);
+                    *((ScriptExecutionContext **)(&entity->cutsceneBeh)) = StartCutscene(entity, (u16*)prop->unk8);
                 }
             }
         }
@@ -116,7 +117,7 @@ static void sub_0808681C(Entity* this) {
     }
 
     if (this->flags & 0x2) {
-        ExecuteScriptCommandSet(this, *(u32**)&this->cutsceneBeh);
+        ExecuteScriptCommandSet(this, *(ScriptExecutionContext **)&this->cutsceneBeh);
         sub_080868EC(this, *(void**)&this->cutsceneBeh);
     }
 }
@@ -128,7 +129,7 @@ void sub_080868B0(Entity* this) {
         this->boundingBox = &gUnk_081206AC;
         this->actionDelay = 8;
     }
-    ExecuteScriptCommandSet(this, *(u32**)&this->cutsceneBeh);
+    ExecuteScriptCommandSet(this, *(ScriptExecutionContext **)&this->cutsceneBeh);
     sub_080868EC(this, *(void**)&this->cutsceneBeh);
 }
 
diff --git a/src/object/windcrest.c b/src/object/windcrest.c
index ff559344..a4c4049d 100644
--- a/src/object/windcrest.c
+++ b/src/object/windcrest.c
@@ -2,9 +2,9 @@
 #include "entity.h"
 #include "functions.h"
 #include "save.h"
+#include "script.h"
 
 extern void sub_0807DD64(Entity*);
-extern void sub_0807DDAC(Entity*, u32);
 extern void sub_0807DDE4(Entity*);
 extern void sub_08078850(Entity*, u32, u32, u8*);
 extern void PlaySFX(u32);
@@ -18,7 +18,7 @@ void Windcrest(Entity* this) {
         this->frameIndex = 0;
         sub_0807DD64(this);
     }
-    sub_0807DDAC(this, 0);
+    sub_0807DDAC(this, NULL);
     sub_0807DDE4(this);
 }