diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2019-02-05 14:35:42 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2019-02-05 14:35:42 -0600 |
| commit | bc4cc9f78a705636228c39311bb6e3c393f090d3 (patch) | |
| tree | d2b59408df53676ffb65e217cc1a62cbcba05f97 /ld_script.txt | |
| parent | 37e86d75788f4ed364db19aabce11e6e054a1084 (diff) | |
| parent | b0ee1009759ed1c46da81b1fb8410e2b75e42bb2 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ld_script.txt b/ld_script.txt index 844c64fb5..306a1f4b0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -27,7 +27,7 @@ SECTIONS { INCLUDE "sym_bss.ld" /* .bss.code starts at 0x3001AA8 */ - src/m4a_2.o(.bss.code); + src/m4a.o(.bss.code); /* COMMON starts at 0x30022A8 */ INCLUDE "sym_common.ld" @@ -136,7 +136,6 @@ SECTIONS { src/battle_anim_80D51AC.o(.text); src/item.o(.text); src/contest.o(.text); - asm/contest.o(.text); src/shop.o(.text); src/fldeff_escalator.o(.text); src/berry.o(.text); @@ -320,9 +319,7 @@ SECTIONS { { asm/libgcnmultiboot.o(.text); asm/m4a_1.o(.text); - src/m4a_2.o(.text); - asm/m4a_3.o(.text); - src/m4a_4.o(.text); + src/m4a.o(.text); src/agb_flash.o(.text); src/agb_flash_1m.o(.text); src/agb_flash_mx.o(.text); @@ -440,14 +437,12 @@ SECTIONS { src/start_menu.o(.rodata); src/tileset_anims.o(.rodata); src/palette.o(.rodata); - data/fanfares.o(.rodata); + src/sound.o(.rodata); src/battle_anim.o(.rodata); src/battle_anim_80A5C6C.o(.rodata); data/map_events.o(.rodata); - data/battle_anim_80A9C70.o(.rodata); src/battle_anim_80A9C70.o(.rodata); src/title_screen.o(.rodata); - data/field_weather.o(.rodata); src/field_weather.o(.rodata); src/field_weather_effect.o(.rodata); src/field_screen_effect.o(.rodata); |