diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /src/link.c | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'src/link.c')
| -rw-r--r-- | src/link.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/link.c b/src/link.c index 0634d2506..c59691bc8 100644 --- a/src/link.c +++ b/src/link.c @@ -22,7 +22,7 @@ #include "new_menu_helpers.h" #include "text.h" #include "strings.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "trade.h" #include "battle.h" @@ -1112,7 +1112,7 @@ static void SetBlockReceivedFlag(u8 who) void ResetBlockReceivedFlags(void) { int i; - + if (gWirelessCommType == TRUE) { for (i = 0; i < MAX_RFU_PLAYERS; i++) @@ -1628,9 +1628,9 @@ void CB2_LinkError(void) u8 *tilemapBuffer; SetGpuReg(REG_OFFSET_DISPCNT, 0); - m4aMPlayStop(&gMPlay_SE1); - m4aMPlayStop(&gMPlay_SE2); - m4aMPlayStop(&gMPlay_SE3); + m4aMPlayStop(&gMPlayInfo_SE1); + m4aMPlayStop(&gMPlayInfo_SE2); + m4aMPlayStop(&gMPlayInfo_SE3); InitHeap(gHeap, HEAP_SIZE); ResetSpriteData(); FreeAllSpritePalettes(); |