Merge remote-tracking branch 'refs/remotes/pret/master'

1 files changed, 65 insertions, 19 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 1fdc52525..517395530 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -9,6 +9,8 @@ SECTIONS {
     ewram (NOLOAD) :
     ALIGN(4)
     {
+        gHeap = .;
+
         . = 0x20000;
 
 <EWRAM>
@@ -39,16 +41,16 @@ SECTIONS {
     ALIGN(4)
     {
         asm/crt0.o(.text);
-        asm/main.o(.text);
+        src/main.o(.text);
         src/malloc.o(.text);
-        asm/dma3_manager.o(.text);
+        src/dma3_manager.o(.text);
         src/gpu_regs.o(.text);
         asm/bg.o(.text);
         asm/blit.o(.text);
         asm/window.o(.text);
         asm/text.o(.text);
         asm/sprite.o(.text);
-        asm/string_util.o(.text);
+        src/string_util.o(.text);
         asm/link.o(.text);
         asm/rtc.o(.text);
         asm/main_menu.o(.text);
@@ -58,10 +60,10 @@ SECTIONS {
         asm/pokemon_1.o(.text);
         asm/calculate_base_damage.o(.text);
         asm/pokemon_2.o(.text);
-        asm/rom_806BD04.o(.text);
+        asm/pokemon_3.o(.text);
         asm/trig.o(.text);
-        asm/rng.o(.text);
-        asm/rom_806F640.o(.text);
+        src/rng.o(.text);
+        asm/util.o(.text);
         src/blend_palette.o(.text);
         asm/daycare.o(.text);
         asm/egg_hatch.o(.text);
@@ -85,16 +87,18 @@ SECTIONS {
         asm/text_window.o(.text);
         asm/script.o(.text);
         asm/scrcmd.o(.text);
-        asm/rom_809BEDC.o(.text);
-        asm/var.o(.text);
-        asm/flag.o(.text);
-        asm/rom_809D7BC.o(.text);
+        asm/field_control_avatar.o(.text);
+        asm/event_data.o(.text);
+        asm/coord_event_weather.o(.text);
+        asm/field_tasks.o(.text);
+        asm/clock.o(.text);
         asm/reset_rtc_screen.o(.text);
         asm/start_menu.o(.text);
         asm/tileset.o(.text);
         src/palette.o(.text);
         asm/sound.o(.text);
-        asm/rom_80A3934.o(.text);
+        asm/battle_anim.o(.text);
+        asm/rom_80A5C6C.o(.text);
         src/task.o(.text);
         asm/rom5.o(.text);
         asm/title_screen.o(.text);
@@ -106,7 +110,7 @@ SECTIONS {
         asm/fldeff_emotion.o(.text);
         asm/wild_encounter.o(.text);
         asm/field_effect.o(.text);
-        asm/rom_80B5E6C.o(.text);
+        asm/unknown_task.o(.text);
         asm/option_menu.o(.text);
         asm/pokedex.o(.text);
         asm/trainer_card.o(.text);
@@ -147,7 +151,7 @@ SECTIONS {
         asm/decoration.o(.text);
         asm/slot_machine.o(.text);
         asm/contest_painting.o(.text);
-        asm/battle_ai.o(.text);
+        src/battle_ai.o(.text);
         asm/trader.o(.text);
         asm/starter_choose.o(.text);
         asm/wallclock.o(.text);
@@ -176,18 +180,27 @@ SECTIONS {
         asm/rom_8158B30.o(.text);
         asm/player_pc.o(.text);
         asm/intro.o(.text);
-        asm/rom_816F318.o(.text);
+        asm/rom_81700F8.o(.text);
+        asm/field_region_map.o(.text);
+        asm/battle_anim_8170478.o(.text);
+        asm/hall_of_fame.o(.text);
+        asm/credits.o(.text);
         asm/lottery_corner.o(.text);
         asm/diploma.o(.text);
         asm/berry_tag_screen.o(.text);
         asm/mystery_event_menu.o(.text);
         asm/save_failed_screen.o(.text);
-        asm/rom_81795E8.o(.text);
+        asm/braille_puzzles.o(.text);
+        asm/pokeblock_feed.o(.text);
         asm/clear_save_data_screen.o(.text);
-        asm/rom_817B064.o(.text);
+        asm/intro_credits_graphics.o(.text);
+        asm/evolution_graphics.o(.text);
+        asm/bard_music.o(.text);
+        asm/fldeff_teleport.o(.text);
+        asm/rom_817C95C.o(.text);
         asm/front_pic_anim.o(.text);
         asm/rom_8184DA4.o(.text);
-        asm/multiboot.o(.text);
+        src/multiboot.o(.text);
         asm/rom_81BAD84.o(.text);
     } =0
 
@@ -215,7 +228,7 @@ SECTIONS {
         src/agb_flash.o(.text);
         src/agb_flash_1m.o(.text);
         src/agb_flash_mx.o(.text);
-        asm/librtc.o(.text);
+        src/siirtc.o(.text);
         asm/librfu.o(.text);
         asm/libagbsyscall.o(.text);
         tools/agbcc/lib/libgcc.a:_call_via_rX.o(.text);
@@ -239,7 +252,40 @@ SECTIONS {
     .rodata :
     ALIGN(4)
     {
+        src/main.o(.rodata);
+        data/bg.o(.rodata);
+        data/window.o(.rodata);
+        data/text.o(.rodata);
+        data/sprite.o(.rodata);
+        src/string_util.o(.rodata);
         data/data2.o(.rodata);
+        data/battle_message.o(.rodata);
+        data/cable_car.o(.rodata);
+        data/save.o(.rodata);
+        data/field_effect_helpers.o(.rodata);
+        data/contest_ai.o(.rodata);
+        data/rom_8158B30.o(.rodata);
+        data/player_pc.o(.rodata);
+        data/intro.o(.rodata);
+        data/field_region_map.o(.rodata);
+        data/battle_anim_8170478.o(.rodata);
+        data/hall_of_fame.o(.rodata);
+        data/credits.o(.rodata);
+        data/lottery_corner.o(.rodata);
+        data/diploma.o(.rodata);
+        data/strings.o(.rodata);
+        data/berry_tag_screen.o(.rodata);
+        data/mystery_event_menu.o(.rodata);
+        data/save_failed_screen.o(.rodata);
+        data/braille_puzzles.o(.rodata);
+        data/pokeblock_feed.o(.rodata);
+        data/clear_save_data_screen.o(.rodata);
+        data/intro_credits_graphics.o(.rodata);
+        data/evolution_graphics.o(.rodata);
+        data/bard_music.o(.rodata);
+        data/data_860A4AC.o(.rodata);
+        data/fonts.o(.rodata);
+        data/mystery_event_msg.o(.rodata);
         src/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
     } =0
@@ -251,7 +297,7 @@ SECTIONS {
         src/agb_flash_1m.o(.rodata);
         src/agb_flash_mx.o(.rodata);
         src/agb_flash_le.o(.rodata);
-        data/librtc_rodata.o(.rodata);
+        src/siirtc.o(.rodata);
         data/librfu_rodata.o(.rodata);
         tools/agbcc/lib/libgcc.a:_divdi3.o(.rodata);
         tools/agbcc/lib/libgcc.a:_udivdi3.o(.rodata);