Merge branch 'master' into asset-extraction

This commit is contained in:
octorock
2021-11-06 00:33:07 +01:00
413 changed files with 6686 additions and 12843 deletions
+3 -3
View File
@@ -157,17 +157,17 @@ void LoadGfxGroup(u32 group) {
case 0xD:
return;
case 0xE:
if (gUnk_02000000->gameLanguage != 0 && gUnk_02000000->gameLanguage != 1) {
if (gSaveHeader->gameLanguage != 0 && gSaveHeader->gameLanguage != 1) {
loadGfx = TRUE;
}
break;
case 0xF:
if (gUnk_02000000->gameLanguage != 0) {
if (gSaveHeader->gameLanguage != 0) {
loadGfx = TRUE;
}
break;
default:
if (ctrl == gUnk_02000000->gameLanguage) {
if (ctrl == gSaveHeader->gameLanguage) {
loadGfx = TRUE;
}
break;