diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-08-22 15:33:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 15:33:38 -0500 |
| commit | 46ca339a3a8d44ae199228e2e4198daa9d337efb (patch) | |
| tree | 152f0292a9f382f9f2ac545e605e2eecc95ae1f6 /ld_script.txt | |
| parent | 3e7bdf4f5fd54676c6f965325ec5b67d3d8b3eef (diff) | |
| parent | 20594938e275bd3d6ec6f38b42400eaac79fa86e (diff) | |
Merge branch 'master' into decompile_battle_5
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/ld_script.txt b/ld_script.txt index 5218e313e..9d2fc2f82 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -74,7 +74,6 @@ SECTIONS { src/daycare.o(.text); asm/daycare.o(.text); src/egg_hatch.o(.text); - asm/egg_hatch.o(.text); src/battle_interface.o(.text); src/smokescreen.o(.text); src/pokeball.o(.text); @@ -84,7 +83,7 @@ SECTIONS { asm/trade.o(.text.sub_804A9F4); src/trade.o(.text.sub_804DAD4); asm/trade.o(.text.sub_804DB2C); - asm/berry_blender.o(.text); + src/berry_blender.o(.text); src/play_time.o(.text); src/new_game.o(.text); src/rom4.o(.text); @@ -229,7 +228,7 @@ SECTIONS { src/fldeff_strength.o(.text); asm/battle_transition.o(.text); src/battle_811DA74.o(.text); - asm/battle_message.o(.text); + src/battle_message.o(.text); src/choose_party.o(.text); asm/cable_car.o(.text); asm/roulette_util.o(.text); @@ -244,7 +243,7 @@ SECTIONS { asm/battle_anim_81258BC.o(.text_812BBFC); src/fldeff_sweetscent.o(.text); asm/battle_anim_812C144.o(.text); - asm/learn_move.o(.text); + src/learn_move.o(.text); src/fldeff_softboiled.o(.text); src/decoration_inventory.o(.text); src/roamer.o(.text); @@ -255,7 +254,7 @@ SECTIONS { src/intro.o(.text); src/field_region_map.o(.text); asm/battle_anim_813F0F4.o(.text); - asm/hall_of_fame.o(.text); + src/hall_of_fame.o(.text); src/credits.o(.text); src/lottery_corner.o(.text); src/diploma.o(.text); @@ -265,7 +264,7 @@ SECTIONS { src/braille_puzzles.o(.text); asm/pokeblock_feed.o(.text); src/clear_save_data_menu.o(.text); - asm/intro_credits_graphics.o(.text); + src/intro_credits_graphics.o(.text); asm/evolution_graphics.o(.text); src/bard_music.o(.text); src/fldeff_teleport.o(.text); @@ -339,11 +338,11 @@ SECTIONS { src/trig.o(.rodata); src/util.o(.rodata); data/daycare.o(.rodata); - data/egg_hatch.o(.rodata); + src/egg_hatch.o(.rodata); data/battle_interface.o(.rodata); src/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); @@ -455,7 +454,7 @@ SECTIONS { data/contest_ai.o(.rodata); data/battle_anim_81258BC.o(.rodata); data/battle_anim_812C144.o(.rodata); - data/learn_move.o(.rodata); + src/learn_move.o(.rodata); src/decoration_inventory.o(.rodata); src/roamer.o(.rodata); data/battle_tower.o(.rodata); @@ -464,7 +463,7 @@ SECTIONS { src/player_pc.o(.rodata); src/intro.o(.rodata); data/battle_anim_813F0F4.o(.rodata); - data/hall_of_fame.o(.rodata); + src/hall_of_fame.o(.rodata); src/credits.o(.rodata); data/credits.o(.rodata); src/lottery_corner.o(.rodata); |