summaryrefslogtreecommitdiff
path: root/src/enemy
diff options
context:
space:
mode:
authorReinmmar <herwig.orlich@gmail.com>2023-09-20 16:45:23 +0200
committerReinmmar <herwig.orlich@gmail.com>2023-09-20 16:45:23 +0200
commitbdfaa7dc1a6fb95db00fe5029e505ffe98efed1d (patch)
tree9e829fa216c05c1bf8cab3d6a127076e482356c0 /src/enemy
parent4a1bbf3dd8b74756e94fe4a54b718212780467ae (diff)
found another place where animations hid
Diffstat (limited to 'src/enemy')
-rw-r--r--src/enemy/businessScrubPrologue.c2
-rw-r--r--src/enemy/enemy4D.c2
-rw-r--r--src/enemy/eyegore.c8
-rw-r--r--src/enemy/gyorgMale.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/enemy/businessScrubPrologue.c b/src/enemy/businessScrubPrologue.c
index aeaa5f6f..657d9d0b 100644
--- a/src/enemy/businessScrubPrologue.c
+++ b/src/enemy/businessScrubPrologue.c
@@ -66,7 +66,7 @@ void sub_08045C3C(BusinessScrubPrologueEntity* this) {
super->subtimer = 0;
this->unk_78 = super->x.HALF.HI;
this->unk_7a = super->y.HALF.HI;
- super->animationState = 0;
+ super->animationState = IdleNorth;
super->direction = 0x10;
super->action = 5;
super->timer = 120;
diff --git a/src/enemy/enemy4D.c b/src/enemy/enemy4D.c
index 7e0ee931..9fe5532b 100644
--- a/src/enemy/enemy4D.c
+++ b/src/enemy/enemy4D.c
@@ -108,7 +108,7 @@ void Enemy4D_Init(Enemy4DEntity* this) {
super->child = projectile;
COLLISION_ON(super);
super->spriteSettings.draw = TRUE;
- super->animationState = 2;
+ super->animationState = IdleEast;
this->unk_7b = 0;
this->unk_7c = 0;
this->unk_7e = 0x28;
diff --git a/src/enemy/eyegore.c b/src/enemy/eyegore.c
index f0c8efd5..1409dd50 100644
--- a/src/enemy/eyegore.c
+++ b/src/enemy/eyegore.c
@@ -146,7 +146,7 @@ void Eyegore_OnGrabbed(EyegoreEntity* this) {
void Eyegore_Init(EyegoreEntity* this) {
sub_0804A720(super);
super->action = 1;
- super->animationState = 2;
+ super->animationState = IdleEast;
super->x.HALF.HI &= 0xfff0;
super->y.HALF.HI = (super->y.HALF.HI & 0xfff0) + 0xc;
this->unk_6d |= 8;
@@ -198,7 +198,7 @@ void Eyegore_Action3(EyegoreEntity* this) {
GetNextFrame(super);
if ((super->frame & ANIM_DONE) != 0) {
super->flags |= ENT_COLLIDE;
- super->animationState = 2;
+ super->animationState = IdleEast;
sub_08030E58(this);
InitializeAnimation(super, 2);
sub_08030FB4(this);
@@ -242,7 +242,7 @@ void Eyegore_Action5(EyegoreEntity* this) {
GetNextFrame(super);
switch (super->frame & 7) {
case 1:
- if (super->animationState != 2) {
+ if (super->animationState != IdleEast) {
if (super->animationState >= 3) {
this->unk_7f = (super->animationState - 1) & 3;
} else {
@@ -266,7 +266,7 @@ void Eyegore_Action5(EyegoreEntity* this) {
if (sub_08049FDC(super, 1)) {
sub_08030E58(this);
} else {
- if (super->animationState == 2) {
+ if (super->animationState == IdleEast) {
super->action = 6;
super->flags &= ~ENT_COLLIDE;
InitializeAnimation(super, 0xe);
diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c
index 20f09035..275d0ab1 100644
--- a/src/enemy/gyorgMale.c
+++ b/src/enemy/gyorgMale.c
@@ -164,8 +164,8 @@ void sub_08046930(GyorgMaleEntity* this) {
return;
super->subAction = 1;
super->timer = 1;
- super->animationState = 0;
- super->direction = 0;
+ super->animationState = IdleNorth;
+ super->direction = IdleNorth;
#ifdef EU
super->speed = 0x200;
#else