1 files changed, 7 insertions, 7 deletions

diff --git a/src/object/object49.c b/src/object/object49.c
index e871d959..16bf7bb9 100644
--- a/src/object/object49.c
+++ b/src/object/object49.c
@@ -19,7 +19,7 @@ extern void (*const gUnk_08121E98[])(Entity*);
 extern const u16 gUnk_08121EA0[];
 
 void Object49(Entity* this) {
-    gUnk_08121E5C[this->entityType.form](this);
+    gUnk_08121E5C[this->type](this);
 }
 
 void sub_0808F0B8(Entity* this) {
@@ -179,10 +179,10 @@ void sub_0808F3DC(Entity* this) {
         this->spriteSettings.b.draw = 1;
         this->action = 1;
         this->actionDelay = 120;
-        InitializeAnimation(this, this->entityType.form + 1);
+        InitializeAnimation(this, this->type + 1);
         // TODO: This block of code might supposed to be a switch statement.
-        if (this->entityType.form != 8) {
-            if (this->entityType.form == 7) {
+        if (this->type != 8) {
+            if (this->type == 7) {
                 sub_0806FAD8(this->attachedEntity, this);
                 return;
             }
@@ -193,13 +193,13 @@ void sub_0808F3DC(Entity* this) {
         ResolveEntityOnTop(this->attachedEntity, this);
     } else {
         if (*(u32*)&this->parent->field_0x74 == 0) {
-            if (this->entityType.form == 8) {
+            if (this->type == 8) {
                 this->attachedEntity->damageType = this->damageType;
             }
             DeleteThisEntity();
         }
 
-        if (this->entityType.form == 5 && this->frames.b.f0) {
+        if (this->type == 5 && this->frames.b.f0) {
             Entity* entity = CreateObjectWithParent(this->attachedEntity, 0x49, 8, 0);
             if (entity) {
                 entity->parent = this->parent;
@@ -233,7 +233,7 @@ void sub_0808F498(Entity* this) {
     } else {
         this->action = 1;
         this->actionDelay = 64;
-        var0 = this->entityType.parameter != 0 ? 44 : 43;
+        var0 = this->type2 != 0 ? 44 : 43;
         this->x.HALF.HI -= this->parent->hitbox->width;
         this->x.HALF.HI += (s32)Random() % (this->parent->hitbox->width * 2);
         this->y.HALF.HI -= this->parent->hitbox->height;