diff --git a/profiles/cclcc/hud/backlogmenu.lua b/profiles/cclcc/hud/backlogmenu.lua index 54e5dc3c3..2f39bb551 100644 --- a/profiles/cclcc/hud/backlogmenu.lua +++ b/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"] = { diff --git a/profiles/cclcc/hud/extramenus.lua b/profiles/cclcc/hud/extramenus.lua index 9144a3f89..b4dccad6e 100644 --- a/profiles/cclcc/hud/extramenus.lua +++ b/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,7 +379,7 @@ 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 }, }; @@ -387,7 +387,7 @@ root.Sprites["MovieMenuGuide"] = { 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", diff --git a/profiles/cclcc/hud/optionsmenu.lua b/profiles/cclcc/hud/optionsmenu.lua index 30205e8bb..8f4c3b374 100644 --- a/profiles/cclcc/hud/optionsmenu.lua +++ b/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 diff --git a/profiles/cclcc/hud/savemenu.lua b/profiles/cclcc/hud/savemenu.lua index abe1500e2..d4d15bbbd 100644 --- a/profiles/cclcc/hud/savemenu.lua +++ b/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}, diff --git a/profiles/cclcc/hud/systemmenu.lua b/profiles/cclcc/hud/systemmenu.lua index 6b9b7d621..23bf9c440 100644 --- a/profiles/cclcc/hud/systemmenu.lua +++ b/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"] = { diff --git a/profiles/cclcc/hud/tipsmenu.lua b/profiles/cclcc/hud/tipsmenu.lua index ccb6ff6f3..71b2c9e86 100644 --- a/profiles/cclcc/hud/tipsmenu.lua +++ b/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", diff --git a/src/games/cclcc/savemenu.cpp b/src/games/cclcc/savemenu.cpp index 4ef15bd93..928037907 100644 --- a/src/games/cclcc/savemenu.cpp +++ b/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() { diff --git a/src/games/cclcc/tipsmenu.cpp b/src/games/cclcc/tipsmenu.cpp index 857d25da5..e2525d9ae 100644 --- a/src/games/cclcc/tipsmenu.cpp +++ b/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); } diff --git a/src/profile/games/cclcc/tipsmenu.cpp b/src/profile/games/cclcc/tipsmenu.cpp index 9fc4cdea6..bcf91e000 100644 --- a/src/profile/games/cclcc/tipsmenu.cpp +++ b/src/profile/games/cclcc/tipsmenu.cpp @@ -21,8 +21,7 @@ void Configure() { TipsNewSprite = EnsureGetMember("TipsNewSprite"); TipsHighlightedTabAdder = EnsureGetMember("TipsHighlightedTabAdder"); - TipsGuideX = EnsureGetMember("TipsGuideX"); - TipsGuideY = EnsureGetMember("TipsGuideY"); + TipsGuidePosition = EnsureGetMember("TipsGuidePosition"); TipsTextTableIndex = EnsureGetMember("TipsTextTableIndex"); TipsTextSortStringIndex = EnsureGetMember("TipsTextSortStringIndex"); diff --git a/src/profile/games/cclcc/tipsmenu.h b/src/profile/games/cclcc/tipsmenu.h index 3dbec8fd7..bd15577e8 100644 --- a/src/profile/games/cclcc/tipsmenu.h +++ b/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;