9 files changed, 100 insertions, 14 deletions
diff --git a/include/constants/global.h b/include/constants/global.h
index f8cfaa4b0..6a05d169e 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -6,6 +6,7 @@
 #define ITEM_NAME_LENGTH 14
 #define POKEMON_NAME_LENGTH 10
 #define OT_NAME_LENGTH 7
+#define MOVE_NAME_LENGTH 12
 
 #define VERSION_SAPPHIRE    1
 #define VERSION_RUBY        2
diff --git a/include/main.h b/include/main.h
index f89ffbd63..a27145c7b 100644
--- a/include/main.h
+++ b/include/main.h
@@ -1,12 +1,12 @@
 #ifndef GUARD_MAIN_H
 #define GUARD_MAIN_H
 
-#include "global.h"
-
 typedef void (*MainCallback)(void);
 typedef void (*IntrCallback)(void);
 typedef void (*IntrFunc)(void);
 
+#include "global.h"
+
 extern IntrFunc gIntrTable[];
 
 struct Main
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 0c0623cc0..2aeef23e9 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -15,7 +15,7 @@ struct YesNoFuncTable
 };
 
 bool16 RunTextPrinters_CheckActive(u8 textPrinterId);
-bool32 MenuHelpers_CallLinkSomething(void);
+bool8 MenuHelpers_CallLinkSomething(void);
 bool8 sub_80BF748(void);
 bool8 MenuHelpers_LinkSomething(void);
 void SetVBlankHBlankCallbacksToNull(void);
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index e2eebc62b..b24f4e785 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -30,5 +30,7 @@ u8 GetMonIconPaletteIndexFromSpecies(u16 species);
 u16 GetIconSpecies(u16 species, u32 personality);
 void LoadMonIconPalettesAt(u16 offset);
 u8 GetValidMonIconPalIndex(u16 species);
+void SafeLoadMonIconPalette(u16 species);
+void SafeFreeMonIconPalette(u16 species);
 
 #endif // GUARD_POKEMON_ICON_H
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 2b8f96316..f70337677 100644
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -3,16 +3,16 @@
 
 #include "main.h"
 
-extern u8 gLastViewedMonIndex;
-
-extern const u8 *const gMoveDescriptionPointers[];
-extern const u8 *const gNatureNamePointers[];
+extern const u8 * const gMoveDescriptionPointers[];
+extern const u8 * const gNatureNamePointers[];
 
 void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
-void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
 u8 GetMoveSlotToReplace(void);
 void SummaryScreen_SetUnknownTaskId(u8 a0);
 void SummaryScreen_DestroyUnknownTask(void);
+u8 GetLastViewedMonIndex(void);
+void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4);
+void sub_8138B38(u8);
 
 // The Pokemon Summary Screen can operate in different modes. Certain features,
 // such as move re-ordering, are available in the different modes.
@@ -20,20 +20,51 @@ enum PokemonSummaryScreenMode
 {
     PSS_MODE_NORMAL,
     PSS_MODE_UNK1,
-    PSS_MODE_BOX,
     PSS_MODE_SELECT_MOVE,
+    PSS_MODE_FORGET_MOVE,
+    PSS_MODE_UNK4,
+    PSS_MODE_BOX,
 };
 
 enum PokemonSummaryScreenPage
 {
     PSS_PAGE_INFO,
     PSS_PAGE_SKILLS,
-    PSS_PAGE_BATTLE_MOVES,
-    PSS_PAGE_CONTEST_MOVES,
+    PSS_PAGE_MOVES,
+    PSS_PAGE_MOVES_INFO,
+    PSS_PAGE_UNK4,
+    PSS_PAGE_MOVE_DELETER,
 };
 
-s32 GetLastViewedMonIndex(void);
-void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4);
-void sub_8138B38(u8);
+enum PokemonSummaryScreenState3270
+{
+    PSS_STATE3270_0,
+    PSS_STATE3270_1,
+    PSS_STATE3270_2,
+    PSS_STATE3270_3,
+    PSS_STATE3270_4,
+    PSS_STATE3270_5,
+    PSS_STATE3270_6
+};
+
+enum PokemonSummaryScreenStat
+{
+    PSS_STAT_ATK,
+    PSS_STAT_DEF,
+    PSS_STAT_SPA,
+    PSS_STAT_SPD,
+    PSS_STAT_SPE
+};
+
+#define TAG_PSS_UNK_64 0x64
+#define TAG_PSS_UNK_65 0x65
+#define TAG_PSS_UNK_66 0x66
+#define TAG_PSS_UNK_67 0x67
+#define TAG_PSS_UNK_6E 0x6E
+#define TAG_PSS_UNK_78 0x78
+#define TAG_PSS_UNK_82 0x82
+#define TAG_PSS_UNK_8C 0x8C
+#define TAG_PSS_UNK_96 0x96
+#define TAG_PSS_UNK_A0 0xA0
 
 #endif // GUARD_POKEMON_SUMMARY_SCREEN_H
diff --git a/include/strings.h b/include/strings.h
index fd224aea4..ce1a41a98 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1468,4 +1468,52 @@ extern const u8 gText_PokemonOnHook[];
 extern const u8 gText_NotEvenANibble[];
 extern const u8 gText_ItGotAway[];
 
+// pokemon_summary_screen
+extern const u8 gUnknown_8419C39[];
+extern const u8 gUnknown_8419C92[];
+extern const u8 gUnknown_8419CA2[];
+extern const u8 gUnknown_8419C45[];
+extern const u8 gUnknown_8419C82[];
+extern const u8 gUnknown_8416202[];
+extern const u8 gUnknown_84161EF[];
+extern const u8 gUnknown_841620E[];
+extern const u8 gUnknown_8416210[];
+extern const u8 gUnknown_8416238[];
+extern const u8 gUnknown_8419C13[];
+extern const u8 gUnknown_8419C0B[];
+extern const u8 gUnknown_841996D[];
+extern const u8 gUnknown_841992F[];
+extern const u8 gUnknown_84198D5[];
+extern const u8 gUnknown_84198B4[];
+extern const u8 gUnknown_84197ED[];
+extern const u8 gUnknown_84197B8[];
+extern const u8 gUnknown_8419841[];
+extern const u8 gUnknown_8419822[];
+extern const u8 gUnknown_841979D[];
+extern const u8 gUnknown_8419782[];
+extern const u8 gUnknown_84199F4[];
+extern const u8 gUnknown_84199AB[];
+extern const u8 gUnknown_8419860[];
+extern const u8 gUnknown_841988A[];
+extern const u8 gUnknown_8419C4D[];
+extern const u8 gUnknown_8419C59[];
+extern const u8 gUnknown_8419C1D[];
+extern const u8 gUnknown_8419C62[];
+extern const u8 gUnknown_8419C72[];
+extern const u8 gUnknown_8419C2A[];
+extern const u8 gUnknown_8419C7B[];
+extern const u8 gUnknown_8419CA9[];
+extern const u8 gUnknown_8419CB9[];
+extern const u8 gUnknown_8419B44[];
+extern const u8 gUnknown_8419B7B[];
+extern const u8 gUnknown_8419BAE[];
+extern const u8 gUnknown_8419BDB[];
+extern const u8 gUnknown_8419A3D[];
+extern const u8 gUnknown_8419B18[];
+extern const u8 gUnknown_8419A6E[];
+extern const u8 gUnknown_8419B18[];
+extern const u8 gUnknown_8419AA2[];
+extern const u8 gUnknown_8419ADE[];
+extern const u8 gUnknown_8419B18[];
+
 #endif //GUARD_STRINGS_H
diff --git a/include/text.h b/include/text.h
index f1bf8b942..cd10de3e6 100644
--- a/include/text.h
+++ b/include/text.h
@@ -141,6 +141,7 @@
 
 #define NUM_TEXT_PRINTERS 32
 
+#define TEXT_SPEED_INSTANT 0
 #define TEXT_SPEED_FF 0xFF
 
 enum
diff --git a/include/trade.h b/include/trade.h
index 196a46587..44d883f66 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -17,5 +17,6 @@ void CB2_ReturnFromLinkTrade(void);
 s32 Trade_CalcLinkPlayerCompatibilityParam(void);
 s32 CanRegisterMonForTradingBoard(struct GFtgtGnameSub rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet);
 s32 GetUnionRoomTradeMessageId(struct GFtgtGnameSub rfuPlayer, struct GFtgtGnameSub rfuPartner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, u8 isObedientBitSet);
+void CB2_ReturnToTradeMenuFromSummary(void);
 
 #endif //GUARD_TRADE_H
diff --git a/include/trainer_pokemon_sprites.h b/include/trainer_pokemon_sprites.h
index 23f6e2cab..fe4fc2510 100644
--- a/include/trainer_pokemon_sprites.h
+++ b/include/trainer_pokemon_sprites.h
@@ -17,5 +17,7 @@ u16 FreeAndDestroyTrainerPicSprite(u16);
 u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
 u16 CreateMonPicSprite_HandleDeoxys(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
 u16 LoadMonPicInWindow(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId);
+u16 CreateMonPicSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys);
+u16 CreateMonPicSprite_HandleDeoxys(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
 
 #endif // GUARD_TRAINER_POKEMON_SPRITES_H