diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-23 13:36:55 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-23 13:36:55 +0200 |
| commit | 5b703079627cf11a123e3f1a7e7f0e5e0fbeb9ed (patch) | |
| tree | cdd424af6aa370aa8af7dcf2bb0f5a2ce48965ad /ld_script.txt | |
| parent | 7d1373e3fa239d74d69b5b3a7cb78b2272a6f54d (diff) | |
revert merge coz its bugged
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ld_script.txt b/ld_script.txt index d55f09d2c..0296ddd56 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -172,7 +172,7 @@ SECTIONS { asm/heal_location.o(.text); asm/region_map.o(.text); asm/cute_sketch.o(.text); - src/decoration.o(.text); + asm/decoration.o(.text); asm/slot_machine.o(.text); asm/contest_painting.o(.text); src/battle_ai_script_commands.o(.text); @@ -206,7 +206,7 @@ SECTIONS { asm/battle_anim_815A0D4.o(.text); asm/learn_move.o(.text); asm/fldeff_softboiled.o(.text); - src/decoration_inventory.o(.text); + asm/decoration_inventory.o(.text); src/roamer.o(.text); asm/battle_tower.o(.text); asm/use_pokeblock.o(.text); @@ -257,7 +257,6 @@ SECTIONS { asm/fldeff_groundshake.o(.text); asm/fossil_specials.o(.text); src/berry_fix_program.o(.text); - src/pokemon_summary_screen.o(.text); asm/pokemon_summary_screen.o(.text); asm/pokenav.o(.text); asm/rayquaza_scene.o(.text); @@ -416,7 +415,7 @@ SECTIONS { data/heal_location.o(.rodata); data/region_map.o(.rodata); data/cute_sketch.o(.rodata); - src/decoration.o(.rodata); + data/decoration.o(.rodata); data/slot_machine.o(.rodata); data/contest_painting.o(.rodata); src/battle_ai_script_commands.o(.rodata); |