diff --git a/Data/Sys/GameSettings/GP5E01.ini b/Data/Sys/GameSettings/GP5E01.ini
index a52b27d7b7..58f4d298e2 100644
--- a/Data/Sys/GameSettings/GP5E01.ini
+++ b/Data/Sys/GameSettings/GP5E01.ini
@@ -218,6 +218,350 @@ C20C8FA0 00000024
 4E800020 00000000
 *Improves the RNG of what items are received.
 
+$Capsules - Shops [Rain, gamemasterplc, Tabitha]
+C204BF38 0000000D
+5743843E 2C030038
+40A20054 807F0098
+88830000 2C040000
+41820044 2C04001E
+4182000C 38630001
+4BFFFFE8 88830001
+2C040005 41A2000C
+38630001 4BFFFFD4
+38800010 88A30000
+2C05000A 41820010
+98830000 38630001
+4BFFFFEC 801F0098
+60000000 00000000
+C20C56E0 00000001
+3A000000 00000000
+C20C5B48 00000001
+3A000000 00000000
+C20C2708 00000001
+38600000 00000000
+C20A9E08 00000004
+3C60817F 6063FFFC
+80830000 2C040001
+41820008 1FDE0003
+3C800000 90830000
+60000000 00000000
+C20C0950 0000013A
+9421FF80 7C0802A6
+90010084 7D800026
+91C10038 91E1003C
+92010040 92210044
+92410048 9261004C
+92810050 92A10054
+92C10058 92E1005C
+93010060 93210064
+93410068 9361006C
+93810070 93A10074
+93C10078 93E1007C
+91810034 3D20817F
+6129FFFE AAA90000
+2F950000 409E0008
+3AA00003 48000059
+05000F00 0A000F00
+0A000A00 1E000A00
+0A000A00 0A000500
+0A000F00 0F001400
+0A000F00 0A000A00
+0A000A00 0F000A00
+14000A00 0A000A00
+0A000A00 0F001400
+1E000F00 14001E00
+1E001400 14000A00
+0A000A00 7D2802A6
+48000039 20202020
+57686963 68106361
+7073756C 6510776F
+756C6410 796F750A
+20202020 6C696B65
+10746F10 70757263
+68617365 00000000
+7FC802A6 48000011
+20202020 20200F25
+73000000 7E6802A6
+4800000D 100E133E
+25640A00 7E4802A6
+48000009 25730000
+7DC802A6 48000011
+20202020 20200F45
+78697400 7D0802A6
+91010028 3D408023
+394AA490 890A0004
+894A0005 7F885000
+40BE007C 38600000
+3C800024 60840001
+38A0FFFF 4CC63182
+7DA06B78 3DA0800A
+39AD0A74 7DA903A6
+7C0D0378 4E800421
+7DA06B78 3DA0800A
+39AD1AE0 7DA903A6
+7C0D0378 4E800421
+7DA06B78 3DA0800A
+39AD0FBC 7DA903A6
+7C0D0378 4E800421
+7DA06B78 3DA08001
+39ADD280 7DA903A6
+7C0D0378 4E800421
+4800078C 3D40801D
+394AA230 3BE003E7
+3900002A 7D0903A6
+89090000 910A0000
+89090000 7F9F4000
+409D0008 7D1F4378
+39290002 394A001C
+4200FFE0 3D208023
+8B29A49A 7F390774
+7F23CB78 7DA06B78
+3DA08004 39AD81E0
+7DA903A6 7C0D0378
+4E800421 7C7C1B78
+7F9F1800 409D0020
+7DA06B78 3DA08001
+39ADD280 7DA903A6
+7C0D0378 4E800421
+48000704 7DA06B78
+3DA08001 39ADCEB0
+7DA903A6 7C0D0378
+4E800421 8123012C
+80690000 4CC63182
+7DA06B78 3DA0800A
+39AD9EEC 7DA903A6
+7C0D0378 4E800421
+57291838 572A402E
+7D295214 3D408023
+394AA070 7D2A482E
+752A2000 41820110
+7DA06B78 3DA0800D
+39AD8FA0 7DA903A6
+7C0D0378 4E800421
+7C7E1B78 4CC63182
+7DA06B78 3DA0800D
+39AD8CE0 7DA903A6
+7C0D0378 4E800421
+7C7F1B78 7F9C1800
+419CFFC0 39400001
+3D20817F 6129FFFC
+B1490000 2F9E0022
+40BE0020 7DA06B78
+3DA0800D 39AD227C
+7DA903A6 7C0D0378
+4E800421 48000024
+2F9E0024 40BE001C
+7DA06B78 3DA0800D
+39AD2368 7DA903A6
+7C0D0378 4E800421
+7F23CB78 7FC4F378
+4CC63182 7DA06B78
+3DA0800A 39ADB014
+7DA903A6 7C0D0378
+4E800421 7F23CB78
+7C9F00D0 4CC63182
+7DA06B78 3DA0800B
+39AD9D88 7DA903A6
+7C0D0378 4E800421
+39400000 3D20817F
+6129FFFC B1490000
+7DA06B78 3DA08001
+39ADD280 7DA903A6
+7C0D0378 4E800421
+4800059C 7DA06B78
+3DA0800D 39AD8FA0
+7DA903A6 7C0D0378
+4E800421 98610008
+5463063E 4CC63182
+7DA06B78 3DA0800D
+39AD8CE0 7DA903A6
+7C0D0378 4E800421
+98610009 5463063E
+7F9C1800 419CFFB8
+7EB4AB78 2F950001
+409D00B4 3BE1000A
+3B600001 3B000000
+3F40801D 2E1B0000
+7DA06B78 3DA0800D
+39AD8FA0 7DA903A6
+7C0D0378 4E800421
+7C7D1B78 4CC63182
+7DA06B78 3DA0800D
+39AD8CE0 7DA903A6
+7C0D0378 4E800421
+40910030 89210008
+7F89E800 41BEFFBC
+3921000A 48000014
+89490000 39290002
+7F8AE800 41BEFFA4
+7F89F840 409EFFEC
+7F9C1800 409C0018
+9B1F0000 393AA21C
+81290014 993F0001
+4800000C 9BBF0000
+987F0001 3B7B0001
+3BFF0002 7F9BA000
+409EFF64 569D103A
+7FBDA214 57A92036
+7FBD4850 38600001
+7FA4EB78 4CC63182
+7DA06B78 3DA08001
+39ADAA04 7DA903A6
+7C0D0378 4E800421
+7C7F1B78 7C7C1B78
+2F9D0000 409D0018
+3923FFFF 39400000
+7FA903A6 9D490001
+4200FFFC 7FE3FB78
+7DC47378 7FC5F378
+4CC63182 7DA06B78
+3DA08017 39AD0090
+7DA903A6 7C0D0378
+4E800421 7FE3FB78
+7DA06B78 3DA08017
+39AD249C 7DA903A6
+7C0D0378 4E800421
+7FE9FB78 3940FFC3
+7D4919EE 3940000A
+99490001 39400000
+99490002 2F940000
+409D01A0 3BA10008
+56B1083C 7E3D8A14
+3AC00004 39E00006
+3A000000 3BC0000C
+7F83E378 7DA06B78
+3DA08017 39AD249C
+7DA903A6 7C0D0378
+4E800421 7C7A1B78
+7EFC1A14 7FB8EB78
+8B7D0000 7F63DB78
+4CC63182 7DA06B78
+3DA0800D 39AD8C8C
+7DA903A6 7C0D0378
+4E800421 4CC63182
+7DA06B78 3DA08005
+39AD8638 7DA903A6
+7C0D0378 4E800421
+7C651B78 7EE3BB78
+7E649B78 4CC63182
+7DA06B78 3DA08017
+39AD0090 7DA903A6
+7C0D0378 4E800421
+7F83E378 7DA06B78
+3DA08017 39AD249C
+7DA903A6 7C0D0378
+4E800421 7ECAB378
+2B9B000B 419E02E0
+2B9B0010 419E02D8
+736900EF 7DEA7B78
+2F890004 419E02C8
+2B9B0019 419E02C0
+7F5A1850 39400001
+2F9A0014 419D02B0
+39400002 2F9A0012
+419D02A4 39400003
+2F9A0010 419D0298
+7ECAB378 2F9A000E
+419D028C 2F9A000C
+7F400026 575AF7FE
+215A0006 48000278
+7D43FA14 7FCA49AE
+39290001 4200FFF4
+7F83E378 7DA06B78
+3DA08017 39AD249C
+7DA903A6 7C0D0378
+4E800421 7C7C1A14
+7E449378 88B80001
+4CC63182 7DA06B78
+3DA08017 39AD0090
+7DA903A6 7C0D0378
+4E800421 3BBD0002
+7F9D8840 409EFE84
+7FE3FB78 7DA06B78
+3DA08017 39AD249C
+7DA903A6 7C0D0378
+4E800421 7C7F1A14
+7DC47378 80A10028
+4CC63182 7DA06B78
+3DA08017 39AD0090
+7DA903A6 7C0D0378
+4E800421 2F950004
+409D0034 38600001
+7FE4FB78 38A00014
+38C00000 4CC63182
+7DA06B78 3DA0800A
+39AD0DB0 7DA903A6
+7C0D0378 4E800421
+48000030 38600003
+7FE4FB78 38A00014
+38C00000 4CC63182
+7DA06B78 3DA0800A
+39AD0DB0 7DA903A6
+7C0D0378 4E800421
+38600010 4CC63182
+7DA06B78 3DA0800A
+39AD1CD8 7DA903A6
+7C0D0378 4E800421
+7DA06B78 3DA0800A
+39AD1AE0 7DA903A6
+7C0D0378 4E800421
+7DA06B78 3DA0800A
+39AD18A8 7DA903A6
+7C0D0378 4E800421
+7C7E1B78 2F83FFFF
+419E00C0 7F83A000
+409C00B8 39400001
+3D20817F 6129FFFC
+B1490000 5469083C
+39410008 7FAA48AE
+2B9D0022 40BE0020
+7DA06B78 3DA0800D
+39AD227C 7DA903A6
+7C0D0378 4E800421
+48000024 2B9D0024
+40BE001C 7DA06B78
+3DA0800D 39AD2368
+7DA903A6 7C0D0378
+4E800421 7F23CB78
+7FA4EB78 4CC63182
+7DA06B78 3DA0800A
+39ADB014 7DA903A6
+7C0D0378 4E800421
+57C9083C 7D214A14
+88890009 7F23CB78
+7C8400D0 4CC63182
+7DA06B78 3DA0800B
+39AD9D88 7DA903A6
+7C0D0378 4E800421
+7DA06B78 3DA0800A
+39AD0FBC 7DA903A6
+7C0D0378 4E800421
+7FE3FB78 4CC63182
+7DA06B78 3DA08001
+39ADAB38 7DA903A6
+7C0D0378 4E800421
+7DA06B78 3DA08001
+39ADD280 7DA903A6
+7C0D0378 4E800421
+48000024 7E098378
+7D105050 7D0903A6
+2F8A0000 419DFD7C
+39400001 7D4903A6
+4BFFFD70 80010084
+81810034 7C0803A6
+81C10038 81E1003C
+82010040 82210044
+82410048 8261004C
+82810050 82A10054
+82C10058 82E1005C
+83010060 83210064
+83410068 8361006C
+83810070 83A10074
+83C10078 83E1007C
+7D808120 38210080
+4E800020 00000000
+*Adds shops to Mario Party 5 Capsule machines
+
 $Capsules - Use Capsules on Yourself For Free [Rain]
 040C2708 38600000
 040C56E0 3A000000
diff --git a/Data/Sys/GameSettings/GP6E01.ini b/Data/Sys/GameSettings/GP6E01.ini
index 5254140774..b1dd51bb44 100644
--- a/Data/Sys/GameSettings/GP6E01.ini
+++ b/Data/Sys/GameSettings/GP6E01.ini
@@ -589,6 +589,373 @@ e2000001 00000000
 e2000001 00000000
 *The return of the classic Coin Star.
 
+$Awards Ceremony - Random Custom Bonus Stars [Tabitha]
+C209C504 0000006B
+3C60802C 60630254
+80630000 2C03005C
+4082033C 3DE08014
+61EFD348 7DE903A6
+3860000A 4E800421
+7C6E1B78 38600009
+4E800421 7C037000
+41820028 7C701B78
+38600008 4E800421
+7C037000 41820028
+7C038000 41820020
+7C711B78 48000038
+38600009 4E800421
+7C037000 4182FFF4
+7C701B78 38600008
+4E800421 7C037000
+4182FFF4 7C038000
+4182FFEC 7C711B78
+48000004 3C608026
+60638F80 B1C30000
+B2030002 B2230004
+3DE00000 61EF0000
+2C0E0000 4182004C
+2C0E0001 41820050
+2C0E0002 41820054
+2C0E0003 41820058
+2C0E0004 4182005C
+2C0E0005 41820060
+2C0E0006 41820064
+2C0E0007 41820068
+2C0E0008 4182006C
+2C0E0009 4182007C
+3DC08883 61CE0014
+48000064 3DC08883
+61CE0015 48000058
+3DC08883 61CE0016
+4800004C 3DC08883
+61CE0017 48000040
+3DC08883 61CE0018
+48000034 3DC08883
+61CE0019 48000028
+3DC08883 61CE001B
+4800001C 3DC0A883
+61CE0022 48000010
+3DC0A883 61CE0034
+48000004 3E20804E
+6231CF10 91D10000
+3DE00000 61EF0000
+3C608026 60638F80
+A2030002 2C100000
+4182004C 2C100001
+41820050 2C100002
+41820054 2C100003
+41820058 2C100004
+4182005C 2C100005
+41820060 2C100006
+41820064 2C100007
+41820068 2C100008
+41820084 2C100009
+41820064 3E0088C7
+62100014 48000064
+3E0088C7 62100015
+48000058 3E0088C7
+62100016 4800004C
+3E0088C7 62100017
+48000040 3E0088C7
+62100018 48000034
+3E0088C7 62100019
+48000028 3E0088C7
+6210001B 4800001C
+3E00A8C7 62100022
+48000010 3E00A8C7
+6210001E 48000004
+3E20804E 6231CF4C
+92110000 3E000000
+62100000 3C608026
+60638F80 A2230004
+2C110000 4182004C
+2C110001 41820050
+2C110002 41820054
+2C110003 418200B8
+2C110004 4182005C
+2C110005 41820060
+2C110006 41820064
+2C110007 41820068
+2C110008 41820000
+2C110009 41820064
+3DE08804 61EF0014
+48000064 3DE08804
+61EF0015 48000058
+3DE08804 61EF0016
+4800004C 3DE00000
+61EF0000 48000040
+3DE08804 61EF0018
+48000034 3DE08804
+61EF0019 48000028
+3DE08804 61EF001B
+4800001C 3DE0A804
+61EF0022 48000010
+3DE0A804 61EF001E
+48000004 3E20804E
+6231CF88 91F10000
+3DE07C06 61EF0378
+91F10004 39C00000
+39E00000 3A000000
+3A200000 3C608000
+60000000 00000000
+C25031DC 000000FD
+3C608026 60638F80
+3DE08053 61EF05CC
+A1C30000 3E00081E
+62100885 920F0010
+3E008585 62100000
+920F0014 3E000000
+62100000 920F0018
+920F001C 920F0020
+920F0024 920F0028
+920F002C 920F0030
+920F0034 920F0038
+920F003C 920F0040
+920F0044 920F0048
+920F004C 920F0050
+920F0090 920F0094
+920F0098 920F009C
+920F00A0 920F00A4
+920F00A8 920F00AC
+920F00B0 920F00B4
+920F00B8 920F00BC
+920F00C0 920F00C4
+920F00C8 920F00CC
+920F00D0 920F00D4
+920F00D8 920F00DC
+920F00E0 920F00E4
+920F00E8 920F00EC
+920F00F0 920F00F4
+920F00F8 920F00FC
+920F0100 920F0104
+920F0108 920F010C
+920F0110 920F0114
+920F0118 920F011C
+2C0E0000 4182004C
+2C0E0001 4182006C
+2C0E0002 4182008C
+2C0E0003 418200AC
+2C0E0004 418200CC
+2C0E0005 418200EC
+2C0E0006 4182010C
+2C0E0007 4182012C
+2C0E0008 4182014C
+2C0E0009 4182016C
+3E000342 62106C75
+920F0000 3E006505
+62100505 920F0004
+3E000505 62101053
+920F0008 48000144
+3E000352 62106564
+920F0000 3E000505
+62100505 920F0004
+3E000505 62101053
+920F0008 4800011C
+3E000343 62106861
+920F0000 3E007261
+62106374 920F0004
+3E006572 62101053
+920F0008 480000F4
+3E000341 62106374
+920F0000 3E00696F
+62106E05 920F0004
+3E000505 62101053
+920F0008 480000CC
+3E000342 62106F77
+920F0000 3E007365
+62107205 920F0004
+3E000505 62101053
+920F0008 480000A4
+3E000343 62106861
+920F0000 3E006E63
+62106505 920F0004
+3E000505 62101053
+920F0008 4800007C
+3E000344 62104B05
+920F0000 3E000505
+62100505 920F0004
+3E000505 62101053
+920F0008 48000054
+3E000343 62106F69
+920F0000 3E006E05
+62100505 920F0004
+3E000505 62101053
+920F0008 4800002C
+3E00034F 62107262
+920F0000 3E000505
+62100505 920F0004
+3E000505 62101053
+920F0008 48000004
+3DE08053 61EF12D4
+A2030002 3DC05374
+61CE6172 91CF000C
+3DC0101E 61CE0877
+91CF0010 3DC0696E
+61CE6E65 91CF0014
+3DC07210 61CE6973
+91CF0018 3DC08585
+61CE8500 91CF001C
+3DC00000 61CE0000
+91CF0024 91CF0028
+91CF002C 91CF0030
+91CF0034 91CF0038
+91CF003C 91CF0040
+91CF0044 91CF0048
+91CF004C 91CF0074
+91CF0078 91CF007C
+91CF0080 91CF0084
+91CF0088 91CF008C
+91CF0090 91CF0094
+2C100000 4182004C
+2C100001 4182006C
+2C100002 4182008C
+2C100003 418200B0
+2C100004 418200D0
+2C100005 418200F0
+2C100006 41820110
+2C100007 41820130
+2C100008 41820178
+2C100009 41820148
+3DC01E06 61CE426C
+91CF0000 3DC07565
+61CE0505 91CF0004
+3DC00505 61CE0510
+91CF0008 48000148
+3DC01E06 61CE5265
+91CF0000 3DC06405
+61CE0505 91CF0004
+3DC00505 61CE0510
+91CF0008 48000120
+3DC01E06 61CE4368
+91CF0000 3DC06172
+61CE6163 91CF0004
+3DC07465 61CE7210
+91CF0008 91CF0060
+480000F4 3DC01E06
+61CE4163 91CF0000
+3DC07469 61CE6F6E
+91CF0004 3DC00505
+61CE0510 91CF0008
+480000CC 3DC01E06
+61CE426F 91CF0000
+3DC07773 61CE6572
+91CF0004 3DC00505
+61CE1048 91CF0008
+480000A4 3DC01E06
+61CE4368 91CF0000
+3DC0616E 61CE6365
+91CF0004 3DC00505
+61CE0510 91CF0008
+4800007C 3DC01E06
+61CE444B 91CF0000
+3DC00505 61CE0505
+91CF0004 3DC00505
+61CE0510 91CF0008
+48000054 3DC01E06
+61CE436F 91CF0000
+3DC0696E 61CE0505
+91CF0004 3DC00505
+61CE0510 91CF0008
+4800002C 3DC01E06
+61CE4D69 91CF0000
+3DC06E69 61CE3D67
+91CF0004 3DC0616D
+61CE6510 91CF0008
+48000004 3E008053
+621008F4 A1E30004
+3DC05374 61CE6172
+91D0000C 3DC01E08
+61CE0505 91D00010
+3DC00510 61CE7769
+91D00014 3DC06E6E
+61CE6572 91D00018
+3DC01069 61CE7385
+91D0001C 3DC08585
+61CE0000 91D00020
+3DC00000 61CE0000
+91D00024 91D00028
+91D0002C 91D00030
+91D00034 91D00038
+91D0003C 91D00040
+91D00044 91D00048
+91D0004C 91D00050
+91D00090 91D00094
+91D00098 91D0009C
+91D000A0 91D000A4
+91D000A8 91D000AC
+91D000B0 91D000B4
+91D000B8 91D000BC
+91D000C0 91D000C4
+91D000C8 91D000CC
+91D000D0 91D000D4
+91D000D8 91D000DC
+91D000E0 91D000E4
+91D000E8 91D000EC
+91D000F0 91D000F4
+91D000F8 91D000FC
+91D00100 2C0F0000
+4182004C 2C0F0001
+4182006C 2C0F0002
+4182008C 2C0F0003
+4182019C 2C0F0004
+418200CC 2C0F0005
+418200EC 2C0F0006
+4182010C 2C0F0007
+4182012C 2C0F0008
+41820000 2C0F0009
+41820144 3DC01E05
+61CE426C 91D00000
+3DC07565 61CE0505
+91D00004 3DC00505
+61CE0510 91D00008
+48000144 3DC01E05
+61CE5265 91D00000
+3DC06405 61CE0505
+91D00004 3DC00505
+61CE0510 91D00008
+4800011C 3DC01E05
+61CE4368 91D00000
+3DC06172 61CE6163
+91D00004 3DC07465
+61CE7210 91D00008
+480000F4 3DC01E05
+61CE4861 91D00000
+3DC07070 61CE656E
+91D00004 3DC0696E
+61CE6710 91D00008
+480000CC 3DC01E05
+61CE426F 91D00000
+3DC07773 61CE6572
+91D00004 3DC00505
+61CE0510 91D00008
+480000A4 3DC01E05
+61CE4368 91D00000
+3DC0616E 61CE6365
+91D00004 3DC00505
+61CE0510 91D00008
+4800007C 3DC01E05
+61CE444B 91D00000
+3DC00505 61CE0505
+91D00004 3DC00505
+61CE0510 91D00008
+48000054 3DC01E05
+61CE436F 91D00000
+3DC0696E 61CE0505
+91D00004 3DC00505
+61CE0510 91D00008
+4800002C 3DC01E05
+61CE4D69 91D00000
+3DC06E69 61CE3D67
+91D00004 3DC0616D
+61CE6510 91D00008
+48000004 39C00000
+39E00000 3A000000
+3A200000 3C608000
+60000000 00000000
+*Random Bonus Stars are back and there is 9 of them.
+*Game randomly picks 3 out of these 9.
+*Minigame Star, Coin Star, Orb Star, Action Star, Red Star, Character Space Star, Bowser Star, Chance Time Star, DK Star
+
 $Board - Castaway Bay - Bowser Steals 40 Coins instead of 20 [WolfGC64]
 C2184538 00000001
 2C140028 00000000