diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
| commit | 9c9bcee1e2fbd3fd374023146f99d0417cd8ab52 (patch) | |
| tree | 848c1688fe743dd0410183b182024ee961f07980 /src/battle/battle_controller_player.c | |
| parent | ce74d72c31a3ebda26adc6ae888700213f64b113 (diff) | |
| parent | 62bdd4d480ced306b85791c828ee8497e9fa2acc (diff) | |
fix merge conflicts
Diffstat (limited to 'src/battle/battle_controller_player.c')
| -rw-r--r-- | src/battle/battle_controller_player.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 653f0938c..c2d34db0d 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -162,7 +162,7 @@ extern u8 gUnknown_0300434C[]; extern u8 gUnknown_0202E8F4; extern u8 gUnknown_0202E8F5; extern u8 gUnknown_02038470[]; -extern u16 gScriptItemId; +extern u16 gSpecialVar_ItemId; extern u8 gDisplayedStringBattle[]; extern const u8 BattleText_LinkStandby[]; @@ -1522,7 +1522,7 @@ void sub_802E03C(void) { if (gMain.callback2 == sub_800F808 && !gPaletteFade.active) { - Emitcmd35(1, gScriptItemId); + Emitcmd35(1, gSpecialVar_ItemId); PlayerBufferExecCompleted(); } } |