name remaining entity fields

This commit is contained in:
theo3
2022-03-28 19:51:32 -07:00
parent 755571834d
commit 92240d4314
348 changed files with 3850 additions and 3850 deletions
+12 -12
View File
@@ -28,8 +28,8 @@ void ArrowProjectile_OnTick(Entity* this) {
}
void sub_080A9334(Entity* this) {
if ((this->bitfield & 0x80) != 0) {
if ((this->bitfield & 0x3f) != 0) {
if ((this->contactFlags & 0x80) != 0) {
if ((this->contactFlags & 0x3f) != 0) {
ModHealth(-2);
sub_080A9488(this);
this->knockbackDuration = 0;
@@ -44,8 +44,8 @@ void ArrowProjectile_Init(Entity* this) {
this->action = 1;
this->spriteSettings.draw = 1;
COLLISION_OFF(this);
this->actionDelay = 0x6a;
this->field_0xf = 0;
this->timer = 0x6a;
this->subtimer = 0;
this->zVelocity = 0xa00;
sub_080A94C0(this, this->type);
}
@@ -55,10 +55,10 @@ void ArrowProjectile_Action1(Entity* this) {
if ((parent == NULL) || (parent->next == NULL)) {
DeleteThisEntity();
}
if (this->field_0xf != 0) {
if (this->subtimer != 0) {
DeleteThisEntity();
}
if (parent->field_0xf != 0) {
if (parent->subtimer != 0) {
this->action = 2;
COLLISION_ON(this);
parent->child = NULL;
@@ -70,18 +70,18 @@ void ArrowProjectile_Action2(Entity* this) {
if (this->collisions != COL_NONE) {
this->action = 3;
COLLISION_OFF(this);
this->actionDelay = 0x20;
this->timer = 0x20;
InitializeAnimation(this, this->animIndex + 2);
EnqueueSFX(SFX_18A);
LinearMoveUpdate(this);
} else if (--this->actionDelay == 0) {
} else if (--this->timer == 0) {
DeleteThisEntity();
}
ProcessMovement3(this);
}
void ArrowProjectile_Action3(Entity* this) {
if (--this->actionDelay == 0) {
if (--this->timer == 0) {
DeleteThisEntity();
}
GetNextFrame(this);
@@ -92,8 +92,8 @@ void ArrowProjectile_Action4(Entity* this) {
CreateDust(this);
DeleteThisEntity();
} else {
if (--this->actionDelay == 0) {
this->actionDelay = 2;
if (--this->timer == 0) {
this->timer = 2;
this->animationState = (this->animationState + 1) & 3;
sub_080A94C0(this, this->animationState);
}
@@ -103,7 +103,7 @@ void ArrowProjectile_Action4(Entity* this) {
void sub_080A9488(Entity* this) {
this->action = 4;
COLLISION_OFF(this);
this->actionDelay = 2;
this->timer = 2;
this->zVelocity = 0x18000;
this->animationState = (this->knockbackDirection & 0x18) >> 3;
EnqueueSFX(SFX_METAL_CLINK);