summaryrefslogtreecommitdiff
path: root/src/evolution_scene.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-12-24 11:15:00 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-12-24 11:15:00 +0100
commit43f23b8a78a0111c88d671942a012d8d4b28596c (patch)
tree743beb78116eb7f6558e8a6c906873e584cbf8b2 /src/evolution_scene.c
parent3a3772c74ff76a258ffa4b6515fa07d5c96a2979 (diff)
parentf209cbd7a0519b49fcf3f1b7a3fca27d6dcaacd8 (diff)
Merge branch 'master' into dump_pointers
Diffstat (limited to 'src/evolution_scene.c')
-rw-r--r--src/evolution_scene.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index bfb558444..85310eace 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -86,7 +86,7 @@ extern void sub_806A068(u16, u8);
extern void sub_807F19C(void);
extern void sub_807B140(void);
extern void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies);
-extern void sub_8085784(void);
+extern void Overworld_PlaySpecialMapMusic(void);
extern void sub_81BFA38(struct Pokemon *party, u8 monId, u8 partyCount, void *CB2_ptr, u16 move);
extern u8 sub_81C1B94(void);
extern void sub_807F1A8(u8 arg0, const u8 *arg1, u8 arg2);
@@ -698,7 +698,7 @@ static void Task_EvolutionScene(u8 taskID)
if (!(gTasks[taskID].tBits & TASK_BIT_LEARN_MOVE))
{
StopMapMusic();
- sub_8085784();
+ Overworld_PlaySpecialMapMusic();
}
gTasks[taskID].tBits |= TASK_BIT_LEARN_MOVE;
@@ -727,7 +727,7 @@ static void Task_EvolutionScene(u8 taskID)
if (!(gTasks[taskID].tBits & TASK_BIT_LEARN_MOVE))
{
StopMapMusic();
- sub_8085784();
+ Overworld_PlaySpecialMapMusic();
}
if (!gTasks[taskID].tEvoWasStopped)
CreateShedinja(gTasks[taskID].tPreEvoSpecies, mon);