Fix external module loading for firm modules such as TwlBg

Closes #1919 and #1921
LumaTeam · Jul 21, 2023 · f40a1cc · f40a1cc
1 parent 11be450
commit f40a1cc
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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;
             }
         }