party_menu third quarter

13 files changed, 82 insertions, 4 deletions

diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h
index 746f10679..4ef90ed60 100644
--- a/include/constants/easy_chat.h
+++ b/include/constants/easy_chat.h
@@ -1,6 +1,28 @@
 #ifndef GUARD_CONSTANTS_EASY_CHAT_H
 #define GUARD_CONSTANTS_EASY_CHAT_H
 
+#define EASY_CHAT_TYPE_PROFILE                 0
+#define EASY_CHAT_TYPE_BATTLE_START            1
+#define EASY_CHAT_TYPE_BATTLE_WON              2
+#define EASY_CHAT_TYPE_BATTLE_LOST             3
+#define EASY_CHAT_TYPE_MAIL                    4
+#define EASY_CHAT_TYPE_INTERVIEW               5
+#define EASY_CHAT_TYPE_BARD_SONG               6
+#define EASY_CHAT_TYPE_FAN_CLUB                7
+#define EASY_CHAT_TYPE_UNK_8                   8
+#define EASY_CHAT_TYPE_TRENDY_PHRASE           9
+#define EASY_CHAT_TYPE_GABBY_AND_TY            10
+#define EASY_CHAT_TYPE_CONTEST_INTERVIEW       11
+#define EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW  12
+#define EASY_CHAT_TYPE_GOOD_SAYING             13
+#define EASY_CHAT_TYPE_FAN_QUESTION            14
+#define EASY_CHAT_TYPE_QUIZ_ANSWER             15
+#define EASY_CHAT_TYPE_QUIZ_QUESTION           16
+#define EASY_CHAT_TYPE_QUIZ_SET_QUESTION       17
+#define EASY_CHAT_TYPE_QUIZ_SET_ANSWER         18
+#define EASY_CHAT_TYPE_APPRENTICE              19
+#define EASY_CHAT_TYPE_QUESTIONNAIRE           20
+
 #define EC_GROUP_POKEMON_2      0x0
 #define EC_GROUP_TRAINER        0x1
 #define EC_GROUP_STATUS         0x2
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 765758035..9c642bb36 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -45,5 +45,6 @@ u16 GetDisplayedWordByIndex(u16 index);
 u16 GetNumDisplayedWords(void);
 const u8 *GetEasyChatWordGroupName(u8);
 u8 *CopyEasyChatWordPadded(u8 *, u16, u16);
+void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback); // TODO: currently in link_rfu.s. further file split needed? 
 
 #endif // GUARD_EASYCHAT_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 1d431771b..ec1a077be 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -33,5 +33,7 @@ void sub_805DC04(void);
 void sub_805DAB0(void);
 bool32 sub_805DAD0(void);
 bool32 sub_805DC24(void);
+bool8 PartyHasMonWithSurf(void);
+bool8 IsPlayerSurfingNorth(void);
 
 #endif //GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index 1b8044592..86fab62e0 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -9,5 +9,6 @@ void sub_80B0244(void);
 void sub_807E3EC(void);
 void sub_807F114(void);
 void sub_807F204(u8 taskId);
+void sub_807DC00(void);
 
 #endif // GUARD_FIELD_SCREEN_EFFECT_H
diff --git a/include/global.h b/include/global.h
index 744d23eb3..3d6049d64 100644
--- a/include/global.h
+++ b/include/global.h
@@ -742,7 +742,7 @@ struct SaveBlock1
     /*0x000C*/ struct WarpData warp1;
     /*0x0014*/ struct WarpData warp2;
     /*0x001C*/ struct WarpData lastHealLocation;
-    /*0x0024*/ struct WarpData warp4;
+    /*0x0024*/ struct WarpData escapeWarp;
     /*0x002C*/ u16 savedMusic;
     /*0x002E*/ u8 weather;
     /*0x002F*/ u8 filler_2F;
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 671488be0..d1bc2b2bc 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -1,6 +1,9 @@
 #ifndef GUARD_LINK_RFU_H
 #define GUARD_LINK_RFU_H
 
+#include "global.h"
+#include "librfu.h"
+
 struct Padded_U8
 {
     u8 value;
@@ -42,6 +45,7 @@ void sub_80F8DC0(void);
 void sub_80FBB20(void);
 bool8 sub_80FA484(bool32 a0);
 void var_800D_set_xB(void);
+struct UnkLinkRfuStruct_02022B14 *sub_80F9800(void);
 
 #include "mevent_server.h"
 extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[];
diff --git a/include/overworld.h b/include/overworld.h
index d893899eb..ab20d9ff0 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -140,7 +140,7 @@ bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd
 
 bool32 sub_8058318(void);
 
-void CB2_ReturnToStartMenu(void);
+void CB2_ReturnToFieldWithOpenMenu(void);
 void CB2_WhiteOut(void);
 void c2_8056854(void);
 void sub_8054F38(u32 newKey);
diff --git a/include/pokemon_special_anim.h b/include/pokemon_special_anim.h
index 8dbf0efa4..d2580552d 100644
--- a/include/pokemon_special_anim.h
+++ b/include/pokemon_special_anim.h
@@ -8,5 +8,9 @@ bool8 sub_811E680(void);
 void GetMonLevelUpWindowStats(struct Pokemon *mon, u16 *currStats);
 void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bgClr, u8 fgClr, u8 shadowClr);
 void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgClr, u8 fgClr, u8 shadowClr);
+void sub_811C540(u8 slotId, u16 itemId, MainCallback callback);
+void sub_811C5AC(u8 slotId, u16 itemId, MainCallback callback);
+u32 sub_811D178(void);
+void sub_811C568(u8 slotId, u16 itemId, u16 moveId, MainCallback callback);
 
 #endif // GUARD_POKEMON_SPECIAL_ANIM_H
diff --git a/include/quest_log.h b/include/quest_log.h
index 4040ed4c9..3dfd5f35c 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -49,6 +49,4 @@ void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value);
 void sub_8110840(void *oldSave);
 void sub_8112F18(u8 windowId);
 
-extern u8 gUnknown_203ADFA;
-
 #endif //GUARD_QUEST_LOG_H
diff --git a/include/region_map.h b/include/region_map.h
index 8d609f104..67287b6c4 100644
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -96,5 +96,6 @@ u8 *GetMapName(u8 *, u16, u16);
 bool32 sub_8124668(u8 mapSecId);
 void GetMapNameGeneric(u8 *, u8);
 void sub_80BFF50(u8 a0, void (*a1)(void));
+void MCB2_FlyMap(void);
 
 #endif //GUARD_REGION_MAP_H
diff --git a/include/strings.h b/include/strings.h
index 16a107de7..8c082ccb4 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -350,6 +350,44 @@ extern const u8 gText_MaleSymbol[];
 extern const u8 gText_FemaleSymbol[];
 extern const u8 gText_Slash[];
 extern const u8 gUnknown_8417457[];
+extern const u8 gText_PkmnNotHolding[];
+extern const u8 gText_PCMailboxFull[];
+extern const u8 gText_MailSentToPC[];
+extern const u8 gText_MailMessageWillBeLost[];
+extern const u8 gText_SendMailToPC[];
+extern const u8 gText_MailTakenFromPkmn[];
+extern const u8 gUnknown_8416B3E[];
+extern const u8 gUnknown_8416B16[];
+extern const u8 gText_PauseUntilPress[];
+extern const u8 gText_CantUseUntilNewBadge[];
+extern const u8 gText_ReturnToHealingSpot[];
+extern const u8 gText_EscapeFromHereAndReturnTo[];
+extern const u8 gText_PkmnCuredOfPoison[];
+extern const u8 gText_PkmnWokeUp2[];
+extern const u8 gText_PkmnBurnHealed[];
+extern const u8 gText_PkmnThawedOut[];
+extern const u8 gText_PkmnCuredOfParalysis[];
+extern const u8 gText_PkmnSnappedOutOfConfusion[];
+extern const u8 gText_PkmnGotOverInfatuation[];
+extern const u8 gText_PkmnBecameHealthy[];
+extern const u8 gText_HP3[];
+extern const u8 gText_Attack3[];
+extern const u8 gText_Defense3[];
+extern const u8 gText_Speed2[];
+extern const u8 gText_SpAtk3[];
+extern const u8 gText_SpDef3[];
+extern const u8 gText_PkmnBaseVar2StatIncreased[];
+extern const u8 gText_MovesPPIncreased[];
+extern const u8 gText_PPWasRestored[];
+extern const u8 gText_PkmnHPRestoredByVar2[];
+extern const u8 gText_PkmnNeedsToReplaceMove[];
+extern const u8 gText_PkmnCantLearnMove[];
+extern const u8 gText_PkmnAlreadyKnows[];
+extern const u8 gText_PkmnLearnedMove3[];
+extern const u8 gText_WhichMoveToForget[];
+extern const u8 gText_12PoofForgotMove[];
+extern const u8 gText_StopLearningMove2[];
+extern const u8 gText_MoveNotLearned[];
 
 // credits
 extern const u8 gString_Dummy[];
diff --git a/include/trade.h b/include/trade.h
index 3c42be3ea..b3b1de23b 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -2,6 +2,7 @@
 #define GUARD_TRADE_H
 
 #include "global.h"
+#include "librfu.h"
 #include "constants/trade.h"
 
 extern struct MailStruct gLinkPartnerMail[6];
@@ -10,5 +11,7 @@ extern u8 gSelectedTradeMonPositions[2];
 extern const u16 gUnknown_826601C[];
 void CB2_ReturnFromLinkTrade(void);
 s32 sub_804FB34(void);
+s32 CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet); // TODO: currently in link_rfu_2.s. further file split needed? 
+s32 GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct rfuPlayer, struct UnkLinkRfuStruct_02022B14Substruct rfuPartner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, u8 isObedientBitSet);
 
 #endif //GUARD_TRADE_H
diff --git a/include/union_room.h b/include/union_room.h
index 00354ff31..03628441b 100644
--- a/include/union_room.h
+++ b/include/union_room.h
@@ -149,4 +149,8 @@ struct TradeUnkStruct
     u32 personality;
 };
 
+extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_203B064;
+extern u16 gUnionRoomOfferedSpecies;
+extern u8 gUnionRoomRequestedMonType;
+
 #endif //GUARD_UNION_ROOM_H