diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-14 23:07:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 23:07:38 -0400 |
| commit | 6f4bf2cb0535b1a7dc72029c65d93e3ebdb19f95 (patch) | |
| tree | bb345f43ac8e5efc15a7c8fb4153df00523efc17 /ld_script.txt | |
| parent | f22e583db60f3d0c33a3d02509c51c2a861e6abd (diff) | |
| parent | baa9f7f55f64f15f5bff54017537b8e467671b34 (diff) | |
Merge pull request #322 from PikalaxALT/field_effect
Decompile field_effect.s
Diffstat (limited to 'ld_script.txt')
| -rwxr-xr-x[-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 a2555016c..7089171dd 100644..100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -134,7 +134,6 @@ SECTIONS { src/trainer_see.o(.text); src/wild_encounter.o(.text); src/field_effect.o(.text); - asm/field_effect.o(.text); asm/unknown_task.o(.text); asm/pokemon_menu.o(.text); src/option_menu.o(.text); @@ -250,7 +249,7 @@ SECTIONS { asm/battle_anim_812C144.o(.text); asm/learn_move.o(.text); src/fldeff_softboiled.o(.text); - asm/decoration_inventory.o(.text); + src/decoration_inventory.o(.text); src/roamer.o(.text); asm/battle_tower.o(.text); asm/use_pokeblock.o(.text); @@ -386,7 +385,7 @@ SECTIONS { data/trainer_see.o(.rodata); src/wild_encounter.o(.rodata); data/wild_encounter.o(.rodata); - data/field_effect.o(.rodata); + src/field_effect.o(.rodata); data/pokemon_menu.o(.rodata); data/option_menu.o(.rodata); data/pokedex.o(.rodata); @@ -457,7 +456,7 @@ SECTIONS { data/battle_anim_81258BC.o(.rodata); data/battle_anim_812C144.o(.rodata); data/learn_move.o(.rodata); - data/decoration_inventory.o(.rodata); + src/decoration_inventory.o(.rodata); src/roamer.o(.rodata); data/battle_tower.o(.rodata); data/use_pokeblock.o(.rodata); |