diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-21 13:25:12 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-21 13:25:12 -0500 |
| commit | 0f116854b2408ea7750e9c3f8da4d4ea2a3e0d38 (patch) | |
| tree | 38bb9b6d56ea6c60be2087e9ff4e76b82c6a8d1b /src/battle/battle_controller_player.c | |
| parent | 272cd213391b5ce87cb2aeac263b3eedb0f19a07 (diff) | |
| parent | 85a8e5f1ded5a0a2354916617dd0b82091a42ee0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into assert
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(); } } |