diff --git a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lcf.template b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lcf.template index bdc95bb6..ab5ad204 100644 --- a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lcf.template +++ b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lcf.template @@ -53,8 +53,8 @@ MEMORY dummy.MAIN_EX.TWL (RW) : ORIGIN = 0x0d000000, LENGTH = 0x0 - arena.MAIN.TWL (RW) : ORIGIN = AFTER(,,LTDMAIN,), LENGTH = 0x0 - arena.MAIN_EX.TWL (RW) : ORIGIN = AFTER(dummy.MAIN_EX.TWL,,,LTDMAIN,), LENGTH = 0x0 + arena.MAIN.TWL (RW) : ORIGIN = AFTER(,,), LENGTH = 0x0 + arena.MAIN_EX.TWL (RW) : ORIGIN = AFTER(dummy.MAIN_EX.TWL,,,), LENGTH = 0x0 check.MAIN.TWL (RW) : ORIGIN = 0x02000000, LENGTH = 0x0f80000 > main.twl.check @@ -161,6 +161,12 @@ SECTIONS + + + + + + @@ -214,6 +220,12 @@ SECTIONS + + + + + + @@ -664,7 +676,7 @@ SECTIONS ########################### LTDAUTOLOADS ############################ SDK_LTDAUTOLOAD.LTDMAIN.START = SDK_STATIC_BSS_END; SDK_LTDAUTOLOAD.LTDMAIN.END = SDK_LTDAUTOLOAD.LTDMAIN.START; - SDK_LTDAUTOLOAD.LTDMAIN.BSS_EDN = SDK_LTDAUTOLOAD.LTDMAIN.START; + SDK_LTDAUTOLOAD.LTDMAIN.BSS_END = SDK_LTDAUTOLOAD.LTDMAIN.START; SDK_LTDAUTOLOAD.LTDMAIN.SIZE = 0; SDK_LTDAUTOLOAD.LTDMAIN.BSS_SIZE = 0; SDK_LTDAUTOLOAD_TOP_START = 0x02400000; diff --git a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf index b4de7a96..e45a994c 100644 --- a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf +++ b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf @@ -23,6 +23,9 @@ Static $(TARGET_NAME) Address 0x02680200 Object $(OBJS_STATIC) Library $(LLIBS) $(GLIBS) $(CW_LIBS) + Object * (.ltdmain) + Object $(OBJS_LTDAUTOLOAD) + Library $(LLIBS_EX) $(GLIBS_EX) } Autoload ITCM @@ -43,11 +46,3 @@ Autoload DTCM Object $(OBJS_AUTOLOAD) (.sbss) } -Ltdautoload LTDMAIN -{ - # NITRO/TWL 共有のオーバーレイが在る場合は、さらにその後ろに配置する必要があります。 - After $(TARGET_NAME) - Object * (.ltdmain) - Object $(OBJS_LTDAUTOLOAD) - Library $(LLIBS_EX) $(GLIBS_EX) -}