mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-03 06:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/MarioPartyNetplay/Dolphin-MPN

Browse source
This commit is contained in:
Nayla Hanegan 2024-12-26 18:01:35 -05:00
commit 7a99b34f21
2 changed files with 57 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View file

@ -16,9 +16,9 @@ jobs:
run: rm -rf /home/runner/work/Dolphin-MPN-src/Dolphin-MPN-src/.git run: rm -rf /home/runner/work/Dolphin-MPN-src/Dolphin-MPN-src/.git
- name: Setup Packages - name: Setup Packages
run: | run: |
sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && \ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && \
sudo flatpak install org.kde.Sdk//5.15 org.kde.Platform//5.15 -y && \ flatpak install org.kde.Sdk//5.15 org.kde.Platform//5.15 -y && \
sudo dnf install libusb1-devel cmake git gcc-c++ libXext-devel libgudev qt6-qtbase-devel systemd-devel openal-soft-devel libevdev-devel libao-devel SOIL-devel libXrandr-devel pulseaudio-libs-devel bluez-libs-devel p7zip SDL2-devel make automake gcc gcc-c++ kernel-devel -y dnf install libusb1-devel cmake git gcc-c++ libXext-devel libgudev qt6-qtbase-devel systemd-devel openal-soft-devel libevdev-devel libao-devel SOIL-devel libXrandr-devel pulseaudio-libs-devel bluez-libs-devel p7zip SDL2-devel make automake gcc gcc-c++ kernel-devel -y
- name: Run Flatpak Builder - name: Run Flatpak Builder
uses: flatpak/flatpak-github-actions@v2 uses: flatpak/flatpak-github-actions@v2
with: with:

108
Data/Sys/GameSettings/GP6E01.ini
View file

@ -732,7 +732,7 @@ $Day/Night Cycle - Faster Day and Night Cycles [Airsola]
$Day/Night Cycle - Start during the Night [Tabitha] $Day/Night Cycle - Start during the Night [Tabitha]
2C265B74 00000100 2C265B74 00000100
2E265B74 00000200 2E265B74 000001FF
00265B80 00000040 00265B80 00000040
E2000002 80008000 E2000002 80008000
@ -911,8 +911,8 @@ $Minigame - Battle Games - Always 50 Coins [Tabitha]
0424BABC 00000032 0424BABC 00000032
0424BAC0 00000032 0424BAC0 00000032
$Minigame - Battle Games - Coins Taken is based off of Progress [Tabitha $Minigame - Battle Games - Coins Taken is based off of Progress [Tabitha]
C21F0168 00000014 C21F0168 00000037
3DC08026 89EE5B75 3DC08026 89EE5B75
3A000001 7DEF8214 3A000001 7DEF8214
3A000005 7DEF83D6 3A000005 7DEF83D6
@ -920,54 +920,54 @@ C21F0168 00000014
7EEF8A14 7F2FBA14 7EEF8A14 7F2FBA14
3E608026 8A735B74 3E608026 8A735B74
3E808021 62943980 3E808021 62943980
7C138040 4081004C 7C137840 4081012C
7C138840 40810038 7C138040 408100E0
7C13B840 40810024 7C138840 40810094
7C13C840 40810010 7C13B840 40810048
38000005 90140000 38000032 3F408024
48000034 38000004 635ABAB0 901A0000
90140000 48000028 3F408024 635ABAB4
38000003 90140000 901A0000 3F408024
4800001C 38000002 635ABAB8 901A0000
90140000 48000010 3F408024 635ABABC
38000001 90140000 901A0000 3F408024
635ABAC0 901A0000
48000114 3800001E
3F408024 635ABAB0
901A0000 3F408024
635ABAB4 901A0000
3F408024 635ABAB8
901A0000 3F408024
635ABABC 901A0000
3F408024 635ABAC0
901A0000 480000D0
38000014 3F408024
635ABAB0 901A0000
3F408024 635ABAB4
901A0000 3F408024
635ABAB8 901A0000
3F408024 635ABABC
901A0000 3F408024
635ABAC0 901A0000
4800008C 3800000A
3F408024 635ABAB0
901A0000 3F408024
635ABAB4 901A0000
3F408024 635ABAB8
901A0000 3F408024
635ABABC 901A0000
3F408024 635ABAC0
901A0000 48000048
38000005 3F408024
635ABAB0 901A0000
3F408024 635ABAB4
901A0000 3F408024
635ABAB8 901A0000
3F408024 635ABABC
901A0000 3F408024
635ABAC0 901A0000
48000004 38600064 48000004 38600064
60000000 00000000 60000000 00000000
20213980 00000005
0424BAB0 00000032
0424BAB4 00000032
0424BAB8 00000032
0424BABC 00000032
0424BAC0 00000032
E2000001 80008000
20213980 00000004
0424BAB0 0000001E
0424BAB4 0000001E
0424BAB8 0000001E
0424BABC 0000001E
0424BAC0 0000001E
E2000001 80008000
20213980 00000003
0424BAB0 00000014
0424BAB4 00000014
0424BAB8 00000014
0424BABC 00000014
0424BAC0 00000014
E2000001 80008000
20213980 00000002
0424BAB0 0000000A
0424BAB4 0000000A
0424BAB8 0000000A
0424BABC 0000000A
0424BAC0 0000000A
E2000001 80008000
20213980 00000001
0424BAB0 00000005
0424BAB4 00000005
0424BAB8 00000005
0424BABC 00000005
0424BAC0 00000005
E2000001 80008000
*Battle minigames take coins dependent on the progress of the game. *Battle minigames take coins dependent on the progress of the game.
*1/5 = 5 *1/5 = 5
*2/5 = 10 *2/5 = 10
@ -986,13 +986,13 @@ e2000001 80008000
*Battle Minigames do not count towards the Mini-Game Star. *Battle Minigames do not count towards the Mini-Game Star.
$Minigame - Battle Games - Force A Battle Right Before Last 5 Turns [Tabitha, gamemasterplc] $Minigame - Battle Games - Force A Battle Right Before Last 5 Turns [Tabitha, gamemasterplc]
C221E51C 00000006 C21F015C 00000006
3C608029 8883151D 3C608026 88835B74
8803151E 7CA40050 88035B75 7CA40050
2C050004 40820014 2C050004 40820014
3CA08021 60A5E57C 3CA0801F 60A50184
7CA903A6 4E800420 7CA903A6 4E800420
801E0000 00000000 801F0000 00000000
$Minigame - Catch You Letter - Disable Love Letters [Tabitha] $Minigame - Catch You Letter - Disable Love Letters [Tabitha]
204CBD6C 80010028 204CBD6C 80010028