Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-11 20:46:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for make modern.

Browse Source
This commit is contained in:
Ariel A
2023-10-15 14:30:07 -04:00
parent f27a252958
commit 294657a585
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/global.fieldmap.h
View File

@@ -63,7 +63,7 @@ struct BackupMapLayout
u16 *map;
};
struct __attribute__((packed)) ObjectEventTemplate
struct __attribute__((packed, aligned(4))) ObjectEventTemplate
{
/*0x00*/ u8 localId;
/*0x01*/ u16 graphicsId;

2
src/follower_helper.c
View File

@@ -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,
},