mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-09 20:11:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cleanup_declarations

Browse Source
This commit is contained in:
Henny022p
2021-03-15 22:56:23 +01:00
parent aac7eb7436 e09678c6ab
commit a2cdfd6d8d
549 changed files with 18187 additions and 4914 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/spearMoblin.c
+9 -9
View File
@@ -58,7 +58,7 @@ void sub_08028284(Entity* this) {
this->attachedEntity->hurtBlinkTime = this->hurtBlinkTime;
if (this->currentHealth == 0) {
this->nonPlanarMovement = 0;
this->speed = 0;
this->field_0x82.HALF.LO = 0;
sub_080287E0(this);
DeleteEntity(this->attachedEntity);
@@ -86,7 +86,7 @@ void sub_08028314(Entity* this) {
if (this->actionDelay) {
this->animationState = this->type2 << 1;
this->actionDelay = 0x1e;
this->nonPlanarMovement = 0x80;
this->speed = 0x80;
this->direction = this->animationState << 2;
sub_080287E0(this);
} else {
@@ -164,13 +164,13 @@ void sub_08028488(Entity* this) {
switch (this->field_0x82.HALF.LO) {
case 3:
this->action = 4;
this->nonPlanarMovement = 0x180;
this->speed = 0x180;
this->direction = sub_08049F84(this, 1);
EnqueueSFX(0x11e);
break;
case 2:
this->action = 2;
this->nonPlanarMovement = 0;
this->speed = 0;
this->actionDelay = (Random() & 7) * 3 + 0x40;
break;
case 4:
@@ -180,7 +180,7 @@ void sub_08028488(Entity* this) {
default:
this->action = 1;
this->field_0x82.HALF.LO = 1;
this->nonPlanarMovement = 0x80;
this->speed = 0x80;
this->actionDelay = (Random() & 7) * 3 + 0x22;
break;
}
@@ -245,7 +245,7 @@ void sub_08028604(Entity* this) {
this->field_0xf = 0;
if (this->field_0x82.HALF.LO == 1) {
this->actionDelay = gUnk_080CC7BC[Random() & 3];
this->nonPlanarMovement = 0x80;
this->speed = 0x80;
if (sub_08049FA0(this) != 0) {
this->direction = gUnk_080CC7D0[Random() & 7] + 0x18 + this->direction & 0x18;
} else {
@@ -262,7 +262,7 @@ void sub_08028604(Entity* this) {
}
} else {
this->actionDelay = 0xc;
this->nonPlanarMovement = 0;
this->speed = 0;
}
if (this->direction >> 2 != this->animationState) {
@@ -324,7 +324,7 @@ void sub_080287B4(Entity* this) {
this->field_0xf = 0;
this->field_0x80.HALF.LO = 0;
this->field_0x7a.HALF.HI = 0;
this->nonPlanarMovement = 0;
this->speed = 0;
this->field_0x82.HALF.LO = 0;
sub_080287E0(this);
}
@@ -371,7 +371,7 @@ void sub_08028858(Entity* this) {
this->hitbox->height = box->height;
if (this->field_0x82.HALF.LO == 0) {
this->nonPlanarMovement = 0;
this->speed = 0;
}
ProcessMovement(this);