23 files changed, 228 insertions, 51 deletions
diff --git a/include/battle.h b/include/battle.h
index c06bdaad5..52c4ee8ae 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -623,7 +623,7 @@ struct BattleHealthboxInfo
     u8 battlerBounceSpriteId;
     u8 animationState;
     u8 field_5;
-    u8 field_6;
+    u8 matrixNum;
     u8 shadowSpriteId;
     u8 field_8;
     u8 field_9;
diff --git a/include/battle_anim.h b/include/battle_anim.h
index e0c1b2b08..1c2093da9 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -75,77 +75,88 @@ int GetAnimBgAttribute(u8 bgId, u8 attributeId);
 
 // battle_anim_80A5C6C.s
 void sub_80A6450(struct Sprite *sprite);
-void SetAverageBattlerPositions(u8 battlerId, bool8 a2, s16 *x, s16 *y);
-void move_anim_8074EE0(struct Sprite *sprite);
-void sub_80A656C(struct Sprite *sprite);
-void InitAnimSpritePos(struct Sprite *sprite, u8 a2);
-void sub_80A6980(struct Sprite *sprite, bool8 a2);
+void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y);
+void DestroySpriteAndMatrix(struct Sprite *sprite);
+void AnimTranslateLinearSimple(struct Sprite *sprite);
+void InitSpritePosToAnimAttacker(struct Sprite *sprite, u8 a2);
+void InitSpritePosToAnimTarget(struct Sprite *sprite, bool8 a2);
 void StartAnimLinearTranslation(struct Sprite *sprite);
 void InitAnimArcTranslation(struct Sprite *sprite);
-bool8 TranslateAnimLinear(struct Sprite *sprite);
+bool8 AnimTranslateLinear(struct Sprite *sprite);
 void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite);
 void sub_80A8EE4(struct Sprite *sprite);
 u8 GetBattlerSpriteCoord2(u8 battlerId, u8 attributeId);
 void sub_80A6FD4(struct Sprite *sprite);
 u16 ArcTan2Neg(s16 a, s16 b);
-void sub_80A73E0(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation);
-void sub_80A67BC(struct Sprite *sprite);
+void TrySetSpriteRotScale(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation);
+void RunStoredCallbackWhenAffineAnimEnds(struct Sprite *sprite);
 void sub_80A66DC(struct Sprite *sprite);
-void sub_80A6838(struct Sprite *sprite);
-void sub_80A67D8(struct Sprite *sprite);
-void sub_80A6864(struct Sprite *sprite, s16 a2);
+void SetSpriteCoordsToAnimAttackerCoords(struct Sprite *sprite);
+void RunStoredCallbackWhenAnimEnds(struct Sprite *sprite);
+void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 a2);
 s16 sub_80A861C(u8 battlerId, u8 a2);
 u8 GetBattlerYCoordWithElevation(u8 battlerId);
 void WaitAnimForDuration(struct Sprite *sprite);
 void sub_80A7938(struct Sprite *sprite);
 void InitAnimLinearTranslation(struct Sprite *sprite);
 void sub_80A6F98(struct Sprite *sprite);
-u8 sub_80A8328(u8 battlerId);
-void *sub_80A8050(s16 bottom, s16 top);
-void sub_80A8048(s16 *bottom, s16 *top, const void *ptr);
+u8 GetBattlerSpriteBGPriority(u8 battlerId);
+void *LoadPointerFromVars(s16 bottom, s16 top);
+void StorePointerInVars(s16 *bottom, s16 *top, const void *ptr);
 void sub_80A8278(void);
 void sub_80A6B30(struct UnknownAnimStruct2*);
 void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1);
-u8 sub_80A82E4(u8 battlerId);
+u8 GetBattlerSpriteSubpriority(u8 battlerId);
 bool8 TranslateAnimArc(struct Sprite *sprite);
 void sub_80A6630(struct Sprite *sprite);
 void sub_80A6680(struct Sprite *sprite);
-void sub_80A7344(u8 spriteId);
-void obj_id_set_rotscale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
+void ResetSpriteRotScale(u8 spriteId);
+void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
 void InitSpriteDataForLinearTranslation(struct Sprite *sprite);
-void sub_80A7270(u8 spriteId, u8 objMode);
-void sub_80A73A0(u8 spriteId);
+void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 objMode);
+void SetBattlerSpriteYOffsetFromRotation(u8 spriteId);
 u32 sub_80A75AC(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7);
 u32 sub_80A76C4(u8 a1, u8 a2, u8 a3, u8 a4);
 u8 sub_80A77AC(u8 a1);
-s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8);
+s16 CloneBattlerSpriteWithBlend(u8);
 void obj_delete_but_dont_free_vram(struct Sprite*);
 u8 sub_80A89C8(int, u8, int);
 void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32);
 void sub_80A6CC0(u32, const void*, u32);
 void sub_80A6DAC(bool8);
-void sub_80A634C(struct Sprite *);
+void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *);
 void sub_80A653C(struct Sprite *);
-void sub_80A7E6C(u8 spriteId);
+void SetBattlerSpriteYOffsetFromYScale(u8 spriteId);
 void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7);
 u8 sub_80A80C8(struct Task *task);
 void sub_80A8EE4(struct Sprite *);
 void sub_80A67F4(struct Sprite *);
 void sub_80A6D48(u32 bgId, const void *src);
-void sub_80A7160(struct Sprite *sprite);
-bool8 sub_80A70E8(struct Sprite *sprite);
-void sub_80A70C0(struct Sprite *sprite);
+void InitAnimFastLinearTranslationWithSpeed(struct Sprite *sprite);
+bool8 AnimFastTranslateLinear(struct Sprite *sprite);
+void InitAndRunAnimFastLinearTranslation(struct Sprite *sprite);
 void TranslateMonBGUntil(struct Sprite *sprite);
 void TranslateSpriteOverDuration(struct Sprite *sprite);
 void sub_80A77C8(struct Sprite *sprite);
+void sub_80A7000(struct Sprite *sprite);
+void TranslateSpriteInCircleOverDuration(struct Sprite *sprite);
+void SetGreyscaleOrOriginalPalette(u16 a1, bool8 a2);
+void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds);
+bool8 RunAffineAnimFromTaskData(struct Task *task);
+void sub_80A78AC(struct Sprite *sprite);
+void sub_80A6BFC(struct UnknownAnimStruct2 *unk, u8 unused);
+u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10);
+void sub_80A749C(struct Sprite *sprite);
+void sub_80A6814(u8 taskId);
+void sub_80A8610(struct Sprite *sprite);
 
 enum
 {
     BATTLER_COORD_X,
     BATTLER_COORD_Y,
     BATTLER_COORD_X_2,
-    BATTLER_COORD_3,
-    BATTLER_COORD_4,
+    BATTLER_COORD_Y_PIC_OFFSET,
+    BATTLER_COORD_Y_PIC_OFFSET_DEFAULT,
 };
 
 u8 GetBattlerSpriteCoord(u8 battlerId, u8 attributeId);
@@ -155,11 +166,10 @@ void sub_80A6C68(u32 arg0);
 u8 GetAnimBattlerSpriteId(u8 wantedBattler);
 bool8 IsDoubleBattle(void);
 u8 sub_80A6D94(void);
-u8 sub_80A8364(u8 battlerId);
+u8 GetBattlerSpriteBGPriorityRank(u8 battlerId);
 void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*));
 void oamt_add_pos2_onto_pos1(struct Sprite *sprite);
 u8 GetBattlerSpriteDefault_Y(u8 battlerId);
-u8 sub_80A82E4(u8 battlerId);
 u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
 
 // battle_anim_80A9C70.s
@@ -173,6 +183,9 @@ u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
 #define STAT_ANIM_MULTIPLE_MINUS2 58
 void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId);
 
+// ground.c
+void sub_81152DC(u8 taskId);
+
 // battle_anim_8170478.s
 u8 ItemIdToBallId(u16 itemId);
 u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId);
@@ -180,6 +193,7 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes,
 
 // battle_anim_utility_funcs.s
 void sub_8116EB4(u8);
+void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u8 *arg8, const u8 *arg9, const u16 *palette);
 
 u32 UnpackSelectedBattleAnimPalettes(s16);
 
diff --git a/include/battle_main.h b/include/battle_main.h
index 5a61b5ef0..18bdde2f1 100644
--- a/include/battle_main.h
+++ b/include/battle_main.h
@@ -7,6 +7,20 @@ struct TrainerMoney
     u8 value;
 };
 
+struct UnknownPokemonStruct4
+{
+    /*0x00*/ u16 species;
+    /*0x02*/ u16 heldItem;
+    /*0x04*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
+    /*0x0F*/ u8 level;
+    /*0x10*/ u16 hp;
+    /*0x12*/ u16 maxhp;
+    /*0x14*/ u32 status;
+    /*0x18*/ u32 personality;
+    /*0x1C*/ u8 gender;
+    /*0x1D*/ u8 language;
+};
+
 #define TYPE_NAME_LENGTH 6
 #define ABILITY_NAME_LENGTH 12
 
@@ -70,6 +84,8 @@ void RunBattleScriptCommands_PopCallbacksStack(void);
 void RunBattleScriptCommands(void);
 bool8 TryRunFromBattle(u8 battlerId);
 
+extern struct UnknownPokemonStruct4 gUnknown_02022FF8[3];
+
 extern const u8 gTypeEffectiveness[336];
 extern const u8 gTypeNames[][TYPE_NAME_LENGTH + 1];
 extern const struct TrainerMoney gTrainerMoneyTable[];
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
index 4967c814d..7a97c4caf 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -260,4 +260,7 @@
 #define TRACKS_FOOT       1
 #define TRACKS_BIKE_TIRE  2
 
+#define EVENT_OBJ_ID_PLAYER 0xFF
+#define EVENT_OBJ_ID_CAMERA 0x7F
+
 #endif  // GUARD_CONSTANTS_EVENT_OBJECTS_H
diff --git a/include/contest.h b/include/contest.h
index c205737ee..54c431b94 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -416,7 +416,6 @@ extern struct ContestResources *gContestResources;
 #define eContestAI (gContestResources->field_C)
 #define shared19328 (*gContestResources->field_10)
 #define shared19338 (*gContestResources->field_14)
-#define shared19348 (*gContestResources->field_18)
 
 #define shared15800 (gHeap + 0x18000)
 #define shared18000 (*(struct Shared18000 *)(gHeap + 0x1a000))
@@ -433,6 +432,7 @@ bool8 Contest_IsMonsTurnDisabled(u8 a);
 bool8 sub_80DE1E8(u8 a);
 void SetStartledString(u8 a, u8 b);
 s8 Contest_GetMoveExcitement(u16);
+u8 sub_80DAE0C(struct Pokemon *);
 void sub_80DEDA8(u8);
 
 #endif //GUARD_CONTEST_H
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 541fa6c1b..23fd9ed83 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_EASYCHAT_H
 #define GUARD_EASYCHAT_H
 
+#include "main.h"
+
 void InitEasyChatPhrases(void);
 void easy_chat_input_maybe(void);
 u8 * CopyEasyChatWord(u8 *dest, u16 word);
@@ -12,5 +14,6 @@ u16 sub_811EE38(u16 group);
 u16 sub_811F01C(void);
 bool16 EasyChat_GetNumWordsInGroup(u8);
 u16 sub_811EE90(u16);
+void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam);
 
 #endif // GUARD_EASYCHAT_H
diff --git a/include/fldeff_softboiled.h b/include/fldeff_softboiled.h
new file mode 100755
index 000000000..abb3c7913
--- /dev/null
+++ b/include/fldeff_softboiled.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_FLDEFF_SOFTBOILED_H
+#define GUARD_FLDEFF_SOFTBOILED_H
+
+void sub_81615A8(u8 taskId);
+void sub_8161560(u8 taskId);
+
+#endif // GUARD_FLDEFF_SOFTBOILED_H
diff --git a/include/graphics.h b/include/graphics.h
index 33a26068b..d7bdf096e 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3911,6 +3911,11 @@ extern const u16 gIntro2BrendanNoTurnPal[];
 extern const u16 gIntro2FlygonPal[];
 extern const u32 gIntro2FlygonGfx[];
 
+// party menu graphics
+extern const u32 gPartyMenuMisc_Gfx[];
+extern const u32 gPartyMenuMisc_Tilemap[];
+extern const u8 gPartyMenuMisc_Pal[];
+
 // berry pics
 extern const u32 gBerryPic_Cheri[];
 extern const u32 gBerryPalette_Cheri[];
@@ -4154,6 +4159,8 @@ extern const u32 gBattleAnimSpriteSheet_050[];
 extern const u32 gBattleAnimSpriteSheet_051[];
 extern const u32 gBattleAnimSpriteSheet_052[];
 extern const u32 gBattleAnimSpriteSheet_053[];
+extern const u32 gUnknown_08C2EA50[];
+extern const u32 gUnknown_08C2EA9C[];
 extern const u32 gBattleAnimSpriteSheet_054[];
 extern const u32 gBattleAnimSpriteSheet_055[];
 extern const u32 gBattleAnimSpriteSheet_056[];
@@ -4372,6 +4379,9 @@ extern const u32 gBattleAnimSpriteSheet_280[];
 extern const u32 gBattleAnimSpriteSheet_281[];
 extern const u32 gBattleAnimSpriteSheet_282[];
 extern const u32 gBattleAnimSpriteSheet_283[];
+extern const u32 gBattleAnimBackgroundTilemap_ScaryFacePlayer[];
+extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceOpponent[];
+extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceContest[];
 extern const u32 gBattleAnimSpriteSheet_284[];
 extern const u32 gBattleAnimSpriteSheet_285[];
 
@@ -4584,10 +4594,15 @@ extern const u32 gBattleAnimSpritePalette_209[];
 extern const u32 gBattleAnimSpritePalette_210[];
 extern const u32 gBattleAnimSpritePalette_211[];
 extern const u32 gBattleAnimSpritePalette_215[];
+extern const u32 gUnknown_08C249D0[];
+extern const u32 gUnknown_08C249F8[];
 extern const u32 gBattleAnimSpritePalette_216[];
 extern const u32 gBattleAnimSpritePalette_217[];
 extern const u32 gBattleAnimSpritePalette_218[];
 extern const u32 gBattleAnimSpritePalette_219[];
+extern const u32 gUnknown_08C232E0;
+extern const u32 gUnknown_08C23D50;
+extern const u32 gUnknown_08C23D78;
 extern const u32 gBattleAnimSpritePalette_220[];
 extern const u32 gBattleAnimSpritePalette_221[];
 extern const u32 gBattleAnimSpritePalette_222[];
@@ -4611,6 +4626,9 @@ extern const u32 gBattleAnimSpritePalette_241[];
 extern const u32 gBattleAnimSpritePalette_242[];
 extern const u32 gBattleAnimSpritePalette_243[];
 extern const u32 gBattleAnimSpritePalette_244[];
+extern const u8 gUnknown_08C2DC68[];
+extern const u16 gUnknown_08C2DDA4[];
+extern const u8 gUnknown_08C2DDC4[];
 extern const u32 gBattleAnimSpritePalette_245[];
 extern const u32 gBattleAnimSpritePalette_248[];
 extern const u32 gBattleAnimSpritePalette_249[];
@@ -4689,6 +4707,9 @@ extern const u32 gBattleAnimBackgroundTilemap_07[];
 extern const u32 gBattleAnimBackgroundTilemap_08[];
 extern const u32 gBattleAnimBackgroundTilemap_09[];
 extern const u32 gBattleAnimBackgroundTilemap_10[];
+extern const u32 gUnknown_08C2A634[];
+extern const u32 gUnknown_08C2A6D4[];
+extern const u32 gUnknown_08C2A6EC[];
 extern const u32 gBattleAnimBackgroundTilemap_11[];
 extern const u32 gBattleAnimBackgroundTilemap_12[];
 extern const u32 gBattleAnimBackgroundTilemap_13[];
@@ -4720,6 +4741,13 @@ extern const u32 gUnknown_08C16FA8[];
 extern const u32 gUnknown_08C16E90[];
 extern const u32 gUnknown_08C17170[];
 
+extern const u32 gUnknown_08D95E00[];
+extern const u32 gUnknown_08D960D0[];
+extern const u32 gUnknown_08D963A4[];
+extern const u32 gBattleAnimBackgroundImage_Surf[];
+extern const u32 gBattleAnimBackgroundPalette_Surf[];
+extern const u32 gBattleAnimBackgroundImageMuddyWater_Pal[];
+
 // Berry blender
 extern const u32 gBerryBlenderArrowTiles[];
 extern const u32 gBerryBlenderStartTiles[];
@@ -4749,9 +4777,4 @@ extern const u32 gCableCarDoor_Gfx[];
 extern const u32 gCableCarCord_Gfx[];
 extern const u16 gCableCar_Pal[];
 
-// Battle Anim
-extern const u32 gUnknown_08C2DDA4[];
-extern const u32 gUnknown_08C2EA50[];
-extern const u32 gUnknown_08C2EA9C[];
-
 #endif //GUARD_GRAPHICS_H
diff --git a/include/item_menu.h b/include/item_menu.h
index ce439e282..a904208d9 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -77,5 +77,6 @@ void CB2_BagMenuFromStartMenu(void);
 u8 GetItemListPosition(u8 pocketId);
 bool8 UseRegisteredKeyItemOnField(void);
 void CB2_GoToSellMenu(void);
+void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)());
 
 #endif //GUARD_item_menu_H
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 426565e56..e394e2611 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -2,6 +2,7 @@
 #define GUARD_LINK_RFU_H
 
 #include "librfu.h"
+#include "link.h"
 
 // Exported type declarations
 
diff --git a/include/math_util.h b/include/math_util.h
new file mode 100755
index 000000000..6b0d42460
--- /dev/null
+++ b/include/math_util.h
@@ -0,0 +1,14 @@
+#ifndef GUARD_MATH_UTIL_H
+#define GUARD_MATH_UTIL_H
+
+s16 sub_8151534(s16 x, s16 y);
+s16 sub_8151550(u8 s, s16 x, s16 y);
+s32 sub_8151574(s32 x, s32 y);
+s16 sub_81515B0(s16 x, s16 y);
+s16 sub_81515D4(u8 s, s16 x, s16 y);
+s32 sub_81515FC(s32 x, s32 y);
+s16 sub_8151624(s16 y);
+s16 sub_815163C(u8 s, s16 y);
+s32 sub_815165C(s32 y);
+
+#endif // GUARD_MATH_UTIL_H
diff --git a/include/menu.h b/include/menu.h
index 894dfd78e..2606b1f58 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -91,5 +91,8 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo
 void sub_8197AE8(bool8 copyToVram);
 void sub_81997AC(u8 windowId, u8 a4, u8 a6, u8 a7, const struct MenuAction *strs);
 s8 Menu_ProcessInputGridLayout(void);
+u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, bool8 APressMuted);
+s8 Menu_ProcessInputNoWrapAround_other(void);
+void sub_8199CBC(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height);
 
 #endif // GUARD_MENU_H
diff --git a/include/party_menu.h b/include/party_menu.h
index cb82eb82c..27a043cb6 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_PARTY_MENU_H
 #define GUARD_PARTY_MENU_H
 
+#include "main.h"
 #include "task.h"
 
 enum
@@ -10,7 +11,9 @@ enum
     AILMENT_PRZ,
     AILMENT_SLP,
     AILMENT_FRZ,
-    AILMENT_BRN
+    AILMENT_BRN,
+    AILMENT_PKRS,
+    AILMENT_FNT
 };
 
 enum
@@ -23,18 +26,23 @@ enum
     PARTY_GIVE_ITEM,
 };
 
-struct Struct203CEC8
-{
-    u8 filler[0x9];
+struct Struct203CEC8 {
+    MainCallback exitCallback;
+    TaskFunc unk4;
+    u8 unk8_0:4;
+    u8 mode:2;
+    u8 unk8_2:2;
     s8 unk9;
     s8 unkA;
     u8 unkB;
-    u8 filler2[0x2];
+    u16 unkC;
+    s16 unkE;
+    s16 unk10;
 };
 
 extern struct Struct203CEC8 gUnknown_0203CEC8;
 
-extern const u16 gUnknown_0861500C[];
+extern const u16 gUnknown_0861500C[]; // tutor table
 
 bool8 pokemon_has_move(struct Pokemon *, u16);
 void sub_81B58A8(void);
@@ -47,9 +55,9 @@ void sub_81B7F60(void);
 
 void sub_81B0FCC(u8 partyIdx, u8 a);
 void sub_81B1370(u8 taskId);
-void display_pokemon_menu_message(u8 windowId);
+void display_pokemon_menu_message(u32 windowId);
 void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func);
-void sub_81B1B5C(void *a, u8 b);
+u8 sub_81B1B5C(const u8 *a, u8 b);
 u8 sub_81B1BD4(void);
 void sub_81B8448(void);
 void sub_81B8518(u8 unused);
@@ -62,13 +70,13 @@ void sub_81B617C(void);
 u8 sub_81B6D14(u16 a);
 bool8 hm_add_c3_without_phase_2(void);
 
-extern void dp05_ether(u8, u16, TaskFunc);
-extern void dp05_pp_up(u8, u16, TaskFunc);
-extern void dp05_rare_candy(u8, u16, TaskFunc);
+extern void dp05_ether(u8, TaskFunc);
+extern void dp05_pp_up(u8, TaskFunc);
+extern void dp05_rare_candy(u8, TaskFunc);
 
-extern void sub_81B67C8(u8, u16, TaskFunc);
-extern void sub_81B79E8(u8, u16, TaskFunc);
-extern void sub_81B6DC4(u8, u16, TaskFunc);
-extern void sub_81B7C74(u8, u16, TaskFunc);
+extern void sub_81B67C8(u8, TaskFunc);
+extern void sub_81B79E8(u8, TaskFunc);
+extern void sub_81B6DC4(u8, TaskFunc);
+extern void sub_81B7C74(u8, TaskFunc);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/player_pc.h b/include/player_pc.h
index bd060faa8..5a0b83683 100644
--- a/include/player_pc.h
+++ b/include/player_pc.h
@@ -84,5 +84,6 @@ extern const struct MenuAction gMailboxMailOptions[];
 
 void ReshowPlayerPC(u8 taskId);
 void sub_816B31C(void);
+void Mailbox_ReturnToMailListAfterDeposit(void);
 
 #endif //GUARD_PLAYER_PC_H
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index f1c8a3e61..17c7d5573 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -16,5 +16,7 @@ u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u
 u8 UpdateMonIconFrame(struct Sprite *sprite);
 void LoadMonIconPalette(u16 species);
 void sub_80D328C(struct Sprite *sprite);
+void sub_80D3014(struct Sprite *sprite);
+void sub_80D32C8(struct Sprite *sprite, u8 animNum);
 
 #endif // GUARD_POKEMON_ICON_H
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index 9b5358f06..7f618498b 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -84,5 +84,6 @@ 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);
+bool32 sub_80D23A8(u16 move);
 
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 5dc37c70d..63d740949 100755
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -1,9 +1,12 @@
 #ifndef GUARD_POKEMON_SUMMARY_SCREEN_H
 #define GUARD_POKEMON_SUMMARY_SCREEN_H
 
+extern u8 gUnknown_0203CF20;
+
 void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
 void sub_81C4F98(u8, void(*)(void));
 void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
+u8 sub_81C1B94(void);
 
 // The Pokemon Summary Screen can operate in different modes. Certain features,
 // such as move re-ordering, are available in the different modes.
diff --git a/include/pokenav.h b/include/pokenav.h
index 1fde8aa44..d8f0c9f97 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -36,5 +36,7 @@ u8 GetCurrentTrainerHillMapId(void);
 u8 sub_81D6490(void);
 const struct WarpEvent *sub_81D6120(void);
 const struct WarpEvent *sub_81D6134(u8);
+void sub_81D3640(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5);
+void sub_81D3784(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4);
 
 #endif //GUARD_POKENAV_H
diff --git a/include/region_map.h b/include/region_map.h
index 0c82232cf..ed1c1a201 100644
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -107,6 +107,7 @@ u8 *sub_8124610(u8 *dest, u16 mapSecId);
 u16 CorrectSpecialMapSecId(u16 mapSecId);
 void sub_8122D88(struct RegionMap *regionMap);
 void PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs(s16 x, s16 y);
+void MCB2_FlyMap(void);
 
 extern const struct RegionMapLocation gRegionMapEntries[];
 
diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h
index b6ca0e248..c1bdbdf34 100644
--- a/include/rom_8011DC0.h
+++ b/include/rom_8011DC0.h
@@ -5,11 +5,16 @@
 
 // Exported RAM declarations
 
+extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38;
+extern u16 gUnknown_02022C3C;
+extern u8 gUnknown_02022C3E;
+
 // Exported ROM declarations
 
 void sub_8018438(void);
 u16 mevent_081445C0(u8);
 void sub_801B990(u32, u32);
 u8 sub_8013F78(void);
+bool32 sub_802C908(u16);
 
 #endif //GUARD_rom_8011DC0_H
diff --git a/include/scanline_effect.h b/include/scanline_effect.h
index eb837e7e2..5bd8b5546 100644
--- a/include/scanline_effect.h
+++ b/include/scanline_effect.h
@@ -3,6 +3,7 @@
 
 // DMA control value to transfer a single 16-bit value at HBlank
 #define SCANLINE_EFFECT_DMACNT_16BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_16BIT | DMA_DEST_RELOAD) << 16) | 1)
+#define SCANLINE_EFFECT_DMACNT_32BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_32BIT | DMA_DEST_RELOAD) << 16) | 1)
 
 #define SCANLINE_EFFECT_REG_BG0HOFS (REG_ADDR_BG0HOFS - REG_ADDR_BG0HOFS)
 #define SCANLINE_EFFECT_REG_BG0VOFS (REG_ADDR_BG0VOFS - REG_ADDR_BG0HOFS)
diff --git a/include/strings.h b/include/strings.h
index 02eaeb19f..a6f61f603 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -401,6 +401,69 @@ extern const u8 gText_ThreeDashes[];
 // party menu text
 extern const u8 gText_PkmnHPRestoredByVar2[];
 extern const u8 gText_CantBeUsedOnPkmn[];
+extern const u8 gText_CancelParticipation[];
+extern const u8 gText_PkmnWasGivenItem[];
+extern const u8 gText_RecievedItemFromPkmn[];
+extern const u8 gText_SwitchPkmnItem[];
+extern const u8 gText_SwitchedPkmnItem[];
+extern const u8 gText_BagFullCouldNotRemoveItem[];
+extern const u8 gText_PkmnCantParticipate[];
+extern const u8 gText_PkmnNotHolding[];
+extern const u8 gText_ThrowAwayItem[];
+extern const u8 gText_ItemThrownAway[];
+extern const u8 gText_SendMailToPC[];
+extern const u8 gText_MailSentToPC[];
+extern const u8 gText_PCMailboxFull[];
+extern const u8 gText_MailMessageWillBeLost[];
+extern const u8 gText_MailTakenFromPkmn[];
+extern const u8 gText_NoMoreThanVar1Pkmn[];
+extern const u8 gText_PkmnCantBeTradedNow[];
+extern const u8 gText_EggCantBeTradedNow[];
+extern const u8 gText_OnlyPkmnForBattle[];
+extern const u8 gJPText_PutVar1IntoSpinner[];
+extern const u8 gText_PauseUntilPress[];
+extern const u8 gText_CantUseUntilNewBadge[];
+extern const u8 gText_ReturnToHealingSpot[];
+extern const u8 gText_EscapeFromHere[];
+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_PkmnGotOverInfatuation[];
+extern const u8 gText_PkmnBecameHealthy[];
+extern const u8 gText_HP3[];
+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_WontHaveEffect[];
+extern const u8 gText_PkmnSnappedOutOfConfusion[];
+extern const u8 gText_PkmnFriendlyBaseVar2Fell[];
+extern const u8 gText_PkmnFriendlyBaseVar2CantFall[];
+extern const u8 gText_PkmnAdoresBaseVar2Fell[];
+extern const u8 gText_PkmnAlreadyKnows[];
+extern const u8 gText_PkmnCantLearnMove[];
+extern const u8 gText_PkmnNeedsToReplaceMove[];
+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[];
+extern const u8 gText_PkmnElevatedToLvVar2[];
+extern const u8 gText_RemoveMailBeforeItem[];
+extern const u8 gText_PkmnHoldingItemCantHoldMail[];
+extern const u8 gText_MailTransferredFromMailbox[];
+extern const u8 gText_CancelBattle[];
+extern const u8 gText_ReturnToWaitingRoom[];
+extern const u8 gText_CancelChallenge[];
+extern const u8 gText_CantSwitchWithAlly[];
+extern const u8 gText_PkmnHasNoEnergy[];
+extern const u8 gText_EggCantBattle[];
+extern const u8 gText_PkmnAlreadySelected[];
+extern const u8 gText_PkmnAlreadyInBattle[];
+extern const u8 gText_PkmnCantSwitchOut[];
 
 //pokedex text
 extern const u8 gText_CryOf[];
diff --git a/include/trade.h b/include/trade.h
index af4da0015..e3c18bffd 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_TRADE_H
 #define GUARD_TRADE_H
 
+#include "link_rfu.h"
+
 // Exported type declarations
 
 // Exported RAM declarations
@@ -10,5 +12,8 @@
 s32 sub_807A728(void);
 void sub_80773AC(void);
 void sub_807AE50(void);
+int sub_807A8D0(u32 /* probably wrong */, u16, u16, u8);
+int sub_807A7E0(u32 /* probably wrong */, u32 /* probably wrong */, u16, u16, u16, u16, u8);
+int sub_807A918(struct Pokemon*, u16);
 
 #endif //GUARD_TRADE_H