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_controller_wally.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_controller_wally.c')
| -rw-r--r-- | src/battle_controller_wally.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index eeb0b596d..b0e1e1480 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -42,7 +42,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200]; extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200]; extern u8 gMultiUsePlayerCursor; extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT]; -extern struct MusicPlayerInfo gMPlay_BGM; +extern struct MusicPlayerInfo gMPlayInfo_BGM; extern u16 gPartnerTrainerId; extern struct SpriteTemplate gUnknown_0202499C; extern u8 gBattleMonForms[BATTLE_BANKS_COUNT]; |