diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:32:58 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:32:58 -0500 |
| commit | 65e35eb2195277214cfaecec183a2fba64e8e538 (patch) | |
| tree | c073aceff1ceba29fdb4d65767a18a07c15c7117 /src/battle/battle_controller_player.c | |
| parent | 6675a6782f3c9be808672aa12c061f1d3f1f5d2e (diff) | |
| parent | aa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff) | |
Merge branch 'master' into decompile_data
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(); } } |