diff options
Diffstat (limited to 'ld_script.txt')
| -rwxr-xr-x[-rw-r--r--] | ld_script.txt | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/ld_script.txt b/ld_script.txt index cca808e89..4e72e03a0 100644..100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -56,10 +56,8 @@ SECTIONS { asm/battle_3.o(.text); asm/battle_4.o(.text); asm/battle_5.o(.text); - asm/battle_6.o(.text); src/battle_6.o(.text); - asm/battle_6.o(.text_8030464); - asm/battle_7.o(.text); + src/battle_7.o(.text); asm/battle_8.o(.text); asm/battle_9.o(.text); asm/battle_10.o(.text); @@ -68,6 +66,7 @@ SECTIONS { src/pokemon_2.o(.text); asm/pokemon_item_effect.o(.text); src/pokemon_3.o(.text); + src/de_rom_8040FE0.o(.text); src/trig.o(.text); src/rng.o(.text); src/util.o(.text); @@ -78,9 +77,13 @@ SECTIONS { asm/egg_hatch.o(.text); src/battle_interface.o(.text); src/smokescreen.o(.text); - asm/pokeball.o(.text); + src/pokeball.o(.text); src/load_save.o(.text); asm/trade.o(.text); + src/trade.o(.text); + asm/trade.o(.text.sub_804A9F4); + src/trade.o(.text.sub_804DAD4); + asm/trade.o(.text.sub_804DB2C); asm/berry_blender.o(.text); src/play_time.o(.text); src/new_game.o(.text); @@ -134,16 +137,12 @@ SECTIONS { src/trainer_see.o(.text); src/wild_encounter.o(.text); src/field_effect.o(.text); - asm/field_effect.o(.text); asm/unknown_task.o(.text); asm/pokemon_menu.o(.text); src/option_menu.o(.text); src/pokedex.o(.text); - asm/pokedex.o(.text); src/trainer_card.o(.text); src/save_menu_util.o(.text); - src/rom_8094928.o(.text); - asm/rom_8094928.o(.text); src/battle_party_menu.o(.text); asm/pokemon_storage_system.o(.text); src/pokemon_storage_system.o(.text); @@ -183,6 +182,7 @@ SECTIONS { asm/rotating_gate.o(.text); src/safari_zone.o(.text); asm/contest_link_80C857C.o(.text); + src/contest_link_80C857C.o(.text); src/item_use.o(.text); asm/battle_anim_80CA710.o(.text); src/bike.o(.text); @@ -201,9 +201,7 @@ SECTIONS { src/heal_location.o(.text); asm/region_map.o(.text); asm/cute_sketch.o(.text); - asm/decoration.o(.text); src/decoration.o(.text); - asm/decoration.o(.text_80FE868); asm/slot_machine.o(.text); src/slot_machine.o(.text); asm/slot_machine.o(.text_8104D30) @@ -236,13 +234,12 @@ SECTIONS { src/fldeff_strength.o(.text); asm/battle_transition.o(.text); src/battle_811DA74.o(.text); - asm/battle_811DA74.o(.text); asm/battle_message.o(.text); - asm/choose_party.o(.text); + src/choose_party.o(.text); asm/cable_car.o(.text); asm/roulette_util.o(.text); asm/cable_car_util.o(.text); - asm/unused_8124F94.o(.text); + src/unused_8124F94.o(.text); src/save.o(.text); src/mystery_event_script.o(.text); asm/mystery_event_script.o(.text); @@ -255,14 +252,13 @@ SECTIONS { asm/battle_anim_812C144.o(.text); asm/learn_move.o(.text); src/fldeff_softboiled.o(.text); - asm/decoration_inventory.o(.text); + src/decoration_inventory.o(.text); src/roamer.o(.text); asm/battle_tower.o(.text); src/use_pokeblock.o(.text); asm/use_pokeblock.o(.text); - asm/battle_anim_8137220.o(.text); + src/battle_anim_8137220.o(.text); src/player_pc.o(.text); - asm/player_pc.o(.text); src/intro.o(.text); src/field_region_map.o(.text); asm/battle_anim_813F0F4.o(.text); @@ -343,12 +339,12 @@ SECTIONS { data/data2.o(.rodata); data/pokemon.o(.rodata); . = ALIGN(4); - data/trig.o(.rodata); + src/trig.o(.rodata); data/util.o(.rodata); data/daycare.o(.rodata); data/egg_hatch.o(.rodata); data/battle_interface.o(.rodata); - data/pokeball.o(.rodata); + src/pokeball.o(.rodata); data/trade.o(.rodata); data/berry_blender.o(.rodata); src/new_game.o(.rodata); @@ -359,9 +355,7 @@ SECTIONS { src/metatile_behavior.o(.rodata); data/field_door.o(.rodata); src/field_player_avatar.o(.rodata); - data/field_player_avatar.o(.rodata); src/field_map_obj.o(.rodata); - data/field_map_obj.o(.rodata); src/field_ground_effect.o(.rodata); data/field_ground_effect.o(.rodata); data/field_map_obj_helpers.o(.rodata); @@ -393,10 +387,11 @@ SECTIONS { data/trainer_see.o(.rodata); src/wild_encounter.o(.rodata); data/wild_encounter.o(.rodata); - data/field_effect.o(.rodata); + src/field_effect.o(.rodata); data/pokemon_menu.o(.rodata); data/option_menu.o(.rodata); - data/pokedex.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); @@ -437,7 +432,7 @@ SECTIONS { src/heal_location.o(.rodata); data/region_map.o(.rodata); data/cute_sketch.o(.rodata); - data/decoration.o(.rodata); + src/decoration.o(.rodata); data/slot_machine.o(.rodata); src/contest_painting.o(.rodata); src/battle_ai.o(.rodata); @@ -456,7 +451,7 @@ SECTIONS { data/battle_transition.o(.rodata); data/battle_811DA74.o(.rodata); data/battle_message.o(.rodata); - data/choose_party.o(.rodata); + src/choose_party.o(.rodata); data/cable_car.o(.rodata); src/save.o(.rodata); data/field_effect_helpers.o(.rodata); @@ -464,12 +459,12 @@ SECTIONS { data/battle_anim_81258BC.o(.rodata); data/battle_anim_812C144.o(.rodata); data/learn_move.o(.rodata); - data/decoration_inventory.o(.rodata); + src/decoration_inventory.o(.rodata); src/roamer.o(.rodata); data/battle_tower.o(.rodata); data/use_pokeblock.o(.rodata); data/battle_anim_8137220.o(.rodata); - data/player_pc.o(.rodata); + src/player_pc.o(.rodata); src/intro.o(.rodata); data/battle_anim_813F0F4.o(.rodata); data/hall_of_fame.o(.rodata); |