Skip to content

Enable GameCube controllers on Wii U (vWii). #1292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GerbilSoft wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Enable GameCube controllers on Wii U (vWii). #1292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
491516f
Enable GameCube controllers on Wii U (vWii).
GerbilSoft Aug 2, 2025
bc197e0
TP69, not TP68, for GCN controllers.
GerbilSoft Aug 2, 2025
df2354e
Bump NIN_MINOR_VERSION: 6.507 -> 6.508
GerbilSoft Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/include/NintendontVersion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define __NINTENDONT_VERSION_H__

#define NIN_MAJOR_VERSION 6
#define NIN_MINOR_VERSION 507
#define NIN_MINOR_VERSION 508

#define NIN_VERSION ((NIN_MAJOR_VERSION << 16) | NIN_MINOR_VERSION)

Expand Down
1 change: 0 additions & 1 deletion kernel/Config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ void ConfigInit( void )
if( IsWiiU() )
{
//ncfg->Config |= NIN_CFG_HID;
ncfg->MaxPads = 0;

// Disable debugging and the drive access LED.
ncfg->Config &= ~(NIN_CFG_DEBUGGER | NIN_CFG_DEBUGWAIT | NIN_CFG_LED);
Expand Down
2 changes: 1 addition & 1 deletion kernel/Patch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,7 +1657,7 @@ void DoPatches( char *Buffer, u32 Length, u32 DiscOffset )
}
}
DisableEXIPatch = (TRIGame == TRI_NONE && ConfigGetConfig(NIN_CFG_MEMCARDEMU) == false);
DisableSIPatch = (!IsWiiU() && TRIGame == TRI_NONE && ConfigGetConfig(NIN_CFG_NATIVE_SI));
DisableSIPatch = (TRIGame == TRI_NONE && ConfigGetConfig(NIN_CFG_NATIVE_SI));

bool PatchWide = ConfigGetConfig(NIN_CFG_FORCE_WIDE);
if(PatchWide && PatchStaticWidescreen(TITLE_ID, GAME_ID & 0xFF)) //if further patching is needed
Expand Down
13 changes: 5 additions & 8 deletions loader/source/FPad.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,12 @@ void FPAD_Update( void )
PAD_Stick_Y |= Pad[i].stickY;
PAD_Stick_X |= Pad[i].stickX;
}
if(!IsWiiU())
PAD_ScanPads();
for(i = 0; i < PAD_CHANMAX; ++i)
{
PAD_ScanPads();
for(i = 0; i < PAD_CHANMAX; ++i)
{
PAD_Pressed |= PAD_ButtonsDown(i) | PAD_ButtonsHeld(i);
PAD_Stick_Y |= PAD_StickY(i);
PAD_Stick_X |= PAD_StickX(i);
}
PAD_Pressed |= PAD_ButtonsDown(i) | PAD_ButtonsHeld(i);
PAD_Stick_Y |= PAD_StickY(i);
PAD_Stick_X |= PAD_StickX(i);
}
if( WPAD_Pressed == 0 && PAD_Pressed == 0 && WiiDRC_Pressed == 0 && ( PAD_Stick_Y < 25 && PAD_Stick_Y > -25 ) && ( PAD_Stick_X < 25 && PAD_Stick_X > -25 ) )
{
Expand Down
14 changes: 7 additions & 7 deletions loader/source/menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,8 +1012,8 @@ static const char *const *GetSettingsDescription(const MenuCtx *ctx)
"will disable Bluetooth and",
"USB HID controllers.",
"",
"This option is not available",
"on Wii U.",
"On Wii U, test point TP69 can",
"be used for one GCN controller.",
NULL
};
return desc_native_si;
Expand Down Expand Up @@ -1471,9 +1471,10 @@ static bool UpdateSettingsMenu(MenuCtx *ctx)
}

// Maximum number of emulated controllers.
// Not available on Wii U.
// Not available on Wii U. (HACK: TP69 is available for 1 GCN controller; also dev vWii debug controller)

// TODO: Disable on RVL-101?
PrintFormat(MENU_SIZE, (!IsWiiU() ? BLACK : DARK_GRAY), MENU_POS_X+50, SettingY(ListLoopIndex),
PrintFormat(MENU_SIZE, BLACK, MENU_POS_X+50, SettingY(ListLoopIndex),
"%-18s:%d", OptionStrings[ListLoopIndex], (ncfg->MaxPads));
ListLoopIndex++;

Expand Down Expand Up @@ -1550,7 +1551,7 @@ static bool UpdateSettingsMenu(MenuCtx *ctx)

// Native controllers. (Required for GBA link; disables Bluetooth and USB HID.)
// TODO: Gray out on RVL-101?
PrintFormat(MENU_SIZE, (IsWiiU() ? DARK_GRAY : BLACK), MENU_POS_X + 50, SettingY(ListLoopIndex),
PrintFormat(MENU_SIZE, BLACK, MENU_POS_X + 50, SettingY(ListLoopIndex),
"%-18s:%-4s", OptionStrings[ListLoopIndex],
(ncfg->Config & (NIN_CFG_NATIVE_SI)) ? "On " : "Off");
ListLoopIndex++;
Expand Down Expand Up @@ -1632,8 +1633,7 @@ static bool UpdateSettingsMenu(MenuCtx *ctx)
// Draw the cursor.
u32 cursor_color = BLACK;
if (ctx->settings.settingPart == 0) {
if ((!IsWiiU() && ctx->settings.posX == NIN_CFG_BIT_USB) ||
(IsWiiU() && ctx->settings.posX == NIN_CFG_NATIVE_SI))
if ((!IsWiiU() && ctx->settings.posX == NIN_CFG_BIT_USB))
{
// Setting is not usable on this platform.
// Gray out the cursor, too.
Expand Down
1 change: 1 addition & 0 deletions multidol/apploader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ u32 Apploader_Run()
appldr_entry = apploader_hdr.entry;

/* Call apploader entry */
#pragma GCC diagnostic warning "-Wincompatible-pointer-types"
appldr_entry(&appldr_init, &appldr_main, &appldr_final);

/* Initialize apploader */
Expand Down