summaryrefslogtreecommitdiff
path: root/src/pokemon.c
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-09-17 01:49:07 -0400
committerhuderlem <huderlem@gmail.com>2019-09-17 16:50:17 -0500
commit6ab192e7393a23ef811a83bdc7e631eafdf368b9 (patch)
treeb35d2b73678ad96b01466439541646eb0adeb9a7 /src/pokemon.c
parent6ab49da81133c86a0609832a1336efbee67c1b22 (diff)
Review changes for #807
Diffstat (limited to 'src/pokemon.c')
-rw-r--r--src/pokemon.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pokemon.c b/src/pokemon.c
index 4833f2db6..29358b22f 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -4329,7 +4329,7 @@ u8 SendMonToPC(struct Pokemon* mon)
{
s32 boxNo, boxPos;
- set_unknown_box_id(VarGet(VAR_STORAGE_UNKNOWN));
+ SetPCBoxToSendMon(VarGet(VAR_PC_BOX_TO_SEND_MON));
boxNo = StorageGetCurrentBox();
@@ -4344,9 +4344,9 @@ u8 SendMonToPC(struct Pokemon* mon)
CopyMon(checkingMon, &mon->box, sizeof(mon->box));
gSpecialVar_MonBoxId = boxNo;
gSpecialVar_MonBoxPos = boxPos;
- if (get_unknown_box_id() != boxNo)
- FlagClear(FLAG_SYS_STORAGE_UNKNOWN_FLAG);
- VarSet(VAR_STORAGE_UNKNOWN, boxNo);
+ if (GetPCBoxToSendMon() != boxNo)
+ FlagClear(FLAG_SHOWN_BOX_WAS_FULL_MESSAGE);
+ VarSet(VAR_PC_BOX_TO_SEND_MON, boxNo);
return MON_GIVEN_TO_PC;
}
}