summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt38
1 files changed, 24 insertions, 14 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 053ee4abc..ca862eb17 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -63,18 +63,18 @@ SECTIONS {
asm/link.o(.text);
src/multiboot.o(.text);
asm/main_menu.o(.text);
- asm/battle_controllers.o(.text);
+ src/battle_controllers.o(.text);
src/decompress.o(.text);
asm/battle_1.o(.text);
asm/battle_2.o(.text);
- asm/battle_util.o(.text);
- asm/battle_script_commands.o(.text);
- asm/battle_util2.o(.text);
- asm/battle_controller_player.o(.text);
- asm/battle_gfx_sfx_util.o(.text);
- asm/battle_controller_opponent.o(.text);
- asm/battle_ai_switch_items.o(.text);
- asm/battle_controller_link_opponent.o(.text);
+ src/battle_util.o(.text);
+ src/battle_script_commands.o(.text);
+ src/battle_util2.o(.text);
+ src/battle_controller_player.o(.text);
+ src/battle_gfx_sfx_util.o(.text);
+ src/battle_controller_opponent.o(.text);
+ src/battle_ai_switch_items.o(.text);
+ src/battle_controller_link_opponent.o(.text);
src/pokemon.o(.text);
src/trig.o(.text);
src/random.o(.text);
@@ -113,7 +113,7 @@ SECTIONS {
asm/battle_anim.o(.text);
asm/battle_anim_mons.o(.text);
src/task.o(.text);
- asm/reshow_battle_screen.o(.text);
+ src/reshow_battle_screen.o(.text);
asm/battle_anim_status_effects.o(.text);
src/title_screen.o(.text);
src/reset_save_heap.o(.text);
@@ -192,7 +192,7 @@ SECTIONS {
src/coins.o(.text);
src/fldeff_strength.o(.text);
src/battle_transition.o(.text);
- asm/battle_controller_link_partner.o(.text);
+ src/battle_controller_link_partner.o(.text);
asm/battle_message.o(.text);
src/math_util.o(.text);
src/roulette_util.o(.text);
@@ -201,7 +201,7 @@ SECTIONS {
src/mystery_event_script.o(.text);
asm/field_effect_helpers.o(.text);
asm/battle_anim_sound_tasks.o(.text);
- asm/battle_controller_safari.o(.text);
+ src/battle_controller_safari.o(.text);
src/fldeff_sweetscent.o(.text);
asm/battle_anim_effects_3.o(.text);
asm/learn_move.o(.text);
@@ -380,11 +380,18 @@ SECTIONS {
src/bg_regs.o(.rodata);
src/string_util.o(.rodata);
data/data.o(.rodata);
+ src/battle_util.o(.rodata);
+ src/battle_script_commands.o(.rodata);
+ src/battle_controller_player.o(.rodata);
+ data/smokescreen.o(.rodata);
+ src/battle_controller_opponent.o(.rodata);
+ src/battle_controller_link_opponent.o(.rodata);
src/pokemon.o(.rodata);
src/trig.o(.rodata);
src/util.o(.rodata);
src/daycare.o(.rodata);
- data/data.o(.rodata.825EF0C);
+ src/battle_gfx_sfx_util.o(.rodata);
+ data/data.o(.rodata.8260270);
data/tilesets.o(.rodata);
data/maps.o(.rodata);
src/fieldmap.o(.rodata);
@@ -419,9 +426,12 @@ SECTIONS {
src/battle_records.o(.rodata);
data/data_83F5738.o(.rodata.83F6C90);
src/battle_transition.o(.rodata);
- data/data_83F5738.o(.rodata.83FB134);
+ src/battle_controller_link_partner.o(.rodata);
+ data/data_83F5738.o(.rodata.83FB218);
src/save.o(.rodata);
data/data_83FECCC.o(.rodata);
+ src/battle_controller_safari.o(.rodata);
+ data/data_83FECCC.o(.rodata.83FEDE4);
src/intro.o(.rodata);
data/data_83FECCC.o(.rodata.battle_anim_special);
src/diploma.o(.rodata);