Android: On-screen classic controller + Wii controller select

It's now possible to switch between a horizontal or vertical Wiimote
with no extension, a Wiimote with a Nunchuk, a Classic Controller,
or a GameCube Controller when running a Wii game.
This commit is contained in:
Sean Maas committed 2016-10-13 21:31:36 -04:00
1 parent 14facbc438
commit f981098438
7 files changed
+455 -152

No files matched your search

@@ -2,9 +2,6 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context="org.dolphinemu.dolphinemu.activities.EmulationActivity">
<item
android:id="@+id/menu_emulation_screenshot"
android:showAsAction="ifRoom"
@@ -0,0 +1,103 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context="org.dolphinemu.dolphinemu.activities.EmulationActivity">
<item
android:id="@+id/menu_emulation_screenshot"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_screenshot"
android:title="@string/overlay_screenshot"/>
<item
android:id="@+id/menu_quicksave"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_quicksave"
android:title="@string/emulation_quicksave"
/>
<item
android:id="@+id/menu_quickload"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_quickload"
android:title="@string/emulation_quickload"
/>
<!-- Save State Slots -->
<item
android:id="@+id/menu_emulation_save_root"
android:showAsAction="never"
android:title="@string/overlay_savestate">
<menu>
<item
android:id="@+id/menu_emulation_save_1"
android:title="@string/overlay_slot1"/>
<item
android:id="@+id/menu_emulation_save_2"
android:title="@string/overlay_slot2"/>
<item
android:id="@+id/menu_emulation_save_3"
android:title="@string/overlay_slot3"/>
<item
android:id="@+id/menu_emulation_save_4"
android:title="@string/overlay_slot4"/>
<item
android:id="@+id/menu_emulation_save_5"
android:title="@string/overlay_slot5"/>
</menu>
</item>
<!-- Load State Slots -->
<item
android:id="@+id/menu_emulation_load_root"
android:showAsAction="never"
android:title="@string/overlay_loadstate">
<menu>
<item
android:id="@+id/menu_emulation_load_1"
android:title="@string/overlay_slot1"/>
<item
android:id="@+id/menu_emulation_load_2"
android:title="@string/overlay_slot2"/>
<item
android:id="@+id/menu_emulation_load_3"
android:title="@string/overlay_slot3"/>
<item
android:id="@+id/menu_emulation_load_4"
android:title="@string/overlay_slot4"/>
<item
android:id="@+id/menu_emulation_load_5"
android:title="@string/overlay_slot5"/>
</menu>
</item>
<item
android:id="@+id/menu_emulation_configure_controls"
android:showAsAction="never"
android:title="@string/emulation_configure_controls">
<menu>
<item
android:id="@+id/menu_emulation_edit_layout"
android:title="@string/emulation_edit_layout"/>
<item
android:id="@+id/menu_emulation_toggle_controls"
android:title="@string/emulation_toggle_controls"/>
<item
android:id="@+id/menu_emulation_adjust_scale"
android:title="@string/emulation_control_scale"/>
<item
android:id="@+id/menu_emulation_choose_controller"
android:title="@string/emulation_choose_controller"/>
</menu>
</item>
</menu>
@@ -32,7 +32,7 @@
<item>3</item>
</integer-array>
<!-- Wiimote extensions -->
<!-- Wii Remote extensions -->
<string-array name="wiimoteExtEntries" translatable="false">
<item>"None"</item>
<item>"Nunchuk"</item>
@@ -179,6 +179,32 @@
<item>12</item>
</integer-array>
<string-array name="wiimoteTypeEntries">
<item>Disabled</item>
<item>Emulated</item>
<item>Real Wii Remote (DolphinBar required)</item>
</string-array>
<integer-array name="wiimoteTypeValues">
<item>0</item>
<item>1</item>
<item>2</item>
</integer-array>
<string-array name="controllersEntries">
<item>GameCube Controller</item>
<item>Wii Remote</item>
<item>Horizontal Wii Remote</item>
<item>Wii Remote + Nunchuk</item>
<item>Classic Controller</item>
</string-array>
<string-array name="controllersValues">
<item>None</item>
<item>None</item>
<item>None</item>
<item>Nunchuk</item>
<item>Classic</item>
</string-array>
<string-array name="gcpadButtons">
<item>A</item>
<item>B</item>
@@ -193,17 +219,6 @@
<item>C Stick</item>
</string-array>
<string-array name="wiimoteTypeEntries">
<item>Disabled</item>
<item>Emulated</item>
<item>Real Wiimote (DolphinBar required)</item>
</string-array>
<integer-array name="wiimoteTypeValues">
<item>0</item>
<item>1</item>
<item>2</item>
</integer-array>
<string-array name="wiimoteButtons">
<item>A</item>
<item>B</item>
@@ -212,10 +227,38 @@
<item>+</item>
<item>-</item>
<item>Home</item>
<item>D-Pad</item>
</string-array>
<string-array name="nunchukButtons">
<item>A</item>
<item>B</item>
<item>1</item>
<item>2</item>
<item>+</item>
<item>-</item>
<item>Home</item>
<item>D-Pad</item>
<item>C</item>
<item>Z</item>
<item>D-Pad</item>
<item>Nunchuk Stick</item>
</string-array>
<string-array name="classicButtons">
<item>a</item>
<item>b</item>
<item>x</item>
<item>y</item>
<item>+</item>
<item>-</item>
<item>Home</item>
<item>L</item>
<item>R</item>
<item>ZL</item>
<item>ZR</item>
<item>D-Pad</item>
<item>Left Stick</item>
<item>Right Stick</item>
</string-array>
</resources>
@@ -364,6 +364,8 @@
<string name="emulation_toggle_controls">Toggle Controls</string>
<string name="emulation_toggle_all">Toggle All</string>
<string name="emulation_control_scale">Adjust Scale</string>
<string name="emulation_choose_controller">Choose Controller</string>
<string name="emulation_controller_changed">You may have to reload the game after changing extensions.</string>
<!-- GC Adapter Menu-->
<string name="gc_adapter_rumble">Enable Vibration</string>