diff options
| author | KDSKardabox <bollygame94@gmail.com> | 2018-03-01 09:13:29 +0530 |
|---|---|---|
| committer | KDSKardabox <bollygame94@gmail.com> | 2018-03-01 09:13:29 +0530 |
| commit | 85492c0dacb5222ebbd43f652c44448ca89de0f9 (patch) | |
| tree | ccb4168b0cb800398a810789e59c108003def9bd /ld_script.txt | |
| parent | 2f9d69f67fef723e3a92bb19c73952f6896e27ad (diff) | |
| parent | c0357cea46635ec3867d18e43b341fb7a4a2fef2 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ld_script.txt b/ld_script.txt index c0b5d97eb..7dcf21569 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -47,7 +47,7 @@ SECTIONS { src/dma3_manager.o(.text); src/gpu_regs.o(.text); src/bg.o(.text); - asm/blit.o(.text); + src/blit.o(.text); src/window.o(.text); src/text.o(.text); src/sprite.o(.text); @@ -236,7 +236,7 @@ SECTIONS { src/evolution_graphics.o(.text); src/bard_music.o(.text); src/fldeff_teleport.o(.text); - asm/battle_link_817C95C.o(.text); + src/battle_tv.o(.text); src/pokemon_animation.o(.text); src/recorded_battle.o(.text); src/battle_controller_recorded_opponent.o(.text); @@ -268,7 +268,7 @@ SECTIONS { src/rayquaza_scene.o(.text); src/walda_phrase.o(.text); asm/contest_link_81D9DE4.o(.text); - asm/trainer_rematch.o(.text); + src/gym_leader_rematch.o(.text); src/unk_transition.o(.text); src/international_string_util.o(.text); asm/international_string_util.o(.text); @@ -382,7 +382,6 @@ SECTIONS { data/smokescreen.o(.rodata); src/battle_controller_opponent.o(.rodata); src/battle_controller_link_opponent.o(.rodata); - data/data2c.o(.rodata); src/pokemon.o(.rodata); src/trig.o(.rodata); src/util.o(.rodata); @@ -512,7 +511,7 @@ SECTIONS { src/intro_credits_graphics.o(.rodata); src/evolution_graphics.o(.rodata); src/bard_music.o(.rodata); - data/battle_link_817C95C.o(.rodata); + src/battle_tv.o(.rodata); src/pokemon_animation.o(.rodata); src/battle_controller_recorded_opponent.o(.rodata); src/battle_controller_recorded_player.o(.rodata); @@ -538,7 +537,7 @@ SECTIONS { data/pokenav.o(.rodata); src/rayquaza_scene.o(.rodata); src/walda_phrase.o(.rodata); - data/trainer_rematch.o(.rodata); + src/gym_leader_rematch.o(.rodata); data/unk_transition.o(.rodata); src/unk_transition.o(.rodata); data/text_input_strings.o(.rodata); |