Merge pull request #616 from octorock/npcs

Create new entity structs for NPCs

5 files changed, 9 insertions, 9 deletions

diff --git a/src/object/cameraTarget.c b/src/object/cameraTarget.c
index 57a5623a..9c001915 100644
--- a/src/object/cameraTarget.c
+++ b/src/object/cameraTarget.c
@@ -49,10 +49,10 @@ void CameraTarget(Entity* this) {
 
     u32 uVar2 = gPlayerState.field_0x27[0] > 0;
 
-    switch (gFuseInfo._0) {
-        case 0:
-        case 1:
-        case 2:
+    switch (gFuseInfo.fusionState) {
+        case FUSION_STATE_0:
+        case FUSION_STATE_1:
+        case FUSION_STATE_2:
             if ((gMessage.doTextBox & 0x7f) == 0) {
                 break;
             }
diff --git a/src/object/cuccoMinigame.c b/src/object/cuccoMinigame.c
index f6b02dd1..efdf3a41 100644
--- a/src/object/cuccoMinigame.c
+++ b/src/object/cuccoMinigame.c
@@ -108,7 +108,7 @@ void CuccoMinigame(CuccoMinigameEntity* this) {
         sub_0807DD64(super);
         sub_0806EC20(super);
     }
-    sub_0807DD94(super, 0);
+    ExecuteScriptAndHandleAnimation(super, NULL);
 }
 
 NONMATCH("asm/non_matching/objectB9/sub_080A1270.inc", void sub_080A1270(CuccoMinigameEntity* this)) {
diff --git a/src/object/cutsceneOrchestrator.c b/src/object/cutsceneOrchestrator.c
index aee672f1..efc726a3 100644
--- a/src/object/cutsceneOrchestrator.c
+++ b/src/object/cutsceneOrchestrator.c
@@ -13,9 +13,9 @@ void CutsceneOrchestrator(Entity* this) {
         if (this->action == 0) {
             this->action = 1;
             this->hitbox = (Hitbox*)&gHitbox_2;
-            sub_0807DD50(this);
+            InitScriptForNPC(this);
         } else {
-            sub_0807DD94(this, NULL);
+            ExecuteScriptAndHandleAnimation(this, NULL);
         }
     } else {
         this->action = 1;
diff --git a/src/object/keyStealingTakkuri.c b/src/object/keyStealingTakkuri.c
index 1b166cab..a3f516d5 100644
--- a/src/object/keyStealingTakkuri.c
+++ b/src/object/keyStealingTakkuri.c
@@ -478,7 +478,7 @@ void sub_0809E1F0(KeyStealingTakkuriEntity* this) {
 }
 
 void sub_0809E210(KeyStealingTakkuriEntity* this) {
-    gPlayerEntity.animationState = sub_0806F5B0(GetFacingDirection(&gPlayerEntity, super)) & 0xfe;
+    gPlayerEntity.animationState = GetAnimationStateForDirection8(GetFacingDirection(&gPlayerEntity, super)) & 0xfe;
     gPlayerState.animation = 0x100;
 }
 
diff --git a/src/object/pullableMushroom.c b/src/object/pullableMushroom.c
index 3200afbf..b231911a 100644
--- a/src/object/pullableMushroom.c
+++ b/src/object/pullableMushroom.c
@@ -198,7 +198,7 @@ void sub_0808ACEC(PullableMushroomEntity* this) {
         case 0x14:
         case 0x16:
             COLLISION_OFF(super);
-            super->animationState = sub_0806F5A4(super->knockbackDirection);
+            super->animationState = GetAnimationStateForDirection4(super->knockbackDirection);
             super->subAction = 2;
             super->timer = 2;
             break;