diff --git a/include/dungeon_portrait_placement.h b/include/dungeon_portrait_placement.h index e6413330c..14fe6ef10 100644 --- a/include/dungeon_portrait_placement.h +++ b/include/dungeon_portrait_placement.h @@ -4,6 +4,6 @@ #include "portrait_placement.h" // See enum "PortraitPlacementID" -const struct PortraitPlacementInfo *GetPortraitPlacementInfo(u8 id); +const PortraitPlacementInfo *GetPortraitPlacementInfo(u8 id); #endif // GUARD_DUNGEON_PORTRAIT_PLACEMENT_H diff --git a/include/portrait_placement.h b/include/portrait_placement.h index 05a26c4ee..80732466e 100644 --- a/include/portrait_placement.h +++ b/include/portrait_placement.h @@ -4,11 +4,11 @@ #include "structs/str_position.h" // Size: R=0x8 | B=0x5 -struct PortraitPlacementInfo +typedef struct PortraitPlacementInfo { /* 0x0 */ DungeonPos pos; /* 0x4 */ bool8 flip; -}; +} PortraitPlacementInfo; // These are named like `PLACEMENT_X_Y` and `PLACEMENT_X_Y_FLIP` enum PortraitPlacementID diff --git a/src/data/portrait_placements.h b/src/data/portrait_placements.h index 6878c4d75..226c81918 100644 --- a/src/data/portrait_placements.h +++ b/src/data/portrait_placements.h @@ -13,7 +13,7 @@ // Looks like they defined `Y_MID_B` as 8 instead of 7 and that's why we have a duplicate placement #define Y_B 8 -static const struct PortraitPlacementInfo sPortraitPlacements[PLACEMENT_COUNT] = { +static const PortraitPlacementInfo sPortraitPlacements[PLACEMENT_COUNT] = { [PLACEMENT_LEFT_BOTTOM_1] = { { X_L, Y_B }, FALSE }, [PLACEMENT_CENTERLEFT_CENTER] = { { X_CENTER_L, Y_CENTER }, FALSE }, [PLACEMENT_LEFT_BOTTOM_2] = { { X_L, Y_B }, FALSE }, diff --git a/src/dungeon_message.c b/src/dungeon_message.c index 8da0e6852..56fa02f8d 100644 --- a/src/dungeon_message.c +++ b/src/dungeon_message.c @@ -444,7 +444,7 @@ void DisplayDungeonDialogue_Async(const struct DungeonDialogueStruct *dialogueIn && dialogueInfo->spriteId != 0x80 && dialogueMonId != MONSTER_NONE) { - const struct PortraitPlacementInfo *placementInfo = GetPortraitPlacementInfo(dialogueInfo->spritePlacementId); + const PortraitPlacementInfo *placementInfo = GetPortraitPlacementInfo(dialogueInfo->spritePlacementId); monPortraitPtr = &monPortrait; monPortraitPtr->faceFile = GetDialogueSpriteDataPtr(dialogueMonId); diff --git a/src/dungeon_portrait_placement.c b/src/dungeon_portrait_placement.c index 33ee0f0db..a7b875939 100644 --- a/src/dungeon_portrait_placement.c +++ b/src/dungeon_portrait_placement.c @@ -6,7 +6,7 @@ #include "data/portrait_placements.h" -const struct PortraitPlacementInfo *GetPortraitPlacementInfo(u8 id) +const PortraitPlacementInfo *GetPortraitPlacementInfo(u8 id) { return &sPortraitPlacements[id]; }