Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-07-19 17:35:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 63b33fd3d2 into d8d37fdbc4

Browse Source
This commit is contained in:
Jordan Woyak 2026-07-02 02:58:09 -05:00 committed by GitHub
commit 88f67a9e82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
View File

@ -1260,7 +1260,7 @@ class SettingsFragmentPresenter(
R.string.main_mem2_size,
0,
64,
128,
256,
"MB",
1
)

8
Source/Core/Core/PowerPC/MMU.cpp
View File

@ -960,7 +960,7 @@ void MMU::DMA_LCToMemory(const u32 mem_address, const u32 cache_address, const u
// TODO: This is terribly slow.
// TODO: Refactor.
// Avatar: The Last Airbender (GC) uses this for videos.
if ((mem_address & 0x0F000000) == 0x08000000)
if ((mem_address & 0x1F000000) == 0x08000000)
{
for (u32 i = 0; i < 32 * num_blocks; i += 4)
{
@ -972,7 +972,7 @@ void MMU::DMA_LCToMemory(const u32 mem_address, const u32 cache_address, const u
// No known game uses this; here for completeness.
// TODO: Refactor.
if ((mem_address & 0x0F000000) == 0x0C000000)
if ((mem_address & 0x1F000000) == 0x0C000000)
{
for (u32 i = 0; i < 32 * num_blocks; i += 4)
{
@ -990,7 +990,7 @@ void MMU::DMA_MemoryToLC(const u32 cache_address, const u32 mem_address, const u
{
// No known game uses this; here for completeness.
// TODO: Refactor.
if ((mem_address & 0x0F000000) == 0x08000000)
if ((mem_address & 0x1F000000) == 0x08000000)
{
for (u32 i = 0; i < 32 * num_blocks; i += 4)
{
@ -1002,7 +1002,7 @@ void MMU::DMA_MemoryToLC(const u32 cache_address, const u32 mem_address, const u
// No known game uses this.
// TODO: Refactor.
if ((mem_address & 0x0F000000) == 0x0C000000)
if ((mem_address & 0x1F000000) == 0x0C000000)
{
for (u32 i = 0; i < 32 * num_blocks; i += 4)
{

2
Source/Core/DolphinQt/Settings/AdvancedPane.cpp
View File

@ -263,7 +263,7 @@ void AdvancedPane::CreateLayout()
mem2_override_slider_layout->setContentsMargins(0, 0, 0, 0);
ram_override_layout->addLayout(mem2_override_slider_layout);
m_mem2_override_slider = new ConfigSliderU32(64, 128, Config::MAIN_MEM2_SIZE, 0x100000);
m_mem2_override_slider = new ConfigSliderU32(64, 256, Config::MAIN_MEM2_SIZE, 0x100000);
mem2_override_slider_layout->addWidget(m_mem2_override_slider);
m_mem2_label =