diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-04-29 13:20:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-29 13:20:00 -0400 |
| commit | ee839a3cd96cbad9e2bafa25422c4bdea3f53723 (patch) | |
| tree | 8fc9c6cb3f84c68c98f4978f0b43bfd9741b5337 /ld_script.txt | |
| parent | 35e7dffe66de92dccda079b62a6ce268906e1440 (diff) | |
| parent | e833d3742325698846eb3d394b41a556a76af711 (diff) | |
Merge pull request #50 from ultima-soul/fldeff
Port fldeff_teleport and decompile fldeff_berrytree
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index 05ce768dd..b59fce167 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -151,7 +151,7 @@ SECTIONS { asm/pokemon_size_record.o(.text); asm/pc_screen_effect.o(.text); asm/fldeff_poison.o(.text); - asm/fldeff_berrytree.o(.text); + src/fldeff_berrytree.o(.text); asm/field_special_scene.o(.text); asm/safari_zone.o(.text); asm/item_use.o(.text); @@ -201,7 +201,7 @@ SECTIONS { asm/save_failed_screen.o(.text); asm/clear_save_data_screen.o(.text); asm/evolution_graphics.o(.text); - asm/fldeff_teleport.o(.text); + src/fldeff_teleport.o(.text); asm/new_menu_helpers.o(.text); asm/box_party_pokemon_dropdown.o(.text); asm/save_menu_util.o(.text); |