resolve merge conflicts and make it compile

1 files changed, 16 insertions, 6 deletions

diff --git a/ld_script.txt b/ld_script.txt
index cbb91e209..601408446 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -9,7 +9,7 @@ SECTIONS {
     ewram (NOLOAD) :
     ALIGN(4)
     {
-<EWRAM>
+        INCLUDE "sym_ewram.ld"
 
         . = 0x40000;
     }
@@ -20,13 +20,13 @@ SECTIONS {
     ALIGN(4)
     {
         /* .bss starts at 0x3000000 */
-<BSS>
+        INCLUDE "sym_bss.ld"
 
         /* .bss.code starts at 0x3000F60 */
         src/libs/m4a_2.o(.bss.code);
 
         /* COMMON starts at 0x3001760 */
-<COMMON>
+        INCLUDE "sym_common.ld"
         tools/agbcc/lib/libc.a:sbrkr.o(COMMON);
         end = .;
         . = 0x8000;
@@ -146,8 +146,10 @@ SECTIONS {
         src/battle/battle_anim_80A7E7C.o(.text);
         src/field/item.o(.text);
         src/debug/matsuda_debug_menu.o(.text);
+        src/debug/crash.o(.text);
         src/contest.o(.text);
         src/field/shop.o(.text);
+        src/field/fldeff_escalator.o(.text);
         src/field/berry.o(.text);
         src/debug/watanabe_debug_menu.o(.text);
         src/field/script_menu.o(.text);
@@ -488,10 +490,12 @@ SECTIONS {
         src/engine/link.o(.rodata);
         src/engine/rtc.o(.rodata);
         src/engine/main_menu.o(.rodata);
-        data/data2a.o(.rodata);
+        data/mon_attrs.o(.rodata);
+        data/btl_attrs.o(.rodata);
         src/battle/battle_4.o(.rodata);
         src/battle/battle_controller_player.o(.rodata);
-        data/data2b.o(.rodata);
+        data/smokescreen.o(.rodata); /* why is smokescreen rodata way up here and not in the correct location? */
+        data/battle_7.o(.rodata);
         src/battle/battle_controller_opponent.o(.rodata);
         src/battle/battle_controller_linkopponent.o(.rodata);
         data/battle_moves.o(.rodata);
@@ -538,7 +542,12 @@ SECTIONS {
         src/battle/battle_anim.o(.rodata);
         src/rom_8077ABC.o(.rodata);
         data/map_events.o(.rodata);
-        data/data_8393054.o(.rodata);
+        data/unused_orb.o(.rodata); /* these files are clearly the rodata for latter part of rom_8077ABC, but the linker linked map_events before these objects for some reason. perhaps it was compiling and linking 2 folders at the same time? */
+        data/gray_sun.o(.rodata);
+        data/sparkle.o(.rodata);
+        data/unused_paw.o(.rodata);
+        data/unused_hit.o(.rodata);
+        data/unused_orb2.o(.rodata);
         src/engine/task.o(.rodata);
         src/battle/battle_anim_807B69C.o(.rodata);
         src/scene/title_screen.o(.rodata);
@@ -570,6 +579,7 @@ SECTIONS {
         src/debug/matsuda_debug_menu.o(.rodata);
         data/contest.o(.rodata);
         src/field/shop.o(.rodata);
+        src/field/fldeff_escalator.o(.rodata);
         src/field/berry.o(.rodata);
         data/debug_menu_watanabe.o(.rodata);
         src/field/script_menu.o(.rodata);