Merge branch 'master' into master

6 files changed, 6 insertions, 6 deletions

diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c
index 932c7f6a..90ae7830 100644
--- a/src/enemy/bombPeahat.c
+++ b/src/enemy/bombPeahat.c
@@ -57,7 +57,7 @@ void sub_0802A8C8(Entity* this)
 void sub_0802A8E0(Entity *this)
 {
   this->previousActionFlag = 1;
-  this->filler[1] = 0x3c;
+  this->field_0x1d = 0x3c;
 }
 
 void sub_0802A8EC(Entity *this)
diff --git a/src/enemy/keese.c b/src/enemy/keese.c
index 825c75ed..980237ef 100644
--- a/src/enemy/keese.c
+++ b/src/enemy/keese.c
@@ -73,7 +73,7 @@ void sub_08021DF0(Entity *this)
     this->height.HALF.HI = -0x10;
   }
   this->direction = Random() & 0x1f;
-  this->filler[0] = 1;
+  this->field_0x1c = 1;
   this->spritePriority.b0 = 3;
   this->collisionLayer = 3;
   UpdateSpriteForCollisionLayer(this);
diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c
index 57fc25e3..a5b63f96 100644
--- a/src/enemy/octorok.c
+++ b/src/enemy/octorok.c
@@ -62,7 +62,7 @@ void sub_0801EB2C(Entity* ent) {
 
 void sub_0801EB68(Entity* ent) {
     ent->previousActionFlag = 1;
-    ent->filler[1] = 60;
+    ent->field_0x1d = 60;
 }
 
 void sub_0801EB74(Entity* ent) {
diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c
index c127367e..714d3788 100644
--- a/src/enemy/rupeeLike.c
+++ b/src/enemy/rupeeLike.c
@@ -25,7 +25,7 @@ void RupeeLike(Entity* this) {
     u32 uVar1;
 
     if (this->entityType.parameter == 0) {
-        uVar1 = sub_080043E8(this);
+        uVar1 = (u8)sub_080043E8(this);
         if (uVar1 != 0) {
             if (this->action == 4) {
                 sub_080296D8(this);
diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c
index c29fe80c..94eb8822 100644
--- a/src/enemy/smallPesto.c
+++ b/src/enemy/smallPesto.c
@@ -46,7 +46,7 @@ void sub_0803169C(Entity *this)
 void sub_080316DC(Entity *this)
 {
   this->previousActionFlag = 1;
-  this->filler[1] = 0x3c;
+  this->field_0x1d = 0x3c;
 }
 
 void sub_080316E8(Entity *this)
diff --git a/src/enemy/wisp.c b/src/enemy/wisp.c
index b54bda31..b56ff33a 100644
--- a/src/enemy/wisp.c
+++ b/src/enemy/wisp.c
@@ -85,7 +85,7 @@ void sub_08033674(Entity* this) {
     sub_0804A720(this);
     this->actionDelay = 0;
     this->action = 1;
-    this->filler[0] = 1;
+    this->field_0x1c = 1;
     this->field_0x80.HWORD = this->x.HALF.HI;
     this->field_0x82.HWORD = this->y.HALF.HI;
     sub_08033744(this);