summaryrefslogtreecommitdiff
path: root/src/enemy/eyegore.c
diff options
context:
space:
mode:
authorHenny022p <73211432+Henny022p@users.noreply.github.com>2026-02-08 18:32:38 +0100
committerGitHub <noreply@github.com>2026-02-08 18:32:38 +0100
commit5ab63f00e522ff69c5bc987e379f0163943f2833 (patch)
tree53622222ac729c6ab6dc75ef7f9bafa8031daf18 /src/enemy/eyegore.c
parent73901a0a012d55ebb66a4627dcb246d19737fcb5 (diff)
parent5b2cafdc894823d57beee8f3947a391d881d91de (diff)
Merge pull request #701 from Henny022p/cleanup/250302HEADmaster
Various code cleanup changes
Diffstat (limited to 'src/enemy/eyegore.c')
-rw-r--r--src/enemy/eyegore.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/enemy/eyegore.c b/src/enemy/eyegore.c
index dfa96343..28f62907 100644
--- a/src/enemy/eyegore.c
+++ b/src/enemy/eyegore.c
@@ -5,10 +5,15 @@
* @brief Eyegore enemy
*/
#include "enemy.h"
-#include "fade.h"
-#include "functions.h"
+#include "sound.h"
+#include "effects.h"
+#include "flags.h"
#include "hitbox.h"
#include "object.h"
+#include "asm.h"
+#include "room.h"
+#include "physics.h"
+#include "player.h"
#include "tiles.h"
typedef struct {
@@ -22,7 +27,7 @@ typedef struct {
/*0x79*/ u8 unk_79;
/*0x7a*/ u8 unk_7a;
/*0x7b*/ u8 unk_7b;
- /*0x7c*/ u16 unk_7c;
+ /*0x7c*/ u16 flag;
/*0x7e*/ u8 unk_7e;
/*0x7f*/ u8 unk_7f;
/*0x80*/ u16 tileIndex1;
@@ -151,7 +156,7 @@ void Eyegore_Init(EyegoreEntity* this) {
this->unk_76 = super->y.HALF.HI;
this->unk_7e = 0x3c;
sub_08030F00(this);
- if (this->unk_7c != 0) {
+ if (this->flag != 0) {
super->flags &= ~ENT_COLLIDE;
InitializeAnimation(super, 10);
} else {
@@ -160,7 +165,7 @@ void Eyegore_Init(EyegoreEntity* this) {
}
void Eyegore_Action1(EyegoreEntity* this) {
- if ((this->unk_7c != 0) && CheckFlags(this->unk_7c)) {
+ if ((this->flag != 0) && CheckFlags(this->flag)) {
sub_08031320(this);
}
}