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
+20 -20
View File
@@ -38,14 +38,14 @@ void sub_0808BB30(Object36Entity* this) {
} else {
super->action = 1;
super->flags |= ENT_COLLIDE;
super->actionDelay = 0x78;
super->field_0xf = 0;
super->timer = 0x78;
super->subtimer = 0;
super->spriteRendering.b3 = 3;
super->spritePriority.b0 = 4;
super->spriteOrientation.flipY = 2;
super->speed = 0x300;
super->hitType = 1;
super->field_0x3c = 7;
super->collisionFlags = 7;
super->hurtType = 0x48;
super->flags2 = 4;
super->hitbox = (Hitbox*)&gHitbox_0;
@@ -71,7 +71,7 @@ void sub_0808BBE0(Object36Entity* this) {
ptr = &gUnk_0812144C[diff * 2];
SetAffineInfo(super, ptr[0], ptr[1], 0);
} else {
super->bitfield &= 0x7f;
super->contactFlags &= 0x7f;
}
}
@@ -81,29 +81,29 @@ void sub_0808BC3C(Object36Entity* this) {
tmp = -0x170;
super->y.HALF.HI = gRoomControls.origin_y - ((super->parent)->zVelocity + tmp);
sub_0808BBE0(this);
if (super->bitfield == 0x93) {
super->actionDelay--;
if (super->contactFlags == 0x93) {
super->timer--;
super->spriteSettings.draw = 1;
if (super->actionDelay == 0) {
if (super->timer == 0) {
SetGlobalFlag(LV1TARU_OPEN);
super->action = 2;
super->field_0xf = 0x80;
super->subtimer = 0x80;
super->spriteOffsetY = 0;
} else {
if ((super->actionDelay & 1) != 0) {
if ((super->timer & 1) != 0) {
super->x.HALF.HI += ((Random() & 3) - 2);
super->y.HALF.HI += ((Random() & 3) - 1);
}
if (super->field_0xf != 1) {
super->field_0xf = 1;
if (super->subtimer != 1) {
super->subtimer = 1;
LoadGfxGroup(0x4a);
}
}
} else {
super->actionDelay = 0x78;
super->timer = 0x78;
super->spriteSettings.draw = 0;
if (super->field_0xf != 0) {
super->field_0xf = 0;
if (super->subtimer != 0) {
super->subtimer = 0;
LoadGfxGroup(0x49);
}
}
@@ -117,11 +117,11 @@ void sub_0808BD00(Object36Entity* this) {
void sub_0808BD14(Object36Entity* this) {
if (super->field_0xf != 0) {
super->field_0xf -= 8;
SetAffineInfo(super, 0x200 - super->field_0xf, 0x200 - super->field_0xf, 0);
if (super->subtimer != 0) {
super->subtimer -= 8;
SetAffineInfo(super, 0x200 - super->subtimer, 0x200 - super->subtimer, 0);
}
if (super->bitfield == 0x93) {
if (super->contactFlags == 0x93) {
super->direction = GetFacingDirection(super, &gPlayerEntity);
LinearMoveUpdate(super);
if (EntityWithinDistance(super, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI - 6, 0x1c)) {
@@ -130,10 +130,10 @@ void sub_0808BD14(Object36Entity* this) {
} else {
if ((super->flags & ENT_COLLIDE) != 0) {
super->flags &= ~ENT_COLLIDE;
super->actionDelay = 0x1e;
super->timer = 0x1e;
} else {
super->spriteSettings.draw ^= 1;
if (--super->actionDelay == 0) {
if (--super->timer == 0) {
sub_0808BD00(this);
}
}