diff options
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/ld_script.txt b/ld_script.txt index 73fbc76bc..660c1d60d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -13,7 +13,7 @@ SECTIONS { . = 0x1C000; -<EWRAM> + INCLUDE "sym_ewram.ld" . = 0x40000; } @@ -24,13 +24,13 @@ SECTIONS { ALIGN(4) { /* .bss starts at 0x3000000 */ -<BSS> + INCLUDE "sym_bss.ld" /* .bss.code starts at 0x3001AA8 */ src/m4a_2.o(.bss.code); /* COMMON starts at 0x30022A8 */ -<COMMON> + INCLUDE "sym_common.ld" *libc.a:sbrkr.o(COMMON); end = .; . = 0x8000; @@ -81,7 +81,7 @@ SECTIONS { src/smokescreen.o(.text); src/pokeball.o(.text); src/load_save.o(.text); - asm/trade.o(.text); + src/trade.o(.text); src/berry_blender.o(.text); src/play_time.o(.text); src/new_game.o(.text); @@ -126,7 +126,6 @@ SECTIONS { src/pokedex.o(.text); asm/trainer_card.o(.text); src/pokemon_storage_system.o(.text); - asm/pokemon_storage_system.o(.text); src/pokemon_icon.o(.text); src/script_movement.o(.text); src/fldeff_cut.o(.text); @@ -162,16 +161,16 @@ SECTIONS { src/water.o(.text); src/fire.o(.text); src/electric.o(.text); - asm/ice.o(.text); + src/ice.o(.text); src/fight.o(.text); src/poison.o(.text); asm/flying.o(.text); - asm/psychic.o(.text); + src/psychic.o(.text); src/bug.o(.text); src/rock.o(.text); src/ghost.o(.text); src/dragon.o(.text); - asm/dark.o(.text); + src/dark.o(.text); src/ground.o(.text); src/normal.o(.text); src/battle_anim_utility_funcs.o(.text); @@ -186,6 +185,7 @@ SECTIONS { src/dewford_trend.o(.text); src/heal_location.o(.text); src/region_map.o(.text); + src/contest_painting_effects.o(.text); asm/contest_painting_effects.o(.text); src/decoration.o(.text); src/slot_machine.o(.text); @@ -194,7 +194,8 @@ SECTIONS { src/trader.o(.text); src/starter_choose.o(.text); src/wallclock.o(.text); - src/rom6.o(.text); + src/fldeff_rocksmash.o(.text); + src/fldeff_dig.o(.text); src/pokeblock.o(.text); src/fldeff_flash.o(.text); src/post_battle_event_funcs.o(.text); @@ -225,7 +226,6 @@ SECTIONS { src/battle_controller_safari.o(.text); src/fldeff_sweetscent.o(.text); src/battle_anim_effects_3.o(.text); - asm/battle_anim_effects_3.o(.text); src/learn_move.o(.text); src/fldeff_softboiled.o(.text); src/decoration_inventory.o(.text); @@ -283,8 +283,7 @@ SECTIONS { src/multiboot.o(.text); src/unk_81BAD84.o(.text); src/battle_controller_player_partner.o(.text); - src/fldeff_groundshake.o(.text); - src/fossil_specials.o(.text); + src/mirage_tower.o(.text); src/berry_fix_program.o(.text); src/pokemon_summary_screen.o(.text); src/unk_pokedex_area_screen_helper.o(.text); @@ -404,7 +403,6 @@ SECTIONS { src/data2b.o(.rodata); src/battle_data.o(.rodata); src/battle_bg.o(.rodata); - data/data2c.o(.rodata); src/battle_main.o(.rodata); src/battle_util.o(.rodata); src/battle_script_commands.o(.rodata); @@ -420,7 +418,7 @@ SECTIONS { src/battle_gfx_sfx_util.o(.rodata); src/battle_interface.o(.rodata); src/pokeball.o(.rodata); - data/trade.o(.rodata); + src/trade.o(.rodata); src/berry_blender.o(.rodata); src/new_game.o(.rodata); src/overworld.o(.rodata); @@ -459,7 +457,6 @@ SECTIONS { src/pokedex.o(.rodata); data/trainer_card.o(.rodata); src/pokemon_storage_system.o(.rodata); - data/pokemon_storage_system.o(.rodata); src/pokemon_icon.o(.rodata); src/fldeff_cut.o(.rodata); src/map_name_popup.o(.rodata); @@ -536,7 +533,6 @@ SECTIONS { src/cable_car.o(.rodata); src/save.o(.rodata); src/field_effect_helpers.o(.rodata); - data/field_effect_helpers.o(.rodata); src/contest_ai.o(.rodata); src/battle_controller_safari.o(.rodata); src/battle_anim_effects_3.o(.rodata); @@ -586,13 +582,12 @@ SECTIONS { src/list_menu.o(.rodata); src/save_location.o(.rodata); src/item_icon.o(.rodata); - data/party_menu.o(.rodata); + src/party_menu.o(.rodata); src/battle_tent.o(.rodata); src/unk_text_util_2.o(.rodata); src/unk_81BAD84.o(.rodata); src/battle_controller_player_partner.o(.rodata); - src/fossil_specials.o(.rodata); - src/fldeff_groundshake.o(.rodata); + src/mirage_tower.o(.rodata); src/berry_fix_program.o(.rodata); src/pokemon_summary_screen.o(.rodata); src/unk_pokedex_area_screen_helper.o(.rodata); @@ -603,7 +598,6 @@ SECTIONS { src/rayquaza_scene.o(.rodata); src/walda_phrase.o(.rodata); src/gym_leader_rematch.o(.rodata); - data/unk_transition.o(.rodata); src/unk_transition.o(.rodata); data/text_input_strings.o(.rodata); data/fonts.o(.rodata); |