From 294657a5852abc6010e1b6a1a2a91c498ed9f350 Mon Sep 17 00:00:00 2001
From: Ariel A <24759293+aarant@users.noreply.github.com>
Date: Sun, 15 Oct 2023 14:30:07 -0400
Subject: [PATCH] Fixes for `make modern`.

---
 include/global.fieldmap.h | 2 +-
 src/follower_helper.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index fe396f0fd0..ce86f8c683 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -63,7 +63,7 @@ struct BackupMapLayout
     u16 *map;
 };
 
-struct __attribute__((packed)) ObjectEventTemplate
+struct __attribute__((packed, aligned(4))) ObjectEventTemplate
 {
     /*0x00*/ u8 localId;
     /*0x01*/ u16 graphicsId;
diff --git a/src/follower_helper.c b/src/follower_helper.c
index 328bd8aab0..2dbf51dadf 100644
--- a/src/follower_helper.c
+++ b/src/follower_helper.c
@@ -290,7 +290,7 @@ const struct FollowerMsgInfoExtended gFollowerConditionalMessages[COND_MSG_COUNT
     [COND_MSG_BURN] =
     {
     .text = sCondMsg42,
-    .st = {.status STATUS1_BURN},
+    .st = {.status = STATUS1_BURN},
     .stFlags = ST_FLAGS_STATUS,
     .emotion = FOLLOWER_EMOTION_SAD,
     },