diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-04 22:21:39 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-04 22:21:39 -0500 |
| commit | 5b5fedfc78a9f2751d001a92c65be86e3ffefcc1 (patch) | |
| tree | e1357a59a3d98cf1e976f948f98d799f87a00bf3 /ld_script.txt | |
| parent | ab06b56532026db85a9cba1c21c8b2235fcdf222 (diff) | |
| parent | f0e98a9204bf19981c0c9652bc9ed82ae95438e4 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into assert
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/ld_script.txt b/ld_script.txt index 18158ecfe..aac5e8028 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -318,9 +318,9 @@ SECTIONS { src/battle/anim/energy_wave.o(.text); src/battle/anim/water.o(.text); asm/water.o(.text); - asm/fire.o(.text); + src/battle/anim/fire.o(.text); src/battle/anim/sunlight.o(.text); - asm/fire_2.o(.text); + src/battle/anim/fire_2.o(.text); src/battle/anim/heated_rock.o(.text); src/battle/anim/wisp_orb.o(.text); asm/wisp_fire.o(.text); @@ -359,10 +359,7 @@ SECTIONS { src/scene/cute_sketch.o(.text); asm/cute_sketch.o(.text); src/field/decoration.o(.text); - asm/slot_machine.o(.text); src/field/slot_machine.o(.text); - asm/slot_machine.o(.text_8104D30) - src/field/slot_machine.o(.text_b); src/scene/contest_painting.o(.text); src/battle/battle_ai.o(.text); src/field/trader.o(.text); @@ -549,7 +546,7 @@ SECTIONS { src/field/field_player_avatar.o(.rodata); src/field/field_map_obj.o(.rodata); src/field/field_ground_effect.o(.rodata); - data/field_map_obj_helpers.o(.rodata); + src/field/field_map_obj_helpers.o(.rodata); src/engine/text_window.o(.rodata); src/engine/script.o(.rodata); src/field/scrcmd.o(.rodata); @@ -577,7 +574,6 @@ SECTIONS { src/engine/cable_club.o(.rodata); src/debug/mori_debug_menu.o(.rodata); src/field/trainer_see.o(.rodata); - data/trainer_see.o(.rodata); src/field/wild_encounter.o(.rodata); src/field/field_effect.o(.rodata); src/pokemon/pokemon_menu.o(.rodata); @@ -598,7 +594,6 @@ SECTIONS { src/field/berry.o(.rodata); src/field/script_menu.o(.rodata); src/engine/naming_screen.o(.rodata); - data/naming_screen.o(.rodata); src/field/money.o(.rodata); data/contest_effect.o(.rodata); src/engine/record_mixing.o(.data); @@ -628,7 +623,7 @@ SECTIONS { src/field/region_map.o(.rodata); data/cute_sketch.o(.rodata); src/field/decoration.o(.rodata); - data/slot_machine.o(.rodata); + src/field/slot_machine.o(.rodata); src/scene/contest_painting.o(.rodata); src/battle/battle_ai.o(.rodata); src/field/trader.o(.rodata); @@ -670,13 +665,13 @@ SECTIONS { src/field/berry_tag_screen.o(.rodata); src/engine/save_failed_screen.o(.rodata); src/pokemon/pokeblock_feed.o(.rodata); - data/intro_credits_graphics.o(.rodata); + src/scene/intro_credits_graphics.o(.rodata); src/scene/evolution_graphics.o(.rodata); - data/bard_music.o(.rodata); - data/unknown_debug_menu.o(.rodata); + src/field/bard_music.o(.rodata); + src/debug/unknown_debug_menu.o(.rodata); data/strings2.o(.rodata); - data/menu_cursor.o(.rodata); - data/mystery_event_msg.o(.rodata); + src/engine/menu_cursor.o(.rodata); + src/engine/mystery_event_msg.o(.rodata); src/libs/m4a_tables.o(.rodata); data/sound_data.o(.rodata); } =0 |