diff options
| -rw-r--r-- | asm/fldeff_berrytree.s | 13 | ||||
| -rw-r--r-- | ld_script.txt | 1 | ||||
| -rw-r--r-- | src/fldeff_berrytree.c | 4 |
3 files changed, 5 insertions, 13 deletions
diff --git a/asm/fldeff_berrytree.s b/asm/fldeff_berrytree.s deleted file mode 100644 index 83c9c8be8..000000000 --- a/asm/fldeff_berrytree.s +++ /dev/null @@ -1,13 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start nullsub_56 -nullsub_56: @ 80A0E74 - bx lr - thumb_func_end nullsub_56 - - .align 2, 0 @ Don't pad with nop. diff --git a/ld_script.txt b/ld_script.txt index 2ee7869b6..bc51c7d0c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -151,6 +151,7 @@ SECTIONS { asm/pokemon_size_record.o(.text); asm/pc_screen_effect.o(.text); asm/fldeff_poison.o(.text); + src/fldeff_berrytree.o(.text); asm/fldeff_berrytree.o(.text); asm/field_special_scene.o(.text); asm/safari_zone.o(.text); diff --git a/src/fldeff_berrytree.c b/src/fldeff_berrytree.c new file mode 100644 index 000000000..53d8c2f1b --- /dev/null +++ b/src/fldeff_berrytree.c @@ -0,0 +1,4 @@ +void nullsub_56(void) +{ + return; +}
\ No newline at end of file |