diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 13:57:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 13:57:05 -0500 |
| commit | c1d17b2df183689c0befd3c7bc08810308f2bcd2 (patch) | |
| tree | d2e6483613f61af4142e6c313ac1007552a52941 /src/mevent_client.c | |
| parent | 1cfeae9ffa11bb86a214721bb264f26ca8cb7d5a (diff) | |
| parent | 13357596b7ed70246a00d438ee37dc1c84b78415 (diff) | |
Merge branch 'master' into doc-routes2
Diffstat (limited to 'src/mevent_client.c')
| -rw-r--r-- | src/mevent_client.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mevent_client.c b/src/mevent_client.c index 4da0b4bc1..d7eff1ec6 100644 --- a/src/mevent_client.c +++ b/src/mevent_client.c @@ -195,15 +195,16 @@ static u32 client_mainseq_4(struct mevent_client * svr) mevent_client_send_word(svr, 0x13, svr->param); break; case 10: - sub_8143F68(svr->recvBuffer); + OverwriteSavedWonderCardWithReceivedCard(svr->recvBuffer); break; case 9: - if (!sub_8143EF4(svr->recvBuffer)) + if (!MEvent_HaveAlreadyReceivedWonderNews(svr->recvBuffer)) { - sub_8143DC8(svr->recvBuffer); + OverwriteSavedWonderNewsWithReceivedNews(svr->recvBuffer); mevent_client_send_word(svr, 0x13, 0); } else + // Other trainer already has news mevent_client_send_word(svr, 0x13, 1); break; case 15: @@ -211,7 +212,7 @@ static u32 client_mainseq_4(struct mevent_client * svr) svr->flag = 0; break; case 16: - sub_8144254(svr->recvBuffer); + MEvent_ReceiveDistributionMon(svr->recvBuffer); break; case 17: MEventSetRamScript(svr->recvBuffer, 1000); |