diff --git a/emu-configs/citra-qt-config.ini b/emu-configs/citra-qt-config.ini index 8de23ae3..a6a37549 100644 --- a/emu-configs/citra-qt-config.ini +++ b/emu-configs/citra-qt-config.ini @@ -39,43 +39,43 @@ camera_outer_right_name\default=true [Controls] profile=0 profile\default=true -profiles\1\button_a="button:1,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_a="button:0,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_a\default=false -profiles\1\button_b="button:0,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_b="button:1,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_b\default=false profiles\1\button_debug="code:79,engine:keyboard" profiles\1\button_debug\default=true -profiles\1\button_down="direction:down,engine:sdl,guid:030000005e040000120b000005050000,hat:0,port:0" +profiles\1\button_down="direction:down,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0" profiles\1\button_down\default=false profiles\1\button_gpio14="code:80,engine:keyboard" profiles\1\button_gpio14\default=true -profiles\1\button_home="button:8,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_home="button:8,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_home\default=false -profiles\1\button_l="button:4,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_l="button:4,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_l\default=false -profiles\1\button_left="direction:left,engine:sdl,guid:030000005e040000120b000005050000,hat:0,port:0" +profiles\1\button_left="direction:left,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0" profiles\1\button_left\default=false -profiles\1\button_r="button:5,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_r="button:5,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_r\default=false -profiles\1\button_right="direction:right,engine:sdl,guid:030000005e040000120b000005050000,hat:0,port:0" +profiles\1\button_right="direction:right,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0" profiles\1\button_right\default=false -profiles\1\button_select="button:6,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_select="button:6,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_select\default=false -profiles\1\button_start="button:7,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_start="button:7,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_start\default=false -profiles\1\button_up="direction:up,engine:sdl,guid:030000005e040000120b000005050000,hat:0,port:0" +profiles\1\button_up="direction:up,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0" profiles\1\button_up\default=false -profiles\1\button_x="button:3,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_x="button:2,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_x\default=false -profiles\1\button_y="button:2,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\button_y="button:3,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\button_y\default=false -profiles\1\button_zl="axis:2,direction:-,engine:sdl,guid:030000005e040000120b000005050000,port:0,threshold:0.000015" +profiles\1\button_zl="axis:3,direction:-,engine:sdl,guid:03000000de280000ff11000001000000,port:0,threshold:-0.5" profiles\1\button_zl\default=false -profiles\1\button_zr="axis:5,direction:-,engine:sdl,guid:030000005e040000120b000005050000,port:0,threshold:0.000015" +profiles\1\button_zr="axis:5,direction:+,engine:sdl,guid:03000000de280000ff11000001000000,port:0,threshold:0.5" profiles\1\button_zr\default=false -profiles\1\c_stick="axis_x:3,axis_y:4,deadzone:0.100000,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\c_stick="axis_x:3,axis_y:4,deadzone:0.100000,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\c_stick\default=false -profiles\1\circle_pad="axis_x:0,axis_y:1,deadzone:0.100000,engine:sdl,guid:030000005e040000120b000005050000,port:0" +profiles\1\circle_pad="axis_x:0,axis_y:1,deadzone:0.100000,engine:sdl,guid:03000000de280000ff11000001000000,port:0" profiles\1\circle_pad\default=false profiles\1\motion_device="engine:motion_emu,update_period:100,sensitivity:0.01,tilt_clamp:90.0" profiles\1\motion_device\default=true @@ -106,10 +106,10 @@ use_cpu_jit=true use_cpu_jit\default=true [Data%20Storage] -nand_directory=/home/steamos/.var/app/net.retrodeck.retrodeck/data/citra-emu/nand/ -nand_directory\default=true -sdmc_directory=/home/steamos/.var/app/net.retrodeck.retrodeck/data/citra-emu/sdmc/ -sdmc_directory\default=true +nand_directory=~/retrodeck/saves/Citra/nand/ +nand_directory\default=false +sdmc_directory=~/retrodeck/saves/Citra/sdmc/ +sdmc_directory\default=false use_virtual_sd=true use_virtual_sd\default=true @@ -330,8 +330,8 @@ Paths\language=en Paths\language\default=false Paths\moviePlaybackPath= Paths\movieRecordPath= -Paths\recentFiles=/var/config/emulationstation/ROMs/n3ds/Gyakuten Saiban 123 - Naruhodo Selection (Japan) Decrypted.3ds -Paths\romsPath= +Paths\recentFiles= +Paths\romsPath=/home/deck/retrodeck/roms/n3ds Paths\screenshotPath= Paths\symbolsPath= Paths\videoDumpingPath= @@ -353,8 +353,8 @@ Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq=- Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq\default=true Shortcuts\Main%20Window\Exit%20Citra\Context=1 Shortcuts\Main%20Window\Exit%20Citra\Context\default=true -Shortcuts\Main%20Window\Exit%20Citra\KeySeq=Ctrl+Q -Shortcuts\Main%20Window\Exit%20Citra\KeySeq\default=true +Shortcuts\Main%20Window\Exit%20Citra\KeySeq=T +Shortcuts\Main%20Window\Exit%20Citra\KeySeq\default=false Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1 Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Esc @@ -377,8 +377,8 @@ Shortcuts\Main%20Window\Load%20File\KeySeq=Ctrl+O Shortcuts\Main%20Window\Load%20File\KeySeq\default=true Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context=1 Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context\default=true -Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq=Ctrl+V -Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq\default=true +Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq=R +Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq\default=false Shortcuts\Main%20Window\Remove%20Amiibo\Context=2 Shortcuts\Main%20Window\Remove%20Amiibo\Context\default=true Shortcuts\Main%20Window\Remove%20Amiibo\KeySeq=F3 @@ -393,16 +393,16 @@ Shortcuts\Main%20Window\Rotate%20Screens%20Upright\KeySeq=F8 Shortcuts\Main%20Window\Rotate%20Screens%20Upright\KeySeq\default=true Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\Context=1 Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\Context\default=true -Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\KeySeq=Ctrl+C -Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\KeySeq\default=true +Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\KeySeq=L +Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\KeySeq\default=false Shortcuts\Main%20Window\Stop%20Emulation\Context=1 Shortcuts\Main%20Window\Stop%20Emulation\Context\default=true Shortcuts\Main%20Window\Stop%20Emulation\KeySeq=F5 Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=true Shortcuts\Main%20Window\Swap%20Screens\Context=1 Shortcuts\Main%20Window\Swap%20Screens\Context\default=true -Shortcuts\Main%20Window\Swap%20Screens\KeySeq=F9 -Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=true +Shortcuts\Main%20Window\Swap%20Screens\KeySeq=Y +Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=false Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\Context=2 Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\Context\default=true Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\KeySeq=Ctrl+Z @@ -452,7 +452,7 @@ fullscreen=true fullscreen\default=true hideInactiveMouse=false hideInactiveMouse\default=true -pauseWhenInBackground=false +pauseWhenInBackground=true pauseWhenInBackground\default=true screenshot_resolution_factor=0 screenshot_resolution_factor\default=true diff --git a/retrodeck.sh b/retrodeck.sh index c2e30371..8f65ee31 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -132,6 +132,10 @@ standalones_init() { # CITRA mkdir -pv /var/config/citra-emu/ cp -fv $emuconfigs/citra-qt-config.ini /var/config/citra-emu/qt-config.ini + sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini + #TODO: do the same with roms folders after new variables is pushed (check even the others qt-emu) + #But actually everything is always symlinked to retrodeck/roms so it might be not needed + #sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini # RPCS3 mkdir -pv /var/config/rpcs3/