summaryrefslogtreecommitdiff
path: root/src/object/object30.c
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2022-03-28 19:51:32 -0700
committertheo3 <arisstephenson2@gmail.com>2022-03-28 20:10:22 -0700
commit92240d43147dd36ed879ce1084f7ca6e35f1db96 (patch)
tree78a3119e1cd63d4f3333a3cade6cc622cdcb6db1 /src/object/object30.c
parent755571834d4fc0e21fdd45b065728c87574a3a07 (diff)
name remaining entity fields
Diffstat (limited to 'src/object/object30.c')
-rw-r--r--src/object/object30.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object/object30.c b/src/object/object30.c
index dca304b4..4f6f1d33 100644
--- a/src/object/object30.c
+++ b/src/object/object30.c
@@ -89,7 +89,7 @@ void Object30_Action2(Object30Entity* this) {
}
// fallthrough
case 1:
- tmp = gUnk_08121194[(super->field_0xf++ >> 3) & 7];
+ tmp = gUnk_08121194[(super->subtimer++ >> 3) & 7];
super->z.HALF.HI = tmp << 0x18 >> 0x18;
if (!IsCollidingPlayer(super)) {
return;
@@ -102,12 +102,12 @@ void Object30_Action2(Object30Entity* this) {
void sub_0808A968(Object30Entity* this) {
super->action = 2;
- super->actionDelay = 0x1e;
+ super->timer = 0x1e;
super->spriteSettings.draw = 1;
super->zVelocity = 0x28000;
super->spritePriority.b1 = 3;
super->spriteSettings.shadow = 0;
- super->field_0x3c |= 0x10;
+ super->collisionFlags |= 0x10;
super->hitbox = (Hitbox*)&gUnk_08121C58;
SetDefaultPriority(super, 2);
this->unk_70 = 0x2800;