berry blender fix merge conflicts

1 files changed, 1 insertions, 1 deletions

diff --git a/src/tv.c b/src/tv.c
index c1d648652..1d978b093 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1883,7 +1883,7 @@ void PutFishingAdviceShowOnTheAir(void)
     }
 }
 
-void sub_80EDA3C(u16 species)
+void SetPokemonAnglerSpecies(u16 species)
 {
     sPokemonAnglerSpecies = species;
 }