merge

1 files changed, 13 insertions, 7 deletions

diff --git a/pokediamond.lcf b/pokediamond.lcf
index 1ff4b507..19b80331 100644
--- a/pokediamond.lcf
+++ b/pokediamond.lcf
@@ -2,7 +2,7 @@
 MEMORY {
     header (RWX) : ORIGIN=0, LENGTH=0
     arm9 (RWX) : ORIGIN=0x2000000, LENGTH=0
-    garbage (RWX) : ORIGIN=0, LENGTH=0
+    unk_10b724 (RWX) : ORIGIN=0, LENGTH=0
     arm9overlay (RWX) : ORIGIN=0, LENGTH=0
     arm7 (RWX) : ORIGIN=0x2380000, LENGTH=0
     filenametable (RWX) : ORIGIN=0, LENGTH=0
@@ -375,12 +375,18 @@ SECTIONS {
 
     .arm9 : AT (0x4000) {
         secure.o (.text)
-        entry.o (.text)
+        crt0.o (.text)
         main.o (.text)
         FUN_02000DF4.o (.text)
         unk_02000E0C.o (.text)
         string_util.o (.text)
         unk_020023C0.o (.text)
+        filesystem.o (.text)
+        unk_02006864.o (.text)
+        script.o (.text)
+        unk_02038C78.o (.text)
+        scrcmd.o (.text)
+        unk_02046030.o (.text)
         rom1.5.o (.text)
         unk_020C9C0C.o (.text)
         PM_arm9.o (.text)
@@ -392,17 +398,17 @@ SECTIONS {
         STD_arm9.o (.text)
         rom2.o (.data)
         string_util.o (.data)
-        rom2_2.o (.text)
+        rom2_2.o (.data)
     } > arm9
 
+    .unk_10b724 : AT (0x10B724) {
+        unk_10b724.o (.text)
+    } > unk_10b724
+
     .arm9overlay : AT (0x10B800) {
         arm9overlay.o (.text)
     } > arm9overlay
 
-    .garbage : AT (0x10B724) {
-        unk_10b724.o (.text)
-    } > garbage
-
 	.FILE_10C400 : AT (0x10C400) {
         FILE_10C400.o (.text) /* 0x10C400 */
 	} > rom3.FILE_10C400