diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-16 21:53:55 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-16 21:53:55 -0500 |
| commit | c06bb601837c810ec71b05c0887118269613855d (patch) | |
| tree | 8ea80e699262df68bf854011e037e03b6f7542f5 /src/battle_2.c | |
| parent | 35f88987254544aa77ec3fb1906e4b545b5b5f2d (diff) | |
| parent | 23f45bd2b6790df259caa180d46706cbdd54f86f (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into dump_slot_machine.s
Diffstat (limited to 'src/battle_2.c')
| -rw-r--r-- | src/battle_2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index 6752c4d4f..61e39b39f 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -92,8 +92,8 @@ extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for? extern u8 gUnknown_02039B28[]; // possibly a struct? extern struct UnknownStruct6 gUnknown_02038C28; // todo: identify & document -extern struct MusicPlayerInfo gMPlay_SE1; -extern struct MusicPlayerInfo gMPlay_SE2; +extern struct MusicPlayerInfo gMPlayInfo_SE1; +extern struct MusicPlayerInfo gMPlayInfo_SE2; extern u8 gDecompressionBuffer[]; extern u16 gUnknown_020243FC; extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT]; @@ -1610,8 +1610,8 @@ void CB2_QuitRecordedBattle(void) UpdatePaletteFade(); if (!gPaletteFade.active) { - m4aMPlayStop(&gMPlay_SE1); - m4aMPlayStop(&gMPlay_SE2); + m4aMPlayStop(&gMPlayInfo_SE1); + m4aMPlayStop(&gMPlayInfo_SE2); FreeRestoreBattleData(); FreeAllWindowBuffers(); SetMainCallback2(gMain.savedCallback); |