diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-12-09 07:56:53 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-09 07:56:53 -0600 |
commit | 5e09850c17bd1d09ab77e4f09a6b1682c210f0ad (patch) | |
tree | d5c1023549cb38f6a039bcdc29fbf90b01160935 /src/egg_hatch.c | |
parent | 0b91d2948a431a5d44166544897a550061c01a31 (diff) | |
parent | c46499b05c81f1d1a872a33ce5b2fd9a20964dc7 (diff) |
Merge pull request #435 from DizzyEggg/weather
Decompile fieldmap
Diffstat (limited to 'src/egg_hatch.c')
-rw-r--r-- | src/egg_hatch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 77296c707..ed25a2c68 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -30,7 +30,7 @@ #include "field_weather.h" #include "international_string_util.h" #include "naming_screen.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "battle.h" // to get rid of later struct EggHatchData @@ -60,7 +60,7 @@ extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle extern const u8 gText_HatchedFromEgg[]; extern const u8 gText_NickHatchPrompt[]; -extern void play_some_sound(void); +extern void PlayRainSoundEffect(void); extern u16 sub_80D22D0(void); extern u8 CountPartyAliveNonEggMonsExcept(u8); @@ -581,7 +581,7 @@ static void Task_EggHatchPlayBGM(u8 taskID) if (gTasks[taskID].data[0] == 0) { StopMapMusic(); - play_some_sound(); + PlayRainSoundEffect(); } if (gTasks[taskID].data[0] == 1) PlayBGM(MUS_ME_SHINKA); |