diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-21 10:34:50 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-21 10:34:50 +0200 |
commit | 9f1842c55f85470646e41611febe798f54d4c7c8 (patch) | |
tree | 11cb8eefad86cc88f48741456175fff3c8738c66 /ld_script.txt | |
parent | 705aa9e4568afe77c856066d595e0b219bd78e82 (diff) | |
parent | e81986cd20dbe0d8a98da646d964310a066f1af5 (diff) |
Merge branch 'master' into decompile_berry_blender
Diffstat (limited to 'ld_script.txt')
-rw-r--r-- | ld_script.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt index 1070f90b1..e2bff7ec0 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); @@ -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); @@ -338,7 +337,7 @@ 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); |