diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 17:18:05 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 17:18:05 +0100 |
| commit | 1e79d53d2f913c65295b2547549d2c4ed849122b (patch) | |
| tree | de6e74a23a65f5d7ebc7e4a7305742b08b6e71c0 /src/battle_controller_player.c | |
| parent | 0310be30079c657f3a21da64683bdf9ac1d4d394 (diff) | |
| parent | 055a419830c0725a629f971b0299c89082c192fd (diff) | |
merge daycare with master
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 91d3d55eb..16c62c53b 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -46,7 +46,7 @@ extern struct MusicPlayerInfo gMPlay_BGM; extern u16 gPartnerTrainerId; extern struct SpriteTemplate gUnknown_0202499C; extern u8 gBattleMonForms[BATTLE_BANKS_COUNT]; -extern u16 gScriptItemId; +extern u16 gSpecialVar_ItemId; extern u8 gUnknown_0203CEE8; extern u8 gUnknown_0203CEE9; extern u8 gUnknown_0203CF00[]; @@ -1416,7 +1416,7 @@ static void CompleteWhenChoseItem(void) { if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) { - EmitOneReturnValue(1, gScriptItemId); + EmitOneReturnValue(1, gSpecialVar_ItemId); PlayerBufferExecCompleted(); } } |