diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-06-25 20:12:52 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-06-25 20:12:52 -0400 |
| commit | f85513f76999c79c6355711fcefaf058d02c7c46 (patch) | |
| tree | ad60d6edad654974f1ef82538da0a402abd69903 /ld_script.txt | |
| parent | 637774362fdbedd8a54b651e6196a1e1a4f4c093 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into sound_check_menu
Diffstat (limited to 'ld_script.txt')
| -rwxr-xr-x | ld_script.txt | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/ld_script.txt b/ld_script.txt index 523c35a85..9acc47bc8 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -56,9 +56,7 @@ 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); src/battle_7.o(.text); asm/battle_8.o(.text); asm/battle_9.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); @@ -81,6 +80,10 @@ SECTIONS { 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); @@ -180,6 +183,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); @@ -232,11 +236,11 @@ SECTIONS { asm/battle_transition.o(.text); src/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); @@ -253,7 +257,7 @@ SECTIONS { src/roamer.o(.text); asm/battle_tower.o(.text); asm/use_pokeblock.o(.text); - asm/battle_anim_8137220.o(.text); + src/battle_anim_8137220.o(.text); src/player_pc.o(.text); src/intro.o(.text); src/field_region_map.o(.text); @@ -351,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); @@ -389,6 +391,7 @@ SECTIONS { data/pokemon_menu.o(.rodata); data/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); @@ -448,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); |