Merge remote-tracking branch 'origin/master' into HEAD

Author: madebr

LEGORacers/include/menu/screens/menugamescreen.h

@@ -5,11 +5,11 @@
 #include "decomp.h"
 #include "menu/screens/menuscreen.h"
 #include "menu/style/sharedmenustyletable.h"
+#include "menu/widgets/menutextbutton.h"
 #include "render/golrenderdevice.h"
 
 class MenuGameContext;
 class MenuScreenCreateParams;
-class MenuTextButton;
 class MenuWidget;
 class GolFont;
 class GolImage;
@@ -44,17 +44,7 @@ class MenuGameScreen : public MenuScreen {
 		void ParseSection(undefined4 p_token) override;  // vtable+0x14
 
 		// SIZE 0xe0
-		class ButtonBinding : public MenuInputBindingTable::IconBinding {
-		public:
-			GolFont* m_stateFonts[6];          // 0x84
-			GolImage* m_stateImages[6];        // 0x9c
-			VisualStateColor m_stateColors[6]; // 0xb4
-			undefined m_unk0xcc[0xd0 - 0xcc];  // 0xcc
-			VisualStateColor m_unk0xd0;        // 0xd0
-			undefined m_unk0xd4[0xd8 - 0xd4];  // 0xd4
-			LegoU32 m_maxTextWidth;            // 0xd8
-			LegoBool32 m_hasMaxTextWidth;      // 0xdc
-		};
+		class ButtonBinding : public MenuTextButton::CreateParams {};
 
 		// SYNTHETIC: LEGORACERS 0x0047f0f0
 		// MenuGameScreen::ButtonBindingTable::`scalar deleting destructor'

LEGORacers/include/menu/style/menuinputbindingtable.h

@@ -91,11 +91,7 @@ class MenuInputBindingTable : public MenuResourceTable {
 	};
 
 	// SIZE 0x98
-	class SelectorBinding : public MenuSelectorBase::CreateParamsWithCarousel {
-	public:
-		undefined4 m_carouselWidget;       // 0x90 (filled at runtime; see MenuSelector::CreateParams)
-		undefined4 m_acceptUnfocusedInput; // 0x94
-	};
+	class SelectorBinding : public MenuSelector::CreateParams {};
 
 	// SIZE 0x9c
 	class ButtonBinding : public IconBinding {

LEGORacers/include/menu/widgets/menutextbutton.h

@@ -23,7 +23,7 @@ class MenuTextButton : public MenuIcon {
 		GolImage* m_stateImages[6];        // 0x9c
 		VisualStateColor m_stateColors[6]; // 0xb4
 		GolStringTable* m_stringTable;     // 0xcc
-		undefined4 m_unk0xd0;              // 0xd0
+		VisualStateColor m_unk0xd0;        // 0xd0
 		undefined2 m_stringId;             // 0xd4
 		undefined2 m_unk0xd6;              // 0xd6
 		LegoU32 m_maxTextWidth;            // 0xd8