Move union room data, more trade doc

2019-10-04 17:24:03 -04:00
parent 2b0c944286
commit 6b556900f8
11 changed files with 1134 additions and 1117 deletions
--- a/src/data/trade.h
+++ b/src/data/trade.h
@@ -353,7 +353,7 @@ static const struct MenuAction sSelectTradeMonActions[] =
    [MENU_ACTION_TRADE]   = {sText_Trade2, sub_807A024}
 };

-static const u8 *const sTradeMessageTexts[] = 
+static const u8 *const sTradeMessages[] = 
 {
    [TRADE_MSG_STANDBY]                    = sText_CommunicationStandby,
    [TRADE_MSG_CANCELED]                   = sText_TheTradeHasBeenCanceled,
--- a/src/data/union_room.h
+++ b/src/data/union_room.h