Fixup alignment of the button guides

profiles/cclcc/hud/backlogmenu.lua

@@ -8,7 +8,7 @@ root.BacklogMenu = {
     BacklogHeaderPosition = { X = 0, Y = 0 },
 
     BacklogControlsSprite = "BacklogControls",
-    BacklogControlsPosition = { X = 0, Y = 986 },
+    BacklogControlsPosition = { X = 0, Y = 989 },
 
     EntryHighlightSprite = "EntryHighlight",
     EntryHighlightLocation = EntryHighlightLocationType.TopLineLeftOfScreen,
@@ -52,7 +52,7 @@ root.Sprites["BacklogHeader"] = {
 
 root.Sprites["BacklogControls"] = {
     Sheet = "Backlog",
-    Bounds = { X = 0, Y = 1151, Width = 1920, Height = 59 },
+    Bounds = { X = 0, Y = 1154, Width = 1920, Height = 59 },
 }
 
 root.Sprites["VoiceIcon"] = {

profiles/cclcc/hud/extramenus.lua

@@ -345,7 +345,7 @@ root.Sprites["LoveMovieSelect"] = {
 -- Album Menu
 root.Sprites["AlbumMenuCGViewerGuide"] = {
     Sheet = "LibraryMenu",
-    Bounds = { X = 0, Y = 1880, Width = 1920, Height = 59 },
+    Bounds = { X = 0, Y = 1881, Width = 1920, Height = 59 },
 };
 
 root.Sprites["AlbumMenuGuide"] = {
@@ -379,15 +379,15 @@ root.Sprites["MovieDiskExtraOpHighlight"] = {
 
 root.Sprites["MovieMenuGuide"] = {
     Sheet = "MovMenu",
-    Bounds = { X = 0, Y = 1169, Width = 1920, Height = 59 },
+    Bounds = { X = 0, Y = 1170, Width = 1920, Height = 59 },
 };
 
 
 -- Music Menu
 
 root.Sprites["MusicMenuGuide"] = {
     Sheet = "MusicMenu",
-    Bounds = { X = 0, Y = 1292, Width = 1920, Height = 59 },
+    Bounds = { X = 0, Y = 1293, Width = 1920, Height = 59 },
 };
 root.Sprites["MusicItemsBackground"] = {
     Sheet = "MusicMenu",

profiles/cclcc/hud/optionsmenu.lua

@@ -54,7 +54,7 @@ root.OptionsMenu = {
 
     GuideSprite = "OptionsGuide",
     VoiceGuideSprite = "OptionsVoiceGuide",
-    GuidePosition = { X = 0, Y = 986 },
+    GuidePosition = { X = 0, Y = 989 },
     GuideFadeStartPosition = { X = 0, Y = 1375 },
 
     EntriesStartPosition = { X = 419, Y = 313 },
@@ -141,12 +141,12 @@ root.Sprites["OptionsNo"] = {
 
 root.Sprites["OptionsGuide"] = {
     Sheet = "Config",
-    Bounds = { X = 0, Y = 2476, Width = 1926, Height = 57 }
+    Bounds = { X = 0, Y = 2479, Width = 1926, Height = 57 }
 };
 
 root.Sprites["OptionsVoiceGuide"] = {
     Sheet = "Config",
-    Bounds = { X = 0, Y = 2416, Width = 1926, Height = 57 }
+    Bounds = { X = 0, Y = 2419, Width = 1926, Height = 57 }
 };
 
 for i = 0, 3 do

profiles/cclcc/hud/savemenu.lua

@@ -13,7 +13,7 @@ root.SaveMenu = {
     SaveEntryPrimaryColor = 0xF07390,
     LoadEntryPrimaryColor = 0x00A1E6,
     SaveEntrySecondaryColor = 0x5E357C,
-    GuidePosition = {X = 1314, Y = 867},
+    GuidePosition = {X = 0, Y = 989},
     MenuTextPosition = {X = 11, Y = 10}, 
     SlotsBackgroundPosition = {X = 135, Y = 0}, 
     PageNumberPosition = {X = 1314, Y = 867},

profiles/cclcc/hud/systemmenu.lua

@@ -155,7 +155,7 @@ end
 
 root.Sprites["SystemMenuButtonGuide"] = {
     Sheet = "MenuChip",
-    Bounds = {X = 0, Y = 1384, Width = 1920, Height = 59}
+    Bounds = {X = 0, Y = 1385, Width = 1920, Height = 59}
 };
 
 root.Sprites["SystemMenuFrame"] = {

profiles/cclcc/hud/tipsmenu.lua

@@ -7,8 +7,7 @@ root.TipsMenu = {
     TransitionOutDuration = 0.4,
     BackgroundSprite = "TipsBookLayer",
     TipsGuideSprite = "TipsGuide",
-    TipsGuideX = 0,
-    TipsGuideY = 990,
+    TipsGuidePosition = { X = 0, Y = 989},
     TipsNewSprite = "TipsNewSprite",
     TipsHighlightedSprite = "TipsHighlightedSprite",
 

src/games/cclcc/savemenu.cpp

@@ -383,7 +383,7 @@ void SaveMenu::Render() {
     }
   }
 
-  UI::DrawButtonPrompt(ButtonGuideSprite[*ActiveMenuType], {0, 989}, col);
+  UI::DrawButtonPrompt(ButtonGuideSprite[*ActiveMenuType], GuidePosition, col);
 }
 
 void SaveMenu::RefreshCurrentEntryInfo() {

src/games/cclcc/tipsmenu.cpp

@@ -286,8 +286,9 @@ void TipsMenu::Render() {
 
   UI::DrawButtonPrompt(
       TipsGuideSprite,
-      glm::vec2(TipsGuideX,
-                TipsGuideY + Profile::Game::DesignHeight / 2 - LastYPos),
+      glm::vec2(
+          TipsGuidePosition.x,
+          TipsGuidePosition.y + Profile::Game::DesignHeight / 2 - LastYPos),
       fade);
 }
 

src/profile/games/cclcc/tipsmenu.cpp

@@ -21,8 +21,7 @@ void Configure() {
   TipsNewSprite = EnsureGetMember<Sprite>("TipsNewSprite");
   TipsHighlightedTabAdder = EnsureGetMember<int>("TipsHighlightedTabAdder");
 
-  TipsGuideX = EnsureGetMember<int>("TipsGuideX");
-  TipsGuideY = EnsureGetMember<int>("TipsGuideY");
+  TipsGuidePosition = EnsureGetMember<glm::vec2>("TipsGuidePosition");
 
   TipsTextTableIndex = EnsureGetMember<int>("TipsTextTableIndex");
   TipsTextSortStringIndex = EnsureGetMember<int>("TipsTextSortStringIndex");

src/profile/games/cclcc/tipsmenu.h

@@ -12,8 +12,7 @@ inline UI::ButtonPrompt TipsGuideSprite;
 inline Sprite TipsHighlightedSprite;
 inline Sprite TipsNewSprite;
 
-inline int TipsGuideX;
-inline int TipsGuideY;
+inline glm::vec2 TipsGuidePosition;
 
 inline int TipsTextTableIndex;
 inline int TipsTextSortStringIndex;