diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-31 18:40:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 18:40:40 -0500 |
| commit | cbc414c44115550c811d6629c23c2e749d9d7fe3 (patch) | |
| tree | 42a2274534149cb609636c3ef98a90438a11ca33 /src/player_pc.c | |
| parent | 425cb7ec71d549bed0a73bb864c3f33a1c89f1c4 (diff) | |
| parent | bc71641386573c7e865d0cec941f84310fbd648f (diff) | |
Merge pull request #698 from Slawter666/synchronise
Synchronise with pokeemerald
Diffstat (limited to 'src/player_pc.c')
| -rw-r--r-- | src/player_pc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/player_pc.c b/src/player_pc.c index ce3dda3c7..f7c2379cd 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -1224,7 +1224,7 @@ static void Mailbox_DoRedrawMailboxMenuAfterReturn(void) static void Mailbox_ReturnToFieldFromReadMail(void) { gFieldCallback = Mailbox_DoRedrawMailboxMenuAfterReturn; - SetMainCallback2(c2_exit_to_overworld_2_switch); + SetMainCallback2(CB2_ReturnToField); } static const u8 gHighlightedMoveToBagFormatText[] = _("{COLOR RED}{STR_VAR_1}"); @@ -1314,7 +1314,7 @@ static void Mailbox_UpdateMailListAfterDeposit(void) void Mailbox_ReturnToMailListAfterDeposit(void) { gFieldCallback = Mailbox_UpdateMailListAfterDeposit; - SetMainCallback2(c2_exit_to_overworld_2_switch); + SetMainCallback2(CB2_ReturnToField); } // you always have at least 1 POKeMON and you cannot receive mail before you leave Littleroot: therefore this function cannot be reached normally. |