Android: Stop extracting pre-defined controller INIs

5 files changed, 11 insertions, 894 deletions

diff --git a/Source/Android/app/src/main/assets/GCPadNew.ini b/Source/Android/app/src/main/assets/GCPadNew.ini
deleted file mode 100644
index 2bf8ffdac3..0000000000
--- a/Source/Android/app/src/main/assets/GCPadNew.ini
+++ /dev/null
@@ -1,104 +0,0 @@
-[GCPad1]
-Device = Android/0/Touchscreen
-Buttons/A = `Button 0`
-Buttons/B = `Button 1`
-Buttons/Start = `Button 2`
-Buttons/X = `Button 3`
-Buttons/Y = `Button 4`
-Buttons/Z = `Button 5`
-D-Pad/Up = `Button 6`
-D-Pad/Down = `Button 7`
-D-Pad/Left = `Button 8`
-D-Pad/Right = `Button 9`
-Main Stick/Up = `Axis 11`
-Main Stick/Down = `Axis 12`
-Main Stick/Left = `Axis 13`
-Main Stick/Right = `Axis 14`
-C-Stick/Up = `Axis 16`
-C-Stick/Down = `Axis 17`
-C-Stick/Left = `Axis 18`
-C-Stick/Right = `Axis 19`
-Triggers/L = `Axis 20`
-Triggers/R = `Axis 21`
-Triggers/L-Analog = `Axis 20`
-Triggers/R-Analog = `Axis 21`
-Triggers/Threshold = 90,000000
-Rumble/Motor = `Rumble 700`
-[GCPad2]
-Device = Android/1/Touchscreen
-Buttons/A = `Button 0`
-Buttons/B = `Button 1`
-Buttons/Start = `Button 2`
-Buttons/X = `Button 3`
-Buttons/Y = `Button 4`
-Buttons/Z = `Button 5`
-D-Pad/Up = `Button 6`
-D-Pad/Down = `Button 7`
-D-Pad/Left = `Button 8`
-D-Pad/Right = `Button 9`
-Main Stick/Up = `Axis 11`
-Main Stick/Down = `Axis 12`
-Main Stick/Left = `Axis 13`
-Main Stick/Right = `Axis 14`
-C-Stick/Up = `Axis 16`
-C-Stick/Down = `Axis 17`
-C-Stick/Left = `Axis 18`
-C-Stick/Right = `Axis 19`
-Triggers/L = `Axis 20`
-Triggers/R = `Axis 21`
-Triggers/L-Analog = `Axis 20`
-Triggers/R-Analog = `Axis 21`
-Triggers/Threshold = 90,000000
-Rumble/Motor = `Rumble 700`
-[GCPad3]
-Device = Android/2/Touchscreen
-Buttons/A = `Button 0`
-Buttons/B = `Button 1`
-Buttons/Start = `Button 2`
-Buttons/X = `Button 3`
-Buttons/Y = `Button 4`
-Buttons/Z = `Button 5`
-D-Pad/Up = `Button 6`
-D-Pad/Down = `Button 7`
-D-Pad/Left = `Button 8`
-D-Pad/Right = `Button 9`
-Main Stick/Up = `Axis 11`
-Main Stick/Down = `Axis 12`
-Main Stick/Left = `Axis 13`
-Main Stick/Right = `Axis 14`
-C-Stick/Up = `Axis 16`
-C-Stick/Down = `Axis 17`
-C-Stick/Left = `Axis 18`
-C-Stick/Right = `Axis 19`
-Triggers/L = `Axis 20`
-Triggers/R = `Axis 21`
-Triggers/L-Analog = `Axis 20`
-Triggers/R-Analog = `Axis 21`
-Triggers/Threshold = 90,000000
-Rumble/Motor = `Rumble 700`
-[GCPad4]
-Device = Android/3/Touchscreen
-Buttons/A = `Button 0`
-Buttons/B = `Button 1`
-Buttons/Start = `Button 2`
-Buttons/X = `Button 3`
-Buttons/Y = `Button 4`
-Buttons/Z = `Button 5`
-D-Pad/Up = `Button 6`
-D-Pad/Down = `Button 7`
-D-Pad/Left = `Button 8`
-D-Pad/Right = `Button 9`
-Main Stick/Up = `Axis 11`
-Main Stick/Down = `Axis 12`
-Main Stick/Left = `Axis 13`
-Main Stick/Right = `Axis 14`
-C-Stick/Up = `Axis 16`
-C-Stick/Down = `Axis 17`
-C-Stick/Left = `Axis 18`
-C-Stick/Right = `Axis 19`
-Triggers/L = `Axis 20`
-Triggers/R = `Axis 21`
-Triggers/L-Analog = `Axis 20`
-Triggers/R-Analog = `Axis 21`
-Triggers/Threshold = 90,000000
-Rumble/Motor = `Rumble 700`
diff --git a/Source/Android/app/src/main/assets/WiimoteNew.ini b/Source/Android/app/src/main/assets/WiimoteNew.ini
deleted file mode 100644
index 7237db7a3d..0000000000
--- a/Source/Android/app/src/main/assets/WiimoteNew.ini
+++ /dev/null
@@ -1,580 +0,0 @@
-[Wiimote1]
-Device = Android/4/Touchscreen
-Buttons/A = `Button 100`
-Buttons/B = `Button 101`
-Buttons/- = `Button 102`
-Buttons/+ = `Button 103`
-Buttons/Home = `Button 104`
-Buttons/1 = `Button 105`
-Buttons/2 = `Button 106`
-D-Pad/Up = `Button 107`
-D-Pad/Down = `Button 108`
-D-Pad/Left = `Button 109`
-D-Pad/Right = `Button 110`
-IR/Up = `Axis 112`
-IR/Down = `Axis 113`
-IR/Left = `Axis 114`
-IR/Right = `Axis 115`
-IR/Forward = `Axis 116`
-IR/Backward = `Axis 117`
-IR/Hide = `Button 118`
-IR/Total Pitch = 20
-IR/Total Yaw = 25
-IR/Vertical Offset = 10
-Swing/Up = `Axis 120`
-Swing/Down = `Axis 121`
-Swing/Left = `Axis 122`
-Swing/Right = `Axis 123`
-Swing/Forward = `Axis 124`
-Swing/Backward = `Axis 125`
-Tilt/Forward = `Axis 127`
-Tilt/Backward = `Axis 128`
-Tilt/Left = `Axis 129`
-Tilt/Right = `Axis 130`
-Tilt/Modifier = `Button 131`
-Tilt/Modifier/Range = 50,000000
-Shake/X = `Button 132`
-Shake/Y = `Button 133`
-Shake/Z = `Button 134`
-Extension = Nunchuk
-Nunchuk/Buttons/C = `Button 200`
-Nunchuk/Buttons/Z = `Button 201`
-Nunchuk/Stick/Up = `Axis 203`
-Nunchuk/Stick/Down = `Axis 204`
-Nunchuk/Stick/Left = `Axis 205`
-Nunchuk/Stick/Right = `Axis 206`
-Nunchuk/Swing/Up = `Axis 208`
-Nunchuk/Swing/Down = `Axis 209`
-Nunchuk/Swing/Left = `Axis 210`
-Nunchuk/Swing/Right = `Axis 211`
-Nunchuk/Swing/Forward = `Axis 212`
-Nunchuk/Swing/Backward = `Axis 213`
-Nunchuk/Tilt/Forward = `Axis 215`
-Nunchuk/Tilt/Backward = `Axis 216`
-Nunchuk/Tilt/Left = `Axis 217`
-Nunchuk/Tilt/Right = `Axis 218`
-Nunchuk/Tilt/Modifier = `Button 219`
-Nunchuk/Tilt/Modifier/Range = 50,000000
-Nunchuk/Shake/X = `Button 220`
-Nunchuk/Shake/Y = `Button 221`
-Nunchuk/Shake/Z = `Button 222`
-Classic/Buttons/A = `Button 300`
-Classic/Buttons/B = `Button 301`
-Classic/Buttons/X = `Button 302`
-Classic/Buttons/Y = `Button 303`
-Classic/Buttons/- = `Button 304`
-Classic/Buttons/+ = `Button 305`
-Classic/Buttons/Home = `Button 306`
-Classic/Buttons/ZL = `Button 307`
-Classic/Buttons/ZR = `Button 308`
-Classic/D-Pad/Up = `Button 309`
-Classic/D-Pad/Down = `Button 310`
-Classic/D-Pad/Left = `Button 311`
-Classic/D-Pad/Right = `Button 312`
-Classic/Left Stick/Up = `Axis 314`
-Classic/Left Stick/Down = `Axis 315`
-Classic/Left Stick/Left = `Axis 316`
-Classic/Left Stick/Right = `Axis 317`
-Classic/Right Stick/Up = `Axis 319`
-Classic/Right Stick/Down = `Axis 320`
-Classic/Right Stick/Left = `Axis 321`
-Classic/Right Stick/Right = `Axis 322`
-Classic/Triggers/L = `Axis 323`
-Classic/Triggers/R = `Axis 324`
-Classic/Triggers/Threshold = 90,000000
-Guitar/Buttons/- = `Button 400`
-Guitar/Buttons/+ = `Button 401`
-Guitar/Frets/Green = `Button 402`
-Guitar/Frets/Red = `Button 403`
-Guitar/Frets/Yellow = `Button 404`
-Guitar/Frets/Blue = `Button 405`
-Guitar/Frets/Orange = `Button 406`
-Guitar/Strum/Up = `Button 407`
-Guitar/Strum/Down = `Button 408`
-Guitar/Stick/Up = `Axis 410`
-Guitar/Stick/Down = `Axis 411`
-Guitar/Stick/Left = `Axis 412`
-Guitar/Stick/Right = `Axis 413`
-Guitar/Whammy/Bar = `Axis 414`
-Drums/Buttons/- = `Button 500`
-Drums/Buttons/+ = `Button 501`
-Drums/Pads/Red = `Button 502`
-Drums/Pads/Yellow = `Button 503`
-Drums/Pads/Blue = `Button 504`
-Drums/Pads/Green = `Button 505`
-Drums/Pads/Orange = `Button 506`
-Drums/Pads/Bass = `Button 507`
-Drums/Stick/Up = `Axis 509`
-Drums/Stick/Down = `Axis 510`
-Drums/Stick/Left = `Axis 511`
-Drums/Stick/Right = `Axis 512`
-Turntable/Buttons/Green Left = `Button 600`
-Turntable/Buttons/Red Left = `Button 601`
-Turntable/Buttons/Blue Left = `Button 602`
-Turntable/Buttons/Green Right = `Button 603`
-Turntable/Buttons/Red Right = `Button 604`
-Turntable/Buttons/Blue Right = `Button 605`
-Turntable/Buttons/- = `Button 606`
-Turntable/Buttons/+ = `Button 607`
-Turntable/Buttons/Home = `Button 608`
-Turntable/Buttons/Euphoria = `Button 609`
-Turntable/Table Left/Left = `Axis 611`
-Turntable/Table Left/Right = `Axis 612`
-Turntable/Table Right/Left = `Axis 614`
-Turntable/Table Right/Right = `Axis 615`
-Turntable/Stick/Up = `Axis 617`
-Turntable/Stick/Down = `Axis 618`
-Turntable/Stick/Left = `Axis 619`
-Turntable/Stick/Right = `Axis 620`
-Turntable/Effect/Dial = `Axis 621`
-Turntable/Crossfade/Left = `Axis 623`
-Turntable/Crossfade/Right = `Axis 624`
-IMUAccelerometer/Left = `Axis 625`
-IMUAccelerometer/Right = `Axis 626`
-IMUAccelerometer/Forward = `Axis 627`
-IMUAccelerometer/Backward = `Axis 628`
-IMUAccelerometer/Up = `Axis 629`
-IMUAccelerometer/Down = `Axis 630`
-IMUGyroscope/Pitch Up = `Axis 631`
-IMUGyroscope/Pitch Down = `Axis 632`
-IMUGyroscope/Roll Left = `Axis 633`
-IMUGyroscope/Roll Right = `Axis 634`
-IMUGyroscope/Yaw Left = `Axis 635`
-IMUGyroscope/Yaw Right = `Axis 636`
-Source = 1
-Rumble/Motor = `Rumble 700`
-[Wiimote2]
-Device = Android/5/Touchscreen
-Buttons/A = `Button 100`
-Buttons/B = `Button 101`
-Buttons/- = `Button 102`
-Buttons/+ = `Button 103`
-Buttons/Home = `Button 104`
-Buttons/1 = `Button 105`
-Buttons/2 = `Button 106`
-D-Pad/Up = `Button 107`
-D-Pad/Down = `Button 108`
-D-Pad/Left = `Button 109`
-D-Pad/Right = `Button 110`
-IR/Up = `Axis 112`
-IR/Down = `Axis 113`
-IR/Left = `Axis 114`
-IR/Right = `Axis 115`
-IR/Forward = `Axis 116`
-IR/Backward = `Axis 117`
-IR/Hide = `Button 118`
-IR/Total Pitch = 15
-IR/Total Yaw = 15
-IR/Vertical Offset = 10
-Swing/Up = `Axis 120`
-Swing/Down = `Axis 121`
-Swing/Left = `Axis 122`
-Swing/Right = `Axis 123`
-Swing/Forward = `Axis 124`
-Swing/Backward = `Axis 125`
-Tilt/Forward = `Axis 127`
-Tilt/Backward = `Axis 128`
-Tilt/Left = `Axis 129`
-Tilt/Right = `Axis 130`
-Tilt/Modifier = `Button 131`
-Tilt/Modifier/Range = 50,000000
-Shake/X = `Button 132`
-Shake/Y = `Button 133`
-Shake/Z = `Button 134`
-Extension = None
-Nunchuk/Buttons/C = `Button 200`
-Nunchuk/Buttons/Z = `Button 201`
-Nunchuk/Stick/Up = `Axis 203`
-Nunchuk/Stick/Down = `Axis 204`
-Nunchuk/Stick/Left = `Axis 205`
-Nunchuk/Stick/Right = `Axis 206`
-Nunchuk/Swing/Up = `Axis 208`
-Nunchuk/Swing/Down = `Axis 209`
-Nunchuk/Swing/Left = `Axis 210`
-Nunchuk/Swing/Right = `Axis 211`
-Nunchuk/Swing/Forward = `Axis 212`
-Nunchuk/Swing/Backward = `Axis 213`
-Nunchuk/Tilt/Forward = `Axis 215`
-Nunchuk/Tilt/Backward = `Axis 216`
-Nunchuk/Tilt/Left = `Axis 217`
-Nunchuk/Tilt/Right = `Axis 218`
-Nunchuk/Tilt/Modifier = `Button 219`
-Nunchuk/Tilt/Modifier/Range = 50,000000
-Nunchuk/Shake/X = `Button 220`
-Nunchuk/Shake/Y = `Button 221`
-Nunchuk/Shake/Z = `Button 222`
-Classic/Buttons/A = `Button 300`
-Classic/Buttons/B = `Button 301`
-Classic/Buttons/X = `Button 302`
-Classic/Buttons/Y = `Button 303`
-Classic/Buttons/- = `Button 304`
-Classic/Buttons/+ = `Button 305`
-Classic/Buttons/Home = `Button 306`
-Classic/Buttons/ZL = `Button 307`
-Classic/Buttons/ZR = `Button 308`
-Classic/D-Pad/Up = `Button 309`
-Classic/D-Pad/Down = `Button 310`
-Classic/D-Pad/Left = `Button 311`
-Classic/D-Pad/Right = `Button 312`
-Classic/Left Stick/Up = `Axis 314`
-Classic/Left Stick/Down = `Axis 315`
-Classic/Left Stick/Left = `Axis 316`
-Classic/Left Stick/Right = `Axis 317`
-Classic/Right Stick/Up = `Axis 319`
-Classic/Right Stick/Down = `Axis 320`
-Classic/Right Stick/Left = `Axis 321`
-Classic/Right Stick/Right = `Axis 322`
-Classic/Triggers/L = `Axis 323`
-Classic/Triggers/R = `Axis 324`
-Classic/Triggers/Threshold = 90,000000
-Guitar/Buttons/- = `Button 400`
-Guitar/Buttons/+ = `Button 401`
-Guitar/Frets/Green = `Button 402`
-Guitar/Frets/Red = `Button 403`
-Guitar/Frets/Yellow = `Button 404`
-Guitar/Frets/Blue = `Button 405`
-Guitar/Frets/Orange = `Button 406`
-Guitar/Strum/Up = `Button 407`
-Guitar/Strum/Down = `Button 408`
-Guitar/Stick/Up = `Axis 410`
-Guitar/Stick/Down = `Axis 411`
-Guitar/Stick/Left = `Axis 412`
-Guitar/Stick/Right = `Axis 413`
-Guitar/Whammy/Bar = `Axis 414`
-Drums/Buttons/- = `Button 500`
-Drums/Buttons/+ = `Button 501`
-Drums/Pads/Red = `Button 502`
-Drums/Pads/Yellow = `Button 503`
-Drums/Pads/Blue = `Button 504`
-Drums/Pads/Green = `Button 505`
-Drums/Pads/Orange = `Button 506`
-Drums/Pads/Bass = `Button 507`
-Drums/Stick/Up = `Axis 509`
-Drums/Stick/Down = `Axis 510`
-Drums/Stick/Left = `Axis 511`
-Drums/Stick/Right = `Axis 512`
-Turntable/Buttons/Green Left = `Button 600`
-Turntable/Buttons/Red Left = `Button 601`
-Turntable/Buttons/Blue Left = `Button 602`
-Turntable/Buttons/Green Right = `Button 603`
-Turntable/Buttons/Red Right = `Button 604`
-Turntable/Buttons/Blue Right = `Button 605`
-Turntable/Buttons/- = `Button 606`
-Turntable/Buttons/+ = `Button 607`
-Turntable/Buttons/Home = `Button 608`
-Turntable/Buttons/Euphoria = `Button 609`
-Turntable/Table Left/Left = `Axis 611`
-Turntable/Table Left/Right = `Axis 612`
-Turntable/Table Right/Left = `Axis 614`
-Turntable/Table Right/Right = `Axis 615`
-Turntable/Stick/Up = `Axis 617`
-Turntable/Stick/Down = `Axis 618`
-Turntable/Stick/Left = `Axis 619`
-Turntable/Stick/Right = `Axis 620`
-Turntable/Effect/Dial = `Axis 621`
-Turntable/Crossfade/Left = `Axis 623`
-Turntable/Crossfade/Right = `Axis 624`
-IMUAccelerometer/Left = `Axis 625`
-IMUAccelerometer/Right = `Axis 626`
-IMUAccelerometer/Forward = `Axis 627`
-IMUAccelerometer/Backward = `Axis 628`
-IMUAccelerometer/Up = `Axis 629`
-IMUAccelerometer/Down = `Axis 630`
-IMUGyroscope/Pitch Up = `Axis 631`
-IMUGyroscope/Pitch Down = `Axis 632`
-IMUGyroscope/Roll Left = `Axis 633`
-IMUGyroscope/Roll Right = `Axis 634`
-IMUGyroscope/Yaw Left = `Axis 635`
-IMUGyroscope/Yaw Right = `Axis 636`
-Source = 0
-Rumble/Motor = `Rumble 700`
-[Wiimote3]
-Device = Android/6/Touchscreen
-Buttons/A = `Button 100`
-Buttons/B = `Button 101`
-Buttons/- = `Button 102`
-Buttons/+ = `Button 103`
-Buttons/Home = `Button 104`
-Buttons/1 = `Button 105`
-Buttons/2 = `Button 106`
-D-Pad/Up = `Button 107`
-D-Pad/Down = `Button 108`
-D-Pad/Left = `Button 109`
-D-Pad/Right = `Button 110`
-IR/Up = `Axis 112`
-IR/Down = `Axis 113`
-IR/Left = `Axis 114`
-IR/Right = `Axis 115`
-IR/Forward = `Axis 116`
-IR/Backward = `Axis 117`
-IR/Hide = `Button 118`
-IR/Total Pitch = 15
-IR/Total Yaw = 15
-IR/Vertical Offset = 10
-Swing/Up = `Axis 120`
-Swing/Down = `Axis 121`
-Swing/Left = `Axis 122`
-Swing/Right = `Axis 123`
-Swing/Forward = `Axis 124`
-Swing/Backward = `Axis 125`
-Tilt/Forward = `Axis 127`
-Tilt/Backward = `Axis 128`
-Tilt/Left = `Axis 129`
-Tilt/Right = `Axis 130`
-Tilt/Modifier = `Button 131`
-Tilt/Modifier/Range = 50,000000
-Shake/X = `Button 132`
-Shake/Y = `Button 133`
-Shake/Z = `Button 134`
-Extension = None
-Nunchuk/Buttons/C = `Button 200`
-Nunchuk/Buttons/Z = `Button 201`
-Nunchuk/Stick/Up = `Axis 203`
-Nunchuk/Stick/Down = `Axis 204`
-Nunchuk/Stick/Left = `Axis 205`
-Nunchuk/Stick/Right = `Axis 206`
-Nunchuk/Swing/Up = `Axis 208`
-Nunchuk/Swing/Down = `Axis 209`
-Nunchuk/Swing/Left = `Axis 210`
-Nunchuk/Swing/Right = `Axis 211`
-Nunchuk/Swing/Forward = `Axis 212`
-Nunchuk/Swing/Backward = `Axis 213`
-Nunchuk/Tilt/Forward = `Axis 215`
-Nunchuk/Tilt/Backward = `Axis 216`
-Nunchuk/Tilt/Left = `Axis 217`
-Nunchuk/Tilt/Right = `Axis 218`
-Nunchuk/Tilt/Modifier = `Button 219`
-Nunchuk/Tilt/Modifier/Range = 50,000000
-Nunchuk/Shake/X = `Button 220`
-Nunchuk/Shake/Y = `Button 221`
-Nunchuk/Shake/Z = `Button 222`
-Classic/Buttons/A = `Button 300`
-Classic/Buttons/B = `Button 301`
-Classic/Buttons/X = `Button 302`
-Classic/Buttons/Y = `Button 303`
-Classic/Buttons/- = `Button 304`
-Classic/Buttons/+ = `Button 305`
-Classic/Buttons/Home = `Button 306`
-Classic/Buttons/ZL = `Button 307`
-Classic/Buttons/ZR = `Button 308`
-Classic/D-Pad/Up = `Button 309`
-Classic/D-Pad/Down = `Button 310`
-Classic/D-Pad/Left = `Button 311`
-Classic/D-Pad/Right = `Button 312`
-Classic/Left Stick/Up = `Axis 314`
-Classic/Left Stick/Down = `Axis 315`
-Classic/Left Stick/Left = `Axis 316`
-Classic/Left Stick/Right = `Axis 317`
-Classic/Right Stick/Up = `Axis 319`
-Classic/Right Stick/Down = `Axis 320`
-Classic/Right Stick/Left = `Axis 321`
-Classic/Right Stick/Right = `Axis 322`
-Classic/Triggers/L = `Axis 323`
-Classic/Triggers/R = `Axis 324`
-Classic/Triggers/Threshold = 90,000000
-Guitar/Buttons/- = `Button 400`
-Guitar/Buttons/+ = `Button 401`
-Guitar/Frets/Green = `Button 402`
-Guitar/Frets/Red = `Button 403`
-Guitar/Frets/Yellow = `Button 404`
-Guitar/Frets/Blue = `Button 405`
-Guitar/Frets/Orange = `Button 406`
-Guitar/Strum/Up = `Button 407`
-Guitar/Strum/Down = `Button 408`
-Guitar/Stick/Up = `Axis 410`
-Guitar/Stick/Down = `Axis 411`
-Guitar/Stick/Left = `Axis 412`
-Guitar/Stick/Right = `Axis 413`
-Guitar/Whammy/Bar = `Axis 414`
-Drums/Buttons/- = `Button 500`
-Drums/Buttons/+ = `Button 501`
-Drums/Pads/Red = `Button 502`
-Drums/Pads/Yellow = `Button 503`
-Drums/Pads/Blue = `Button 504`
-Drums/Pads/Green = `Button 505`
-Drums/Pads/Orange = `Button 506`
-Drums/Pads/Bass = `Button 507`
-Drums/Stick/Up = `Axis 509`
-Drums/Stick/Down = `Axis 510`
-Drums/Stick/Left = `Axis 511`
-Drums/Stick/Right = `Axis 512`
-Turntable/Buttons/Green Left = `Button 600`
-Turntable/Buttons/Red Left = `Button 601`
-Turntable/Buttons/Blue Left = `Button 602`
-Turntable/Buttons/Green Right = `Button 603`
-Turntable/Buttons/Red Right = `Button 604`
-Turntable/Buttons/Blue Right = `Button 605`
-Turntable/Buttons/- = `Button 606`
-Turntable/Buttons/+ = `Button 607`
-Turntable/Buttons/Home = `Button 608`
-Turntable/Buttons/Euphoria = `Button 609`
-Turntable/Table Left/Left = `Axis 611`
-Turntable/Table Left/Right = `Axis 612`
-Turntable/Table Right/Left = `Axis 614`
-Turntable/Table Right/Right = `Axis 615`
-Turntable/Stick/Up = `Axis 617`
-Turntable/Stick/Down = `Axis 618`
-Turntable/Stick/Left = `Axis 619`
-Turntable/Stick/Right = `Axis 620`
-Turntable/Effect/Dial = `Axis 621`
-Turntable/Crossfade/Left = `Axis 623`
-Turntable/Crossfade/Right = `Axis 624`
-IMUAccelerometer/Left = `Axis 625`
-IMUAccelerometer/Right = `Axis 626`
-IMUAccelerometer/Forward = `Axis 627`
-IMUAccelerometer/Backward = `Axis 628`
-IMUAccelerometer/Up = `Axis 629`
-IMUAccelerometer/Down = `Axis 630`
-IMUGyroscope/Pitch Up = `Axis 631`
-IMUGyroscope/Pitch Down = `Axis 632`
-IMUGyroscope/Roll Left = `Axis 633`
-IMUGyroscope/Roll Right = `Axis 634`
-IMUGyroscope/Yaw Left = `Axis 635`
-IMUGyroscope/Yaw Right = `Axis 636`
-Source = 0
-Rumble/Motor = `Rumble 700`
-[Wiimote4]
-Device = Android/7/Touchscreen
-Buttons/A = `Button 100`
-Buttons/B = `Button 101`
-Buttons/- = `Button 102`
-Buttons/+ = `Button 103`
-Buttons/Home = `Button 104`
-Buttons/1 = `Button 105`
-Buttons/2 = `Button 106`
-D-Pad/Up = `Button 107`
-D-Pad/Down = `Button 108`
-D-Pad/Left = `Button 109`
-D-Pad/Right = `Button 110`
-IR/Up = `Axis 112`
-IR/Down = `Axis 113`
-IR/Left = `Axis 114`
-IR/Right = `Axis 115`
-IR/Forward = `Axis 116`
-IR/Backward = `Axis 117`
-IR/Hide = `Button 118`
-IR/Total Pitch = 15
-IR/Total Yaw = 15
-IR/Vertical Offset = 10
-Swing/Up = `Axis 120`
-Swing/Down = `Axis 121`
-Swing/Left = `Axis 122`
-Swing/Right = `Axis 123`
-Swing/Forward = `Axis 124`
-Swing/Backward = `Axis 125`
-Tilt/Forward = `Axis 127`
-Tilt/Backward = `Axis 128`
-Tilt/Left = `Axis 129`
-Tilt/Right = `Axis 130`
-Tilt/Modifier = `Button 131`
-Tilt/Modifier/Range = 50,000000
-Shake/X = `Button 132`
-Shake/Y = `Button 133`
-Shake/Z = `Button 134`
-Extension = None
-Nunchuk/Buttons/C = `Button 200`
-Nunchuk/Buttons/Z = `Button 201`
-Nunchuk/Stick/Up = `Axis 203`
-Nunchuk/Stick/Down = `Axis 204`
-Nunchuk/Stick/Left = `Axis 205`
-Nunchuk/Stick/Right = `Axis 206`
-Nunchuk/Swing/Up = `Axis 208`
-Nunchuk/Swing/Down = `Axis 209`
-Nunchuk/Swing/Left = `Axis 210`
-Nunchuk/Swing/Right = `Axis 211`
-Nunchuk/Swing/Forward = `Axis 212`
-Nunchuk/Swing/Backward = `Axis 213`
-Nunchuk/Tilt/Forward = `Axis 215`
-Nunchuk/Tilt/Backward = `Axis 216`
-Nunchuk/Tilt/Left = `Axis 217`
-Nunchuk/Tilt/Right = `Axis 218`
-Nunchuk/Tilt/Modifier = `Button 219`
-Nunchuk/Tilt/Modifier/Range = 50,000000
-Nunchuk/Shake/X = `Button 220`
-Nunchuk/Shake/Y = `Button 221`
-Nunchuk/Shake/Z = `Button 222`
-Classic/Buttons/A = `Button 300`
-Classic/Buttons/B = `Button 301`
-Classic/Buttons/X = `Button 302`
-Classic/Buttons/Y = `Button 303`
-Classic/Buttons/- = `Button 304`
-Classic/Buttons/+ = `Button 305`
-Classic/Buttons/Home = `Button 306`
-Classic/Buttons/ZL = `Button 307`
-Classic/Buttons/ZR = `Button 308`
-Classic/D-Pad/Up = `Button 309`
-Classic/D-Pad/Down = `Button 310`
-Classic/D-Pad/Left = `Button 311`
-Classic/D-Pad/Right = `Button 312`
-Classic/Left Stick/Up = `Axis 314`
-Classic/Left Stick/Down = `Axis 315`
-Classic/Left Stick/Left = `Axis 316`
-Classic/Left Stick/Right = `Axis 317`
-Classic/Right Stick/Up = `Axis 319`
-Classic/Right Stick/Down = `Axis 320`
-Classic/Right Stick/Left = `Axis 321`
-Classic/Right Stick/Right = `Axis 322`
-Classic/Triggers/L = `Axis 323`
-Classic/Triggers/R = `Axis 324`
-Classic/Triggers/Threshold = 90,000000
-Guitar/Buttons/- = `Button 400`
-Guitar/Buttons/+ = `Button 401`
-Guitar/Frets/Green = `Button 402`
-Guitar/Frets/Red = `Button 403`
-Guitar/Frets/Yellow = `Button 404`
-Guitar/Frets/Blue = `Button 405`
-Guitar/Frets/Orange = `Button 406`
-Guitar/Strum/Up = `Button 407`
-Guitar/Strum/Down = `Button 408`
-Guitar/Stick/Up = `Axis 410`
-Guitar/Stick/Down = `Axis 411`
-Guitar/Stick/Left = `Axis 412`
-Guitar/Stick/Right = `Axis 413`
-Guitar/Whammy/Bar = `Axis 414`
-Drums/Buttons/- = `Button 500`
-Drums/Buttons/+ = `Button 501`
-Drums/Pads/Red = `Button 502`
-Drums/Pads/Yellow = `Button 503`
-Drums/Pads/Blue = `Button 504`
-Drums/Pads/Green = `Button 505`
-Drums/Pads/Orange = `Button 506`
-Drums/Pads/Bass = `Button 507`
-Drums/Stick/Up = `Axis 509`
-Drums/Stick/Down = `Axis 510`
-Drums/Stick/Left = `Axis 511`
-Drums/Stick/Right = `Axis 512`
-Turntable/Buttons/Green Left = `Button 600`
-Turntable/Buttons/Red Left = `Button 601`
-Turntable/Buttons/Blue Left = `Button 602`
-Turntable/Buttons/Green Right = `Button 603`
-Turntable/Buttons/Red Right = `Button 604`
-Turntable/Buttons/Blue Right = `Button 605`
-Turntable/Buttons/- = `Button 606`
-Turntable/Buttons/+ = `Button 607`
-Turntable/Buttons/Home = `Button 608`
-Turntable/Buttons/Euphoria = `Button 609`
-Turntable/Table Left/Left = `Axis 611`
-Turntable/Table Left/Right = `Axis 612`
-Turntable/Table Right/Left = `Axis 614`
-Turntable/Table Right/Right = `Axis 615`
-Turntable/Stick/Up = `Axis 617`
-Turntable/Stick/Down = `Axis 618`
-Turntable/Stick/Left = `Axis 619`
-Turntable/Stick/Right = `Axis 620`
-Turntable/Effect/Dial = `Axis 621`
-Turntable/Crossfade/Left = `Axis 623`
-Turntable/Crossfade/Right = `Axis 624`
-IMUAccelerometer/Left = `Axis 625`
-IMUAccelerometer/Right = `Axis 626`
-IMUAccelerometer/Forward = `Axis 627`
-IMUAccelerometer/Backward = `Axis 628`
-IMUAccelerometer/Up = `Axis 629`
-IMUAccelerometer/Down = `Axis 630`
-IMUGyroscope/Pitch Up = `Axis 631`
-IMUGyroscope/Pitch Down = `Axis 632`
-IMUGyroscope/Roll Left = `Axis 633`
-IMUGyroscope/Roll Right = `Axis 634`
-IMUGyroscope/Yaw Left = `Axis 635`
-IMUGyroscope/Yaw Right = `Axis 636`
-Source = 0
-Rumble/Motor = `Rumble 700`
diff --git a/Source/Android/app/src/main/assets/WiimoteProfile.ini b/Source/Android/app/src/main/assets/WiimoteProfile.ini
deleted file mode 100644
index 89f7d87f5b..0000000000
--- a/Source/Android/app/src/main/assets/WiimoteProfile.ini
+++ /dev/null
@@ -1,144 +0,0 @@
-[Profile]
-Device = Android/4/Touchscreen
-Buttons/A = `Button 100`
-Buttons/B = `Button 101`
-Buttons/- = `Button 102`
-Buttons/+ = `Button 103`
-Buttons/Home = `Button 104`
-Buttons/1 = `Button 105`
-Buttons/2 = `Button 106`
-D-Pad/Up = `Button 107`
-D-Pad/Down = `Button 108`
-D-Pad/Left = `Button 109`
-D-Pad/Right = `Button 110`
-IR/Up = `Axis 112`
-IR/Down = `Axis 113`
-IR/Left = `Axis 114`
-IR/Right = `Axis 115`
-IR/Forward = `Axis 116`
-IR/Backward = `Axis 117`
-IR/Hide = `Button 118`
-IR/Total Pitch = 20
-IR/Total Yaw = 25
-IR/Vertical Offset = 10
-Swing/Up = `Axis 120`
-Swing/Down = `Axis 121`
-Swing/Left = `Axis 122`
-Swing/Right = `Axis 123`
-Swing/Forward = `Axis 124`
-Swing/Backward = `Axis 125`
-Tilt/Forward = `Axis 127`
-Tilt/Backward = `Axis 128`
-Tilt/Left = `Axis 129`
-Tilt/Right = `Axis 130`
-Tilt/Modifier = `Button 131`
-Tilt/Modifier/Range = 50,000000
-Shake/X = `Button 132`
-Shake/Y = `Button 133`
-Shake/Z = `Button 134`
-Extension = Nunchuk
-Nunchuk/Buttons/C = `Button 200`
-Nunchuk/Buttons/Z = `Button 201`
-Nunchuk/Stick/Up = `Axis 203`
-Nunchuk/Stick/Down = `Axis 204`
-Nunchuk/Stick/Left = `Axis 205`
-Nunchuk/Stick/Right = `Axis 206`
-Nunchuk/Swing/Up = `Axis 208`
-Nunchuk/Swing/Down = `Axis 209`
-Nunchuk/Swing/Left = `Axis 210`
-Nunchuk/Swing/Right = `Axis 211`
-Nunchuk/Swing/Forward = `Axis 212`
-Nunchuk/Swing/Backward = `Axis 213`
-Nunchuk/Tilt/Forward = `Axis 215`
-Nunchuk/Tilt/Backward = `Axis 216`
-Nunchuk/Tilt/Left = `Axis 217`
-Nunchuk/Tilt/Right = `Axis 218`
-Nunchuk/Tilt/Modifier = `Button 219`
-Nunchuk/Tilt/Modifier/Range = 50,000000
-Nunchuk/Shake/X = `Button 220`
-Nunchuk/Shake/Y = `Button 221`
-Nunchuk/Shake/Z = `Button 222`
-Classic/Buttons/A = `Button 300`
-Classic/Buttons/B = `Button 301`
-Classic/Buttons/X = `Button 302`
-Classic/Buttons/Y = `Button 303`
-Classic/Buttons/- = `Button 304`
-Classic/Buttons/+ = `Button 305`
-Classic/Buttons/Home = `Button 306`
-Classic/Buttons/ZL = `Button 307`
-Classic/Buttons/ZR = `Button 308`
-Classic/D-Pad/Up = `Button 309`
-Classic/D-Pad/Down = `Button 310`
-Classic/D-Pad/Left = `Button 311`
-Classic/D-Pad/Right = `Button 312`
-Classic/Left Stick/Up = `Axis 314`
-Classic/Left Stick/Down = `Axis 315`
-Classic/Left Stick/Left = `Axis 316`
-Classic/Left Stick/Right = `Axis 317`
-Classic/Right Stick/Up = `Axis 319`
-Classic/Right Stick/Down = `Axis 320`
-Classic/Right Stick/Left = `Axis 321`
-Classic/Right Stick/Right = `Axis 322`
-Classic/Triggers/L = `Axis 323`
-Classic/Triggers/R = `Axis 324`
-Classic/Triggers/Threshold = 90,000000
-Guitar/Buttons/- = `Button 400`
-Guitar/Buttons/+ = `Button 401`
-Guitar/Frets/Green = `Button 402`
-Guitar/Frets/Red = `Button 403`
-Guitar/Frets/Yellow = `Button 404`
-Guitar/Frets/Blue = `Button 405`
-Guitar/Frets/Orange = `Button 406`
-Guitar/Strum/Up = `Button 407`
-Guitar/Strum/Down = `Button 408`
-Guitar/Stick/Up = `Axis 410`
-Guitar/Stick/Down = `Axis 411`
-Guitar/Stick/Left = `Axis 412`
-Guitar/Stick/Right = `Axis 413`
-Guitar/Whammy/Bar = `Axis 414`
-Drums/Buttons/- = `Button 500`
-Drums/Buttons/+ = `Button 501`
-Drums/Pads/Red = `Button 502`
-Drums/Pads/Yellow = `Button 503`
-Drums/Pads/Blue = `Button 504`
-Drums/Pads/Green = `Button 505`
-Drums/Pads/Orange = `Button 506`
-Drums/Pads/Bass = `Button 507`
-Drums/Stick/Up = `Axis 509`
-Drums/Stick/Down = `Axis 510`
-Drums/Stick/Left = `Axis 511`
-Drums/Stick/Right = `Axis 512`
-Turntable/Buttons/Green Left = `Button 600`
-Turntable/Buttons/Red Left = `Button 601`
-Turntable/Buttons/Blue Left = `Button 602`
-Turntable/Buttons/Green Right = `Button 603`
-Turntable/Buttons/Red Right = `Button 604`
-Turntable/Buttons/Blue Right = `Button 605`
-Turntable/Buttons/- = `Button 606`
-Turntable/Buttons/+ = `Button 607`
-Turntable/Buttons/Home = `Button 608`
-Turntable/Buttons/Euphoria = `Button 609`
-Turntable/Table Left/Left = `Axis 611`
-Turntable/Table Left/Right = `Axis 612`
-Turntable/Table Right/Left = `Axis 614`
-Turntable/Table Right/Right = `Axis 615`
-Turntable/Stick/Up = `Axis 617`
-Turntable/Stick/Down = `Axis 618`
-Turntable/Stick/Left = `Axis 619`
-Turntable/Stick/Right = `Axis 620`
-Turntable/Effect/Dial = `Axis 621`
-Turntable/Crossfade/Left = `Axis 623`
-Turntable/Crossfade/Right = `Axis 624`
-IMUAccelerometer/Left = `Axis 625`
-IMUAccelerometer/Right = `Axis 626`
-IMUAccelerometer/Forward = `Axis 627`
-IMUAccelerometer/Backward = `Axis 628`
-IMUAccelerometer/Up = `Axis 629`
-IMUAccelerometer/Down = `Axis 630`
-IMUGyroscope/Pitch Up = `Axis 631`
-IMUGyroscope/Pitch Down = `Axis 632`
-IMUGyroscope/Roll Left = `Axis 633`
-IMUGyroscope/Roll Right = `Axis 634`
-IMUGyroscope/Yaw Left = `Axis 635`
-IMUGyroscope/Yaw Right = `Axis 636`
-Rumble/Motor = `Rumble 700`
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
index b1584df1be..c4bfdbd7bf 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
@@ -31,13 +31,16 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 /**
- * A service that spawns its own thread in order to copy several binary and shader files
- * from the Dolphin APK to the external file system.
+ * A class that spawns its own thread in order perform initialization.
+ *
+ * The initialization steps include:
+ * - Extracting the Sys directory from the APK so it can be accessed using regular file APIs
+ * - Letting the native code know where on external storage it should place the User directory
+ * - Running the native code's init steps (which include things like populating the User directory)
  */
 public final class DirectoryInitialization
 {
   public static final String EXTRA_STATE = "directoryState";
-  private static final int WiimoteNewVersion = 5;  // Last changed in PR 8907
   private static final MutableLiveData<DirectoryInitializationState> directoryState =
           new MutableLiveData<>(DirectoryInitializationState.NOT_YET_INITIALIZED);
   private static volatile boolean areDirectoriesAvailable = false;
@@ -73,8 +76,7 @@ public final class DirectoryInitialization
       System.exit(1);
     }
 
-    initializeInternalStorage(context);
-    boolean wiimoteIniWritten = initializeExternalStorage(context);
+    extractSysDirectory(context);
     NativeLibrary.Initialize();
     NativeLibrary.ReportStartToAnalytics();
 
@@ -82,7 +84,8 @@ public final class DirectoryInitialization
 
     checkThemeSettings(context);
 
-    if (wiimoteIniWritten)
+    // TODO: Does doing this still make sense?
+    if (false)
     {
       // This has to be done after calling NativeLibrary.Initialize(),
       // as it relies on the config system
@@ -131,7 +134,7 @@ public final class DirectoryInitialization
     return true;
   }
 
-  private static void initializeInternalStorage(Context context)
+  private static void extractSysDirectory(Context context)
   {
     File sysDirectory = new File(context.getFilesDir(), "Sys");
 
@@ -153,45 +156,6 @@ public final class DirectoryInitialization
     SetSysDirectory(sysDirectory.getPath());
   }
 
-  // Returns whether the WiimoteNew.ini file was written to
-  private static boolean initializeExternalStorage(Context context)
-  {
-    // Create User directory structure and copy some NAND files from the extracted Sys directory.
-    CreateUserDirectories();
-
-    // GCPadNew.ini and WiimoteNew.ini must contain specific values in order for controller
-    // input to work as intended (they aren't user configurable), so we overwrite them just
-    // in case the user has tried to modify them manually.
-    //
-    // ...Except WiimoteNew.ini contains the user configurable settings for Wii Remote
-    // extensions in addition to all of its lines that aren't user configurable, so since we
-    // don't want to lose the selected extensions, we don't overwrite that file if it exists.
-    //
-    // TODO: Redo the Android controller system so that we don't have to extract these INIs.
-    String configDirectory = NativeLibrary.GetUserDirectory() + File.separator + "Config";
-    String profileDirectory =
-            NativeLibrary.GetUserDirectory() + File.separator + "Config/Profiles/Wiimote/";
-    createWiimoteProfileDirectory(profileDirectory);
-
-    copyAsset("GCPadNew.ini", new File(configDirectory, "GCPadNew.ini"), true, context);
-
-    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-    boolean overwriteWiimoteIni = prefs.getInt("WiimoteNewVersion", 0) != WiimoteNewVersion;
-    boolean wiimoteIniWritten = copyAsset("WiimoteNew.ini",
-            new File(configDirectory, "WiimoteNew.ini"), overwriteWiimoteIni, context);
-    if (overwriteWiimoteIni)
-    {
-      SharedPreferences.Editor sPrefsEditor = prefs.edit();
-      sPrefsEditor.putInt("WiimoteNewVersion", WiimoteNewVersion);
-      sPrefsEditor.apply();
-    }
-
-    copyAsset("WiimoteProfile.ini", new File(profileDirectory, "WiimoteProfile.ini"), true,
-            context);
-
-    return wiimoteIniWritten;
-  }
-
   private static void deleteDirectoryRecursively(@NonNull final File file)
   {
     if (file.isDirectory())
@@ -322,18 +286,6 @@ public final class DirectoryInitialization
     }
   }
 
-  private static void createWiimoteProfileDirectory(String directory)
-  {
-    File wiiPath = new File(directory);
-    if (!wiiPath.isDirectory())
-    {
-      if (!wiiPath.mkdirs())
-      {
-        Log.error("[DirectoryInitialization] Failed to create folder " + wiiPath.getAbsolutePath());
-      }
-    }
-  }
-
   public static boolean preferOldFolderPicker(Context context)
   {
     // As of January 2021, ACTION_OPEN_DOCUMENT_TREE seems to be broken on the Nvidia Shield TV
@@ -433,7 +385,5 @@ public final class DirectoryInitialization
     }
   }
 
-  private static native void CreateUserDirectories();
-
   private static native void SetSysDirectory(String path);
 }
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
index 95297664db..375d470eb5 100644
--- a/Source/Android/jni/MainAndroid.cpp
+++ b/Source/Android/jni/MainAndroid.cpp
@@ -355,12 +355,6 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_utils_DirectoryInitializat
   File::SetSysDirectory(path);
 }
 
-JNIEXPORT void JNICALL
-Java_org_dolphinemu_dolphinemu_utils_DirectoryInitialization_CreateUserDirectories(JNIEnv*, jclass)
-{
-  UICommon::CreateDirectories();
-}
-
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetUserDirectory(
     JNIEnv* env, jclass, jstring jDirectory)
 {
@@ -510,6 +504,7 @@ Java_org_dolphinemu_dolphinemu_NativeLibrary_UpdateGCAdapterScanThread(JNIEnv*,
 
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Initialize(JNIEnv*, jclass)
 {
+  UICommon::CreateDirectories();
   Common::RegisterMsgAlertHandler(&MsgAlert);
   Common::AndroidSetReportHandler(&ReportSend);
   DolphinAnalytics::AndroidSetGetValFunc(&GetAnalyticValue);