diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-07 22:16:52 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 22:16:52 -0600 |
| commit | 6b38db228befa044a2cfe31ed78555e3f0bd3935 (patch) | |
| tree | 4aafddc91df76b5674c47a2be3bb1b3a42a0b519 /ld_script.txt | |
| parent | 17d5ba39acb897e07e6842cbff5b1172cc6f7951 (diff) | |
| parent | be36c506387648a11afe51b0f4209386947feb37 (diff) | |
Merge pull request #515 from huderlem/battle_2
Decompile battle_2 and battle_util
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt index 9a2cbe4e5..68466c1a0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -50,8 +50,7 @@ SECTIONS { src/rom_800D42C.o(.text); asm/battle_1.o(.text_800DC24); src/battle/battle_2.o(.text); - asm/battle_2.o(.text); - src/battle/battle_3.o(.text); + src/battle/battle_util.o(.text); src/battle/battle_4.o(.text); src/battle/battle_controller_player.o(.text); src/battle/battle_7.o(.text); @@ -453,7 +452,7 @@ SECTIONS { src/battle/battle_controller_opponent.o(.rodata); src/battle/battle_controller_linkopponent.o(.rodata); data/battle_moves.o(.rodata); - src/battle/battle_3.o(.rodata); + src/battle/battle_util.o(.rodata); src/pokemon/pokemon_data.o(.rodata); . = ALIGN(4); src/engine/trig.o(.rodata); |