Fix external module loading for firm modules such as TwlBg

Closes #1919 and #1921
2023-07-21 11:30:55 +02:00 · 2023-07-21 11:30:55 +02:00 · f40a1cc47b
commit f40a1cc47b
parent 11be450894
1 changed files with 2 additions and 0 deletions
--- a/arm9/source/firm.c
+++ b/arm9/source/firm.c
@ -471,6 +471,8 @@ static void mergeSection0(FirmwareType firmType, u32 firmVersion, bool loadFromS
                   memcmp(moduleList[i].name, ((Cxi *)dst)->exHeader.systemControlInfo.appTitle, sizeof(((Cxi *)dst)->exHeader.systemControlInfo.appTitle)) != 0)
                    error("An external FIRM module is invalid or corrupted.");

+                dst += dstModuleSize;
+                maxModuleSize -= dstModuleSize;
                continue;
            }
        }