16 files changed, 114 insertions, 1 deletions
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index ff5a629af..b449bb501 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_CONTROLLERS_H
 #define GUARD_BATTLE_CONTROLLERS_H
 
+#include "battle.h"
+
 enum
 {
     REQUEST_ALL_BATTLE,
diff --git a/include/battle_frontier_2.h b/include/battle_frontier_2.h
index d410749b9..09e974068 100644
--- a/include/battle_frontier_2.h
+++ b/include/battle_frontier_2.h
@@ -11,5 +11,6 @@ void sub_81AA078(u16*, u8);
 void sub_81A4C30(void);
 void sub_819A4F8(void);
 void sub_819DC00(void);
+bool8 sub_81A6BF4(void);
 
 #endif // GUARD_BATTLE_FRONTIER_2_H
diff --git a/include/battle_tent.h b/include/battle_tent.h
new file mode 100644
index 000000000..a894d4cfb
--- /dev/null
+++ b/include/battle_tent.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_BATTLE_TENT_H
+#define GUARD_BATTLE_TENT_H
+
+bool8 sub_81B9E94(void);
+
+#endif //GUARD_BATTLE_TENT_H
diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h
index b9c518b1b..8ff75dfa9 100644
--- a/include/constants/region_map_sections.h
+++ b/include/constants/region_map_sections.h
@@ -216,4 +216,8 @@
 #define MAPSEC_TRAINER_HILL                 0xD4
 #define MAPSEC_NONE                         0xD5
 
+#define MAPSEC_SPECIAL_EGG                  0xFD
+#define MAPSEC_IN_GAME_TRADE                0xFE
+#define MAPSEC_FATEFUL_ENCOUNTER            0xFF
+
 #endif //GUARD_REGIONMAPSEC_H
diff --git a/include/contest_effect.h b/include/contest_effect.h
index 4b3b151eb..5f48e1b8b 100644
--- a/include/contest_effect.h
+++ b/include/contest_effect.h
@@ -18,6 +18,7 @@ struct ContestEffect
 
 extern const struct ContestMove gContestMoves[];
 extern const struct ContestEffect gContestEffects[];
+extern const u8 *const gContestEffectDescriptionPointers[];
 
 bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove);
 
diff --git a/include/graphics.h b/include/graphics.h
index 2dc5e99bf..a5acca625 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3382,4 +3382,24 @@ extern const u8 gCreditsCopyrightEnd_Gfx[];
 extern const u8 gPokenavConditionMarker_Gfx[];
 extern const u16 gPokenavConditionMarker_Pal[];
 
+extern const u8 gUnknown_08D9862C[];
+extern const u8 gUnknown_08D98CC8[];
+extern const u8 gUnknown_08D987FC[];
+extern const u8 gUnknown_08D9898C[];
+extern const u8 gUnknown_08D98B28[];
+extern const u8 gUnknown_08D9853C[];
+extern const u8 gUnknown_08D85620[];
+extern const u16 gSummaryScreenWindow_Tilemap[];
+extern const u16 gMoveTypes_Pal[];
+extern const u8 gUnknown_08D97D0C[];
+
+extern const u16 gSummaryScreenPowAcc_Tilemap[];
+extern const u16 gUnknown_08DC3C34[];
+
+extern const u8 gMoveTypes_Gfx[];
+extern const u8 gUnknown_08D97BEC[];
+extern const u8 gUnknown_08D97CF4[];
+extern const u8 gStatusGfx_Icons[];
+extern const u8 gStatusPal_Icons[];
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/m4a.h b/include/m4a.h
index a1f413cf5..595379495 100644
--- a/include/m4a.h
+++ b/include/m4a.h
@@ -17,6 +17,7 @@ void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed);
 void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed);
 void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo);
 
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern struct MusicPlayerInfo gMPlayInfo_SE3;
diff --git a/include/menu.h b/include/menu.h
index 5dfd99c64..054d8cb34 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -85,5 +85,7 @@ void RemoveMapNamePopUpWindow(void);
 u8 GetMapNamePopUpWindowId(void);
 u8 AddMapNamePopUpWindow(void);
 void sub_8199F74(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 letterSpacing, u8 lineSpacing);
+void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
+void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP);
 
 #endif // GUARD_MENU_H
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 387a89fdd..ee8501d18 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -2,6 +2,7 @@
 #define GUARD_MENU_HELPERS_H
 
 #include "task.h"
+#include "window.h"
 
 // Exported type declarations
 
diff --git a/include/mon_markings.h b/include/mon_markings.h
index 852e8b4eb..22c3f14a4 100644
--- a/include/mon_markings.h
+++ b/include/mon_markings.h
@@ -21,4 +21,6 @@ struct PokemonMarkMenu
     /*0x10B4*/ u8 tileLoadState;
 }; // 10b8
 
+struct Sprite *sub_811FF94(u16 tileTag, u16 paletteTag, const u16 *palette);
+
 #endif //POKEEMERALD_MON_MARKINGS_H
diff --git a/include/party_menu.h b/include/party_menu.h
index cb2c38891..02e481200 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -57,5 +57,8 @@ u8 sub_81B1360(void);
 void sub_81B8904(u8 arg0, void (*callback)(void));
 void OpenPartyMenuInBattle(u8 caseId);
 u16 ItemIdToBattleMoveId(u16 itemId);
+u8 sub_81B205C(struct Pokemon* a);
+u8 sub_81B6D14(u16 a);
+bool8 hm_add_c3_without_phase_2(void);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/pokeball.h b/include/pokeball.h
index 84178b5b2..30a1d8b11 100644
--- a/include/pokeball.h
+++ b/include/pokeball.h
@@ -18,6 +18,8 @@ enum
     POKEBALL_COUNT
 };
 
+extern const struct SpriteTemplate gBallSpriteTemplates[];
+
 #define POKEBALL_PLAYER_SENDOUT     0xFF
 #define POKEBALL_OPPONENT_SENDOUT   0xFE
 
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index 03f4e0da6..9b5358f06 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -83,5 +83,6 @@ void CompactPartySlots(void);
 u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
 bool8 CheckFreePokemonStorageSpace(void);
 u8 StorageGetCurrentBox(void);
+u8 sub_80D214C(struct BoxPokemon *a, u8 b, u8 c, u8 d);
 
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 75caa9a3a..3d3b6f0e3 100755
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -2,6 +2,24 @@
 #define GUARD_POKEMON_SUMMARY_SCREEN_H
 
 void sub_81C4F98(u8, void(*)(void));
-void ShowSelectMovePokemonSummaryScreen(void *a, u8 b, u8 c, void *d, u16 e);
+void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
+
+// The Pokemon Summary Screen can operate in different modes. Certain features,
+// such as move re-ordering, are available in the different modes.
+enum PokemonSummaryScreenMode
+{
+    PSS_MODE_NORMAL,
+    PSS_MODE_UNK1,
+    PSS_MODE_UNK2,
+    PSS_MODE_SELECT_MOVE,
+};
+
+enum PokemonSummaryScreenPage
+{
+	PSS_PAGE_INFO,
+	PSS_PAGE_SKILLS,
+	PSS_PAGE_BATTLE_MOVES,
+	PSS_PAGE_CONTEST_MOVES,
+};
 
 #endif // GUARD_POKEMON_SUMMARY_SCREEN_H
diff --git a/include/region_map.h b/include/region_map.h
index af331ad81..6339f7a88 100644
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -94,5 +94,6 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag);
 u8 *GetMapName(u8 *, u16, u16);
 bool32 sub_8124668(u8 mapSecId);
 u8 *sub_81245DC(u8 *dest, u16 mapSecId);
+u8 *sub_8124610(u8 *dest, u16 mapSecId);
 
 #endif //GUARD_REGION_MAP_H
diff --git a/include/strings.h b/include/strings.h
index f8b216a39..f88425b26 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -776,4 +776,52 @@ extern const u8 gText_TeachWhichMoveToPkmn[];
 extern const u8 gText_GiveUpTeachingNewMove[];
 extern const u8 gText_TeachX[];
 
+extern const u8 gText_LevelSymbol[];
+extern const u8 gText_PkmnInfo[];
+extern const u8 gText_PkmnSkills[];
+extern const u8 gText_BattleMoves[];
+extern const u8 gText_ContestMoves[];
+extern const u8 gText_HMMovesCantBeForgotten2[];
+extern const u8 gText_Info[];
+extern const u8 gText_Switch[];
+extern const u8 gText_RentalPkmn[];
+extern const u8 gText_TypeSlash[];
+extern const u8 gText_HP4[];
+extern const u8 gText_Attack3[];
+extern const u8 gText_Defense3[];
+extern const u8 gText_SpAtk4[];
+extern const u8 gText_SpDef4[];
+extern const u8 gText_Speed2[];
+extern const u8 gText_ExpPoints[];
+extern const u8 gText_NextLv[];
+extern const u8 gText_Status[];
+extern const u8 gText_Power[];
+extern const u8 gText_Accuracy2[];
+extern const u8 gText_Appeal[];
+extern const u8 gText_Jam[];
+extern const u8 gText_OTSlash[];
+extern const u8 gText_UnkCtrlF907F908[];
+extern const u8 gText_XNature[];
+extern const u8 gText_XNatureHatchedAtYZ[];
+extern const u8 gText_XNatureHatchedSomewhereAt[];
+extern const u8 gText_XNatureMetAtYZ[];
+extern const u8 gText_XNatureMetSomewhereAt[];
+extern const u8 gText_XNatureFatefulEncounter[];
+extern const u8 gText_XNatureProbablyMetAt[];
+extern const u8 gText_XNatureObtainedInTrade[];
+extern const u8 gText_EmptyString5[];
+extern const u8 gText_EggWillTakeALongTime[];
+extern const u8 gText_EggAboutToHatch[];
+extern const u8 gText_EggWillHatchSoon[];
+extern const u8 gText_EggWillTakeSomeTime[];
+extern const u8 gText_PeculiarEggNicePlace[];
+extern const u8 gText_PeculiarEggTrade[];
+extern const u8 gText_EggFromTraveler[];
+extern const u8 gText_EggFromHotSprings[];
+extern const u8 gText_OddEggFoundByCouple[];
+extern const u8 gText_None[];
+extern const u8 gText_RibbonsVar1[];
+extern const u8 gText_OneDash[];
+extern const u8 gText_TwoDashes[];
+
 #endif //GUARD_STRINGS_H