From 57603a0d46c785d845a3fa168f94c01dc8b0b253 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Thu, 18 Apr 2019 08:18:12 -0700 Subject: [PATCH] Fix formatting and ld_script --- ld_script.txt | 1 - src/fldeff_berrytree.c | 4 ++-- src/fldeff_teleport.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ld_script.txt b/ld_script.txt index bc51c7d0c..86464ee98 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -152,7 +152,6 @@ SECTIONS { 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); asm/item_use.o(.text); diff --git a/src/fldeff_berrytree.c b/src/fldeff_berrytree.c index 53d8c2f1b..90ca36508 100644 --- a/src/fldeff_berrytree.c +++ b/src/fldeff_berrytree.c @@ -1,4 +1,4 @@ void nullsub_56(void) { - return; -} \ No newline at end of file + +} diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c index 35515e9cb..74fad1110 100644 --- a/src/fldeff_teleport.c +++ b/src/fldeff_teleport.c @@ -39,4 +39,4 @@ static void StartTeleportFieldEffect(void) { FieldEffectActiveListRemove(FLDEFF_USE_TELEPORT); CreateTeleportFieldEffectTask(); -} \ No newline at end of file +}