summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt30
1 files changed, 19 insertions, 11 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 982cc1d04..d2ace3a76 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -60,7 +60,7 @@ SECTIONS {
src/battle_2.o(.text);
src/battle_util.o(.text);
src/battle_script_commands.o(.text);
- asm/battle_5.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);
@@ -85,6 +85,7 @@ SECTIONS {
src/load_save.o(.text);
asm/load_save.o(.text);
asm/trade.o(.text);
+ src/berry_blender.o(.text);
asm/berry_blender.o(.text);
src/play_time.o(.text);
src/new_game.o(.text);
@@ -129,6 +130,7 @@ SECTIONS {
asm/option_menu.o(.text);
asm/pokedex.o(.text);
asm/trainer_card.o(.text);
+ src/pokemon_storage_system.o(.text);
asm/pokemon_storage_system.o(.text);
asm/pokemon_icon.o(.text);
asm/script_movement.o(.text);
@@ -167,15 +169,15 @@ SECTIONS {
src/mail.o(.text);
asm/menu_helpers.o(.text);
asm/dewford_trend.o(.text);
- asm/heal_location.o(.text);
- asm/region_map.o(.text);
+ src/heal_location.o(.text);
+ src/region_map.o(.text);
asm/cute_sketch.o(.text);
src/decoration.o(.text);
asm/slot_machine.o(.text);
asm/contest_painting.o(.text);
src/battle_ai_script_commands.o(.text);
asm/trader.o(.text);
- asm/starter_choose.o(.text);
+ src/starter_choose.o(.text);
asm/wallclock.o(.text);
asm/rom6.o(.text);
asm/battle_records.o(.text);
@@ -212,9 +214,9 @@ SECTIONS {
asm/player_pc.o(.text);
asm/intro.o(.text);
src/reset_save_heap.o(.text);
- asm/field_region_map.o(.text);
+ src/field_region_map.o(.text);
asm/battle_anim_8170478.o(.text);
- asm/hall_of_fame.o(.text);
+ src/hall_of_fame.o(.text);
asm/credits.o(.text);
src/lottery_corner.o(.text);
src/diploma.o(.text);
@@ -348,9 +350,11 @@ SECTIONS {
src/battle_interface.o(.rodata);
data/pokeball.o(.rodata);
data/trade.o(.rodata);
- data/berry_blender.o(.rodata);
+ src/berry_blender.o(.rodata);
src/new_game.o(.rodata);
data/rom4.o(.rodata);
+ data/tilesets.o(.rodata);
+ data/maps.o(.rodata);
data/fieldmap.o(.rodata);
src/metatile_behavior.o(.rodata);
data/rom_8486FEC.o(.rodata);
@@ -371,6 +375,8 @@ SECTIONS {
data/battle_anims.o(.rodata);
src/battle_anim.o(.rodata);
data/rom_8525F58.o(.rodata);
+ data/map_events.o(.rodata);
+ data/battle_anim_80A9C70.o(.rodata);
data/title_screen.o(.rodata);
data/field_screen.o(.rodata);
data/battle_setup.o(.rodata);
@@ -410,14 +416,16 @@ SECTIONS {
data/mauville_old_man.o(.rodata);
src/mail.o(.rodata);
data/menu_helpers.o(.rodata);
- data/heal_location.o(.rodata);
- data/region_map.o(.rodata);
+ src/heal_location.o(.rodata);
+ src/region_map.o(.rodata);
data/cute_sketch.o(.rodata);
src/decoration.o(.rodata);
data/slot_machine.o(.rodata);
data/contest_painting.o(.rodata);
src/battle_ai_script_commands.o(.rodata);
data/data4.o(.rodata);
+ data/starter_choose.o(.rodata);
+ data/data4c.o(.rodata);
src/battle_controller_link_partner.o(.rodata);
src/battle_message.o(.rodata);
data/cable_car.o(.rodata);
@@ -433,9 +441,9 @@ SECTIONS {
src/battle_controller_wally.o(.rodata);
data/player_pc.o(.rodata);
data/intro.o(.rodata);
- data/field_region_map.o(.rodata);
+ src/field_region_map.o(.rodata);
data/battle_anim_8170478.o(.rodata);
- data/hall_of_fame.o(.rodata);
+ src/hall_of_fame.o(.rodata);
data/credits.o(.rodata);
src/lottery_corner.o(.rodata);
src/diploma.o(.rodata);