diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:42:18 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:42:18 +0000 |
| commit | 7c79b030e90ae6f4b3b3c91518c315959ede456e (patch) | |
| tree | b12fe2ca0d42b900fb1d45491e81a1bc6d86a348 /src/battle_controller_player_partner.c | |
| parent | 2acab81713aac51f96a50dc42a67ec7761901aa4 (diff) | |
| parent | 055a419830c0725a629f971b0299c89082c192fd (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'src/battle_controller_player_partner.c')
| -rw-r--r-- | src/battle_controller_player_partner.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 6ace9121c..0cd34442a 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -35,7 +35,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200]; extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200]; extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT]; extern struct SpriteTemplate gUnknown_0202499C; -extern u16 gScriptItemId; +extern u16 gSpecialVar_ItemId; extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT]; extern u8 gBattleOutcome; extern u16 gBattle_BG0_X; @@ -1581,7 +1581,7 @@ static void PlayerPartnerHandleChoosePokemon(void) } } - *(gBattleStruct->field_5C + gActiveBank) = chosenMonId; + *(gBattleStruct->monToSwitchIntoId + gActiveBank) = chosenMonId; EmitChosenMonReturnValue(1, chosenMonId, NULL); PlayerPartnerBufferExecCompleted(); } |