diff --git a/Data/Sys/GameSettings/GMPE01.ini b/Data/Sys/GameSettings/GMPE01.ini index cac2760a60..cb0af07000 100644 --- a/Data/Sys/GameSettings/GMPE01.ini +++ b/Data/Sys/GameSettings/GMPE01.ini @@ -320,11 +320,13 @@ C207D25C 0000000B 39C00000 00000000 $Lottery - Double the Price [Tabitha] -0407BD20 2C1E000A +C207D25C 00000001 +2C1E000A 00000000 *Makes the lottery cost nothing instead of the usual 5 coins. $Lottery - Free Entry [Tabitha] -0407BD20 2C1E0000 +C207D25C 00000001 +2C1E0000 00000000 *Makes the lottery cost nothing instead of the usual 5 coins. $Items - Bowser Suit Can Appear in Item Bags [WolfGC64] @@ -617,6 +619,10 @@ C2083CF0 00000002 *-Warp Pipe and Mini-Mega Hammer have a 10% rate *-Boo Crystal Ball, Gaddlight, Magic Lamp and Bowser Suit have a 5% rate +$Items - Item Shops - Are Open Last Turn [Tabitha] +C2077DCC 00000001 +60000000 00000000 + $Items - Start with a Mini and Mega Mushroom [WolfGC64] C2063AE0 00000013 7C83032E 2C040007 diff --git a/Data/Sys/GameSettings/GMPEDX.ini b/Data/Sys/GameSettings/GMPEDX.ini new file mode 100644 index 0000000000..a8bc929ae5 --- /dev/null +++ b/Data/Sys/GameSettings/GMPEDX.ini @@ -0,0 +1,1218 @@ +[OnLoad] +# Add memory patches to be loaded once on boot here. +[OnFrame] +# Add memory patches to be applied every frame here. +[Gecko] +$QOL - Allow Digital Presses for Map Screen [gamemasterplc] +c2086774 00000002 +70000020 2c000020 +60000000 00000000 +c2073c7c 00000002 +735a0020 281a0020 +60000000 00000000 +*Fixes a bug where only analog inputs work while using the triggers. + +$QOL - Automatically Advance Text Boxes [gamemasterplc] +04044A90 60000000 +*Automatically scrolls the text boxes without pushing A + +$QOL - Disable Advance on Results [gamemasterplc] +20446468 4182FF60 +04446468 4BFFFF60 +E2000001 80008000 +*Disables proceading on the final results incase you have the habit of skipping it. + +$QOL - Disable ALL Taunts [WolfGC64] +04139874 0000FFFF +04139878 0000FFFF +0413987C 0000FFFF +04139880 0000FFFF +04139884 0000FFFF +04139888 0000FFFF +0413988C 0000FFFF +04139890 0000FFFF + +$QOL - Faster Boot Time [Ralf] +04056168 38607FFF +*Automatically advance through the initial cutscences. + +$QOL - Increased Board Speed [gamemasterplc] +04066dd8 38c0000d +20432574 2c1c002d +04432570 3b9c0002 +e2000001 80008000 +040786a0 c02281f0 +0406e314 c02281f0 +0408FB64 3860001E +0408FC08 3860001E +0408FCAC 3860001E +0408FD50 3860001E +0408FA78 3BDE0002 +20432574 2C1C002D +04432570 3B9C0002 +E2000001 80008000 +0408F4D4 38600005 +0408F53C 3860000F +0408F0E4 3BFF0002 +0408F154 3BFF0002 +*Board animations happen faster. + +$QOL - Increased Taunt Capabilities [gamemasterplc] +04061d5c 60000000 +04061eb8 60000000 +*Taunt during your turn. +*Also removes the cap on how fast you can taunt. + +$QOL - Instant Text Display [gamemasterplc] +04044808 38600000 +*Text is displayed instantly. + +$QOL - Show Controller Port Number of Who Paused [gamemasterplc] +c203e9b4 00000002 +807f0050 906d0000 +38600000 00000000 +c2031b88 0000000c +3860012c 3880000a +38a0002d 38c00028 +38e000ff 90ed0004 +38ed0004 3d008000 +6108b150 7d0903a6 +4e800421 3860012c +3880000a 3ca08013 +38a5db52 80cd0000 +38c60001 c02283c0 +3ce08000 60e7aff4 +7ce903a6 4e800421 +57a0083c 00000000 +C20B1184 00000007 +88CD8488 38C60001 +C02281F0 38600138 +38800010 3CA08012 +60A5DB53 3CE08000 +60E7AFF4 7CE903A6 +4E800421 880D8488 +60000000 00000000 +*Check which player is pausing during the game. + +$QOL - Skip Genie Cutscene [WolfGC64] +C20967E4 00000001 +60000000 00000000 + +$Awards Ceremony - Bonus Ztars [Tabitha] +281D3CE2 0000004E +04441D9C 3885FFFF +04441D68 3803FFFF +E2000001 80008000 +*Bonus stars take away a Star rather than awarding one + +$Board - Boo's Haunted Bash - Red Boo Always On [gamemasterplc] +201D3CE0 0000005C +0018FD08 00000000 +E2000001 80008000 +*Red Boo's bridges are always active in the board Boo's Haunted Bash. + +$Board - Bowser's Gnarly Party - Bridges Fall After One Cross [gamemasterplc] +2043801c 4182004c +04438294 38000002 +E2000001 80008000 +*Bridges fall after one crossing instead of three in the board Bowser's Gnarly Party. + +$Board - Goomba's Greedy Gala - Never Go Back To Start [gamemasterplc] +20432D5C 3860000A +04432D60 38600009 +E2000001 80008000 +*Goomba always wins in the dice minigame in the board Goomba's Greedy Gala. +*This means the only way back to start is in the top right section and requires extensive use of Happening Spaces and Mini Mushroom Pipes. + +$Board - Koopa's Seaside Soiree - Banana Peel is a Normal Junction [gamemasterplc] +2043030c 48000088 +044326fc 4e800020 +e2000001 80008000 +*Replaces the banana peel junctions with normal junctions in Koopa's Seaside Soiree. + +$Board - Toad's Midway Madness - Teacups are Normal Junctions [gamemasterplc, Tabitha] +20435308 80010008 +044352f4 4e800020 +0419dd14 00520077 +E2000001 80008000 +*Replaces the teacup junctions with normal junctions in Toad's Midway Madness. + +$Economy - Boo Coin Steals are Free [Tabitha] +040A61DC 2C1E0000 +040A517C 2C030000 +*Free stealing at the boo house + +$Economy - Boo Star Steals Cost 40 Coins [WolfGC64] +040A5F30 2C1E0028 + +$Economy - Boo Steals 15 Coins Minimum [Ralf, Tabitha] +C20A19CC 00000003 +7C1D0000 4181000C +7C1D0378 3BBD0001 +7C00E850 00000000 +040A19B0 3BA00014 + +$Economy - Bowser Always Appears on a Bowser Space [Tabitha] +04097784 38600014 + +$Economy - Blue Spaces Give 5 Coins [Rain] +C207FBC4 00000001 +3BC00005 00000000 + +$Economy - Koopa Kid Always Appears on Bowser Spaces [Tabitha] +04097784 38600028 + +$Economy - Minigames Award 20 Coins [Tabitha] + 2A18FD2C 00000003 +2A18FD2C 00000007 +2A18FD2C 00000015 +2A18FD2C 0000001D +2A18FD2C 00000025 +2A18FD2C 00000026 +2A18FD2C 00000027 +2A18FD2C 00000028 +2A18FD2C 00000036 +2818FC60 0000000A +0218FC60 00000014 +E0000000 80008000 +2A18FD2C 00000003 +2A18FD2C 00000007 +2A18FD2C 00000015 +2A18FD2C 0000001D +2A18FD2C 00000025 +2A18FD2C 00000026 +2A18FD2C 00000027 +2A18FD2C 00000028 +2A18FD2C 00000036 +2818FC90 0000000A +0218FC90 00000014 +E0000000 80008000 +2A18FD2C 00000003 +2A18FD2C 00000007 +2A18FD2C 00000015 +2A18FD2C 0000001D +2A18FD2C 00000025 +2A18FD2C 00000026 +2A18FD2C 00000027 +2A18FD2C 00000028 +2A18FD2C 00000036 +2818FCC0 0000000A +0218FCC0 00000014 +E0000000 80008000 +2A18FD2C 00000003 +2A18FD2C 00000007 +2A18FD2C 00000015 +2A18FD2C 0000001D +2A18FD2C 00000025 +2A18FD2C 00000026 +2A18FD2C 00000027 +2A18FD2C 00000028 +2A18FD2C 00000036 +2818FCF0 0000000A +0218FCF0 00000014 +E0000000 80008000 + +$Economy - Red Spaces Take Away 20 Coins [Rain] +C207FD5C 00000001 +3BC00014 00000000 + +$Economy - Stars are Free [gamemasterplc] +040843cc 2c030000 +04084590 2c030000 +040845cc 2c030000 +04084720 38800000 +*Stars cost nothing instead of the usual 20 coins. + +$Economy - Stars Cost 40 Coins [WolfGC64] +040843CC 2C030028 +04084590 2C030028 +040845CC 2C030028 +0408473C 2C1C0028 +*Stars cost 40 coins instead of the usual 20 coins. + +$Economy - Start with 20 Coins +020A8F0E 00000014 + +$Last 5 Turns - is Double Blue/Red Space Coins [Rain] +040AD074 38600000 +040AD078 987E0001 + +$Last 5 Turns - is Red Spaces to Bowser Spaces [Rain] +040AD074 38600001 +040AD078 987E0001 + +$Last 5 Turns - is Red Spaces to Fortune Spaces [Rain] +040ACDC0 3BA00003 +040AD074 38600002 +040AD078 987E0001 + +$Last 5 Turns - is Stars are Free [Rain] +040AD074 38600003 +040AD078 987E0001 + +$Lottery - 3rd Place Prize is Gaddlight or Warp Pipe [Tabitha] +0407EA58 3B800064 +0407EA60 3B80001E +021D5678 00000805 + +$Lottery - 3rd Place Prize is Magic Lamp or Boo's Crystal Ball [Tabitha] +0407EA58 3B800064 +0407EA60 3B80001E +021D5678 00000BOC + +$Lottery - 3rd Place Prize is an Item Bag [Tabitha] +0407EA58 3B800064 +0407EA60 3B80001E +021D5678 00000D0D + +$Lottery - CPU Cannot win Scratch Tickets [Tabitha] +C207D25C 00000001 +980D8BF9 00000000 + +$Lottery - Double the Price [Tabitha] +C207D25C 00000001 +2C1E000A 00000000 +*Makes the lottery cost nothing instead of the usual 5 coins. + +$Lottery - Free Entry [Tabitha] +C207D25C 00000001 +2C1E0000 00000000 +*Makes the lottery cost nothing instead of the usual 5 coins. + +$Items - Bowser Suit Gives Double Dice [WolfGC64] +C2085CEC 00000005 +3DC0801D 61CE3F44 +89CE0000 38000001 +2C0E000A 41820008 +48000008 38000002 +39C00000 00000000 + +$Items - Bowser Suit Steals 20 Coins [Tabitha] +C206C788 00000001 +2C000014 00000000 +C206C790 00000001 +38000014 00000000 +*30 is too harsh. + +$Items - Deletion [Rain] +c208d424 00000002 +987d0001 3c608000 +93a30010 00000000 +c208a07c 0000001f +9421ffe0 7c0802a6 +9001001c 90a10018 +3c608018 6063fcf8 +8883000a 1c840030 +3c608018 6063fc38 +7c632214 88830004 +5485083c 3c80801d +60843ad0 7c842a14 +88840000 80a10018 +2c040020 41820008 +48000090 3ca08000 +60a50010 80a50000 +88a50001 2c050000 +41820018 2c050001 +41820038 2c050002 +41820050 48000064 +3ca00000 60a500ff +88c30006 88e30007 +98c30005 98e30006 +98a30007 3ca00000 +60a50200 4800003c +88c30007 98c30006 +3cc00000 60c600ff +98c30007 3ca00000 +60a50200 4800001c +3cc00000 60c600ff +98c30007 3ca00000 +60a50200 48000004 +8001001c 94210020 +7c0803a6 7cbd2b78 +60000000 00000000 +*Item Deletion is now a thing. +*Press B to view your items, then delete the item with R. + +$Items - Event Accessibility Doesn't Depend on Mini/Mega Status / Bowser Suit [Celerizer, WolfGC64] +04075ff0 38600000 +040a50a4 38600000 +04077c50 38600000 +0407a868 38600000 +04083fe4 60000000 +04076148 60000000 +204302f8 2c030002 +044302fc 60000000 +04434aa4 60000000 +e2000001 80008000 +204302e0 2c030002 +044302e4 4800000c +e2000001 80008000 +204303f0 2c030002 +044303f4 60000000 +0443049c 60000000 +e2000001 80008000 +204302a8 2c030002 +044302ac 4800000c +e2000001 80008000 +20430338 2c030002 +0443033c 4800000c +e2000001 80008000 +C2076014 00000002 +38000000 28000000 +60000000 00000000 +*Access all board events regardless of Mega / Mini Mushrooms. + +$Items - Mini Mushroom Has 2 Dice [WolfGC64] +00085D33 00000002 + +$Items - Mega Status No Longer Steals Coins [gamemasterplc] +0406be70 38600000 +0406beac 38600000 +0406be1c 38600000 +*Mega Mushroom no longer steal coins when you pass players. + +$Items - Mini Mushroom Rolls 1-10 [gamemasterplc] +04085D74 3800000A +*Mini Mushroom rolls a 1-10 dice instead of a 1-5 dice. + +$Items - Mini Pipes Work at Normal Size [gamemasterplc] +04066348 60000000 +04064ed0 60000000 +04065114 60000000 +*Mini Pipes do not require a Mini Mushroom to pass. + +$Items - Remove Roueltte [WolfGC64] +C20816CC 00000001 +9421FFE0 00000000 +C208186C 00000001 +880D8338 00000000 +*Restores the vanilla roulette for Warp Pipe and Swap Card and adds it to Gaddbrush, if you liked the timeable spinner better than a random result. + +$Items - Start with a Mini and Mega Mushroom [WolfGC64] +C2063AE0 00000013 +7C83032E 2C040007 +40820080 3DC08018 +61CEFCFC 89CE0000 +2C0E0001 4082006C +3DC08018 61CEFC3D +39E00001 99EE0000 +39E00000 99EE0001 +39E000FF 99EE0002 +39E00001 99EE0030 +39E00000 99EE0031 +39E000FF 99EE0032 +39E00001 99EE0060 +39E00000 99EE0061 +39E000FF 99EE0062 +39E00001 99EE0090 +39E00000 99EE0091 +39E000FF 99EE0092 +39C00000 39E00000 +60000000 00000000 + +$Items - Status Items don't negate other players' Speed Blocks and Reverse Shrooms [WolfGC64] +C208EF48 0000000A +3C608018 6063FD62 +38C00000 88A30004 +2C050001 4082000C +38A00002 98A30004 +88A30007 2C050001 +4082000C 38A00002 +98A30007 38C60001 +38630009 2C060003 +41810008 4BFFFFC8 +7C602214 00000000 + +$Items - Item Bags - Have All Items [WolfGC64, Tabitha, SilverRoxas] +C208B1EC 00000037 +2C1E0000 41820148 +2C1E00FF 41820140 +2C1E00FF 41820138 +2C1E00FF 41820130 +2C1E00FF 41820128 +2C1E00FF 41820120 +2C1E00FF 41820118 +2C1E00FF 41820110 +2C1E00FF 41820108 +2C1E00FF 41820100 +2C1E00FF 418200F8 +2C1E00FF 418200F0 +2C1E00FF 418200E8 +2C1E00FF 418200E0 +2C1E00FF 418200D8 +2C1E00FF 418200D0 +2C1E00FF 418200C8 +2C1E00FF 418200C0 +2C1E00FF 418200B8 +2C1E00FF 418200B0 +2C1E00FF 418200A8 +2C1E00FF 418200A0 +2C1E00FF 41820098 +2C1E00FF 41820090 +2C1E00FF 41820088 +2C1E00FF 41820080 +2C1E00FF 41820078 +2C1E00FF 41820070 +2C1E00FF 41820068 +2C1E00FF 41820060 +2C1E00FF 41820058 +2C1E00FF 41820050 +2C1E00FF 41820048 +2C1E00FF 41820040 +2C1E00FF 41820038 +2C1E000D 41820030 +2C1BFFFF 40820044 +2C1E0011 41820020 +2C1E0013 41820018 +2C1E0014 41820010 +2C1E0015 41820008 +48000020 3FC08005 +63DEFB40 7FC903A6 +38600024 4E800421 +7C7E1B78 4BFFFE9C +2C1BFFFF 41820040 +2C1E0007 40820008 +3BC00011 2C1E0001 +40820008 3BC00013 +2C1E001F 40820008 +3BC00014 2C1E0022 +40820008 3BC00015 +2C1E0004 40820008 +3BC0000C 2C1E00FF +60000000 00000000 + +$Items - Item Bags - Have All Non-Rare Items [WolfGC64, Tabitha, SilverRoxas] +02071C74 00000001 +04071C44 01010101 +04071C48 01010101 +04071C4C 01010100 +04071C50 01010100 +04071C54 01000000 +04071C58 00010101 +04071C5C 01010101 +04071C60 01010101 +04071C64 01010000 + +$Items - Item Bags - Balanced Odds [WolfGC64, Tabitha, SilverRoxas] +02071C74 00000001 +04071C44 01010101 +04071C48 01010101 +04071C4C 01010100 +04071C50 01010100 +04071C54 01000000 +04071C58 00010101 +04071C5C 01010101 +04071C60 01010101 +04071C64 01010000 + +$Items - Item Shops - All Items w/o Wacky Watch Can Be Bought +04071f30 01010101 +04071f34 01010101 +04071f38 01010101 +04071f3C 01010101 +04071f40 01010101 +04071f44 01010001 +04071f48 01010101 +04071f4C 01010101 +04071f50 01010101 +02071f62 00000101 +04071f64 01010101 +04071f68 01010101 +04071f6C 01010101 +04071f70 01010101 +04071f74 01010101 +04071f78 00010101 +04071f7C 01010101 +04071f80 01010101 +04071f84 01010000 +04071F94 01010101 +04071f98 01010101 +04071f9C 01010101 +04071fA0 01010101 +04071fA4 01010101 +04071fA8 01010001 +04071fAC 01010101 +04071fB0 01010101 +04071fB4 01010101 +02071FC6 00000101 +04071fC8 01010101 +04071fCC 01010101 +04071fD0 01010101 +04071fD4 01010101 +04071fD8 01010101 +04071fDC 00010101 +04071fE0 01010101 +04071fE4 01010101 +04071fE8 01010000 +04071Ff8 01010101 +04071ffc 01010101 +04072000 01010101 +04072004 01010101 +04072008 01010101 +0407200c 01010001 +04072010 01010101 +04072014 01010101 +04072018 01010101 +0207202A 00000101 +0407202C 01010101 +04072030 01010101 +04072034 01010101 +04072038 01010101 +0407203C 01010101 +04072040 00010101 +04072044 01010101 +04072048 01010101 +0407204C 01010000 +0407205C 01010101 +04072060 01010101 +04072064 01010101 +04072068 01010101 +0407206C 01010101 +04072070 01010001 +04072074 01010101 +04072078 01010101 +0407207C 01010101 +0207208E 00000101 +04072090 01010101 +04072094 01010101 +04072098 01010101 +0407209C 01010101 +040720A0 01010101 +040720A4 00010101 +040720A8 01010101 +040720AC 01010101 +040720B0 01010000 +040720C0 01010101 +040720C4 01010101 +040720C8 01010101 +040720CC 01010101 +040720D0 01010101 +040720D4 01010001 +040720D8 01010101 +040720DC 01010101 +040720E0 01010101 +*Makes every Item that shows up on the MP4DX shop completely random. Rare Items are in play. += +$Items - Item Shops - All Items +04071f30 01010101 +04071f34 01010101 +04071f38 01010101 +04071f3C 01010101 +04071f40 01010101 +04071f44 01010101 +04071f48 01010101 +04071f4C 01010101 +04071f50 01010101 +02071f62 00000101 +04071f64 01010101 +04071f68 01010101 +04071f6C 01010101 +04071f70 01010101 +04071f74 01010101 +04071f78 01010101 +04071f7C 01010101 +04071f80 01010101 +04071f84 01010000 +04071F94 01010101 +04071f98 01010101 +04071f9C 01010101 +04071fA0 01010101 +04071fA4 01010101 +04071fA8 01010101 +04071fAC 01010101 +04071fB0 01010101 +04071fB4 01010101 +02071FC6 00000101 +04071fC8 01010101 +04071fCC 01010101 +04071fD0 01010101 +04071fD4 01010101 +04071fD8 01010101 +04071fDC 01010101 +04071fE0 01010101 +04071fE4 01010101 +04071fE8 01010000 +04071Ff8 01010101 +04071ffc 01010101 +04072000 01010101 +04072004 01010101 +04072008 01010101 +0407200c 01010101 +04072010 01010101 +04072014 01010101 +04072018 01010101 +0207202A 00000101 +0407202C 01010101 +04072030 01010101 +04072034 01010101 +04072038 01010101 +0407203C 01010101 +04072040 01010101 +04072044 01010101 +04072048 01010101 +0407204C 01010000 +0407205C 01010101 +04072060 01010101 +04072064 01010101 +04072068 01010101 +0407206C 01010101 +04072070 01010101 +04072074 01010101 +04072078 01010101 +0407207C 01010101 +0207208E 00000101 +04072090 01010101 +04072094 01010101 +04072098 01010101 +0407209C 01010101 +040720A0 01010101 +040720A4 01010101 +040720A8 01010101 +040720AC 01010101 +040720B0 01010000 +040720C0 01010101 +040720C4 01010101 +040720C8 01010101 +040720CC 01010101 +040720D0 01010101 +040720D4 01010101 +040720D8 01010101 +040720DC 01010101 +040720E0 01010101 +*Makes every Item that shows up on the MP4DX shop completely random. Rare Items are in play. + +$Items - Item Shops - All Items w/o Wacky Watch + Skeleton Key Always Purchasable) +04071f30 01010101 +04071f34 01010101 +04071f38 01010101 +04071f3C 01010101 +04071f40 01010101 +04071f44 01010001 +04071f48 01010101 +04071f4C 01010101 +04071f50 01010101 +02071f62 00000101 +04071f64 01010101 +04071f68 01010101 +04071f6C 01010101 +04071f70 01010101 +04071f74 01010101 +04071f78 00010101 +04071f7C 01010101 +04071f80 01010101 +04071f84 01010000 +04071F94 01010101 +04071f98 01010101 +04071f9C 01010101 +04071fA0 01010101 +04071fA4 01010101 +04071fA8 01010001 +04071fAC 01010101 +04071fB0 01010101 +04071fB4 01010101 +02071FC6 00000101 +04071fC8 01010101 +04071fCC 01010101 +04071fD0 01010101 +04071fD4 01010101 +04071fD8 01010101 +04071fDC 00010101 +04071fE0 01010101 +04071fE4 01010101 +04071fE8 01010000 +04071Ff8 01010101 +04071ffc 01010101 +04072000 01010101 +04072004 01010101 +04072008 01010101 +0407200c 01010001 +04072010 01010101 +04072014 01010101 +04072018 01010101 +0207202A 00000101 +0407202C 01010101 +04072030 01010101 +04072034 01010101 +04072038 01010101 +0407203C 01010101 +04072040 00010101 +04072044 01010101 +04072048 01010101 +0407204C 01010000 +0407205C 01010101 +04072060 01010101 +04072064 01010101 +04072068 01010101 +0407206C 01010101 +04072070 01010001 +04072074 01010101 +04072078 01010101 +0407207C 01010101 +0207208E 00000101 +04072090 01010101 +04072094 01010101 +04072098 01010101 +0407209C 01010101 +040720A0 01010101 +040720A4 00010101 +040720A8 01010101 +040720AC 01010101 +040720B0 01010000 +040720C0 01010101 +040720C4 01010101 +040720C8 01010101 +040720CC 01010101 +040720D0 01010101 +040720D4 01010001 +040720D8 01010101 +040720DC 01010101 +040720E0 01010101 +*Makes every Item that shows up on the MP4DX shop completely random. Rare Items are in play. + +$Items - Item Shops - All Items [WolfGC64] +04071f30 01010101 +04071f34 01010101 +04071f38 01010101 +04071f3C 01010101 +04071f40 01010101 +04071f44 01010101 +04071f48 01010101 +04071f4C 01010101 +04071f50 01010101 +02071f62 00000101 +04071f64 01010101 +04071f68 01010101 +04071f6C 01010101 +04071f70 01010101 +04071f74 01010101 +04071f78 01010101 +04071f7C 01010101 +04071f80 01010101 +04071f84 01010000 +04071F94 01010101 +04071f98 01010101 +04071f9C 01010101 +04071fA0 01010101 +04071fA4 01010101 +04071fA8 01010101 +04071fAC 01010101 +04071fB0 01010101 +04071fB4 01010101 +02071FC6 00000101 +04071fC8 01010101 +04071fCC 01010101 +04071fD0 01010101 +04071fD4 01010101 +04071fD8 01010101 +04071fDC 01010101 +04071fE0 01010101 +04071fE4 01010101 +04071fE8 01010000 +04071Ff8 01010101 +04071ffc 01010101 +04072000 01010101 +04072004 01010101 +04072008 01010101 +0407200c 01010101 +04072010 01010101 +04072014 01010101 +04072018 01010101 +0207202A 00000101 +0407202C 01010101 +04072030 01010101 +04072034 01010101 +04072038 01010101 +0407203C 01010101 +04072040 01010101 +04072044 01010101 +04072048 01010101 +0407204C 01010000 +0407205C 01010101 +04072060 01010101 +04072064 01010101 +04072068 01010101 +0407206C 01010101 +04072070 01010101 +04072074 01010101 +04072078 01010101 +0407207C 01010101 +0207208E 00000101 +04072090 01010101 +04072094 01010101 +04072098 01010101 +0407209C 01010101 +040720A0 01010101 +040720A4 01010101 +040720A8 01010101 +040720AC 01010101 +040720B0 01010000 +040720C0 01010101 +040720C4 01010101 +040720C8 01010101 +040720CC 01010101 +040720D0 01010101 +040720D4 01010101 +040720D8 01010101 +040720DC 01010101 +040720E0 01010101 +*Makes every Item that shows up on the MP4DX shop completely random. Rare Items are in play. No warranted items. + +$Items - Item Shops - Are Open Last Turn [Tabitha] +C2077DCC 00000001 +60000000 00000000 + +$Items - Item Shops - Balanced Items Only [WolfGC64, Tabitha, SilverRoxas] +28071C98 00000000 +04071f30 00040303 +04071f34 02030303 +04071f38 00030301 +04071f3C 02060404 +04071f40 05000500 +04071f44 00000004 +04071f48 02000701 +04071f4C 04040404 +04071f50 04020505 +E2000001 80008000 +28071C98 00000000 +04071f30 00040303 +04071f34 02030303 +04071f38 00030301 +04071f3C 02060404 +04071f40 05000500 +04071f44 00000004 +04071f48 02000701 +04071f4C 04040404 +04071f50 04020505 +E2000001 80008000 +2C071C98 00000001 +04071f30 00040303 +04071f34 02030303 +04071f38 00030301 +04071f3C 02060404 +04071f40 05000500 +04071f44 00000004 +04071f48 02000701 +04071f4C 04040404 +04071f50 04020505 +E2000001 80008000 +02071f62 00000004 +04071f64 03030500 +04071f68 03080505 +04071f6C 03010002 +04071f70 04040200 +04071f74 03000000 +04071f78 00030200 +04071f7C 04070204 +04071f80 03020504 +04071f84 02030000 +04071F94 00030302 +04071f98 03030304 +04071f9C 04030402 +04071fA0 01030305 +04071fA4 05000400 +04071fA8 00000005 +04071fAC 03000504 +04071fB0 04030404 +04071fB4 03020405 +02071FC6 00000002 +04071fC8 02020201 +04071fCC 04020204 +04071fD0 04040305 +04071fD4 03040401 +04071fD8 02010101 +04071fDC 01040400 +04071fE0 05030404 +04071fE4 04040201 +04071fE8 05050000 +04071Ff8 00020202 +04071ffc 02040402 +04072000 02040404 +04072004 03050304 +04072008 04010201 +0407200c 01010104 +04072010 04000503 +04072014 04040404 +04072018 02010505 +0207202A 00000004 +0407202C 03030500 +04072030 03080505 +04072034 03010002 +04072038 04040200 +0407203C 03000000 +04072040 00030200 +04072044 04070204 +04072048 03020504 +0407204C 02030000 +0407205C 00030302 +04072060 03030304 +04072064 04030402 +04072068 01030305 +0407206C 05000400 +04072070 00000005 +04072074 03000504 +04072078 04030404 +0407207C 03020405 +0207208E 00000001 +04072090 02020001 +04072094 04000004 +04072098 0407080b +0407209C 02000901 +040720A0 01010101 +040720A4 01030200 +040720A8 00010704 +040720AC 04040302 +040720B0 01070000 +040720C0 00010202 +040720C4 00040400 +040720C8 00040407 +040720CC 080b0200 +040720D0 09010101 +040720D4 01010103 +040720D8 02000001 +040720DC 07040404 +040720E0 03020107 + +$Items - Item Shops - Reserved Items Always and Only Skeleton Keys [WolfGC64] +000720F2 000000FF +020720F3 0000FF19 + +$Items - Item Shops - Reserved Items are Gold ➜ Warp Block [WolfGC64] +000720F2 0000000F +000720F3 0000001A +000720F4 00000019 + +$Items - Item Shops - Reserved Items Don't Exist [WolfGC64] +000720F2 000000FF +020720F3 0000FFFF + +$Items - Item Spaces - All Items w/o Wacky Watch [WolfGC64] +02071C42 00000005 +04071C44 05050505 +04071C48 05050505 +04071C4C 05050557 +04071C50 05070A07 +04071C54 05070707 +04071C58 00050505 +04071C5C 05050505 +04071C60 05050505 +04071C64 05050000 +*Madness. Every Item has equal odds, and Rare Items can appear anytime. + +$Items - Item Spaces - Purely Random Items [WolfGC64] +02071C42 00000005 +04071C44 05050505 +04071C48 05050505 +04071C4C 05050500 +04071C50 05060904 +04071C54 04040404 +04071C58 02050505 +04071C5C 05050505 +04071C60 05050505 +04071C64 05050000 +*Madness. Every Item has equal odds, and Rare Items can appear anytime. + +$Items - Item Spaces - Pureley Random w/o Wacky Watch [WolfGC64] +02071C42 00000101 +04071C44 01010101 +04071C48 01010101 +04071C4C 01010101 +04071C50 01010101 +04071C54 01010101 +04071C58 00010101 +04071C5C 01010101 +04071C60 01010101 +04071C64 01010000 +04071C68 01010101 +04071C74 01010101 +04071C78 01010101 +04071C7C 01010101 +04071C80 01010101 +04071C84 01010101 +04071C88 01010101 +04071C8C 01010101 +04071C90 01010101 +04071C94 01010101 +*Madness. Every Item has equal odds, and Rare Items can appear anytime. + +$Items - Item Spaces - Single Item Preset [WolfGC64] +02071C42 00000005 +04071C44 05050505 +04071C48 05050505 +04071C4C 05050500 +04071C50 05060904 +04071C54 04040404 +04071C58 02050505 +04071C5C 05050505 +04071C60 05050505 +04071C64 05050000 +*A version of the default MP4DX preset where you can only get a single item per Item Space. A less frantic game, but every item except Mini Mushroom is still a possibility! + +$Items - Item Spaces - Stock MP4 [WolfGC64] +02071C42 00000505 +04071C44 00000000 +04071C48 00000000 +04071C4C 00000000 +04071C50 00000000 +04071C54 00000000 +04071C58 00000000 +04071C5C 00000000 +04071C60 00000000 +04071C64 00000000 +*Madness. Every Item has equal odds, and Rare Items can appear anytime. + + +$Items - Super Mini Mushroom has 3 Dice [WolfGC64] +00085D3F 00000003 + +$Items - Use Multiple Items on the Same Turn [WolfGC64] +0018FD6A 00000001 +0018FD73 00000001 +0018FD7C 00000001 +0018FD85 00000001 +*MP4DX specific version +*Use as many items as you want on a single turn! + +$Minigame - Battle Games - Always 50 Coins [Tabitha] +041D5DE0 32323232 +041D5DE4 32000000 + +$Minigame - Disable Most End of Turn Minigames [WolfGC64] +C205C6E4 0000000A +3C608018 6063FCFC +89C30000 39E30001 +89EF0000 7DEE7850 +2C0F0005 41820010 +2C0F0000 41820008 +4800000C 38600000 +48000010 39CE0001 +99C30000 38600001 +39C00000 39E00000 +2C030000 00000000 +*End-of-turn minigames are needed in MP4DX for the Last 5 Turns event to happen and the game to be able to end, so this code makes -most- turns end without a minigame, except the turn before the last 5 turns and the last turn. + +$Minigame - Domination - More Whomps [UnclePunch] +C203220C 0000001F +A0610008 2C03000F +408200E8 807F0004 +4800002D 7C8802A6 +A0A40000 7CA00734 +2C00FFFF 41820054 +80C40002 7CA32A14 +90C50000 38840006 +4BFFFFE0 4E800021 +00200000 4C60016C +38600528 24BC281F +04B0393C 280004B0 +27C0281F 012C2608 +281F04B4 2664281F +04B42850 380304B0 +29A83804 04B0FFFF +807F0004 48000031 +7C8802A6 A0A40000 +38840002 A0C40000 +7CC00734 2C00FFFF +41820058 7CC33214 +90A60000 38840002 +4BFFFFE4 4E800021 +39908490 849884A0 +84A884B0 84B884E0 +84E884F0 84F88500 +85088530 85388550 +85588560 856885E0 +85E88630 86388640 +864886F0 86F88730 +87388B10 8B18FFFF +38600000 00000000 +*Increases the limit from 160 to 300 Whomps per player in the minigame Dominiation + +$Minigame - Fish n' Drips - 3 Players have 2 Less Rounds [Tabitha] +2819047C 0000003B +0442D31C 42820000 +E2000001 80008000 + +$Minigame - Manta Rings - Just Hold A [Tabitha] +281D3CE2 00000009 +04005FA4 60000000 +E2000001 80000000 +2A1D3CE2 00000009 +04005FA4 7F83032E +E2000001 80008000 + +$Minigame - Three Throw - All Hoops Empty [gamemasterplc] +20434274 3800000A +04434260 38800000 +0443427C 38A00000 +0443425C 60000000 +E2000001 80008000 + +$Music - Disable Music +041d3d1c 00000001 +*Disables all in-game music. + +$Space Replacemnt - Add More Item Spaces to Most Boards [WolfGC64, Tabitha] +C205C810 0000001E +3DC0801D 61CE3CE0 +81CE0000 3DE08019 +61EFDA10 2C0E0059 +41820030 2C0E005A +41820000 2C0E005B +41820040 2C0E005C +4182006C 2C0E005D +41820084 2C0E005E +41820000 48000098 +39C00004 B1CF0760 +B1CF0958 B1CF09C8 +B1CF0B50 B1CF0F78 +B1CF1598 48000078 +39C00004 B1CF0728 +B1CF0840 B1CF0990 +B1CF0BF8 B1CF0CA0 +B1CF0F08 B1CF1100 +B1CF1528 B1CF1870 +B1CF18A8 B1CF1C98 +48000044 39C00004 +B1CF0D10 B1CF0E98 +B1CF0F78 B1CF0028 +B1CF0178 B1CF02C8 +48000024 39C00004 +B1CF0028 B1CF0108 +B1CF05D8 B1CF0840 +B1CF09C8 B1CF0ED0 +48000004 39C00000 +39E00000 2C030000 +60000000 00000000 +*This code adds more item spaces to every board to increase the chances of getting items each turn. MP4DX defaults are designed around the lower amount of item spaces, so this is recommended mostly for No Item Bag/Less powerful items rulesets. + +$Space Replacement - Reversal Of Fortune Spaces ➜ Mushroom Spaces [Tabitha, Ralf] +C2076A08 00000003 +A01F0028 28000007 +4082000C 38000004 +B01F0028 00000000 + +$Turns - Double the Amount of Turns [Airsola] +C205BEF8 00000004 +2C000032 4182000C +7C000214 48000008 +38000063 98030005 +60000000 00000000 +*50 turns becomes 99 due to integer cap. + +$Turns - Press Z On Pause Menu to End Game [Ralf] +040B11C4 40820014 + +$Extra - 30Hz Gameplay [gamemasterplc] +041D3B00 40000000 +041D3B04 00000002 +04035480 38600001 +C200592C 00000009 +3C808000 6084D01C +7C8903A6 4E800421 +3C808000 60845B4C +7C8903A6 4E800421 +38800000 908D8688 +908D868C 38600001 +3C808000 6084D01C +7C8903A6 4E800421 +60000000 00000000 +*Game runs at 30Hz but still feel like 60FPS. Great for people with bad PCs +*Can break certain minigames diff --git a/Data/Sys/wiitdb-en.txt b/Data/Sys/wiitdb-en.txt index f899b2397c..27b849f389 100644 --- a/Data/Sys/wiitdb-en.txt +++ b/Data/Sys/wiitdb-en.txt @@ -9443,6 +9443,7 @@ GMNE78 = Monsters, Inc. Scream Arena GMNP78 = Monsters, Inc. Scream Arena GMOP70 = Micro Machines GMPE01 = Mario Party 4 +GMPEDX = Mario Party 4 DX GMPJ01 = Mario Party 4 GMPP01 = Mario Party 4 GMPW01 = Mario Party 4 diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 5662b034f6..cdf67afcc1 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -1087,30 +1087,10 @@ CPUThreadGuard::~CPUThreadGuard() } static GameName mGameBeingPlayed = GameName::UnknownGame; -const std::map mGameMap = {{"GMPE01", GameName::MarioParty4}, +const std::map mGameMap = {{"GMPE01", GameName::MarioParty4DX}, {"GP5E01", GameName::MarioParty5}, {"GP6E01", GameName::MarioParty6}, {"GP7E01", GameName::MarioParty7}, - {"RM8E01", GameName::MarioParty8}}; - -std::optional> getGameFreeMemory() -{ - switch (mGameBeingPlayed) { - case GameName::MarioParty4: - return std::nullopt; - case GameName::MarioParty5: - return std::make_pair(0x801A811C, 0x801A9B5C); - case GameName::MarioParty6: - return std::make_pair(0x80213974, 0x80216014); - case GameName::MarioParty7: - return std::make_pair(0x8023CF6C, 0x8023F9D0); - case GameName::MarioParty8: - return std::make_pair(0x802D5100, 0x802D9500); - case GameName::UnknownGame: - return std::nullopt; - default: - return std::nullopt; - } -} - + {"RM8E01", GameName::MarioParty8}, + {"GMPEDX", GameName::MarioParty4}}; } // namespace Core diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h index e40b9c29ec..1ccf72341a 100644 --- a/Source/Core/Core/Core.h +++ b/Source/Core/Core/Core.h @@ -199,13 +199,13 @@ void UpdateInputGate(bool require_focus, bool require_full_focus = false); void UpdateTitle(Core::System& system); enum class GameName : u8 { - UnknownGame = 0, - MarioParty4 = 1, - MarioParty5 = 2, - MarioParty6 = 3, - MarioParty7 = 4, - MarioParty8 = 5 + UnknownGame = 0, + MarioParty4 = 1, + MarioParty5 = 2, + MarioParty6 = 3, + MarioParty7 = 4, + MarioParty8 = 5, + MarioParty4DX = 6 }; -std::optional> getGameFreeMemory(); } // namespace Core diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp index 34b702d8a2..3b944f64fd 100644 --- a/Source/Core/Core/GeckoCode.cpp +++ b/Source/Core/Core/GeckoCode.cpp @@ -182,7 +182,7 @@ static Installation InstallCodeHandlerLocked(const Core::CPUThreadGuard& guard) const bool is_mpn_handler_and_game_id_gp5e01 = IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "GP5E01"); const bool is_mpn_handler_and_game_id_gmpe01 = - IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "GMPE01"); + IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "GMPE01") || (SConfig::GetInstance().GetGameID() == "GMPEDX"); u32 codelist_base_address = is_mpn_handler_and_game_id_rm8e01 ? INSTALLER_BASE_ADDRESS_MP8 : diff --git a/Source/Core/DolphinQt/Config/PropertiesDialog.cpp b/Source/Core/DolphinQt/Config/PropertiesDialog.cpp index bdd718f2f5..aa1cc0adf7 100644 --- a/Source/Core/DolphinQt/Config/PropertiesDialog.cpp +++ b/Source/Core/DolphinQt/Config/PropertiesDialog.cpp @@ -115,6 +115,7 @@ GeckoDialog::GeckoDialog(QWidget* parent) : QDialog(parent) QVBoxLayout* layout = new QVBoxLayout(); QTabWidget* tab_widget = new QTabWidget(this); GeckoCodeWidget* mp4_gecko = new GeckoCodeWidget("GMPE01", "GMPE01", 0); + GeckoCodeWidget* mp4dx_gecko = new GeckoCodeWidget("GMPEDX", "GMPEDX", 0); GeckoCodeWidget* mp5_gecko = new GeckoCodeWidget("GP5E01", "GP5E01", 0); GeckoCodeWidget* mp6_gecko = new GeckoCodeWidget("GP6E01", "GP6E01", 0); GeckoCodeWidget* mp7_gecko = new GeckoCodeWidget("GP7E01", "GP7E01", 0); @@ -122,6 +123,8 @@ GeckoDialog::GeckoDialog(QWidget* parent) : QDialog(parent) connect(mp4_gecko, &GeckoCodeWidget::OpenGeneralSettings, this, &GeckoDialog::OpenGeneralSettings); + connect(mp4dx_gecko, &GeckoCodeWidget::OpenGeneralSettings, this, + &GeckoDialog::OpenGeneralSettings); connect(mp5_gecko, &GeckoCodeWidget::OpenGeneralSettings, this, &GeckoDialog::OpenGeneralSettings); connect(mp6_gecko, &GeckoCodeWidget::OpenGeneralSettings, this, @@ -136,6 +139,8 @@ GeckoDialog::GeckoDialog(QWidget* parent) : QDialog(parent) tab_widget->addTab(GetWrappedWidget(mp4_gecko, this, padding_width, padding_height), tr("Mario Party 4")); + tab_widget->addTab(GetWrappedWidget(mp4dx_gecko, this, padding_width, padding_height), + tr("Mario Party 4 DX")); tab_widget->addTab(GetWrappedWidget(mp5_gecko, this, padding_width, padding_height), tr("Mario Party 5")); tab_widget->addTab(GetWrappedWidget(mp6_gecko, this, padding_width, padding_height), diff --git a/Source/Core/DolphinQt/MarioPartyNetplay/InstallUpdateDialog.cpp b/Source/Core/DolphinQt/MarioPartyNetplay/InstallUpdateDialog.cpp index 2479add65f..77d1e17709 100644 --- a/Source/Core/DolphinQt/MarioPartyNetplay/InstallUpdateDialog.cpp +++ b/Source/Core/DolphinQt/MarioPartyNetplay/InstallUpdateDialog.cpp @@ -185,6 +185,12 @@ bool InstallUpdateDialog::unzipFile(const std::string& zipFilePath, const std::s return false; // Failed to get file info } + // Skip User/GC and User/GameSettings directories + if (std::string(filename).find("User/GC") == 0 || std::string(filename).find("User/GameSettings") == 0) + { + continue; // Skip these directories + } + // Create full path for the extracted file std::string fullPath = destDir + "/" + std::string(filename); QString qFullPath = QString::fromStdString(fullPath);