diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-17 01:49:07 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-09-17 16:50:17 -0500 |
| commit | 6ab192e7393a23ef811a83bdc7e631eafdf368b9 (patch) | |
| tree | b35d2b73678ad96b01466439541646eb0adeb9a7 /src/battle_script_commands.c | |
| parent | 6ab49da81133c86a0609832a1336efbee67c1b22 (diff) | |
Review changes for #807
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6f1b43240..4002852b7 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -10227,17 +10227,17 @@ static void atkF0_givecaughtmon(void) { if (GiveMonToPlayer(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY) { - if (!sub_813B21C()) + if (!ShouldShowBoxWasFullMessage()) { gBattleCommunication[MULTISTRING_CHOOSER] = 0; - StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN))); + StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON))); GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2); } else { - StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN))); + StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON))); // box the mon was sent to GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2); - StringCopy(gStringVar3, GetBoxNamePtr(get_unknown_box_id())); + StringCopy(gStringVar3, GetBoxNamePtr(GetPCBoxToSendMon())); //box the mon was going to be sent to gBattleCommunication[MULTISTRING_CHOOSER] = 2; } |