diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-14 20:29:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-14 20:29:03 -0500 |
| commit | cdc04dfe9f259535ee1cd2155f838d8092def817 (patch) | |
| tree | f4c372594f6ae720a9340a2a1a933ed8302123bc /src/battle_script_commands.c | |
| parent | 58935b17f7e9073346d4f08254a35991274ad5c2 (diff) | |
| parent | f544f6e356d5bdee868e685a537e18a69aed1890 (diff) | |
Merge pull request #221 from GriffinRichards/doc-cerulean
Document Cerulean City scripts
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 a20f47ad4..3b9270948 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -9563,17 +9563,17 @@ static void atkF0_givecaughtmon(void) { if (GiveMonToPlayer(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY) { - if (!sub_80CC7B4()) + if (!ShouldShowBoxWasFullMessage()) { gBattleCommunication[MULTISTRING_CHOOSER] = 0; - StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_0x4037))); + 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_0x4037))); + 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; } if (FlagGet(FLAG_SYS_NOT_SOMEONES_PC)) |