summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt29
1 files changed, 13 insertions, 16 deletions
diff --git a/ld_script.txt b/ld_script.txt
index b0d2c0c39..3e12b279d 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -58,7 +58,7 @@ SECTIONS {
asm/battle_5.o(.text);
src/battle_6.o(.text);
src/battle_7.o(.text);
- asm/battle_8.o(.text);
+ src/battle_8.o(.text);
asm/battle_9.o(.text);
src/battle_10.o(.text);
src/pokemon_1.o(.text);
@@ -109,7 +109,7 @@ SECTIONS {
src/coord_event_weather.o(.text);
src/field_tasks.o(.text);
src/clock.o(.text);
- asm/reset_rtc_screen.o(.text);
+ src/reset_rtc_screen.o(.text);
asm/party_menu.o(.text);
src/party_menu.o(.text);
asm/party_menu.o(.text_8070968);
@@ -128,7 +128,7 @@ SECTIONS {
asm/field_weather.o(.text);
src/field_fadetransition.o(.text);
asm/field_fadetransition.o(.text);
- asm/field_screen_effect.o(.text);
+ src/field_screen_effect.o(.text);
src/battle_setup.o(.text);
asm/cable_club.o(.text);
src/cable_club.o(.text);
@@ -137,7 +137,7 @@ SECTIONS {
src/trainer_see.o(.text);
src/wild_encounter.o(.text);
src/field_effect.o(.text);
- asm/unknown_task.o(.text);
+ src/unknown_task.o(.text);
asm/pokemon_menu.o(.text);
src/option_menu.o(.text);
src/pokedex.o(.text);
@@ -147,7 +147,7 @@ SECTIONS {
asm/pokemon_storage_system.o(.text);
src/pokemon_storage_system.o(.text);
asm/pokemon_storage_system.o(.text_8098A38);
- asm/pokemon_icon.o(.text);
+ src/pokemon_icon.o(.text);
asm/pokemon_summary_screen.o(.text);
src/pokemon_summary_screen.o(.text);
asm/pokemon_summary_screen.o(.text_80A0958);
@@ -168,7 +168,6 @@ SECTIONS {
src/money.o(.text);
asm/contest_effect.o(.text);
src/record_mixing.o(.text);
- asm/record_mixing.o(.text);
src/sound_check_menu.o(.text);
src/secret_base.o(.text);
asm/secret_base.o(.text_80BC1D0);
@@ -191,7 +190,7 @@ SECTIONS {
asm/pokenav.o(.text);
src/pokenav.o(.text);
asm/pokenav.o(.text_80F708C);
- asm/mon_markings.o(.text);
+ src/mon_markings.o(.text);
src/mauville_old_man.o(.text);
asm/mauville_old_man.o(.text);
src/mail.o(.text);
@@ -199,7 +198,7 @@ SECTIONS {
src/script_pokemon_util_80F99CC.o(.text);
src/dewford_trend.o(.text);
src/heal_location.o(.text);
- asm/region_map.o(.text);
+ src/region_map.o(.text);
asm/cute_sketch.o(.text);
src/decoration.o(.text);
asm/slot_machine.o(.text);
@@ -213,15 +212,13 @@ SECTIONS {
src/wallclock.o(.text);
src/rom6.o(.text);
src/pokeblock.o(.text);
- asm/fldeff_flash.o(.text);
+ src/fldeff_flash.o(.text);
src/post_battle_event_funcs.o(.text);
src/time_events.o(.text);
src/birch_pc.o(.text);
src/hof_pc.o(.text);
src/field_specials.o(.text);
- asm/battle_records.o(.text);
src/battle_records.o(.text);
- asm/battle_records.o(.text_8110494);
asm/pokedex_area_screen.o(.text);
asm/evolution_scene.o(.text);
asm/roulette.o(.text);
@@ -378,7 +375,7 @@ SECTIONS {
data/battle_anim_807B69C.o(.rodata);
src/title_screen.o(.rodata);
data/field_weather.o(.rodata);
- data/rom_8080874.o(.rodata);
+ src/field_screen_effect.o(.rodata);
src/battle_setup.o(.rodata);
data/cable_club.o(.rodata);
data/mori_debug_menu.o(.rodata);
@@ -390,10 +387,9 @@ SECTIONS {
src/option_menu.o(.rodata);
src/pokedex.o(.rodata);
src/trainer_card.o(.rodata);
- data/trainer_card.o(.rodata);
src/battle_party_menu.o(.rodata);
data/pokemon_storage_system.o(.rodata);
- data/pokemon_icon.o(.rodata);
+ src/pokemon_icon.o(.rodata);
data/pokemon_summary_screen.o(.rodata);
data/fldeff_cut.o(.rodata);
src/item_menu.o(.rodata);
@@ -408,7 +404,8 @@ SECTIONS {
data/naming_screen.o(.rodata);
data/money.o(.rodata);
data/contest_effect.o(.rodata);
- data/record_mixing.o(.rodata);
+ src/record_mixing.o(.data);
+ src/record_mixing.o(.rodata);
src/sound_check_menu.o(.rodata);
data/secret_base.o(.rodata);
data/tv.o(.rodata);
@@ -428,7 +425,7 @@ SECTIONS {
data/mail.o(.rodata);
src/menu_helpers.o(.rodata);
src/heal_location.o(.rodata);
- data/region_map.o(.rodata);
+ src/region_map.o(.rodata);
data/cute_sketch.o(.rodata);
src/decoration.o(.rodata);
data/slot_machine.o(.rodata);