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_gfx_sfx_util.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_gfx_sfx_util.c')
| -rw-r--r-- | src/battle_gfx_sfx_util.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 4f444b8bf..775578ca2 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -34,9 +34,9 @@ extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT]; extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT]; extern u8 gBattleMonForms[BATTLE_BANKS_COUNT]; extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT]; -extern struct MusicPlayerInfo gMPlay_SE1; -extern struct MusicPlayerInfo gMPlay_SE2; -extern struct MusicPlayerInfo gMPlay_BGM; +extern struct MusicPlayerInfo gMPlayInfo_SE1; +extern struct MusicPlayerInfo gMPlayInfo_SE2; +extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const struct BattleMove gBattleMoves[]; extern const u8 gUnknown_0831C604[]; @@ -527,8 +527,8 @@ bool8 mplay_80342A4(u8 bank) if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_8 < 30) return TRUE; - m4aMPlayStop(&gMPlay_SE1); - m4aMPlayStop(&gMPlay_SE2); + m4aMPlayStop(&gMPlayInfo_SE1); + m4aMPlayStop(&gMPlayInfo_SE2); } if (zero == 0) { |