From 416d67c8325758d01decad6e5648263aa7e906df Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Thu, 10 May 2018 18:36:57 -0500 Subject: Finish porting/decompiling field_effect.c --- src/egg_hatch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/egg_hatch.c') diff --git a/src/egg_hatch.c b/src/egg_hatch.c index e64a98ab1..08767c68f 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -25,6 +25,7 @@ #include "window.h" #include "constants/abilities.h" #include "daycare.h" +#include "overworld.h" #include "battle.h" // to get rid of later struct EggHatchData @@ -44,8 +45,6 @@ struct EggHatchData u8 textColor[3]; }; -extern void (*gFieldCallback)(void); - extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const u8 gBattleTextboxTiles[]; extern const u8 gBattleTextboxTilemap[]; -- cgit v1.2.3 From 4e2886db8179072badaad0a3ff131b95dd0a7e94 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 11 May 2018 00:33:32 -0500 Subject: Use song constants --- src/egg_hatch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/egg_hatch.c') diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 08767c68f..8914d6ff3 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -574,10 +574,10 @@ static void Task_EggHatchPlayBGM(u8 taskID) play_some_sound(); } if (gTasks[taskID].data[0] == 1) - PlayBGM(376); + PlayBGM(MUS_ME_SHINKA); if (gTasks[taskID].data[0] > 60) { - PlayBGM(377); + PlayBGM(MUS_SHINKA); DestroyTask(taskID); // UB: task is destroyed, yet the value is incremented } -- cgit v1.2.3