27 files changed, 234 insertions, 95 deletions
diff --git a/include/berry.h b/include/berry.h
index 40715868b..c5a132ccb 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -62,6 +62,7 @@ void FieldObjectInteractionPickBerryTree(void);
 void FieldObjectInteractionRemoveBerryTree(void);
 u8 PlayerHasBerries(void);
 void ResetBerryTreeSparkleFlags(void);
+const struct Berry * sub_809C8A0(u8 berryIdx);
 
 extern const struct Berry gBerries[];
 
diff --git a/include/berry_pouch.h b/include/berry_pouch.h
new file mode 100644
index 000000000..8e652225b
--- /dev/null
+++ b/include/berry_pouch.h
@@ -0,0 +1,12 @@
+#ifndef GUARD_BERRY_POUCH_H
+#define GUARD_BERRY_POUCH_H
+
+#include "task.h"
+
+void BerryPouch_StartFadeToExitCallback(u8 taskId);
+void BerryPouch_SetExitCallback(void (*)(void));
+void InitBerryPouch(u8, void (*)(void), u8);
+void DisplayItemMessageInBerryPouch(u8 taskId, u8 bgId, const u8 * str, TaskFunc followUpFunc);
+void sub_813E2B8(u8 taskId);
+
+#endif //GUARD_BERRY_POUCH_H
diff --git a/include/berry_powder.h b/include/berry_powder.h
new file mode 100644
index 000000000..89582aacc
--- /dev/null
+++ b/include/berry_powder.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_BERRY_POWDER_H
+#define GUARD_BERRY_POWDER_H
+
+u32 GetBerryPowder(void);
+
+#endif //GUARD_BERRY_POWDER_H
diff --git a/include/bike.h b/include/bike.h
index 468c48273..68cc5f5c9 100644
--- a/include/bike.h
+++ b/include/bike.h
@@ -2,5 +2,7 @@
 #define GUARD_BIKE_H
 
 void sub_80BD620(u32 unkC, u32 unk10);
+bool8 sub_80BD540(void);
+void StartTransitionToFlipBikeState(u8 flags);
 
 #endif //GUARD_BIKE_H
diff --git a/include/constants/fanfares.h b/include/constants/fanfares.h
new file mode 100644
index 000000000..21d3af79c
--- /dev/null
+++ b/include/constants/fanfares.h
@@ -0,0 +1,22 @@
+#ifndef GUARD_CONSTANTS_FANFARES_H
+#define GUARD_CONSTANTS_FANFARES_H
+
+enum Fanfares
+{
+    FANFARE_00,
+    FANFARE_01,
+    FANFARE_02,
+    FANFARE_03,
+    FANFARE_04,
+    FANFARE_05,
+    FANFARE_06,
+    FANFARE_07,
+    FANFARE_08,
+    FANFARE_09,
+    FANFARE_10,
+    FANFARE_POKEFLUTE,
+    FANFARE_KEY_ITEM,
+    FANFARE_DEX_EVAL
+};
+
+#endif //GUARD_CONSTANTS_FANFARES_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 98ec3e47e..209e68aee 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1,6 +1,10 @@
 #ifndef GUARD_CONSTANTS_FLAGS_H
 #define GUARD_CONSTANTS_FLAGS_H
 
+// Sys Flags Maybe
+#define FLAG_WHITE_FLUTE_ACTIVE                                     0x803
+#define FLAG_BLACK_FLUTE_ACTIVE                                     0x804
+
 // World Map Flags
 #define FLAG_WORLD_MAP_PALLET_TOWN                                  0x890
 #define FLAG_WORLD_MAP_VIRIDIAN_CITY                                0x891
diff --git a/include/constants/global.h b/include/constants/global.h
new file mode 100644
index 000000000..b1c8fed3e
--- /dev/null
+++ b/include/constants/global.h
@@ -0,0 +1,81 @@
+#ifndef GUARD_CONSTANTS_GLOBAL_H
+#define GUARD_CONSTANTS_GLOBAL_H
+
+#define POKEMON_SLOTS_NUMBER 412
+
+#define ITEM_NAME_LENGTH 14
+#define POKEMON_NAME_LENGTH 10
+#define OT_NAME_LENGTH 7
+
+enum
+{
+    VERSION_SAPPHIRE = 1,
+    VERSION_RUBY = 2,
+    VERSION_EMERALD = 3,
+    VERSION_FIRE_RED = 4,
+    VERSION_LEAF_GREEN = 5,
+};
+
+enum LanguageId {
+    LANGUAGE_JAPANESE = 1,
+    LANGUAGE_ENGLISH = 2,
+    LANGUAGE_FRENCH = 3,
+    LANGUAGE_ITALIAN = 4,
+    LANGUAGE_GERMAN = 5,
+    // 6 goes unused but the theory is it was meant to be Korean
+        LANGUAGE_SPANISH = 7,
+};
+
+#define GAME_LANGUAGE (LANGUAGE_ENGLISH)
+
+#define PC_ITEMS_COUNT      30
+#define BAG_ITEMS_COUNT     42
+#define BAG_KEYITEMS_COUNT  30
+#define BAG_POKEBALLS_COUNT 13
+#define BAG_TMHM_COUNT      58
+#define BAG_BERRIES_COUNT   43
+
+enum
+{
+    MALE,
+    FEMALE
+};
+
+enum
+{
+    OPTIONS_BUTTON_MODE_NORMAL,
+    OPTIONS_BUTTON_MODE_LR,
+    OPTIONS_BUTTON_MODE_L_EQUALS_A
+};
+
+enum
+{
+    OPTIONS_TEXT_SPEED_SLOW,
+    OPTIONS_TEXT_SPEED_MID,
+    OPTIONS_TEXT_SPEED_FAST
+};
+
+enum
+{
+    OPTIONS_SOUND_MONO,
+    OPTIONS_SOUND_STEREO
+};
+
+enum
+{
+    OPTIONS_BATTLE_STYLE_SHIFT,
+    OPTIONS_BATTLE_STYLE_SET
+};
+
+enum
+{
+    POCKET_ITEMS = 1,
+    POCKET_KEY_ITEMS,
+    POCKET_POKE_BALLS,
+    POCKET_TM_CASE,
+    POCKET_BERRY_POUCH,
+};
+
+#define NUM_BAG_POCKETS 5
+
+#endif //GUARD_CONSTANTS_GLOBAL_H
diff --git a/include/constants/items.h b/include/constants/items.h
index cc73119e6..6959ad358 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -395,11 +395,4 @@
 // Check if the item is one that can be used on a Pokemon.
 #define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
 
-// POCKETS
-#define POCKET_ITEMS       1
-#define POCKET_KEY_ITEMS   2
-#define POCKET_POKE_BALLS  3
-#define POCKET_TM_CASE     4
-#define POCKET_BERRY_POUCH 5
-
 #endif  // GUARD_CONSTANTS_ITEMS_H
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 38c47c965..989b27387 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -35,8 +35,8 @@
 #define VAR_0x401D                 0x401D
 #define VAR_0x401E                 0x401E
 #define VAR_0x401F                 0x401F
-#define VAR_RECYCLE_GOODS          0x4020
-#define VAR_REPEL_STEP_COUNT       0x4021
+#define VAR_REPEL_STEP_COUNT       0x4020
+#define VAR_0x4021                 0x4021
 #define VAR_ICE_STEP_COUNT         0x4022
 #define VAR_0x4023                 0x4023
 #define VAR_MIRAGE_RND_H           0x4024
diff --git a/include/field_effect.h b/include/field_effect.h
index 979037a8e..426f77510 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -82,5 +82,6 @@ bool8 FieldEffectActiveListContains(u8 id);
 void sub_80B69DC(void);
 void CreateTeleportFieldEffectTask(void);
 void FieldEffectActiveListRemove(u8 id);
+void sub_8085620(void);
 
 #endif //GUARD_FIELD_EFFECTS_H
diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h
index d0856c84c..4ba350491 100644
--- a/include/field_fadetransition.h
+++ b/include/field_fadetransition.h
@@ -14,5 +14,6 @@ void sub_807E500(void);
 void sub_807DF64(void);
 void sub_807DC18(void);
 void FieldCallback_ReturnToEventScript2(void);
+void sub_807DC00(void);
 
 #endif // GUARD_FIELD_FADETRANSITION_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index b365a9d92..4871bd082 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -22,5 +22,7 @@ void sub_805D9C4(struct Sprite *sprite);
 void sub_805D154(u8 direction);
 void sub_805DAE4(u8 direction);
 void SetPlayerAvatarTransitionFlags(u16 a);
+bool8 IsPlayerFacingSurfableFishableWater(void);
+void sub_805D2C0(u8 secondaryId);
 
 #endif //GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/field_specials.h b/include/field_specials.h
index c1bc8e8c9..a12fee575 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -7,5 +7,6 @@ u8 GetLeadMonIndex(void);
 u8 CountDigits(u16 number);
 void TV_PrintIntToStringVar(u8, int);
 u16 ScrSpecial_GetStarter(void);
+void sub_80CCB68(void);
 
 #endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/field_weather.h b/include/field_weather.h
index cf0e34d06..13a1b4fcb 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -13,5 +13,6 @@ void DoCurrentWeather(void);
 void SetSav1WeatherFromCurrMapHeader(void);
 void sub_807B0C4(u16 *, u16 *, u32);
 void PlayRainStoppingSoundEffect(void);
+bool8 sub_807AA70(void);
 
 #endif // GUARD_WEATHER_H
diff --git a/include/global.h b/include/global.h
index d08a1e0df..050c311e4 100644
--- a/include/global.h
+++ b/include/global.h
@@ -4,6 +4,7 @@
 #include "config.h"
 #include "gba/gba.h"
 #include <string.h>
+#include "constants/global.h"
 
 // Prevent cross-jump optimization.
 #define BLOCK_CROSS_JUMP asm("");
@@ -39,10 +40,6 @@
 // Converts a number to Q4.12 fixed-point format
 #define Q_4_12(n)  ((s16)((n) * 4096))
 
-#define POKEMON_SLOTS_NUMBER 412
-#define POKEMON_NAME_LENGTH 10
-#define OT_NAME_LENGTH 7
-
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) >= (b) ? (a) : (b))
 
@@ -79,75 +76,6 @@ extern u8 gStringVar2[];
 extern u8 gStringVar3[];
 extern u8 gStringVar4[];
 
-enum
-{
-    VERSION_SAPPHIRE = 1,
-    VERSION_RUBY = 2,
-    VERSION_EMERALD = 3,
-    VERSION_FIRE_RED = 4,
-    VERSION_LEAF_GREEN = 5,
-};
-
-enum LanguageId {
-    LANGUAGE_JAPANESE = 1,
-    LANGUAGE_ENGLISH = 2,
-    LANGUAGE_FRENCH = 3,
-    LANGUAGE_ITALIAN = 4,
-    LANGUAGE_GERMAN = 5,
-    // 6 goes unused but the theory is it was meant to be Korean
-        LANGUAGE_SPANISH = 7,
-};
-
-#define GAME_LANGUAGE (LANGUAGE_ENGLISH)
-
-#define PC_ITEMS_COUNT      30
-#define BAG_ITEMS_COUNT     42
-#define BAG_KEYITEMS_COUNT  30
-#define BAG_POKEBALLS_COUNT 13
-#define BAG_TMHM_COUNT      58
-#define BAG_BERRIES_COUNT   43
-
-enum
-{
-    MALE,
-    FEMALE
-};
-
-enum
-{
-    OPTIONS_BUTTON_MODE_NORMAL,
-    OPTIONS_BUTTON_MODE_LR,
-    OPTIONS_BUTTON_MODE_L_EQUALS_A
-};
-
-enum
-{
-    OPTIONS_TEXT_SPEED_SLOW,
-    OPTIONS_TEXT_SPEED_MID,
-    OPTIONS_TEXT_SPEED_FAST
-};
-
-enum
-{
-    OPTIONS_SOUND_MONO,
-    OPTIONS_SOUND_STEREO
-};
-
-enum
-{
-    OPTIONS_BATTLE_STYLE_SHIFT,
-    OPTIONS_BATTLE_STYLE_SET
-};
-
-enum
-{
-    BAG_ITEMS = 1,
-    BAG_POKEBALLS,
-    BAG_TMsHMs,
-    BAG_BERRIES,
-    BAG_KEYITEMS
-};
-
 struct Coords16
 {
     s16 x;
diff --git a/include/item.h b/include/item.h
index f5a8db699..0f0adbca8 100644
--- a/include/item.h
+++ b/include/item.h
@@ -1,18 +1,20 @@
-#ifndef ITEM_H
-#define ITEM_H
+#ifndef GUARD_ITEM_H
+#define GUARD_ITEM_H
+
+#include "global.h"
 
 typedef void (*ItemUseFunc)(u8);
 
 struct Item
 {
-    u8 name[14];
+    u8 name[ITEM_NAME_LENGTH];
     u16 itemId;
     u16 price;
     u8 holdEffect;
     u8 holdEffectParam;
     const u8 *description;
     u8 importance;
-    u8 unk19;
+    u8 exitsBagOnUse;
     u8 pocket;
     u8 type;
     ItemUseFunc fieldUseFunc;
@@ -60,20 +62,20 @@ u8 ItemId_GetBattleUsage(u16 itemId);
 ItemUseFunc ItemId_GetBattleFunc(u16 itemId);
 u8 ItemId_GetSecondaryId(u16 itemId);
 u16 itemid_get_market_price(u16 itemId);
-void sub_809A2DC(void);
-void sub_809A2A4(void);
+void ClearItemSlotsInAllBagPockets(void);
+void ClearPCItemSlots(void);
 void CopyItemName(u16, u8 *);
 void sub_809A824(u16 itemId);
 bool8 AddBagItem(u16 itemId, u16 amount);
 
-void sub_809A5E4(struct BagPocket *);
+void SortPocketAndPlaceHMsFirst(struct BagPocket *);
 u16 BagGetItemIdByPocketPosition(u8 a0, u16 a1);
 u16 BagGetQuantityByPocketPosition(u8 a0, u16 a1);
 bool8 itemid_is_unique(u16 itemId);
-void sub_809A584(struct ItemSlot * slots, u8 capacity);
-u16 GetBagItemId(u16 *);
+void BagPocketCompaction(struct ItemSlot * slots, u8 capacity);
+u16 GetPcItemQuantity(u16 *);
 
 void ItemPcCompaction(void);
 void RemoveItemFromPC(u16 itemId, u16 quantity);
 
-#endif // ITEM_H
+#endif // GUARD_ITEM_H
diff --git a/include/item_menu.h b/include/item_menu.h
index 2d4be4fd7..2e83ed1f4 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -2,6 +2,7 @@
 #define GUARD_ITEM_MENU_H
 
 #include "global.h"
+#include "task.h"
 
 // Exported type declarations
 
@@ -26,7 +27,15 @@ void sub_81AAC50(void);
 void sub_81AAC70(void);
 void sub_8108CF0(void);
 void sub_810B108(u8);
-void UseFameCheckerFromMenu(void);
+void ReturnToBagFromKeyItem(void);
 void ItemMenu_MoveItemSlotToNewPositionInArray(struct ItemSlot * slots, int pos1, int pos2);
+void ItemMenu_StartFadeToExitCallback(u8 taskId);
+void sub_8108CB4(void);
+void ItemMenu_SetExitCallback(void (*)(void));
+void DisplayItemMessageInBag(u8 taskId, u8 bgId, const u8 * string, TaskFunc followUpFunc);
+void sub_810A1F8(u8 taskId);
+void sub_8107ECC(void);
+void sub_8108DC8(u8 pocketId);
+void sub_81089F4(u8 pocketId);
 
 #endif //GUARD_ITEM_MENU_H
diff --git a/include/item_use.h b/include/item_use.h
index 04e61ab59..0a45762f7 100644
--- a/include/item_use.h
+++ b/include/item_use.h
@@ -6,4 +6,37 @@
 void sub_80A1E0C(u8);
 void ItemUse_SetQuestLogEvent(u8, struct Pokemon *, u16, u16);
 
+void FieldUseFunc_OrangeMail(u8 taskId);
+void FieldUseFunc_MachBike(u8 taskId);
+void FieldUseFunc_OldRod(u8 taskId);
+void FieldUseFunc_CoinCase(u8 taskId);
+void FieldUseFunc_PowderJar(u8 taskId);
+void FieldUseFunc_PokeFlute(u8 taskId);
+void FieldUseFunc_Medicine(u8 taskId);
+void FieldUseFunc_Ether(u8 taskId);
+void FieldUseFunc_PpUp(u8 taskId);
+void FieldUseFunc_RareCandy(u8 taskId);
+void FieldUseFunc_EvoItem(u8 taskId);
+void FieldUseFunc_SacredAsh(u8 taskId);
+void FieldUseFunc_TmCase(u8 taskId);
+void FieldUseFunc_BerryPouch(u8 taskId);
+void BattleUseFunc_BerryPouch(u8 taskId);
+void FieldUseFunc_TeachyTv(u8 taskId);
+void FieldUseFunc_SuperRepel(u8 taskId);
+void FieldUseFunc_BlackFlute(u8 taskId);
+void FieldUseFunc_TownMap(u8 taskId);
+void FieldUseFunc_FameChecker(u8 taskId);
+void FieldUseFunc_VsSeeker(u8 taskId);
+void BattleUseFunc_PokeBallEtc(u8 taskId);
+void BattleUseFunc_PokeFlute(u8 taskId);
+void BattleUseFunc_GuardSpec(u8 taskId);
+void BattleUseFunc_Medicine(u8 taskId);
+void BattleUseFunc_Ether(u8 taskId);
+void BattleUseFunc_PokeDoll(u8 taskId);
+void FieldUseFunc_OakStopsYou(u8 taskId);
+void ItemUseOutOfBattle_EscapeRope(u8 taskId);
+void ItemUseOutOfBattle_EnigmaBerry(u8 taskId);
+void ItemUseInBattle_EnigmaBerry(u8 taskId);
+void ItemUseOutOfBattle_Itemfinder(u8 taskId);
+
 #endif //GUARD_ITEM_USE_H
diff --git a/include/itemfinder.h b/include/itemfinder.h
new file mode 100644
index 000000000..2b882b144
--- /dev/null
+++ b/include/itemfinder.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_ITEMFINDER_H
+#define GUARD_ITEMFINDER_H
+
+void sub_813EC8C(u8 taskId);
+
+#endif //GUARD_ITEMFINDER_H
diff --git a/include/load_save.h b/include/load_save.h
index f62bc05aa..bd33f89c8 100644
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -25,5 +25,6 @@ void MoveSaveBlocks_ResetHeap(void);
 void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey);
 void ApplyNewEncryptionKeyToBagItems(u32 encryptionKey);
 void ApplyNewEncryptionKeyToWord(u32 * word, u32 encryptionKey);
+void ApplyNewEncryptionKeyToHword(u16 * hword, u32 encryptionKey);
 
 #endif // GUARD_LOAD_SAVE_H
diff --git a/include/mail.h b/include/mail.h
index 5d6ad559b..9ffccbb5b 100644
--- a/include/mail.h
+++ b/include/mail.h
@@ -21,5 +21,6 @@ bool8 MonHasMail(struct Pokemon *mon);
 void TakeMailFromMon(struct Pokemon *mon);
 u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail);
 void ClearMailStruct(struct MailStruct *mail);
+void sub_80BEBEC(struct MailStruct * mail, void (* callback)(void), u8 a2);
 
 #endif // GUARD_MAIL_H
diff --git a/include/overworld.h b/include/overworld.h
index b8cf58b4d..ab77542c2 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -31,6 +31,8 @@ extern MainCallback gFieldCallback;
 
 extern struct WarpData gUnknown_2031DBC;
 
+extern u8 gUnknown_2031DE0;
+
 void IncrementGameStat(u8 index);
 
 void Overworld_SetMapObjTemplateCoords(u8, s16, s16);
@@ -112,5 +114,7 @@ void sub_805671C(void);
 void sub_8055DC4(void);
 bool8 sub_8055FC4(void);
 bool8 is_light_level_8_or_9(u8 mapType);
+bool32 sub_8055C9C(void);
+void sub_8054D70(void);
 
 #endif //GUARD_ROM4_H
diff --git a/include/party_menu.h b/include/party_menu.h
index 527147296..3b620c3b0 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -52,5 +52,14 @@ void GetMonNickname(const struct Pokemon * mon, u8 * dest);
 void sub_81202F8(const u8 * src, u8 a1);
 bool8 sub_8120370(void);
 void PartyMenuInit(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback);
+void sub_81252D0(u8 taskId, TaskFunc followUpFunc);
+void ItemUseCB_PpRestore(u8 taskId, TaskFunc followUpFunc);
+void dp05_pp_up(u8 taskId, TaskFunc followUpFunc);
+void dp05_rare_candy(u8 taskId, TaskFunc followUpFunc);
+void sub_8126B60(u8 taskId, TaskFunc followUpFunc);
+void sub_8126894(u8 taskId, TaskFunc followUpFunc);
+void sub_81279E0(void);
+void ItemUseCB_Medicine(u8 taskId, TaskFunc followUpFunc);
+u8 GetItemEffectType(u16 itemId);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/pokemon.h b/include/pokemon.h
index a6dd9931b..ed0108159 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -678,4 +678,6 @@ u8 GetMonsStateToDoubles(void);
 void sub_803E0A4(struct Pokemon *mon, struct BattleTowerPokemon *src);
 void SetMultiuseSpriteTemplateToPokemon(u16 trainerSpriteId, u8 battlerPosition);
 
+const u8 * Battle_PrintStatBoosterEffectMessage(u16 itemId);
+
 #endif // GUARD_POKEMON_H
diff --git a/include/region_map.h b/include/region_map.h
index ea8a8130e..394fee469 100644
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -95,5 +95,6 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag);
 u8 *GetMapName(u8 *, u16, u16);
 bool32 sub_8124668(u8 mapSecId);
 void sub_80C4DF8(u8 *, u8);
+void sub_80BFF50(u8 a0, void (*a1)(void));
 
 #endif //GUARD_REGION_MAP_H
diff --git a/include/strings.h b/include/strings.h
index 08dd25174..1aa858e82 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -161,4 +161,20 @@ extern const u8 gText_WithdrawItem[];
 extern const u8 gText_Withdraw[];
 extern const u8 gText_ReturnToPC[];
 
+extern const u8 gUnknown_8416425[];
+extern const u8 gUnknown_8416451[];
+extern const u8 gUnknown_8416537[];
+extern const u8 gUnknown_841658C[];
+extern const u8 gUnknown_841659E[];
+extern const u8 gUnknown_84165D2[];
+extern const u8 gUnknown_8416600[];
+extern const u8 gUnknown_8416631[];
+extern const u8 gUnknown_8416644[];
+extern const u8 gUnknown_841665C[];
+extern const u8 gUnknown_8416690[];
+extern const u8 gUnknown_84166A7[];
+extern const u8 gUnknown_84169DC[];
+
+extern const u8 gUnknown_84162BD[];
+
 #endif //GUARD_STRINGS_H
diff --git a/include/unk_815C980.h b/include/unk_815C980.h
index 78d4bd73b..a3249a8e2 100644
--- a/include/unk_815C980.h
+++ b/include/unk_815C980.h
@@ -17,8 +17,8 @@ struct UnkStruct3
 
 void sub_815C9F4(void);
 void sub_815D108(u32 id);
-void sub_815CD70(u32 id, s32 arg1);
-u8 sub_815D324(u32 shape, u32 size);
+void sub_815D1A8(u32 id, bool32 arg1);
 bool32 sub_815CA40(u32 id, s32 arg1, const struct UnkStruct3 *arg2);
+void sub_815CD70(u32 id, s32 arg1);
 
 #endif //GUARD_UNK_815C980_H