summaryrefslogtreecommitdiff
path: root/src/enemy/vaatiArm.c
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2023-12-30 20:05:32 -0800
committertheo3 <arisstephenson2@gmail.com>2023-12-30 20:05:32 -0800
commit201955ea052a5188f2e59bdcdbf6c52ff158ee66 (patch)
tree66474a7515b56c90e1d0b94a0a39f42da6677d71 /src/enemy/vaatiArm.c
parent37714644960c56650dd1067b86aafa685eaf01f4 (diff)
create enemy struct and enemy flags
Diffstat (limited to 'src/enemy/vaatiArm.c')
-rw-r--r--src/enemy/vaatiArm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c
index 476730df..65ace01e 100644
--- a/src/enemy/vaatiArm.c
+++ b/src/enemy/vaatiArm.c
@@ -43,7 +43,7 @@ typedef struct VaatiArm_HeapStruct {
VaatiArm_HeapStruct1 s1[5];
} VaatiArm_HeapStruct;
-extern void sub_0804AA1C(Entity*);
+extern void EnemyDetachFX(Entity*);
static u32 sub_080437DC(VaatiArmEntity*);
static bool32 sub_08043C98(VaatiArmEntity*);
@@ -835,7 +835,7 @@ static void sub_08043130(VaatiArmEntity* this) {
if (super->spriteSettings.draw == 0) {
super->subAction = 9;
super->timer = 60;
- sub_0804AA1C(super);
+ EnemyDetachFX(super);
}
}
}
@@ -913,7 +913,7 @@ void sub_080432A8(VaatiArmEntity* this) {
super->subAction = 1;
super->timer = 0x1e;
((VaatiArm_HeapStruct*)super->myHeap)->s1[0].unk04.HWORD = 0x4000;
- sub_0804AA1C(&((VaatiArm_HeapStruct*)super->myHeap)->entities[4]->base);
+ EnemyDetachFX(&((VaatiArm_HeapStruct*)super->myHeap)->entities[4]->base);
}
}
@@ -1066,7 +1066,7 @@ static void sub_08043580(VaatiArmEntity* this) {
entity->collisionFlags = entity->collisionFlags | 0x10;
entity->hitType = 0x39;
entity->hitbox = (Hitbox*)&gUnk_080FD538;
- sub_0804AA1C(super);
+ EnemyDetachFX(super);
}
}
@@ -1443,7 +1443,7 @@ static void sub_08043D08(VaatiArmEntity* this) {
entity->flags &= ~ENT_COLLIDE;
entity->spriteSettings.draw = 0;
InitializeAnimation(entity, 0x13);
- sub_0804AA1C(entity);
+ EnemyDetachFX(entity);
fx = CreateFx(entity, FX_GIANT_EXPLOSION4, 0);
if (fx != NULL) {
fx->x.HALF.HI += gUnk_080D13E9[super->type2];