diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-12 01:39:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-12 01:39:28 -0400 |
| commit | a274cc6a76a59768bcfaef345d55a39f6c1ddbac (patch) | |
| tree | e6977a9d8066e946148b8d1dfcf95e721b59e54f /src/decoration.c | |
| parent | 810ca5f8ff79aeec6ffe8e982f4786aade616b4d (diff) | |
| parent | 876a89eba4903e5ef1ccad22b1ee52023fb24513 (diff) | |
Merge branch 'master' into flatten_sprite_pos
Diffstat (limited to 'src/decoration.c')
| -rw-r--r-- | src/decoration.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/decoration.c b/src/decoration.c index cbdd99234..62d1966bf 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -147,7 +147,7 @@ static void ReturnToActionsMenuFromCategories(u8 taskId); static void ExitTraderDecorationMenu(u8 taskId); static void CopyDecorationMenuItemName(u8 *dest, u16 decoration); static void DecorationItemsMenu_OnCursorMove(s32 itemIndex, bool8 flag, struct ListMenu *menu); -static void DecorationItemsMenu_PrintDecorationInUse(u8 windowId, s32 itemIndex, u8 y); +static void DecorationItemsMenu_PrintDecorationInUse(u8 windowId, u32 itemIndex, u8 y); static void ShowDecorationItemsWindow(u8 taskId); static void HandleDecorationItemsMenuInput(u8 taskId); static void PrintDecorationItemDescription(s32 itemIndex); @@ -912,9 +912,9 @@ static void DecorationItemsMenu_OnCursorMove(s32 itemIndex, bool8 flag, struct L PrintDecorationItemDescription(itemIndex); } -static void DecorationItemsMenu_PrintDecorationInUse(u8 windowId, s32 itemIndex, u8 y) +static void DecorationItemsMenu_PrintDecorationInUse(u8 windowId, u32 itemIndex, u8 y) { - if (itemIndex != -2) + if (itemIndex != LIST_CANCEL) { if (IsDecorationIndexInSecretBase(itemIndex + 1) == TRUE) BlitMenuInfoIcon(windowId, MENU_INFO_ICON_BALL_RED, 92, y + 2); |