From b5734d09a469ea679b01cdb2f6eb1a267b068d20 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Sun, 9 Mar 2025 16:56:10 +0000
Subject: [PATCH] cleanup

---
 include/area.h              | 2 +-
 src/enemy/chuchuBoss.c      | 1 -
 src/enemy/peahat.c          | 2 +-
 src/manager/miscManager.c   | 2 +-
 src/npc/castorWildsStatue.c | 4 ++--
 src/object/evilSpirit.c     | 1 -
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/include/area.h b/include/area.h
index 0bfbf919..8c49e393 100644
--- a/include/area.h
+++ b/include/area.h
@@ -83,7 +83,7 @@ typedef struct {
     u16 pixel_width;
     u16 pixel_height;
     u16 tileSet_id;
-} FORCE_WORD_ALIGNED RoomHeader;
+} PACKED ALIGNED(2) RoomHeader;
 static_assert(sizeof(RoomHeader) == 0xa);
 extern RoomHeader* gAreaRoomHeaders[];
 
diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c
index a7c52e03..e59a2b5b 100644
--- a/src/enemy/chuchuBoss.c
+++ b/src/enemy/chuchuBoss.c
@@ -1105,7 +1105,6 @@ void sub_08026E1C(ChuchuBossEntity* this) {
             COLLISION_ON(super);
             if (sub_08027C54(this)) {
                 this->unk_84->unk_04++;
-                ;
                 super->child->health = 0xff;
             }
             if (this->unk_84->unk_04 == 3) {
diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c
index 52437ceb..0a134afe 100644
--- a/src/enemy/peahat.c
+++ b/src/enemy/peahat.c
@@ -265,7 +265,7 @@ void Peahat_Stunned(PeahatEntity* this) {
                 super->hitType = 0x71;
             }
             break;
-    };
+    }
 }
 
 void Peahat_RepairPropeller(PeahatEntity* this) {
diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c
index 93889ec9..0008dc51 100644
--- a/src/manager/miscManager.c
+++ b/src/manager/miscManager.c
@@ -75,7 +75,7 @@ typedef struct {
     u16 width;
     u16 height;
     u16 unk_08;
-} PACKED __attribute__((aligned(2))) MiscManager_HelperStruct;
+} PACKED ALIGNED(2) MiscManager_HelperStruct;
 
 const MiscManager_HelperStruct gUnk_08108354[] = {
     { 0xF0, 0xB0, 0xF0, 0xB0, 0x100 },
diff --git a/src/npc/castorWildsStatue.c b/src/npc/castorWildsStatue.c
index 911fc0c5..175cb3c2 100644
--- a/src/npc/castorWildsStatue.c
+++ b/src/npc/castorWildsStatue.c
@@ -167,7 +167,7 @@ void sub_080675D4(Entity* this) {
             ent->spriteRendering.b3 = this->spriteRendering.b3;
             SortEntityAbove(this, ent);
         }
-    };
+    }
     gUnk = gUnk_08110E8A;
     for (i = 0; i < 4; i++, gUnk++) {
         Entity* ent = CreateFx(this, FX_ROCK, 0);
@@ -180,7 +180,7 @@ void sub_080675D4(Entity* this) {
             ent->spriteRendering.b3 = this->spriteRendering.b3;
             SortEntityAbove(this, ent);
         }
-    };
+    }
     if (this->subAction > 2) {
         this->spriteSettings.draw = 0;
     }
diff --git a/src/object/evilSpirit.c b/src/object/evilSpirit.c
index 7f74689a..03c65712 100644
--- a/src/object/evilSpirit.c
+++ b/src/object/evilSpirit.c
@@ -104,7 +104,6 @@ void EvilSpirit_Action1(EvilSpiritEntity* this) {
             } else {
                 this->unk76 = this->unk7c - 0x20;
                 this->unk7a = this->unk7c + 0x50;
-                ;
             }
         }
         super->x = super->parent->x;