diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-11-12 01:34:34 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-11-12 01:34:34 -0800 |
| commit | ecc8a1439ddeedd458af5427711e07e146ed4612 (patch) | |
| tree | efe4f755b15c985ecba9c4a0ad7e3759cd510e3d /src/enemy/fallingBoulder.c | |
| parent | f70c95f0373d659683840682d327da3db774659c (diff) | |
remove redundant unions
Diffstat (limited to 'src/enemy/fallingBoulder.c')
| -rw-r--r-- | src/enemy/fallingBoulder.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c index 039c817f..6084d868 100644 --- a/src/enemy/fallingBoulder.c +++ b/src/enemy/fallingBoulder.c @@ -32,7 +32,7 @@ void sub_0802C254(Entity* this) { void sub_0802C258(Entity* this) { sub_0804A720(this); - this->hVelocity = 0x20000; + this->zVelocity = 0x20000; this->actionDelay = 2; this->field_0x7a.HWORD = Random() & 0x70; switch (this->type) { @@ -45,7 +45,7 @@ void sub_0802C258(Entity* this) { } this->field_0x80.HWORD = this->x.HALF.HI; this->field_0x82.HWORD = this->y.HALF.HI; - this->height.HALF.HI = -0x10; + this->z.HALF.HI = -0x10; this->collisionLayer = 3; this->spriteRendering.b3 = 1; this->spritePriority.b0 = 2; @@ -70,7 +70,7 @@ NONMATCH("asm/non_matching/fallingBoulder/sub_0802C334.inc", void sub_0802C334(E return; } this->field_0x7c.HALF.LO = 1; - this->spriteSettings.b.draw = 1; + this->spriteSettings.draw = 1; } GetNextFrame(this); this->field_0x7c.HALF.HI = COORD_TO_TILE(this); @@ -113,7 +113,7 @@ NONMATCH("asm/non_matching/fallingBoulder/sub_0802C334.inc", void sub_0802C334(E sub_080AEFB4(this); } else { sub_0806F69C(this); - if (this->height.HALF.HI - y > 0x38) { + if (this->z.HALF.HI - y > 0x38) { sub_0802C62C(this); this->field_0x7a.HWORD = (Random() & 0x7f) | 0x80; if (this->type == 3) { @@ -190,7 +190,7 @@ void sub_0802C4B0(Entity* this) { } rand = Random() & 7; - this->hVelocity = 0x20000; + this->zVelocity = 0x20000; if (rand & 4) { if (rand & 3) { *(u32*)&this->cutsceneBeh = gUnk_080CD58C[offset | 1]; @@ -210,7 +210,7 @@ void sub_0802C62C(Entity* this) { this->action = 1; this->y.HALF.HI = this->field_0x82.HWORD; this->x.HALF.HI = this->field_0x80.HWORD; - this->spriteSettings.b.draw = 0; + this->spriteSettings.draw = 0; COLLISION_OFF(this); this->field_0x7c.HALF.LO = 0; } |