Merge branch 'master' into contest_link_80C2020

1 files changed, 200 insertions, 110 deletions

diff --git a/ld_script.txt b/ld_script.txt
index c421aa463..0a80f9bf4 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -27,7 +27,7 @@ SECTIONS {
 
         /* COMMON starts at 0x3001760 */
         INCLUDE "sym_common.ld"
-        tools/agbcc/lib/libc.a:sbrkr.o(COMMON);
+        *libc.a:sbrkr.o(COMMON);
         end = .;
         . = 0x8000;
     }
@@ -47,16 +47,15 @@ SECTIONS {
         src/main_menu.o(.text);
         src/rom3.o(.text);
         src/decompress.o(.text);
-        asm/battle_1.o(.text);
-        src/rom_800D42C.o(.text);
-        asm/battle_1.o(.text_800DC24);
+        asm/decompress.o(.text);
+        src/battle/battle_bg.o(.text);
         src/battle/battle_2.o(.text);
         src/battle/battle_util.o(.text);
         src/battle/battle_4.o(.text);
         src/battle/battle_controller_player.o(.text);
         src/battle/battle_7.o(.text);
         src/battle/battle_controller_opponent.o(.text);
-        asm/battle_9.o(.text);
+        src/battle/battle_ai_switch_items.o(.text);
         src/battle/battle_controller_linkopponent.o(.text);
         src/pokemon_1.o(.text);
         src/battle/calculate_base_damage.o(.text);
@@ -86,7 +85,7 @@ SECTIONS {
         src/field_player_avatar.o(.text);
         src/event_object_movement.o(.text);
         src/field_message_box.o(.text);
-        src/map_obj_lock.o(.text);
+        src/event_obj_lock.o(.text);
         src/text_window.o(.text);
         src/script.o(.text);
         src/scrcmd.o(.text);
@@ -116,11 +115,8 @@ SECTIONS {
         src/battle/battle_setup.o(.text);
         src/cable_club.o(.text);
         src/debug/tomomichi_debug_menu.o(.text);
-        asm/tomomichi_debug_menu.o(.text);
         src/debug/nohara_debug_menu.o(.text);
-        asm/nohara_debug_menu.o(.text);
         src/debug/mori_debug_menu.o(.text);
-        asm/taya_debug_window.o(.text);
         src/debug/taya_debug_window.o(.text);
         src/trainer_see.o(.text);
         src/wild_encounter.o(.text);
@@ -156,11 +152,10 @@ SECTIONS {
         src/fldeff_escalator.o(.text);
         src/berry.o(.text);
         src/debug/watanabe_debug_menu.o(.text);
-        asm/watanabe_debug_menu.o(.text);
         src/script_menu.o(.text);
         src/naming_screen.o(.text);
         src/money.o(.text);
-        asm/contest_effect.o(.text);
+        src/contest_effect.o(.text);
         src/record_mixing.o(.text);
         src/debug/sound_check_menu.o(.text);
         src/secret_base.o(.text);
@@ -171,7 +166,6 @@ SECTIONS {
         src/field_poison.o(.text);
         src/pokemon_size_record.o(.text);
         src/pc_screen_effect.o(.text);
-        asm/pc_screen_effect.o(.text);
         src/fldeff_secretpower.o(.text);
         src/fldeff_secret_base_pc.o(.text);
         src/fldeff_decoration.o(.text);
@@ -188,7 +182,6 @@ SECTIONS {
         src/battle/anim/seed.o(.text);
         src/battle/anim/orbit.o(.text);
         src/battle/anim/leaf.o(.text);
-        src/battle/anim/cutter.o(.text);
         src/battle/anim/tendrils.o(.text);
         src/battle/anim/silhouette.o(.text);
         src/battle/anim/copy_orb.o(.text);
@@ -212,28 +205,20 @@ SECTIONS {
         src/battle/anim/unused_3.o(.text);
         src/battle/anim/sleep.o(.text);
         src/battle/anim/scan.o(.text);
-        src/battle/anim/lunge_1.o(.text);
-        src/battle/anim/unused_4.o(.text);
-        src/battle/anim/lunge_2.o(.text);
+        src/battle/anim/lunge.o(.text);
         src/battle/anim/slash.o(.text);
         src/battle/anim/brace.o(.text);
         src/battle/anim/cube.o(.text);
-        src/battle/anim/tile_in.o(.text);
-        src/battle/anim/tile_out.o(.text);
+        src/battle/anim/tile.o(.text);
         src/battle/anim/moon.o(.text);
         src/battle/anim/twinkle.o(.text);
         src/battle/anim/flash.o(.text);
         src/battle/anim/strike.o(.text);
         src/battle/anim/evasion.o(.text);
         src/battle/anim/fang.o(.text);
-        src/battle/anim/note_wave.o(.text);
-        src/battle/anim/note_scatter.o(.text);
-        src/battle/anim/drum.o(.text);
-        src/battle/anim/note_scatter_2.o(.text);
+        src/battle/anim/musical.o(.text);
         src/battle/anim/thought.o(.text);
-        src/battle/anim/wave_finger.o(.text);
-        src/battle/anim/spin_finger.o(.text);
-        src/battle/anim/taunt_finger.o(.text);
+        src/battle/anim/finger.o(.text);
         src/battle/anim/unused_5.o(.text);
         src/battle/anim/unused_6.o(.text);
         src/battle/anim/unused_7.o(.text);
@@ -242,7 +227,6 @@ SECTIONS {
         src/battle/anim/alert.o(.text);
         src/battle/anim/sword.o(.text);
         src/battle/anim/sonic.o(.text);
-        src/battle/anim/sonic_task.o(.text);
         src/battle/anim/unused_9.o(.text);
         src/battle/anim/money.o(.text);
         src/battle/anim/bullet.o(.text);
@@ -258,11 +242,8 @@ SECTIONS {
         src/battle/anim/thrashing.o(.text);
         src/battle/anim/draw.o(.text);
         src/battle/anim/ring.o(.text);
-        src/battle/anim/egg.o(.text);
         src/battle/anim/espeed.o(.text);
-        src/battle/anim/smoke.o(.text);
-        src/battle/anim/glow.o(.text);
-        src/battle/anim/note_rain.o(.text);
+        src/battle/anim/heal_bell.o(.text);
         src/battle/anim/heart_1.o(.text);
         src/battle/anim/curtain.o(.text);
         src/battle/anim/startle.o(.text);
@@ -271,8 +252,7 @@ SECTIONS {
         src/battle/anim/flying_hearts.o(.text);
         src/battle/anim/love_bg.o(.text);
         src/battle/anim/scary_face.o(.text);
-        src/battle/anim/orbit_fast.o(.text);
-        src/battle/anim/orbit_scatter.o(.text);
+        src/battle/anim/hidden_power_orbit.o(.text);
         src/battle/anim/spit.o(.text);
         src/battle/anim/perceive.o(.text);
         src/battle/anim/angel.o(.text);
@@ -294,24 +274,28 @@ SECTIONS {
         src/battle/anim/fire.o(.text);
         src/battle/anim/sunlight.o(.text);
         src/battle/anim/fire_2.o(.text);
-        src/battle/anim/heated_rock.o(.text);
         src/battle/anim/wisp_orb.o(.text);
         src/battle/anim/wisp_fire.o(.text);
         src/battle/anim/thunder.o(.text);
         src/battle/anim/beta_beat_up.o(.text);
         src/battle/anim/shock.o(.text);
-        asm/current.o(.text);
+        src/battle/anim/current.o(.text);
+        src/battle/anim/ice.o(.text);
         asm/ice.o(.text);
         src/battle/anim/fight.o(.text);
         src/battle/anim/poison.o(.text);
+        src/battle/anim/flying.o(.text);
         asm/flying.o(.text);
         src/battle/anim/psychic.o(.text);
         src/battle/anim/bug.o(.text);
         src/battle/anim/rock.o(.text);
+        src/battle/anim/ghost.o(.text);
         asm/ghost.o(.text);
         src/battle/anim/dragon.o(.text);
         src/battle/anim/dark.o(.text);
+        src/battle/anim/ground.o(.text);
         asm/ground.o(.text);
+        src/battle/anim/normal.o(.text);
         asm/normal.o(.text);
         src/battle/anim/battle_intro.o(.text);
         src/bike.o(.text);
@@ -329,8 +313,8 @@ SECTIONS {
         src/dewford_trend.o(.text);
         src/heal_location.o(.text);
         src/region_map.o(.text);
-        src/cute_sketch.o(.text);
-        asm/cute_sketch.o(.text);
+        src/contest_painting_effects.o(.text);
+        asm/contest_painting_effects.o(.text);
         src/decoration.o(.text);
         src/slot_machine.o(.text);
         src/contest_painting.o(.text);
@@ -347,12 +331,10 @@ SECTIONS {
         src/hof_pc.o(.text);
         src/field_specials.o(.text);
         src/battle/battle_records.o(.text);
-        asm/pokedex_area_screen.o(.text);
+        src/pokedex_area_screen.o(.text);
         src/evolution_scene.o(.text);
         src/roulette.o(.text);
-        asm/pokedex_cry_screen.o(.text);
         src/pokedex_cry_screen.o(.text);
-        asm/pokedex_cry_screen.o(.text_811A4F8);
         src/coins.o(.text);
         src/landmark.o(.text);
         src/fldeff_strength.o(.text);
@@ -366,15 +348,16 @@ SECTIONS {
         src/unused_8124F94.o(.text);
         src/save.o(.text);
         src/mystery_event_script.o(.text);
-        asm/unk_debug_menu_3.o(.text);
+        src/debug/ereader_debug_menu.o(.text);
         src/field_effect_helpers.o(.text);
         src/contest_ai.o(.text);
         src/unused_81258BC.o(.text);
         src/battle/anim/sfx.o(.text);
         src/battle/battle_controller_safari.o(.text);
         src/fldeff_sweetscent.o(.text);
+        src/battle/battle_anim_812C144.o(.text);
         asm/battle_anim_812C144.o(.text);
-        src/learn_move.o(.text);
+        src/move_tutor_menu.o(.text);
         src/fldeff_softboiled.o(.text);
         src/decoration_inventory.o(.text);
         src/roamer.o(.text);
@@ -396,7 +379,6 @@ SECTIONS {
         src/pokeblock_feed.o(.text);
         src/clear_save_data_menu.o(.text);
         src/debug/nakamura_debug_menu.o(.text);
-        asm/nakamura_debug_menu.o(.text);
         src/intro_credits_graphics.o(.text);
         src/evolution_graphics.o(.text);
         src/bard_music.o(.text);
@@ -433,54 +415,54 @@ SECTIONS {
         src/libs/agb_flash_mx.o(.text);
         src/libs/siirtc.o(.text);
         src/libs/libagbsyscall.o(.text);
-        tools/agbcc/lib/libgcc.a:_call_via_rX.o(.text);
-        tools/agbcc/lib/libgcc.a:_divsi3.o(.text);
-        tools/agbcc/lib/libgcc.a:_dvmd_tls.o(.text);
-        tools/agbcc/lib/libgcc.a:_fixunsdfsi.o(.text);
-        tools/agbcc/lib/libgcc.a:_fixunssfsi.o(.text);
-        tools/agbcc/lib/libgcc.a:_modsi3.o(.text);
-        tools/agbcc/lib/libgcc.a:_muldi3.o(.text);
-        tools/agbcc/lib/libgcc.a:_udivdi3.o(.text);
-        tools/agbcc/lib/libgcc.a:_udivsi3.o(.text);
-        tools/agbcc/lib/libgcc.a:_umodsi3.o(.text);
-        tools/agbcc/lib/libgcc.a:dp-bit.o(.text);
-        tools/agbcc/lib/libgcc.a:fp-bit.o(.text);
-        tools/agbcc/lib/libgcc.a:_lshrdi3.o(.text);
-        tools/agbcc/lib/libgcc.a:_negdi2.o(.text);
-        tools/agbcc/lib/libc.a:memcpy.o(.text);
-        tools/agbcc/lib/libc.a:memset.o(.text);
-        tools/agbcc/lib/libc.a:strcmp.o(.text);
-        tools/agbcc/lib/libc.a:vfprintf.o(.text);
-        tools/agbcc/lib/libc.a:vsprintf.o(.text);
-        tools/agbcc/lib/libc.a:fvwrite.o(.text);
-        tools/agbcc/lib/libc.a:locale.o(.text);
-        tools/agbcc/lib/libc.a:findfp.o(.text);
-        tools/agbcc/lib/libc.a:fflush.o(.text);
-        tools/agbcc/lib/libc.a:wsetup.o(.text);
-        tools/agbcc/lib/libc.a:mbtowc_r.o(.text);
-        tools/agbcc/lib/libc.a:s_isinf.o(.text);
-        tools/agbcc/lib/libc.a:s_isnan.o(.text);
-        tools/agbcc/lib/libc.a:memchr.o(.text);
-        tools/agbcc/lib/libc.a:strlen.o(.text);
-        tools/agbcc/lib/libc.a:dtoa.o(.text);
-        tools/agbcc/lib/libc.a:memmove.o(.text);
-        tools/agbcc/lib/libc.a:stdio.o(.text);
-        tools/agbcc/lib/libc.a:mprec.o(.text);
-        tools/agbcc/lib/libc.a:mallocr.o(.text);
-        tools/agbcc/lib/libc.a:fwalk.o(.text);
-        tools/agbcc/lib/libc.a:freer.o(.text);
-        tools/agbcc/lib/libc.a:makebuf.o(.text);
-        tools/agbcc/lib/libc.a:readr.o(.text);
-        tools/agbcc/lib/libc.a:writer.o(.text);
-        tools/agbcc/lib/libc.a:lseekr.o(.text);
-        tools/agbcc/lib/libc.a:closer.o(.text);
-        tools/agbcc/lib/libc.a:callocr.o(.text);
-        tools/agbcc/lib/libc.a:sbrkr.o(.text);
-        tools/agbcc/lib/libc.a:mlock.o(.text);
-        tools/agbcc/lib/libc.a:fstatr.o(.text);
-        tools/agbcc/lib/libc.a:libcfunc.o(.text);
-        tools/agbcc/lib/libc.a:syscalls.o(.text);
-        tools/agbcc/lib/libc.a:errno.o(.text);
+        *libgcc.a:_call_via_rX.o(.text);
+        *libgcc.a:_divsi3.o(.text);
+        *libgcc.a:_dvmd_tls.o(.text);
+        *libgcc.a:_fixunsdfsi.o(.text);
+        *libgcc.a:_fixunssfsi.o(.text);
+        *libgcc.a:_modsi3.o(.text);
+        *libgcc.a:_muldi3.o(.text);
+        *libgcc.a:_udivdi3.o(.text);
+        *libgcc.a:_udivsi3.o(.text);
+        *libgcc.a:_umodsi3.o(.text);
+        *libgcc.a:dp-bit.o(.text);
+        *libgcc.a:fp-bit.o(.text);
+        *libgcc.a:_lshrdi3.o(.text);
+        *libgcc.a:_negdi2.o(.text);
+        *libc.a:memcpy.o(.text);
+        *libc.a:memset.o(.text);
+        *libc.a:strcmp.o(.text);
+        *libc.a:vfprintf.o(.text);
+        *libc.a:vsprintf.o(.text);
+        *libc.a:fvwrite.o(.text);
+        *libc.a:locale.o(.text);
+        *libc.a:findfp.o(.text);
+        *libc.a:fflush.o(.text);
+        *libc.a:wsetup.o(.text);
+        *libc.a:mbtowc_r.o(.text);
+        *libc.a:s_isinf.o(.text);
+        *libc.a:s_isnan.o(.text);
+        *libc.a:memchr.o(.text);
+        *libc.a:strlen.o(.text);
+        *libc.a:dtoa.o(.text);
+        *libc.a:memmove.o(.text);
+        *libc.a:stdio.o(.text);
+        *libc.a:mprec.o(.text);
+        *libc.a:mallocr.o(.text);
+        *libc.a:fwalk.o(.text);
+        *libc.a:freer.o(.text);
+        *libc.a:makebuf.o(.text);
+        *libc.a:readr.o(.text);
+        *libc.a:writer.o(.text);
+        *libc.a:lseekr.o(.text);
+        *libc.a:closer.o(.text);
+        *libc.a:callocr.o(.text);
+        *libc.a:sbrkr.o(.text);
+        *libc.a:mlock.o(.text);
+        *libc.a:fstatr.o(.text);
+        *libc.a:libcfunc.o(.text);
+        *libc.a:syscalls.o(.text);
+        *libc.a:errno.o(.text);
         src/libs/libisagbprn.o(.text);
     } =0
 
@@ -496,6 +478,8 @@ SECTIONS {
         src/rtc.o(.rodata);
         src/main_menu.o(.rodata);
         data/mon_attrs.o(.rodata);
+        src/battle/battle_1.o(.rodata);
+        src/battle/battle_bg.o(.rodata);
         data/btl_attrs.o(.rodata);
         src/battle/battle_4.o(.rodata);
         src/battle/battle_controller_player.o(.rodata);
@@ -503,7 +487,7 @@ SECTIONS {
         data/battle_7.o(.rodata);
         src/battle/battle_controller_opponent.o(.rodata);
         src/battle/battle_controller_linkopponent.o(.rodata);
-        data/battle_moves.o(.rodata);
+        src/data/battle_moves.o(.rodata);
         src/battle/battle_util.o(.rodata);
         src/pokemon_1.o(.rodata);
         src/pokemon_1.o(.data); /* gEvolutionTable needs to be non-const to match */
@@ -516,7 +500,8 @@ SECTIONS {
         src/util.o(.rodata);
         src/daycare.o(.rodata);
         src/egg_hatch.o(.rodata);
-        data/battle_interface.o(.rodata);
+        src/battle/battle_7.o(.rodata);
+        src/battle/battle_interface.o(.rodata);
         src/battle/pokeball.o(.rodata);
         src/trade.o(.rodata);
         src/berry_blender.o(.rodata);
@@ -539,7 +524,6 @@ SECTIONS {
         src/start_menu.o(.rodata);
         src/debug/start_menu_debug.o(.data);
         src/debug/start_menu_debug.o(.rodata);
-        data/start_menu_debug.o(.rodata);
         src/menu.o(.rodata);
         src/tileset_anim.o(.rodata);
         src/palette.o(.rodata);
@@ -561,10 +545,10 @@ SECTIONS {
         src/field_screen_effect.o(.rodata);
         src/battle/battle_setup.o(.rodata);
         src/cable_club.o(.rodata);
-        data/debug_menu_tomomichi.o(.rodata);
-        data/debug_menu_nohara.o(.rodata);
+        src/debug/tomomichi_debug_menu.o(.rodata);
+        src/debug/nohara_debug_menu.o(.rodata);
         src/debug/mori_debug_menu.o(.rodata);
-        data/debug_menu_taya.o(.rodata);
+        src/debug/taya_debug_window.o(.rodata);
         src/trainer_see.o(.rodata);
         src/wild_encounter.o(.rodata);
         src/field_effect.o(.rodata);
@@ -591,11 +575,12 @@ SECTIONS {
         src/shop.o(.rodata);
         src/fldeff_escalator.o(.rodata);
         src/berry.o(.rodata);
-        data/debug_menu_watanabe.o(.rodata);
+        src/debug/watanabe_debug_menu.o(.rodata);
+        src/debug/watanabe_debug_menu.o(.data);
         src/script_menu.o(.rodata);
         src/naming_screen.o(.rodata);
         src/money.o(.rodata);
-        data/contest_effect.o(.rodata);
+        src/contest_effect.o(.rodata);
         src/record_mixing.o(.data);
         src/record_mixing.o(.rodata);
         src/debug/sound_check_menu.o(.rodata);
@@ -604,19 +589,123 @@ SECTIONS {
         src/battle/contest_link_80C2020.o(.rodata);
         src/pokemon_size_record.o(.rodata);
         src/pc_screen_effect.o(.rodata);
-        data/pc_screen_effect.o(.rodata);
+        src/pc_screen_effect.o(.data);
         src/fldeff_secretpower.o(.rodata);
         src/fldeff_decoration.o(.rodata);
         src/fldeff_recordmixing.o(.rodata);
         src/field_special_scene.o(.rodata);
         src/rotating_gate.o(.rodata);
         src/item_use.o(.rodata);
-        data/battle_anim_80CA710.o(.rodata);
+        src/battle/anim/powder.o(.rodata);
+        src/battle/anim/orbs.o(.rodata);
+        src/battle/anim/seed.o(.rodata);
+        src/battle/anim/orbit.o(.rodata);
+        src/battle/anim/leaf.o(.rodata);
+        src/battle/anim/tendrils.o(.rodata);
+        src/battle/anim/copy_orb.o(.rodata);
+        src/battle/anim/roots.o(.rodata);
+        src/battle/anim/osmose.o(.rodata);
+        src/battle/anim/hop.o(.rodata);
+        src/battle/anim/heal.o(.rodata);
+        src/battle/anim/hop_2.o(.rodata);
+        src/battle/anim/switch.o(.rodata);
+        src/battle/anim/flying_path.o(.rodata);
+        src/battle/anim/flying_petals.o(.rodata);
+        src/battle/anim/shimmer.o(.rodata);
+        src/battle/anim/homing.o(.rodata);
+        src/battle/anim/whip.o(.rodata);
+        src/battle/anim/unused_1.o(.rodata);
+        src/battle/anim/slice.o(.rodata);
+        src/battle/anim/unused_2.o(.rodata);
+        src/battle/anim/shield.o(.rodata);
+        src/battle/anim/bottle.o(.rodata);
+        src/battle/anim/glitter.o(.rodata);
+        src/battle/anim/unused_3.o(.rodata);
+        src/battle/anim/sleep.o(.rodata);
+        src/battle/anim/scan.o(.rodata);
+        src/battle/anim/lunge.o(.rodata);
+        src/battle/anim/slash.o(.rodata);
+        src/battle/anim/brace.o(.rodata);
+        src/battle/anim/cube.o(.rodata);
+        src/battle/anim/tile.o(.rodata);
+        src/battle/anim/moon.o(.rodata);
+        src/battle/anim/twinkle.o(.rodata);
+        src/battle/anim/strike.o(.rodata);
+        src/battle/anim/fang.o(.rodata);
+        src/battle/anim/musical.o(.rodata);
+        src/battle/anim/thought.o(.rodata);
+        src/battle/anim/finger.o(.rodata);
+        src/battle/anim/unused_5.o(.rodata);
+        src/battle/anim/unused_6.o(.rodata);
+        src/battle/anim/unused_7.o(.rodata);
+        src/battle/anim/unused_8.o(.rodata);
+        src/battle/anim/alert.o(.rodata);
+        src/battle/anim/sword.o(.rodata);
+        src/battle/anim/sonic.o(.rodata);
+        src/battle/anim/egg.o(.rodata);
+        src/battle/anim/unused_9.o(.rodata);
+        src/battle/anim/money.o(.rodata);
+        src/battle/anim/bullet.o(.rodata);
+        src/battle/anim/cyclone.o(.rodata);
+        src/battle/anim/grip.o(.rodata);
+        src/battle/anim/guillotine.o(.rodata);
+        src/battle/anim/splash.o(.rodata);
+        src/battle/anim/grow.o(.rodata);
+        src/battle/anim/breath.o(.rodata);
+        src/battle/anim/anger.o(.rodata);
+        src/battle/anim/thrashing.o(.rodata);
+        src/battle/anim/draw.o(.rodata);
+        src/battle/anim/ring.o(.rodata);
+        src/battle/anim/espeed.o(.rodata);
+        src/battle/anim/heal_bell.o(.rodata);
+        src/battle/anim/heart_1.o(.rodata);
+        src/battle/anim/startle.o(.rodata);
+        src/battle/anim/blow_kiss.o(.rodata);
+        src/battle/anim/kiss_fountain.o(.rodata);
+        src/battle/anim/flying_hearts.o(.rodata);
+        src/battle/anim/hidden_power_orbit.o(.rodata);
+        src/battle/anim/spit.o(.rodata);
+        src/battle/anim/perceive.o(.rodata);
+        src/battle/anim/angel.o(.rodata);
+        src/battle/anim/angel_kiss.o(.rodata);
+        src/battle/anim/devil.o(.rodata);
+        src/battle/anim/swipe.o(.rodata);
+        src/battle/anim/struggle.o(.rodata);
+        src/battle/anim/uproar.o(.rodata);
+        src/battle/anim/noise.o(.rodata);
+        src/battle/anim/note_spin.o(.rodata);
+        src/battle/anim/guard.o(.rodata);
+        src/battle/anim/rain.o(.rodata);
+        src/battle/anim/bubble.o(.rodata);
+        src/battle/anim/aurora.o(.rodata);
+        src/battle/anim/energy_wave.o(.rodata);
+        src/battle/anim/water.o(.rodata);
+        src/battle/anim/fire.o(.rodata);
+        src/battle/anim/sunlight.o(.rodata);
+        src/battle/anim/fire_2.o(.rodata);
+        src/battle/anim/wisp_orb.o(.rodata);
+        src/battle/anim/wisp_fire.o(.rodata);
+        src/battle/anim/thunder.o(.rodata);
+        src/battle/anim/beta_beat_up.o(.rodata);
+        src/battle/anim/shock.o(.rodata);
+        src/battle/anim/current.o(.rodata);
+        src/battle/anim/ice.o(.rodata);
+        src/battle/anim/fight.o(.rodata);
+        src/battle/anim/poison.o(.rodata);
+        src/battle/anim/flying.o(.rodata);
+        src/battle/anim/psychic.o(.rodata);
+        src/battle/anim/bug.o(.rodata);
+        src/battle/anim/rock.o(.rodata);
+        src/battle/anim/ghost.o(.rodata);
+        src/battle/anim/dragon.o(.rodata);
+        src/battle/anim/dark.o(.rodata);
+        src/battle/anim/ground.o(.rodata);
+        src/battle/anim/normal.o(.rodata);
         src/battle/anim/battle_intro.o(.rodata);
         src/bike.o(.rodata);
         src/easy_chat_1.o(.rodata);
         src/easy_chat_2.o(.rodata);
-        data/easy_chat.o(.rodata);
+        src/easy_chat_2.o(.data);
         data/pokenav.o(.rodata);
         src/mon_markings.o(.rodata);
         src/mauville_man.o(.rodata);
@@ -624,7 +713,7 @@ SECTIONS {
         src/menu_helpers.o(.rodata);
         src/heal_location.o(.rodata);
         src/region_map.o(.rodata);
-        data/cute_sketch.o(.rodata);
+        data/contest_painting_effects.o(.rodata);
         src/decoration.o(.rodata);
         src/slot_machine.o(.rodata);
         src/contest_painting.o(.rodata);
@@ -637,10 +726,11 @@ SECTIONS {
         src/time_events.o(.rodata);
         src/field_specials.o(.rodata);
         src/battle/battle_records.o(.rodata);
-        data/pokedex_area_screen.o(.rodata);
+        src/pokedex_area_screen.o(.rodata);
         src/evolution_scene.o(.rodata);
         data/roulette.o(.rodata);
-        data/pokedex_cry_screen.o(.rodata);
+        src/pokedex_cry_screen.o(.rodata);
+        src/pokedex_cry_screen.o(.data);
         src/landmark.o(.rodata);
         src/battle/battle_transition.o(.rodata);
         src/battle/battle_controller_linkpartner.o(.rodata);
@@ -648,12 +738,12 @@ SECTIONS {
         src/choose_party.o(.rodata);
         src/cable_car.o(.rodata);
         src/save.o(.rodata);
-        data/unk_debug_menu_3.o(.rodata);
+        src/debug/ereader_debug_menu.o(.rodata);
         src/field_effect_helpers.o(.rodata);
         src/contest_ai.o(.rodata);
         src/battle/battle_controller_safari.o(.rodata);
         data/battle_anim_812C144.o(.rodata);
-        src/learn_move.o(.rodata);
+        src/move_tutor_menu.o(.rodata);
         src/decoration_inventory.o(.rodata);
         src/roamer.o(.rodata);
         src/battle_tower.o(.rodata);
@@ -679,7 +769,7 @@ SECTIONS {
         data/strings2.o(.rodata);
         src/menu_cursor.o(.rodata);
         src/mystery_event_msg.o(.rodata);
-        data/debug_menu_3.o(.rodata);
+        data/debug_mystery_event_scripts.o(.rodata);
         src/libs/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
     } =0
@@ -1114,9 +1204,9 @@ SECTIONS {
         src/libs/agb_flash_mx.o(.rodata);
         src/libs/agb_flash_le.o(.rodata);
         src/libs/siirtc.o(.rodata);
-        tools/agbcc/lib/libgcc.a:_udivdi3.o(.rodata);
-        tools/agbcc/lib/libc.a(.rodata);
-        tools/agbcc/lib/libc.a(.data);
+        *libgcc.a:_udivdi3.o(.rodata);
+        *libc.a(.rodata);
+        *libc.a(.data);
         src/libs/libisagbprn.o(.rodata);
     } =0