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/pokemon.c | |
parent | 58935b17f7e9073346d4f08254a35991274ad5c2 (diff) | |
parent | f544f6e356d5bdee868e685a537e18a69aed1890 (diff) |
Merge pull request #221 from GriffinRichards/doc-cerulean
Document Cerulean City scripts
Diffstat (limited to 'src/pokemon.c')
-rw-r--r-- | src/pokemon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 99fe39709..39019421c 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3632,7 +3632,7 @@ static u8 SendMonToPC(struct Pokemon* mon) { s32 boxNo, boxPos; - set_unknown_box_id(VarGet(VAR_0x4037)); + SetPCBoxToSendMon(VarGet(VAR_PC_BOX_TO_SEND_MON)); boxNo = StorageGetCurrentBox(); @@ -3647,9 +3647,9 @@ static u8 SendMonToPC(struct Pokemon* mon) CopyMon(checkingMon, &mon->box, sizeof(mon->box)); gSpecialVar_MonBoxId = boxNo; gSpecialVar_MonBoxPos = boxPos; - if (get_unknown_box_id() != boxNo) + if (GetPCBoxToSendMon() != boxNo) FlagClear(FLAG_SYS_CHANGED_BOX_TO_STORE_MON); - VarSet(VAR_0x4037, boxNo); + VarSet(VAR_PC_BOX_TO_SEND_MON, boxNo); return MON_GIVEN_TO_PC; } } |