dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

one last goto

Browse Source
This commit is contained in:
Kurausukun
2021-05-23 22:26:34 -04:00
committed by huderlem
parent aca96a1510
commit 94939e395b
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gflib/bg.c
+12 -18
View File
@@ -173,36 +173,30 @@ u8 LoadBgVram(u8 bg, const void *src, u16 size, u16 destOffset, u8 mode)
u16 offset; u16 offset;
s8 cursor; s8 cursor;
if (!IsInvalidBg(bg) && sGpuBgConfigs.configs[bg].visible) if (IsInvalidBg(bg) || !sGpuBgConfigs.configs[bg].visible)
{ return -1;
switch (mode) switch (mode)
{ {
case 0x1: case 0x1:
offset = sGpuBgConfigs.configs[bg].charBaseIndex * BG_CHAR_SIZE; offset = sGpuBgConfigs.configs[bg].charBaseIndex * BG_CHAR_SIZE;
offset = destOffset + offset;
cursor = RequestDma3Copy(src, (void*)(offset + BG_VRAM), size, 0);
if (cursor == -1)
return -1;
break; break;
case 0x2: case 0x2:
offset = sGpuBgConfigs.configs[bg].mapBaseIndex * BG_SCREEN_SIZE; offset = sGpuBgConfigs.configs[bg].mapBaseIndex * BG_SCREEN_SIZE;
offset = destOffset + offset;
cursor = RequestDma3Copy(src, (void*)(offset + BG_VRAM), size, 0);
if (cursor == -1)
return -1;
break; break;
default: default:
cursor = -1; cursor = -1;
goto end; break;
} }
offset = destOffset + offset;
cursor = RequestDma3Copy(src, (void*)(offset + BG_VRAM), size, 0);
if (cursor == -1)
{
return -1;
}
}
else
{
return -1;
}
end:
return cursor; return cursor;
} }