diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-19 17:04:04 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-19 20:36:59 -0500 |
| commit | b2c74cae8456cfa10a27a3a2d4b97971fd964b6d (patch) | |
| tree | 0c98bbc5052c586cc0957ab7edad600021a9f769 /src/trade_scene.c | |
| parent | cd4462f58cce785f408af26a7a3b11ad08575a5a (diff) | |
Sync global
Diffstat (limited to 'src/trade_scene.c')
| -rw-r--r-- | src/trade_scene.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/trade_scene.c b/src/trade_scene.c index 9c644dc8c..73ebf54c3 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -131,7 +131,7 @@ static void SpriteCB_TradePokeball_Outbound(struct Sprite * sprite); static void SpriteCB_TradePokeball_Outbound2(struct Sprite * sprite); static void SpriteCB_TradePokeball_Inbound(struct Sprite * sprite); static void BufferInGameTradeMonName(void); -static void GetInGameTradeMail(struct MailStruct * mail, const struct InGameTrade * inGameTrade); +static void GetInGameTradeMail(struct Mail * mail, const struct InGameTrade * inGameTrade); static void CB2_RunTradeAnim_LinkTrade(void); static void CB2_WaitAndAckTradeComplete(void); static void CB2_HandleTradeEnded(void); @@ -2432,7 +2432,7 @@ static void CreateInGameTradePokemonInternal(u8 playerSlot, u8 inGameTradeIdx) { const struct InGameTrade * inGameTrade = &sInGameTrades[inGameTradeIdx]; u8 level = GetMonData(&gPlayerParty[playerSlot], MON_DATA_LEVEL); - struct MailStruct mail; + struct Mail mail; u8 metLocation = METLOC_IN_GAME_TRADE; struct Pokemon * tradeMon = &gEnemyParty[0]; u8 mailNum; @@ -2472,7 +2472,7 @@ static void CreateInGameTradePokemonInternal(u8 playerSlot, u8 inGameTradeIdx) CalculateMonStats(&gEnemyParty[0]); } -static void GetInGameTradeMail(struct MailStruct * mail, const struct InGameTrade * inGameTrade) +static void GetInGameTradeMail(struct Mail * mail, const struct InGameTrade * inGameTrade) { int i; for (i = 0; i < MAIL_WORDS_COUNT; i++) |