diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2019-08-04 00:02:13 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2019-08-04 00:02:13 +0200 |
| commit | 16415792972c3fbdd498dc3e0878d6e8bb0f9abe (patch) | |
| tree | 3920b4ab1335ef7cfad3eb639e3e41ffe1a7defd /ld_script.txt | |
| parent | 81a11c4fc9087d54e68694b89f1d8af791c2ae8e (diff) | |
| parent | ce941e6f56803b389c20a52c0a5b89f5ade12b7a (diff) | |
Merge branch 'master' into pok_jump
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ld_script.txt b/ld_script.txt index 97605865d..63afe45d2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -75,7 +75,6 @@ SECTIONS { asm/berry_crush.o(.text*); src/berry_powder.o(.text*); src/dodrio_berry_picking.o(.text*); - asm/dodrio_berry_picking.o(.text*); src/pokemon_jump.o(.text*); src/rtc.o(.text*); src/main_menu.o(.text*); @@ -447,7 +446,6 @@ SECTIONS { data/berry_crush.o(.rodata); data/berry_powder.o(.rodata); src/dodrio_berry_picking.o(.rodata); - data/dodrio_berry_picking.o(.rodata); src/pokemon_jump.o(.rodata); src/rtc.o(.rodata); src/main_menu.o(.rodata); @@ -599,7 +597,6 @@ SECTIONS { src/roamer.o(.rodata); src/battle_tower.o(.rodata); src/use_pokeblock.o(.rodata); - data/use_pokeblock.o(.rodata); src/battle_controller_wally.o(.rodata); src/player_pc.o(.rodata); src/intro.o(.rodata); @@ -657,10 +654,13 @@ SECTIONS { src/pokenav_main_menu.o(.rodata); src/pokenav_match_call_ui.o(.rodata); src/pokenav_unk_1.o(.rodata); - data/pokenav.o(.rodata); + src/pokenav_unk_2.o(.rodata); src/pokenav_unk_3.o(.rodata); src/pokenav_unk_4.o(.rodata); src/pokenav_unk_5.o(.rodata); + src/pokenav_unk_7.o(.rodata); + src/pokenav_unk_8.o(.rodata); + src/pokenav_unk_9.o(.rodata); src/pokenav_unk_10.o(.rodata); src/pokenav_match_call_data.o(.rodata); src/menu_specialized.o(.rodata); |