Merge branch 'main' into battle-dev

2026-09-30 05:18:36 -05:00 · 2023-09-09 11:22:56 -07:00
parent cfdfc80d19 ab488c95a7
commit b8fa07712b
1793 changed files with 5606 additions and 310778 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,11 @@
 /tools/cw/mwrap.exe

 # Wrapped subprojects folders
+/subprojects/libvct-*/
+/subprojects/NitroDWC-*/
+/subprojects/NitroSDK-*/
+/subprojects/NitroSystem-*/
+/subprojects/NitroWiFi-*/
 /subprojects/nitrogfx/
 /subprojects/libpng-*/
 /subprojects/zlib-*/
--- a/README.md
+++ b/README.md
@@ -6,30 +6,4 @@ This repository builds the following ROMs:

 * [**pokeplatinum.us.nds**](https://datomatic.no-intro.org/index.php?page=show_record&s=28&n=3541) `sha1: ce81046eda7d232513069519cb2085349896dec7`

-Other disassembly and/or decompilation projects:
-* [**Pokémon Red and Blue**](https://github.com/pret/pokered)
-* [**Pokémon Gold and Silver (Space World '97 demo)**](https://github.com/pret/pokegold-spaceworld)
-* [**Pokémon Yellow**](https://github.com/pret/pokeyellow)
-* [**Pokémon Trading Card Game**](https://github.com/pret/poketcg)
-* [**Pokémon Pinball**](https://github.com/pret/pokepinball)
-* [**Pokémon Stadium**](https://github.com/pret/pokestadium)
-* [**Pokémon Gold and Silver**](https://github.com/pret/pokegold)
-* [**Pokémon Crystal**](https://github.com/pret/pokecrystal)
-* [**Pokémon Ruby and Sapphire**](https://github.com/pret/pokeruby)
-* [**Pokémon Pinball: Ruby & Sapphire**](https://github.com/pret/pokepinballrs)
-* [**Pokémon FireRed and LeafGreen**](https://github.com/pret/pokefirered)
-* [**Pokémon Emerald**](https://github.com/pret/pokeemerald)
-* [**Pokémon Mystery Dungeon: Red Rescue Team**](https://github.com/pret/pmd-red)
-
-Gen 4 decompilation projects:
-* [**Pokémon Diamond and Pearl**](https://github.com/pret/pokediamond)
-* [**Pokémon HeartGold and SoulSilver**](https://github.com/pret/pokeheartgold)
-* [**Pokémon Mystery Dungeon: Explorers of Sky**](https://github.com/pret/pmd-sky)
-
-## Contacts
-
-You can find us on:
-
-* [Discord (VoidMatrix, #decomp)](https://discord.gg/prUAgd5)
-* [Discord (PRET, #pokediamond)](https://discord.gg/d5dubZ3)
-* [IRC](https://web.libera.chat/?#pret)
+For contacts and other pret projects, see [pret.github.io](https://pret.github.io/). In addition to the pret Discord, also see the [VoidMatrix Discord (#decomp)](https://discord.gg/prUAgd5).
--- a/asm/dtcm.s
+++ b/asm/dtcm.s
@@ -1,47 +0,0 @@
-
-	.extern OS_IrqDummy
-    .extern OSi_IrqTimer0
-    .extern OSi_IrqTimer1
-    .extern OSi_IrqTimer2
-    .extern OSi_IrqTimer3
-    .extern OSi_IrqDma0
-    .extern OSi_IrqDma1
-    .extern OSi_IrqDma2
-    .extern OSi_IrqDma3
-    
-    
-    .text
-
-	.section .dtcm, 4
-
-	.public OS_IRQTable
-OS_IRQTable:
-    .word OS_IrqDummy
-    .word OS_IrqDummy
-    .word OS_IrqDummy
-    .word OSi_IrqTimer0
-    .word OSi_IrqTimer1
-    .word OSi_IrqTimer2
-    .word OSi_IrqTimer3
-    .word OS_IrqDummy
-    .word OSi_IrqDma0
-    .word OSi_IrqDma1
-    .word OSi_IrqDma2
-    .word OSi_IrqDma3
-    .word OS_IrqDummy
-    .word OS_IrqDummy
-    .word OS_IrqDummy
-    .word OS_IrqDummy
-    .word OS_IrqDummy
-    .word OS_IrqDummy
-    .word OS_IrqDummy
-    .word OS_IrqDummy
-    .word OS_IrqDummy
-    .word OS_IrqDummy
-
-
-	.bss
-
-    .public OSi_IrqThreadQueue
-OSi_IrqThreadQueue:
-	.space 0x8
--- a/asm/incbin/ov14_022248A4.bin
+++ b/asm/incbin/ov14_022248A4.bin
--- a/asm/meson.build
+++ b/asm/meson.build
@@ -1,4 +1,3 @@
 pokeplatinum_asm = files(
-    'overlay014/ov14_022248A4.s',
-    'dtcm.s'
+    'overlay014/ov14_022248A4.s'
 )
--- a/config.sh
+++ b/config.sh
@@ -69,4 +69,4 @@ elif is_wsl_accessing_windows; then
 fi

 # Launch meson
-"${MESON:-meson}" setup --native-file=meson/"$native_file" --native-file="$build/root.ini" --cross-file=meson/"$cross_file" --cross-file="$build/root.ini" "$@" -- "$build"
+"${MESON:-meson}" setup --wrap-mode=nopromote --native-file=meson/"$native_file" --native-file="$build/root.ini" --cross-file=meson/"$cross_file" --cross-file="$build/root.ini" "$@" -- "$build"
--- a/include/battle/ai_context.h
+++ b/include/battle/ai_context.h
@@ -4,9 +4,8 @@
 #include "constants/battle.h"
 #include "constants/moves.h"

-#include "struct_defs/struct_020790C4.h"
-#include "struct_decls/struct_itemdata_decl.h"
-
+#include "item.h"
+#include "move_table.h"
 typedef struct AIContext {
    u8 scriptCursor;
    u8 moveSlot;
--- a/include/berry_data.h
+++ b/include/berry_data.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_BERRY_DATA_H

 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_berry_data_decl.h"

 #define FIRMNESS_VERY_SOFT     1
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -1,3 +1,6 @@
+#ifndef POKEPLATINUM_CONSTANTS_ITEMS_H
+#define POKEPLATINUM_CONSTANTS_ITEMS_H
+
 #define POCKET_ITEMS        0
 #define POCKET_MEDICINE     1
 #define POCKET_BALLS        2
@@ -662,4 +665,11 @@
 // New to Platinum
 #define ITEM_VS_RECORDER         465
 #define ITEM_GRACIDEA            466
-#define ITEM_SECRET_KEY          467
+#define ITEM_SECRET_KEY          467
+
+#define NUM_ITEMS                ITEM_SECRET_KEY
+#define MAX_ITEMS                (NUM_ITEMS + 1)
+
+#define ITEM_RETURN_ID           0xFFFF
+
+#endif // POKEPLATINUM_CONSTANTS_ITEMS_H
--- a/include/constants/message_banks.h
+++ b/include/constants/message_banks.h
@@ -0,0 +1,8 @@
+#ifndef POKEPLATINUM_CONSTANTS_MESSAGE_BANKS_H
+#define POKEPLATINUM_CONSTANTS_MESSAGE_BANKS_H
+
+enum ArchiveMessageBank {
+    MESSAGE_BANK_SPECIES_NAMES = 412,
+};
+
+#endif // POKEPLATINUM_CONSTANTS_MESSAGE_BANKS_H
--- a/include/constants/moves.h
+++ b/include/constants/moves.h
@@ -477,5 +477,6 @@
 #define CLASS_STATUS   2

 #define NUM_MOVES   MOVE_SHADOW_FORCE
+#define MAX_MOVES   (NUM_MOVES + 1)

 #endif //POKEPLATINUM_CONSTANTS_MOVES_H
--- a/include/item.h
+++ b/include/item.h
@@ -1,54 +1,53 @@
-#ifndef POKEPLATINUM_UNK_0207CDEC_H
-#define POKEPLATINUM_UNK_0207CDEC_H
+#ifndef POKEPLATINUM_ITEM_DATA_H
+#define POKEPLATINUM_ITEM_DATA_H

-#include "struct_decls/struct_02023790_decl.h"
-#include "struct_decls/struct_itemdata_decl.h"
+#include "strbuf.h"

 typedef struct ItemPartyParam {
-    u8 slp_heal : 1;
-    u8 psn_heal : 1;
-    u8 brn_heal : 1;
-    u8 frz_heal : 1;
-    u8 prz_heal : 1;
-    u8 cfs_heal : 1;
-    u8 inf_heal : 1;
-    u8 guard_spec : 1;
+    u8 healSleep : 1;
+    u8 healPoison : 1;
+    u8 healBurn : 1;
+    u8 healFreeze : 1;
+    u8 healParalysis : 1;
+    u8 healConfusion : 1;
+    u8 healAttract : 1;
+    u8 guardSpec : 1;
    u8 revive : 1;
-    u8 revive_all : 1;
-    u8 level_up : 1;
+    u8 reviveAll : 1;
+    u8 levelUp : 1;
    u8 evolve : 1;
-    u8 atk_stages : 4;
-    u8 def_stages : 4;
-    u8 spatk_stages : 4;
-    u8 spdef_stages : 4;
-    u8 speed_stages : 4;
-    u8 accuracy_stages : 4;
-    u8 critrate_stages : 2;
-    u8 pp_up : 1;
-    u8 pp_max : 1;
-    u8 pp_restore : 1;
-    u8 pp_restore_all : 1;
-    u8 hp_restore : 1;
-    u8 hp_ev_up : 1;
-    u8 atk_ev_up : 1;
-    u8 def_ev_up : 1;
-    u8 speed_ev_up : 1;
-    u8 spatk_ev_up : 1;
-    u8 spdef_ev_up : 1;
-    u8 friendship_mod_lo : 1;
-    u8 friendship_mod_med : 1;
-    u8 friendship_mod_hi : 1;
-    s8 hp_ev_up_param;
-    s8 atk_ev_up_param;
-    s8 def_ev_up_param;
-    s8 speed_ev_up_param;
-    s8 spatk_ev_up_param;
-    s8 spdef_ev_up_param;
-    u8 hp_restore_param;
-    u8 pp_restore_param;
-    s8 friendship_mod_lo_param;
-    s8 friendship_mod_med_param;
-    s8 friendship_mod_hi_param;
+    u8 atkStages : 4;
+    u8 defStages : 4;
+    u8 spatkStages : 4;
+    u8 spdefStages : 4;
+    u8 speedStages : 4;
+    u8 accStages : 4;
+    u8 critStages : 2;
+    u8 ppUp : 1;
+    u8 ppMax : 1;
+    u8 ppRestore : 1;
+    u8 ppRestoreAll : 1;
+    u8 hpRestore : 1;
+    u8 giveHPEVs : 1;
+    u8 giveAtkEVs : 1;
+    u8 giveDefEVs : 1;
+    u8 giveSpeedEVs : 1;
+    u8 giveSpAtkEVs : 1;
+    u8 giveSpDefEVs : 1;
+    u8 giveFriendshipLow : 1;
+    u8 giveFriendshipMed : 1;
+    u8 giveFriendshipHigh : 1;
+    s8 hpEVs;
+    s8 atkEVs;
+    s8 defEVs;
+    s8 speedEVs;
+    s8 spatkEVs;
+    s8 spdefEVs;
+    u8 hpRestored;
+    u8 ppRestored;
+    s8 friendshipLow;
+    s8 friendshipMed;
+    s8 friendshipHigh;
    u8 padding[2];
 } ItemPartyParam;

@@ -76,27 +75,266 @@ typedef struct ItemData {
    u8 padding[2];
 } ItemData;

-void sub_0207CDEC(void * param0, u16 param1, u16 param2);
-u16 sub_0207CE78(u16 param0, u16 param1);
-u16 sub_0207CF10(u16 param0);
-u16 Item_GetIndexOfIconNCER(void);
-u16 Item_GetIndexOfIconNANR(void);
-void * Item_LoadDataOrGFX(u16 param0, u16 param1, u32 param2);
-void Item_GetNameIntoString(Strbuf *dst, u16 param1, u32 param2);
-void Item_GetDescriptionIntoString(Strbuf *dst, u16 param1, u16 param2);
-s32 Item_GetAttribute(u16 param0, u16 param1, u32 param2);
-s32 Item_GetAttributeFromStruct(ItemData * param0, u16 param1);
-const u16 GetMoveFromTMOrHMItemID(u16 param0);
-u8 Item_IsMoveHM(u16 param0);
-u8 Item_GetTMOrHMNumberFromID(u16 param0);
-u8 Item_IsMail(u16 param0);
-u8 sub_0207D2F0(u16 param0);
-u16 sub_0207D310(u8 param0);
-u8 Item_IsBerry(u16 param0);
-u8 sub_0207D344(u16 param0);
-u16 sub_0207D354(u8 param0);
-u8 Item_IsHerbalMedicine(u16 param0);
-void * ItemData_LoadTable(int param0);
-ItemData * sub_0207D3B0(ItemData * param0, u16 param1);
+enum ItemFileType {
+	ITEM_FILE_TYPE_DATA,
+	ITEM_FILE_TYPE_ICON,
+	ITEM_FILE_TYPE_PALETTE,
+	ITEM_FILE_TYPE_GBA,
+};

-#endif // POKEPLATINUM_UNK_0207CDEC_H
+enum ItemDataParam {
+    ITEM_PARAM_PRICE,
+    ITEM_PARAM_HOLD_EFFECT,
+    ITEM_PARAM_HOLD_EFFECT_PARAM,
+    ITEM_PARAM_PREVENT_TOSS,
+    ITEM_PARAM_IS_SELECTABLE,
+    ITEM_PARAM_FIELD_POCKET,
+    ITEM_PARAM_FIELD_USE_FUNC,
+    ITEM_PARAM_BATTLE_USE_FUNC,
+    ITEM_PARAM_PLUCK_EFFECT,
+    ITEM_PARAM_FLING_EFFECT,
+    ITEM_PARAM_FLING_POWER,
+    ITEM_PARAM_NATURAL_GIFT_POWER,
+    ITEM_PARAM_NATURAL_GIFT_TYPE,
+    ITEM_PARAM_BATTLE_POCKET,
+    ITEM_PARAM_PARTY_USE,
+    ITEM_PARAM_HEAL_SLEEP,
+    ITEM_PARAM_HEAL_POISON,
+    ITEM_PARAM_HEAL_BURN,
+    ITEM_PARAM_HEAL_FREEZE,
+    ITEM_PARAM_HEAL_PARALYSIS,
+    ITEM_PARAM_HEAL_CONFUSION,
+    ITEM_PARAM_HEAL_ATTRACT,
+    ITEM_PARAM_GUARD_SPEC,
+    ITEM_PARAM_REVIVE,
+    ITEM_PARAM_REVIVE_ALL,
+    ITEM_PARAM_LEVEL_UP,
+    ITEM_PARAM_EVOLVE,
+    ITEM_PARAM_ATK_STAGES,
+    ITEM_PARAM_DEF_STAGES,
+    ITEM_PARAM_SPATK_STAGES,
+    ITEM_PARAM_SPDEF_STAGES,
+    ITEM_PARAM_SPEED_STAGES,
+    ITEM_PARAM_ACC_STAGES,
+    ITEM_PARAM_CRIT_STAGES,
+    ITEM_PARAM_PP_UP,
+    ITEM_PARAM_PP_MAX,
+    ITEM_PARAM_PP_RESTORE,
+    ITEM_PARAM_PP_RESTORE_ALL,
+    ITEM_PARAM_HP_RESTORE,
+    ITEM_PARAM_GIVE_HP_EVS,
+    ITEM_PARAM_GIVE_ATK_EVS,
+    ITEM_PARAM_GIVE_DEF_EVS,
+    ITEM_PARAM_GIVE_SPEED_EVS,
+    ITEM_PARAM_GIVE_SPATK_EVS,
+    ITEM_PARAM_GIVE_SPDEF_EVS,
+    ITEM_PARAM_GIVE_FRIENDSHIP_LOW,
+    ITEM_PARAM_GIVE_FRIENDSHIP_MED,
+    ITEM_PARAM_GIVE_FRIENDSHIP_HIGH,
+    ITEM_PARAM_HP_EVS,
+    ITEM_PARAM_ATK_EVS,
+    ITEM_PARAM_DEF_EVS,
+    ITEM_PARAM_SPEED_EVS,
+    ITEM_PARAM_SPATK_EVS,
+    ITEM_PARAM_SPDEF_EVS,
+    ITEM_PARAM_HP_RESTORED,
+    ITEM_PARAM_PP_RESTORED,
+    ITEM_PARAM_FRIENDSHIP_LOW,
+    ITEM_PARAM_FRIENDSHIP_MED,
+    ITEM_PARAM_FRIENDSHIP_HIGH,
+};
+
+/**
+ * @brief Move the item in the corresponding pocket from one slot to another.
+ *
+ * All other items in the pocket will be moved up or down within the pocket,
+ * depending on whether the target slot is above or below the current slot.
+ *
+ * @param pocket    The pocket of items in the bag.
+ * @param srcSlot   The slot of the item to be moved.
+ * @param dstSlot   The slot to which the item will be moved.
+ */
+void Item_MoveInPocket(void *pocket, u16 srcSlot, u16 dstSlot);
+
+/**
+ * @brief Get an ID of the specified type for an item.
+ *
+ * Each type points to a different value for the item's entry in sItemArchiveIDs.
+ *
+ * @param item
+ * @param type      The type of ID to get. 
+ * @return The item's ID of the specified type.
+ */
+u16 Item_FileID(u16 item, enum ItemFileType type);
+
+/**
+ * @brief Get the ID of an item which matches the given GBA-era item ID.
+ *
+ * @param gbaID     GBA-era item ID.
+ * @return ID of the item which corresponds to the given GBA-era ID.
+ */
+u16 Item_FromGBAID(u16 param0);
+
+/**
+ * @brief Get the file index of the global NCER file used by all item icons.
+ *
+ * @return File index of the global item icon NCER.
+ */
+u16 Item_IconNCERFile(void);
+
+/**
+ * @brief Get the file index of the global NANR file used by all item icons.
+ *
+ * @return File index of the global item icon NANR.
+ */
+u16 Item_IconNANRFile(void);
+
+/**
+ * @brief Load item data of the specified type.
+ *
+ * @param item      The item to load.
+ * @param type      The type of data to load. Determines which NARC is loaded.
+ * @param heapID    ID of the heap to own the allocated memory.
+ * @return The loaded data structure.
+ */
+void* Item_Load(u16 item, enum ItemFileType type, u32 heapID);
+
+/**
+ * @brief Load the name of the item into a string buffer.
+ *
+ * @param dst       The destination string buffer.
+ * @param item      The item whose name we should load.
+ * @param heapID    ID of the heap to own memory needed for the text archive.
+ */
+void Item_LoadName(Strbuf *dst, u16 item, u32 heapID);
+
+/**
+ * @brief Load the description of the item into a string buffer.
+ *
+ * @param dst       The destination string buffer.
+ * @param item      The item whose description we should load.
+ * @param heapID    ID of the heap to own memory needed for the text archive.
+ */
+void Item_LoadDescription(Strbuf *dst, u16 item, u16 heapID);
+
+/**
+ * @brief Load a parameter for a given item from the data archive.
+ *
+ * @param item      The item to load.
+ * @param param     The param to load from the item.
+ * @param heapID    The heap on which to load the item data.
+ * @return Parameter value from the loaded item.
+ */
+s32 Item_LoadParam(u16 item, enum ItemDataParam param, u32 heapID);
+
+/**
+ * @brief Get a param value from a loaded item.
+ *
+ * @param itemData  The loaded item.
+ * @param param     The param value to get.
+ * @return Parameter value from the loaded item.
+ */
+s32 Item_Get(ItemData *itemData, enum ItemDataParam param);
+
+/**
+ * @brief Get the move corresponding to a TM or HM.
+ *
+ * Returns MOVE_NONE if the input item is not a TM or HM.
+ *
+ * @param item      The TM or HM item ID.
+ * @return The move stored in the given TM or HM.
+ */
+const u16 Item_MoveForTMHM(u16 item);
+
+/**
+ * @brief Check if a given move is an HM move.
+ *
+ * @param move      The move to check.
+ * @return TRUE if the move is assignable via an HM. FALSE otherwise.
+ */
+u8 Item_IsHMMove(u16 move);
+
+/**
+ * @brief Get the TM number for a given item, if it is a TM or HM.
+ *
+ * HMs are considered to be TMs 93 - 100.
+ *
+ * @param item
+ * @return TM number for the given item, or ITEM_NONE if it is not a TM or HM.
+ */
+u8 Item_TMHMNumber(u16 item);
+
+/**
+ * @brief Check if a given item is mail.
+ *
+ * @param item
+ * @return TRUE if the item is mail, FALSE otherwise.
+ */
+u8 Item_IsMail(u16 item);
+
+/**
+ * @brief Get the mail number for a given item.
+ *
+ * @param item
+ * @return The mail number for the item, or ITEM_NONE if the item is not mail.
+ */
+u8 Item_MailNumber(u16 item);
+
+/**
+ * @brief Get the item for a given mail number.
+ *
+ * @param mail
+ * @return The item for the mail number, or ITEM_NONE if none exists. 
+ */
+u16 Item_ForMailNumber(u8 mail);
+
+/**
+ * @brief Check if a given item is a berry.
+ *
+ * @param item 
+ * @return TRUE if the item is a berry, FALSE otherwise.
+ */
+u8 Item_IsBerry(u16 item);
+
+/**
+ * @brief Get the berry number for a given item.
+ *
+ * @param item
+ * @return The berry number for the item, or ITEM_NONE if the item is not a berry.
+ */
+u8 Item_BerryNumber(u16 item);
+
+/**
+ * @brief Get the item for a given berry number.
+ *
+ * @param berry
+ * @return The item for the berry number, or ITEM_RETURN_ID if none exists.
+ */
+u16 Item_ForBerryNumber(u8 item);
+
+/**
+ * @brief Check if a given item is herbal medicine.
+ *
+ * @param item 
+ * @return TRUE if the item is herbal medicine, FALSE otherwise.
+ */
+u8 Item_IsHerbalMedicine(u16 item);
+
+/**
+ * @brief Load the full table of item data into the heap.
+ *
+ * @param heapID    The heap which will own the item table's allocation.
+ * @return The full table of item data.
+ */
+void* ItemTable_Load(int heapID);
+
+/**
+ * @brief Get the ItemData value at a given index from within a loaded table.
+ *
+ * @param itemTable The loaded item table.
+ * @param index     Index of the ItemData to be retrieved.
+ * @return ItemData at a given index within the loaded item table.
+ */
+ItemData* ItemTable_Index(ItemData *itemTable, u16 index);
+
+#endif // POKEPLATINUM_ITEM_DATA_H
--- a/include/message.h
+++ b/include/message.h
@@ -0,0 +1,226 @@
+#ifndef POKEPLATINUM_MESSAGE_H
+#define POKEPLATINUM_MESSAGE_H
+
+#include "struct_decls/struct_02006C24_decl.h"
+
+#include "strbuf.h"
+
+typedef struct MessageBankEntry {
+    u32 offset;
+    u32 length;
+} MessageBankEntry;
+
+typedef struct MessageBank {
+    u16 count;
+    u16 seed;
+
+    MessageBankEntry entries[];
+} MessageBank;
+
+typedef struct MessageLoader {
+    u16 type;
+    u16 heapID;
+    u16 narcID;
+    u16 bankID;
+
+    union {
+        MessageBank *bank;
+        NARC *narc;
+    };
+} MessageLoader;
+
+enum MessageLoaderType {
+    MESSAGE_LOADER_BANK_HANDLE,
+    MESSAGE_LOADER_NARC_HANDLE,
+};
+
+/**
+ * @brief Load a message file out of the given NARC.
+ * 
+ * @param narcID 
+ * @param dataID    Index of the message data file in the NARC.
+ * @param heapID    Which heap will own the allocation.
+ * @return Allocated message data.
+ */
+MessageBank * MessageBank_Load(u32 param0, u32 param1, u32 param2);
+
+/**
+ * @brief Free allocated message data back to the heap.
+ * 
+ * @param msgData 
+ */
+void MessageBank_Free(MessageBank * param0);
+
+/**
+ * @brief Get an entry out of the pre-loaded message bank and copy it into the
+ * destination buffer.
+ * 
+ * @param bank      Loaded message bank.
+ * @param entryID   Entry in the message bank to load.
+ * @param dst       Destination character buffer.
+ */
+void MessageBank_Get(const MessageBank *bank, u32 entryID, charcode_t *dst);
+
+/**
+ * @brief Load a message bank from an archive, then load an entry from that bank
+ * and copy it into the destination buffer.
+ * 
+ * @param narcID    Archive from which to load the message bank.
+ * @param bankID    Index of the bank to load from the archive.
+ * @param entryID   Index of the entry to load from the bank.
+ * @param heapID    Heap on which to allocate the loaded archive.
+ * @param dst       Destination character buffer.
+ */
+void MessageBank_GetFromNARC(u32 narcID, u32 bankID, u32 entryID, u32 heapID, charcode_t *dst);
+
+/**
+ * @brief Get an entry out of the pre-loaded message bank and copy it into the
+ * destination Strbuf struct.
+ * 
+ * @param bank      Loaded message bank.
+ * @param entryID   Entry in the message bank to load.
+ * @param strbuf    Destination Strbuf struct.
+ */
+void MessageBank_GetStrbuf(const MessageBank *bank, u32 entryID, Strbuf *strbuf);
+
+/**
+ * @brief Load a message bank from an archive, then load an entry from that bank
+ * and copy it into a newly-allocated Strbuf struct.
+ * 
+ * @param bank      Loaded message bank.
+ * @param entryID   Entry in the message bank to load.
+ * @param heapID    Heap on which to allocate the new Strbuf struct.
+ * @return A newly-allocated Strbuf struct containing the loaded bank entry.
+ */
+Strbuf* MessageBank_GetNewStrbuf(const MessageBank *bank, u32 entryID, u32 heapID);
+
+/**
+ * @brief Load a message bank from an archive, then load an entry from that bank
+ * and copy it into the destination Strbuf struct.
+ * 
+ * @param narcID    Archive from which to load the message bank.
+ * @param bankID    Index of the bank to load from the archive.
+ * @param entryID   Index of the entry to load from the bank.
+ * @param heapID    Heap on which to allocate the loaded archive.
+ * @param strbuf    Destination Strbuf struct.
+ */
+void MessageBank_GetStrbufFromNARC(u32 narcID, u32 bankID, u32 entryID, u32 heapID, Strbuf *strbuf);
+
+/**
+ * @brief Load a message bank from an archive, then load an entry from that bank
+ * and copy it into the destination Strbuf struct.
+ * 
+ * @param narc      Archive from which to load the message bank.
+ * @param bankID    Index of the bank to load from the archive.
+ * @param entryID   Index of the entry to load from the bank.
+ * @param heapID    Heap on which to allocate the loaded archive.
+ * @param strbuf    Destination Strbuf struct.
+ */
+void MessageBank_GetStrbufFromHandle(NARC *narc, u32 bankID, u32 entryID, u32 heapID, Strbuf *strbuf);
+
+/**
+ * @brief Load a message bank from an archive, then load an entry from that bank
+ * and copy it into a destination Strbuf struct.
+ * 
+ * @param narcID    Archive from which to load the message bank.
+ * @param bankID    Index of the bank to load from the archive.
+ * @param entryID   Index of the entry to load from the bank.
+ * @param heapID    Heap on which to allocate the loaded archive.
+ * @return A newly-allocated Strbuf struct containing the loaded bank entry.
+ */
+Strbuf* MessageBank_GetNewStrbufFromNARC(u32 narcID, u32 bankID, u32 entryID, u32 heapID);
+
+/**
+ * @brief Load a message bank from an archive, then load an entry from that bank
+ * and copy it into a destination Strbuf struct.
+ * 
+ * @param narc      Archive from which to load the message bank.
+ * @param bankID    Index of the bank to load from the archive.
+ * @param entryID   Index of the entry to load from the bank.
+ * @param heapID    Heap on which to allocate the loaded archive.
+ * @return A newly-allocated Strbuf struct containing the loaded bank entry.
+ */
+Strbuf* MessageBank_GetNewStrbufFromHandle(NARC *narc, u32 bankID, u32 entryID, u32 heapID);
+
+/**
+ * @brief Get the number of entries in a pre-loaded message bank.
+ * 
+ * @param bank      Pre-loaded message bank.
+ * @return Number of entries in the bank.
+ */
+u32 MessageBank_EntryCount(const MessageBank *bank);
+
+/**
+ * @brief Get the number of entries in a bank by loading it from an archive.
+ * 
+ * @param narcID    Archive from which to load the bank.
+ * @param bankID    Index of the bank to load from the archive.
+ * @return Number of entries in the loaded bank.
+ */
+u32 MessageBank_NARCEntryCount(u32 narcID, u32 bankID);
+
+/**
+ * @brief Initialize a new MessageLoader struct targeting a given archive and
+ * message bank.
+ * 
+ * @param type      The load-type; controls if we use a bank or NARC handle.
+ * @param narcID    Archive from which to load any banks.
+ * @param bankID    Index of the bank we are targeting.
+ * @param heapID    Heap on which to allocate the loaded archive. 
+ * @return Initialized MessageLoader struct.
+ */
+MessageLoader* MessageLoader_Init(enum MessageLoaderType type, u32 narcID, u32 bankID, u32 heapID);
+
+/**
+ * @brief Free a MessageLoader struct back to its owning heap.
+ * 
+ * @param loader    The struct to be freed.
+ */
+void MessageLoader_Free(MessageLoader *loader);
+
+/**
+ * @brief Load a bank entry into the destination Strbuf struct.
+ * 
+ * @param loader    The loader; controls the entry load from a message bank.
+ * @param entryID   The entry to be loaded from the loader's target bank.
+ * @param strbuf    Destination Strbuf struct.
+ */
+void MessageLoader_GetStrbuf(const MessageLoader *loader, u32 entryID, Strbuf *strbuf);
+
+/**
+ * @brief Load a bank entry and copy it into a newly-allocated Strbuf struct.
+ * 
+ * @param loader    The loader; controls the entry load from a message bank.
+ * @param entryID   The entry to be loaded from the loader's target bank.
+ * @return A newly-allocated Strbuf struct containing the loaded bank entry.
+ */
+Strbuf* MessageLoader_GetNewStrbuf(const MessageLoader *loader, u32 entryID);
+
+/**
+ * @brief Get the number of entries in the loader's target message bank.
+ * 
+ * @param loader    The loader.
+ * @return The number of entries in the loader's target message bank.
+ */
+u32 MessageLoader_MessageCount(const MessageLoader *loader);
+
+/**
+ * @brief Load a bank entry into the destination buffer.
+ * 
+ * @param loader    The loader; controls the entry load from a message bank.
+ * @param entryID   The entry to be loaded from the loader's target bank.
+ * @param dst       The destination buffer.
+ */
+void MessageLoader_Get(const MessageLoader *loader, u32 entryID, charcode_t *dst);
+
+/**
+ * @brief Load the name of a Pokemon species into the destination buffer into
+ * a destination buffer.
+ * 
+ * @param species   The target species ID; targets an entry in pl_personal.
+ * @param heapID    Heap on which to allocate the temporary message bank load.
+ * @param dst       The destination buffer.
+ */
+void MessageLoader_GetSpeciesName(u32 species, u32 heapID, charcode_t *dst);
+
+#endif // POKEPLATINUM_MESSAGE_H
--- a/include/move_table.h
+++ b/include/move_table.h
@@ -1,9 +1,27 @@
-#ifndef POKEPLATINUM_UNK_020790B0_H
-#define POKEPLATINUM_UNK_020790B0_H
+#ifndef POKEPLATINUM_MOVE_TABLE_H
+#define POKEPLATINUM_MOVE_TABLE_H

-#include "struct_defs/struct_020790C4.h"
+typedef struct MoveContestData {
+    u8 effect;
+    u8 type;
+    u8 padding02[2]; // needed to match
+} MoveContestData;

-typedef enum MoveAttribute {
+typedef struct MoveTable {
+    u16 effect;
+    u8 class;
+    u8 power;
+    u8 type;
+    u8 accuracy;
+    u8 pp;
+    u8 effectChance;
+    u16 range;
+    s8 priority;
+    u8 flags;
+    MoveContestData contest;
+} MoveTable;
+
+enum MoveAttribute {
    MOVEATTRIBUTE_EFFECT = 0,
    MOVEATTRIBUTE_CLASS,
    MOVEATTRIBUTE_POWER,
@@ -11,16 +29,49 @@ typedef enum MoveAttribute {
    MOVEATTRIBUTE_ACCURACY,
    MOVEATTRIBUTE_PP,
    MOVEATTRIBUTE_EFFECT_CHANCE,
-    MOVEATTRIBUTE_UNK7,
+    MOVEATTRIBUTE_RANGE,
    MOVEATTRIBUTE_PRIORTY,
-    MOVEATTRIBUTE_UNK9,
-    MOVEATTRIBUTE_UNK10,
+    MOVEATTRIBUTE_FLAGS,
+    MOVEATTRIBUTE_CONTEST_EFFECT,
    MOVEATTRIBUTE_CONTEST_TYPE,
-} MoveAttribute;
+};

-void MoveTable_Load(void * dest);
-u32 MoveTable_GetMoveAttribute(int moveID, int attrno);
-u8 MoveTable_GetMoveMaxPP(u16 moveID, u8 ppUps);
-u32 MoveTable_GetAttribute(MoveTable * moveTable, int attribute);
+/**
+ * @brief Load the full move table into a destination buffer.
+ * 
+ * No allocation happens here; the destination buffer is assumed to be
+ * allocated on entry.
+ * 
+ * @param buf
+ */
+void MoveTable_Load(void *buf);

-#endif // POKEPLATINUM_UNK_020790B0_H
+/**
+ * @brief Load a param for a given move from the global move table.
+ * 
+ * @param move      The move to load.
+ * @param param     The param value to load.
+ * @return Value of the parameter for the requested move.
+ */
+u32 MoveTable_LoadParam(int move, enum MoveAttribute param);
+
+/**
+ * @brief Compute the maximum PP for a given move according to a specified
+ * number of PP Ups applied to that move.
+ * 
+ * @param move
+ * @param ppUps     The number of PP Ups which have been applied to this move.
+ * @return The maximum PP of the move, accounting for PP Ups.
+ */
+u8 MoveTable_CalcMaxPP(u16 move, u8 ppUps);
+
+/**
+ * @brief Get a param value for a given move table entry.
+ * 
+ * @param entry     A pre-loaded move table entry.
+ * @param param     The param to get.
+ * @return Value of the parameter for the given move.
+ */
+u32 MoveTable_Get(MoveTable *entry, enum MoveAttribute param);
+
+#endif // POKEPLATINUM_MOVE_TABLE_H
--- a/include/overlay005/ov5_021DC018.h
+++ b/include/overlay005/ov5_021DC018.h
@@ -1,17 +1,17 @@
 #ifndef POKEPLATINUM_OV5_021DC018_H
 #define POKEPLATINUM_OV5_021DC018_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay005/struct_ov5_021DC1A4_decl.h"

-UnkStruct_ov5_021DC1A4 * ov5_021DC150(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, UnkStruct_0200B144 * param8);
+UnkStruct_ov5_021DC1A4 * ov5_021DC150(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, MessageLoader * param8);
 void ov5_021DC1A4(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2);
 void ov5_021DC1AC(UnkStruct_ov5_021DC1A4 * param0);
 void ov5_021DC424(UnkStruct_ov5_021DC1A4 * param0);
-UnkStruct_ov5_021DC1A4 * ov5_021DC48C(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, UnkStruct_0200B144 * param8);
+UnkStruct_ov5_021DC1A4 * ov5_021DC48C(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, MessageLoader * param8);
 void ov5_021DC4B0(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2, u32 param3);
 void ov5_021DC4B8(UnkStruct_ov5_021DC1A4 * param0);
 void ov5_021DC528(UnkStruct_ov5_021DC1A4 * param0, u16 param1);
--- a/include/overlay005/ov5_021DD42C.h
+++ b/include/overlay005/ov5_021DD42C.h
@@ -1,14 +1,14 @@
 #ifndef POKEPLATINUM_OV5_021DD42C_H
 #define POKEPLATINUM_OV5_021DD42C_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0203E724_decl.h"
 #include "overlay005/struct_ov5_021DD42C.h"

 void ov5_021DD42C(UnkStruct_ov5_021DD42C * param0, UnkStruct_0203E724 * param1);
-void ov5_021DD444(UnkStruct_0203E724 * param0, const UnkStruct_0200B144 * param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C * param4);
-void ov5_021DD498(UnkStruct_0203E724 * param0, const UnkStruct_0200B144 * param1, int param2);
+void ov5_021DD444(UnkStruct_0203E724 * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C * param4);
+void ov5_021DD498(UnkStruct_0203E724 * param0, const MessageLoader * param1, int param2);
 void ov5_021DD4CC(UnkStruct_0203E724 * param0, u16 param1, u16 param2, u16 param3, s16 param4, u8 param5);
 void ov5_021DD530(UnkStruct_0203E724 * param0, UnkStruct_0200B358 * param1, u8 param2, u8 param3);

--- a/include/overlay006/ov6_022489E4.h
+++ b/include/overlay006/ov6_022489E4.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV6_022489E4_H
 #define POKEPLATINUM_OV6_022489E4_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_defs/struct_020954F0.h"
 #include "struct_defs/struct_02095C48.h"
--- a/include/overlay007/struct_ov7_0224D008.h
+++ b/include/overlay007/struct_ov7_0224D008.h
@@ -3,14 +3,14 @@

 #include "struct_decls/struct_0200112C_decl.h"
 #include "struct_decls/struct_02001AF4_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020203AC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_0202B628_decl.h"
@@ -29,7 +29,7 @@ typedef struct {
    UnkStruct_02013A04 * unk_7C;
    UnkStruct_02001AF4 * unk_80;
    UnkStruct_02013A04 * unk_84;
-    UnkStruct_0200B144 * unk_88;
+    MessageLoader * unk_88;
    UnkStruct_0200B358 * unk_8C;
    UnkStruct_020203AC * unk_90;
    UnkStruct_ov5_021D30A8 unk_94;
--- a/include/overlay008/ov8_02249960.h
+++ b/include/overlay008/ov8_02249960.h
@@ -1,8 +1,8 @@
 #ifndef POKEPLATINUM_OV8_02249960_H
 #define POKEPLATINUM_OV8_02249960_H

-#include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "message.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_defs/struct_0205AA50.h"

@@ -21,7 +21,7 @@ void ov8_0224AD34(UnkStruct_0203CDB0 * param0, const u8 param1);
 void ov8_0224B020(UnkStruct_0203CDB0 * param0);
 void ov8_0224B0FC(UnkStruct_0203CDB0 * param0);
 BOOL ov8_0224B110(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
-BOOL ov8_0224B67C(UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, Strbuf *param3);
+BOOL ov8_0224B67C(UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1, MessageLoader * param2, Strbuf *param3);
 BOOL ov8_0224B714(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3);
 void ov8_0224B764(UnkStruct_0203CDB0 * param0);
 void ov8_0224B7C0(UnkStruct_0203CDB0 * param0);
--- a/include/overlay010/struct_ov10_0221F800.h
+++ b/include/overlay010/struct_ov10_0221F800.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV10_0221F800_H
 #define POKEPLATINUM_STRUCT_OV10_0221F800_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_party_decl.h"
 #include "overlay006/battle_params.h"

--- a/include/overlay013/struct_ov13_022213F0.h
+++ b/include/overlay013/struct_ov13_022213F0.h
@@ -2,13 +2,13 @@
 #define POKEPLATINUM_STRUCT_OV13_022213F0_H

 #include "struct_decls/struct_02002F38_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay013/struct_ov13_0221FC20.h"
 #include "overlay013/struct_ov13_02221ED0.h"
@@ -38,7 +38,7 @@ typedef struct {
    u8 unk_1F9F_4 : 3;
    u8 unk_1F9F_7 : 1;
    UnkStruct_0200C440 * unk_1FA0;
-    UnkStruct_0200B144 * unk_1FA4;
+    MessageLoader * unk_1FA4;
    UnkStruct_0200B358 * unk_1FA8;
    Strbuf* unk_1FAC;
    UnkStruct_0200C704 * unk_1FB0;
--- a/include/overlay013/struct_ov13_02227244.h
+++ b/include/overlay013/struct_ov13_02227244.h
@@ -2,13 +2,13 @@
 #define POKEPLATINUM_STRUCT_OV13_02227244_H

 #include "struct_decls/struct_02002F38_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0207CDEC.h"
 #include "overlay013/struct_ov13_022264F4.h"
@@ -20,7 +20,7 @@ typedef struct {
    UnkStruct_02018340 * unk_04;
    UnkStruct_02002F38 * unk_08;
    UnkStruct_0200C440 * unk_0C;
-    UnkStruct_0200B144 * unk_10;
+    MessageLoader * unk_10;
    UnkStruct_0200B358 * unk_14;
    Strbuf* unk_18;
    UnkStruct_0205AA50 unk_1C;
@@ -30,7 +30,7 @@ typedef struct {
    u8 unk_32;
    UnkStruct_ov13_02228A50 * unk_34;
    UnkStruct_ov16_0226DEEC * unk_38;
-    UnkStruct_0207CDEC unk_3C[5][36];
+    BagItem unk_3C[5][36];
    UnkStruct_0200C704 * unk_30C;
    UnkStruct_0200D0F4 * unk_310[6];
    u16 unk_328[3][144];
--- a/include/overlay016/ov16_0223DF00.h
+++ b/include/overlay016/ov16_0223DF00.h
@@ -4,14 +4,14 @@
 #include "struct_decls/struct_02002F38_decl.h"
 #include "struct_decls/struct_02007768_decl.h"
 #include "struct_decls/struct_02007C7C_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02015F84_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_defs/struct_020279FC.h"
@@ -38,10 +38,10 @@

 UnkStruct_02018340 * ov16_0223DF00(BattleSystem * param0);
 UnkStruct_0205AA50 * ov16_0223DF04(BattleSystem * param0, int param1);
-u32 BattleSystem_BattleType(BattleSystem * param0);
-BattleContext * BattleSystem_Context(BattleSystem *battleSys);
-UnkStruct_ov16_0225BFFC * BattleSystem_BattlerData(BattleSystem * param0, int param1);
-int BattleSystem_MaxBattlers(BattleSystem * param0);
+u32 ov16_0223DF0C(BattleSystem * param0);
+BattleContext * ov16_0223DF10(BattleSystem * param0);
+UnkStruct_ov16_0225BFFC * ov16_0223DF14(BattleSystem * param0, int param1);
+int ov16_0223DF1C(BattleSystem * param0);
 Party * ov16_0223DF20(BattleSystem * param0, int param1);
 int ov16_0223DF60(BattleSystem * param0, int param1);
 Pokemon * ov16_0223DFAC(BattleSystem * param0, int param1, int param2);
@@ -55,8 +55,8 @@ UnkStruct_ov16_0226D160 * ov16_0223E034(BattleSystem * param0, UnkEnum_ov16_0226
 void ov16_0223E040(BattleSystem * param0, UnkEnum_ov16_0226D194 param1, UnkStruct_ov16_0226D160 * param2);
 UnkStruct_0200C440 * ov16_0223E04C(BattleSystem * param0);
 UnkStruct_0200C440 * ov16_0223E054(BattleSystem * param0);
-UnkStruct_0200B144 * ov16_0223E05C(BattleSystem * param0);
-UnkStruct_0200B144 * ov16_0223E060(BattleSystem * param0);
+MessageLoader * ov16_0223E05C(BattleSystem * param0);
+MessageLoader * ov16_0223E060(BattleSystem * param0);
 UnkStruct_02002F38 * ov16_0223E064(BattleSystem * param0);
 UnkStruct_02026324 * ov16_0223E068(BattleSystem * param0);
 u8 * ov16_0223E06C(BattleSystem * param0);
@@ -77,17 +77,17 @@ UnkStruct_0207D3C0 * ov16_0223E1AC(BattleSystem * param0);
 UnkStruct_0207D99C * ov16_0223E1B0(BattleSystem * param0);
 u32 ov16_0223E1B4(BattleSystem * param0, int param1);
 int ov16_0223E1C4(BattleSystem * param0, int param1);
-u8 BattleSystem_BattlerSlot(BattleSystem *battleSys, int battler);
+u8 ov16_0223E1F8(BattleSystem * param0, int param1);
 u8 ov16_0223E208(BattleSystem * param0, int param1);
 void * ov16_0223E220(BattleSystem * param0);
 UnkStruct_020797DC * ov16_0223E228(BattleSystem * param0);
 int ov16_0223E22C(BattleSystem * param0);
 int ov16_0223E240(BattleSystem * param0);
 int ov16_0223E24C(BattleSystem * param0);
-int BattleSystem_Partner(BattleSystem *battleSys, int battler);
+int ov16_0223E258(BattleSystem * param0, int param1);
 int ov16_0223E2A4(BattleSystem * param0, int param1, int param2);
 BOOL ov16_0223E30C(BattleSystem * param0, int param1, int param2, int param3, int param4);
-u32 BattleSystem_BattleStatus(BattleSystem *battleSys);
+u32 ov16_0223EBEC(BattleSystem * param0);
 int ov16_0223EBF8(BattleSystem * param0);
 int ov16_0223EC04(BattleSystem * param0);
 u8 ov16_0223EC58(BattleSystem * param0, int param1, u8 param2);
@@ -171,7 +171,7 @@ void ov16_0223F9A0(BattleSystem * param0, int param1);
 BOOL ov16_0223F9E0(BattleSystem * param0, int param1);
 void ov16_0223F9F0(void);
 u8 ov16_0223F9FC(BattleSystem * param0, int param1, int param2, int param3, int param4);
-u8 ov16_0223FB24(BattleSystem * param0, UnkStruct_0200B144 * param1, BattleMessage * param2, int param3);
-u8 ov16_0223FB78(BattleSystem * param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8);
+u8 ov16_0223FB24(BattleSystem * param0, MessageLoader * param1, BattleMessage * param2, int param3);
+u8 ov16_0223FB78(BattleSystem * param0, UnkStruct_0205AA50 * param1, MessageLoader * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8);

 #endif // POKEPLATINUM_OV16_0223DF00_H
--- a/include/overlay017/ov17_0223F118.h
+++ b/include/overlay017/ov17_0223F118.h
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0207C690.h"
 #include "struct_defs/struct_02095C48.h"
 #include "overlay017/struct_ov17_0223F2E4.h"
--- a/include/overlay017/struct_ov17_0223F88C.h
+++ b/include/overlay017/struct_ov17_0223F88C.h
@@ -4,14 +4,14 @@
 #include "struct_decls/struct_02002F38_decl.h"
 #include "struct_decls/struct_02007768_decl.h"
 #include "struct_decls/struct_02007C7C_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
@@ -27,10 +27,10 @@ typedef struct {
    UnkStruct_ov12_0221FCDC * unk_20;
    UnkStruct_02018340 * unk_24;
    UnkStruct_0205AA50 unk_28[1];
-    UnkStruct_0200B144 * unk_38;
-    UnkStruct_0200B144 * unk_3C;
-    UnkStruct_0200B144 * unk_40;
-    UnkStruct_0200B144 * unk_44;
+    MessageLoader * unk_38;
+    MessageLoader * unk_3C;
+    MessageLoader * unk_40;
+    MessageLoader * unk_44;
    UnkStruct_0200B358 * unk_48;
    Strbuf* unk_4C;
    UnkStruct_02002F38 * unk_50;
--- a/include/overlay017/struct_ov17_022476F8.h
+++ b/include/overlay017/struct_ov17_022476F8.h
@@ -4,13 +4,13 @@
 #include "struct_decls/struct_02002F38_decl.h"
 #include "struct_decls/struct_02007768_decl.h"
 #include "struct_decls/struct_02007C7C_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 #include "overlay016/struct_ov16_0223E0C8.h"
@@ -25,7 +25,7 @@ typedef struct {
    UnkStruct_0200C704 * unk_20;
    UnkStruct_02018340 * unk_24;
    UnkStruct_0205AA50 unk_28[1];
-    UnkStruct_0200B144 * unk_38;
+    MessageLoader * unk_38;
    UnkStruct_0200B358 * unk_3C;
    Strbuf* unk_40;
    UnkStruct_02002F38 * unk_44;
--- a/include/overlay017/struct_ov17_0224A1EC.h
+++ b/include/overlay017/struct_ov17_0224A1EC.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02002F38_decl.h"
 #include "struct_decls/struct_02007768_decl.h"
 #include "struct_decls/struct_02007C7C_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 #include "overlay016/struct_ov16_0223E0C8.h"
@@ -36,7 +36,7 @@ typedef struct {
    UnkStruct_0200C704 * unk_5C;
    UnkStruct_02018340 * unk_60;
    UnkStruct_0205AA50 unk_64[2];
-    UnkStruct_0200B144 * unk_84;
+    MessageLoader * unk_84;
    UnkStruct_0200B358 * unk_88;
    Strbuf* unk_8C;
    UnkStruct_02002F38 * unk_90;
--- a/include/overlay017/struct_ov17_022507C4.h
+++ b/include/overlay017/struct_ov17_022507C4.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02002F38_decl.h"
 #include "struct_decls/struct_02007768_decl.h"
 #include "struct_decls/struct_02007C7C_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 #include "overlay016/struct_ov16_0223E0C8.h"
@@ -26,7 +26,7 @@ typedef struct {
    UnkStruct_0200C704 * unk_1C;
    UnkStruct_02018340 * unk_20;
    UnkStruct_0205AA50 unk_24[9];
-    UnkStruct_0200B144 * unk_B4;
+    MessageLoader * unk_B4;
    UnkStruct_0200B358 * unk_B8;
    Strbuf* unk_BC;
    UnkStruct_02002F38 * unk_C0;
--- a/include/overlay019/ov19_021D0D80.h
+++ b/include/overlay019/ov19_021D0D80.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV19_021D0D80_H

 #include "struct_decls/struct_020067E8_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_defs/box_pokemon.h"
 #include "struct_decls/struct_020797DC_decl.h"
@@ -17,7 +17,7 @@ int ov19_021D0DEC(UnkStruct_020067E8 * param0, int * param1);
 int ov19_021D0E58(UnkStruct_020067E8 * param0, int * param1);
 BOOL ov19_021D3B18(const UnkStruct_ov19_021D5DF8 * param0);
 BOOL ov19_021D3B20(const UnkStruct_ov19_021D5DF8 * param0);
-UnkStruct_0200B144 * ov19_021D5DE8(const UnkStruct_ov19_021D5DF8 * param0);
+MessageLoader * ov19_021D5DE8(const UnkStruct_ov19_021D5DF8 * param0);
 const UnkStruct_0200B358 * ov19_021D5DF0(const UnkStruct_ov19_021D5DF8 * param0);
 int ov19_021D5DF8(const UnkStruct_ov19_021D5DF8 * param0);
 u32 ov19_021D5E08(const UnkStruct_ov19_021D4DF0 * param0);
--- a/include/overlay019/ov19_021DA92C.h
+++ b/include/overlay019/ov19_021DA92C.h
@@ -2,14 +2,14 @@
 #define POKEPLATINUM_OV19_021DA92C_H

 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DA9E0.h"

-BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, const UnkStruct_0200B144 * param5, NARC * param6);
+BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, const MessageLoader * param5, NARC * param6);
 void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 * param0);
 void ov19_021DAA80(UnkStruct_ov19_021DA9E0 * param0);
 void ov19_021DAA90(UnkStruct_ov19_021DA9E0 * param0);
--- a/include/overlay019/ov19_021DB2FC.h
+++ b/include/overlay019/ov19_021DB2FC.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV19_021DB2FC_H

 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
@@ -11,7 +11,7 @@
 #include "overlay019/struct_ov19_021DB6F0.h"
 #include "overlay019/struct_ov19_021DF964.h"

-BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, UnkStruct_0200B144 * param5, const UnkStruct_0200B358 * param6, int param7, NARC * param8);
+BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, MessageLoader * param5, const UnkStruct_0200B358 * param6, int param7, NARC * param8);
 void ov19_021DB370(UnkStruct_ov19_021DB6F0 * param0);
 void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 * param0);
 void ov19_021DB448(UnkStruct_ov19_021DB6F0 * param0, u32 param1);
--- a/include/overlay019/ov19_021DEC04.h
+++ b/include/overlay019/ov19_021DEC04.h
@@ -2,14 +2,14 @@
 #define POKEPLATINUM_OV19_021DEC04_H

 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DEC04_decl.h"

-BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, UnkStruct_0200B144 * param5, NARC * param6);
+BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, MessageLoader * param5, NARC * param6);
 void ov19_021DECAC(UnkStruct_ov19_021DEC04 * param0);
 void ov19_021DECE8(UnkStruct_ov19_021DEC04 * param0, NARC * param1);
 void ov19_021DEDDC(UnkStruct_ov19_021DEC04 * param0, BOOL param1);
--- a/include/overlay019/struct_ov19_021D4F5C.h
+++ b/include/overlay019/struct_ov19_021D4F5C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV19_021D4F5C_H
 #define POKEPLATINUM_STRUCT_OV19_021D4F5C_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"

 typedef struct {
    u8 unk_00;
--- a/include/overlay019/struct_ov19_021D5BAC.h
+++ b/include/overlay019/struct_ov19_021D5BAC.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV19_021D5BAC_H
 #define POKEPLATINUM_STRUCT_OV19_021D5BAC_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"

 typedef struct {
    void * unk_00;
--- a/include/overlay019/struct_ov19_021D5FAC.h
+++ b/include/overlay019/struct_ov19_021D5FAC.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV19_021D5FAC_H
 #define POKEPLATINUM_STRUCT_OV19_021D5FAC_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"

 typedef struct {
    void * unk_00;
--- a/include/overlay019/struct_ov19_021DA9E0.h
+++ b/include/overlay019/struct_ov19_021DA9E0.h
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
--- a/include/overlay019/struct_ov19_021DB6F0.h
+++ b/include/overlay019/struct_ov19_021DB6F0.h
@@ -1,10 +1,10 @@
 #ifndef POKEPLATINUM_STRUCT_OV19_021DB6F0_H
 #define POKEPLATINUM_STRUCT_OV19_021DB6F0_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
@@ -16,8 +16,8 @@ typedef struct {
    u8 padding_04[4];
    const UnkStruct_ov19_021D4DF0 * unk_08;
    UnkStruct_ov19_021D61B0 * unk_0C;
-    UnkStruct_0200B144 * unk_10;
-    UnkStruct_0200B144 * unk_14;
+    MessageLoader * unk_10;
+    MessageLoader * unk_14;
    UnkStruct_0205AA50 * unk_18;
    u16 unk_1C;
    u16 unk_1E;
--- a/include/overlay019/struct_ov19_021DBA9C.h
+++ b/include/overlay019/struct_ov19_021DBA9C.h
@@ -1,14 +1,14 @@
 #ifndef POKEPLATINUM_STRUCT_OV19_021DBA9C_H
 #define POKEPLATINUM_STRUCT_OV19_021DBA9C_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_defs/struct_0201AE08.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
@@ -41,7 +41,7 @@ typedef struct {
    u8 unk_3E4[18][1024];
    u8 unk_4BE4[18];
    u8 padding_4BF6[2];
-    UnkStruct_0200B144 * unk_4BF8;
+    MessageLoader * unk_4BF8;
    Strbuf* unk_4BFC;
 } UnkStruct_ov19_021DBA9C;

--- a/include/overlay020/ov20_021D0D80.h
+++ b/include/overlay020/ov20_021D0D80.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV20_021D0D80_H

 #include "struct_decls/struct_020067E8_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"

 int ov20_021D0D80(UnkStruct_020067E8 * param0, int * param1);
--- a/include/overlay020/ov20_021D5044.h
+++ b/include/overlay020/ov20_021D5044.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV20_021D5044_H
 #define POKEPLATINUM_OV20_021D5044_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"

 u32 ov20_021D5044(void);
 void ov20_021D5048(u32 param0, Strbuf *param1);
--- a/include/overlay021/ov21_021D0D80.h
+++ b/include/overlay021/ov21_021D0D80.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
 #include "struct_defs/union_02022594_020225E0.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay021/struct_ov21_021D0D80_1.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
--- a/include/overlay021/ov21_021D3208.h
+++ b/include/overlay021/ov21_021D3208.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV21_021D3208_H
 #define POKEPLATINUM_OV21_021D3208_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay021/struct_ov21_021D3208.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D37DC.h"
--- a/include/overlay021/ov21_021D4C0C.h
+++ b/include/overlay021/ov21_021D4C0C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV21_021D4C0C_H
 #define POKEPLATINUM_OV21_021D4C0C_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay021/struct_ov21_021D1FA4.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
--- a/include/overlay021/ov21_021D5600.h
+++ b/include/overlay021/ov21_021D5600.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV21_021D5600_H
 #define POKEPLATINUM_OV21_021D5600_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"

 void ov21_021D5600(Strbuf *param0);
 int ov21_021D5608(int param0);
--- a/include/overlay021/struct_ov21_021D3320.h
+++ b/include/overlay021/struct_ov21_021D3320.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV21_021D3320_H
 #define POKEPLATINUM_STRUCT_OV21_021D3320_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_decls/struct_02098700_decl.h"
 #include "overlay021/struct_ov21_021D3A60.h"
--- a/include/overlay022/struct_ov22_0225A428.h
+++ b/include/overlay022/struct_ov22_0225A428.h
@@ -3,7 +3,7 @@

 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay022/struct_ov22_022597BC.h"
 #include "overlay022/struct_ov22_0225A914.h"
--- a/include/overlay023/ov23_0223E140.h
+++ b/include/overlay023/ov23_0223E140.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV23_0223E140_H
 #define POKEPLATINUM_OV23_0223E140_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay023/struct_ov23_0224271C_decl.h"

--- a/include/overlay023/ov23_022416A8.h
+++ b/include/overlay023/ov23_022416A8.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV23_022416A8_H
 #define POKEPLATINUM_OV23_022416A8_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay023/struct_ov23_02241A80.h"
 #include "overlay023/struct_ov23_02241A88.h"
--- a/include/overlay023/ov23_02241F74.h
+++ b/include/overlay023/ov23_02241F74.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV23_02241F74_H

 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02029894_decl.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
--- a/include/overlay023/ov23_0224340C.h
+++ b/include/overlay023/ov23_0224340C.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV23_0224340C_H

 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay023/struct_ov23_0224271C_decl.h"

--- a/include/overlay023/ov23_0224B05C.h
+++ b/include/overlay023/ov23_0224B05C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV23_0224B05C_H
 #define POKEPLATINUM_OV23_0224B05C_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02029894_decl.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
--- a/include/overlay023/ov23_02253D40.h
+++ b/include/overlay023/ov23_02253D40.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV23_02253D40_H
 #define POKEPLATINUM_OV23_02253D40_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "overlay023/struct_ov23_02253E2C_decl.h"
@@ -13,7 +13,7 @@ UnkStruct_ov23_02253E2C * ov23_02253D48(int param0, int param1, UnkStruct_020183
 void ov23_02253DD8(UnkStruct_ov23_02253E2C * param0);
 void ov23_02253DFC(UnkStruct_ov23_02253E2C * param0, int param1, int param2);
 void ov23_02253E2C(UnkStruct_ov23_02253E2C * param0, UnkStruct_02018340 * param1, u16 param2, u16 param3);
-UnkStruct_0200B144 * ov23_02253E3C(UnkStruct_ov23_02253E2C * param0);
+MessageLoader * ov23_02253E3C(UnkStruct_ov23_02253E2C * param0);
 int ov23_02253F40(UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3);
 int ov23_02253F60(UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3);
 int ov23_02253F78(UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3, int param4);
--- a/include/overlay023/struct_ov23_02250CD4.h
+++ b/include/overlay023/struct_ov23_02250CD4.h
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0206A844.h"
--- a/include/overlay062/funcptr_ov62_022349A8.h
+++ b/include/overlay062/funcptr_ov62_022349A8.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_FUNCPTR_OV62_022349A8_H
 #define POKEPLATINUM_FUNCPTR_OV62_022349A8_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"

 typedef void (* UnkFuncPtr_ov62_022349A8)(void *, Strbuf *);

--- a/include/overlay062/ov62_02231690.h
+++ b/include/overlay062/ov62_02231690.h
@@ -2,10 +2,10 @@
 #define POKEPLATINUM_OV62_02231690_H

 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202F41C_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0208B878.h"
@@ -39,8 +39,8 @@ void ov62_02232378(UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1
 void ov62_02232394(UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1);
 void ov62_022323B8(UnkStruct_ov62_022323B8 * param0, int param1);
 void ov62_022324A0(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, const UnkStruct_ov62_02248CDC * param2);
-void ov62_02232594(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, UnkStruct_0200B144 * param2, const UnkStruct_ov62_02248CDC * param3);
-void ov62_02232778(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, UnkStruct_0200B144 * param2, const UnkStruct_ov62_02248CDC * param3, int param4, int param5, Strbuf *param6);
+void ov62_02232594(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, MessageLoader * param2, const UnkStruct_ov62_02248CDC * param3);
+void ov62_02232778(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, MessageLoader * param2, const UnkStruct_ov62_02248CDC * param3, int param4, int param5, Strbuf *param6);
 void ov62_02232AAC(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, const UnkStruct_ov62_02248CDC * param2, Strbuf *param3[20][2]);
 int ov62_02232BB4(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, Strbuf *param2[20][2]);
 int ov62_02232C78(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, int param2, int param3, Strbuf *param4);
--- a/include/overlay062/struct_ov62_0223118C.h
+++ b/include/overlay062/struct_ov62_0223118C.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02002F38_decl.h"
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02007768_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
@@ -27,8 +27,8 @@ typedef struct {
    UnkStruct_02023FCC * unk_18;
    UnkUnion_02022594 unk_1C[5];
    BOOL unk_30;
-    UnkStruct_0200B144 * unk_34;
-    UnkStruct_0200B144 * unk_38;
+    MessageLoader * unk_34;
+    MessageLoader * unk_38;
    UnkStruct_02012744 * unk_3C;
    int unk_40;
    int unk_44;
--- a/include/overlay062/struct_ov62_02233310.h
+++ b/include/overlay062/struct_ov62_02233310.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV62_02233310_H
 #define POKEPLATINUM_STRUCT_OV62_02233310_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay062/struct_ov62_02233310_sub1.h"
@@ -18,7 +18,7 @@ typedef struct {
    UnkStruct_0205AA50 unk_18;
    const UnkStruct_ov62_02248CDC * unk_28;
    UnkStruct_0200D0F4 * unk_2C[2];
-    UnkStruct_0200B144 * unk_34;
+    MessageLoader * unk_34;
    UnkStruct_ov62_02233310_sub1 unk_38;
    BOOL unk_48;
    u8 padding_4C[4];
--- a/include/overlay062/struct_ov62_022349A8.h
+++ b/include/overlay062/struct_ov62_022349A8.h
@@ -1,9 +1,9 @@
 #ifndef POKEPLATINUM_STRUCT_OV62_022349A8_H
 #define POKEPLATINUM_STRUCT_OV62_022349A8_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay061/struct_ov61_0222B138.h"
 #include "overlay061/struct_ov61_0222B920.h"
@@ -39,7 +39,7 @@ typedef struct {
    int unk_3E8;
    int unk_3EC;
    int unk_3F0;
-    UnkStruct_0200B144 * unk_3F4;
+    MessageLoader * unk_3F4;
    UnkStruct_0200B358 * unk_3F8;
    Strbuf* unk_3FC;
    UnkStruct_ov61_0222B920 unk_400;
--- a/include/overlay062/struct_ov62_0223E01C_sub1.h
+++ b/include/overlay062/struct_ov62_0223E01C_sub1.h
@@ -1,13 +1,13 @@
 #ifndef POKEPLATINUM_STRUCT_OV62_0223E01C_SUB1_H
 #define POKEPLATINUM_STRUCT_OV62_0223E01C_SUB1_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"

 typedef struct {
    int unk_00;
    int unk_04;
    u16 * unk_08;
-    UnkStruct_0200B144 * unk_0C;
+    MessageLoader * unk_0C;
    BOOL unk_10;
 } UnkStruct_ov62_0223E01C_sub1;

--- a/include/overlay062/struct_ov62_02246B00.h
+++ b/include/overlay062/struct_ov62_02246B00.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV62_02246B00_H
 #define POKEPLATINUM_STRUCT_OV62_02246B00_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"

 typedef struct {
--- a/include/overlay065/struct_ov65_0222EBE0_t.h
+++ b/include/overlay065/struct_ov65_0222EBE0_t.h
@@ -5,14 +5,14 @@
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "struct_decls/struct_020067E8_decl.h"
 #include "struct_decls/struct_02009714_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_defs/struct_0205AA50.h"
@@ -39,8 +39,8 @@ struct UnkStruct_ov65_0222EBE0_t {
    UnkStruct_02018340 * unk_15C;
    UnkStruct_021C0794 * unk_160;
    UnkStruct_0200B358 * unk_164;
-    UnkStruct_0200B144 * unk_168;
-    UnkStruct_0200B144 * unk_16C;
+    MessageLoader * unk_168;
+    MessageLoader * unk_16C;
    Strbuf* unk_170;
    Strbuf* unk_174;
    Strbuf* unk_178;
--- a/include/overlay066/ov66_0223177C.h
+++ b/include/overlay066/ov66_0223177C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV66_0223177C_H
 #define POKEPLATINUM_OV66_0223177C_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay066/struct_ov66_02231428.h"
 #include "overlay066/struct_ov66_0223177C_decl.h"
 #include "overlay066/struct_ov66_0223185C.h"
--- a/include/overlay070/ov70_0225D9A4.h
+++ b/include/overlay070/ov70_0225D9A4.h
@@ -3,7 +3,7 @@

 #include "struct_decls/struct_020067E8_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay066/struct_ov66_0222DFF8_decl.h"
 #include "overlay070/struct_ov70_0225C894_decl.h"
 #include "overlay070/struct_ov70_0225CA20_decl.h"
--- a/include/overlay071/ov71_0223C69C.h
+++ b/include/overlay071/ov71_0223C69C.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV71_0223C69C_H

 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02072014.h"

--- a/include/overlay071/struct_ov71_0223B620.h
+++ b/include/overlay071/struct_ov71_0223B620.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV71_0223B620_H

 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02072014.h"
 #include "overlay071/struct_ov71_0223C444.h"
--- a/include/overlay072/struct_ov72_0223DB98_t.h
+++ b/include/overlay072/struct_ov72_0223DB98_t.h
@@ -3,14 +3,14 @@

 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_defs/struct_0205AA50.h"
@@ -25,7 +25,7 @@ struct UnkStruct_ov72_0223DB98_t {
    UnkStruct_0202CD88 * unk_08;
    UnkStruct_020279FC * unk_0C;
    UnkStruct_0200B358 * unk_10;
-    UnkStruct_0200B144 * unk_14;
+    MessageLoader * unk_14;
    Strbuf* unk_18[5];
    Strbuf* unk_2C;
    Strbuf* unk_30;
--- a/include/overlay079/struct_ov79_021D0E1C.h
+++ b/include/overlay079/struct_ov79_021D0E1C.h
@@ -3,7 +3,7 @@

 #include "struct_decls/struct_0200112C_decl.h"
 #include "struct_decls/struct_02001AF4_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
@@ -37,7 +37,7 @@ typedef struct UnkStruct_ov79_021D0E1C_t {
    UnkStruct_0203D9B8 * unk_20;
    UnkStruct_02018340 * unk_24;
    UnkStruct_020158A8 * unk_28;
-    UnkStruct_0200B144 * unk_2C;
+    MessageLoader * unk_2C;
    UnkStruct_ov79_021D0E1C_sub1 unk_30;
    u16 unk_80;
    u16 unk_82;
--- a/include/overlay079/struct_ov79_021D0E1C_sub1.h
+++ b/include/overlay079/struct_ov79_021D0E1C_sub1.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV79_021D0E1C_SUB1_H

 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"

 typedef struct {
    UnkStruct_0200B358 * unk_00;
--- a/include/overlay079/struct_ov79_021D38D0.h
+++ b/include/overlay079/struct_ov79_021D38D0.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV79_021D38D0_H
 #define POKEPLATINUM_STRUCT_OV79_021D38D0_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"

 typedef struct {
--- a/include/overlay080/struct_ov80_021D2A08.h
+++ b/include/overlay080/struct_ov80_021D2A08.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV80_021D2A08_H
 #define POKEPLATINUM_STRUCT_OV80_021D2A08_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02039EBC_decl.h"
 #include "struct_defs/struct_0203D8AC.h"
 #include "overlay080/struct_ov80_021D259C.h"
@@ -37,8 +37,8 @@ typedef struct UnkStruct_ov80_021D2A08_t {
    UnkStruct_ov80_021D2C1C * unk_3C;
    UnkStruct_ov80_021D2E10 * unk_40;
    UnkStruct_ov80_021D259C unk_44[5];
-    UnkStruct_0200B144 * unk_80;
-    UnkStruct_0200B144 * unk_84;
+    MessageLoader * unk_80;
+    MessageLoader * unk_84;
    Strbuf* unk_88;
    int unk_8C;
    int unk_90;
--- a/include/overlay081/struct_ov81_021D1610.h
+++ b/include/overlay081/struct_ov81_021D1610.h
@@ -1,10 +1,10 @@
 #ifndef POKEPLATINUM_STRUCT_OV81_021D1610_H
 #define POKEPLATINUM_STRUCT_OV81_021D1610_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B628_decl.h"
 #include "struct_defs/struct_0205AA50.h"
@@ -16,7 +16,7 @@ typedef struct {
    UnkStruct_0202B628 * unk_44;
    UnkStruct_02025E6C * unk_48;
    UnkStruct_021C0794 * unk_4C;
-    UnkStruct_0200B144 * unk_50;
+    MessageLoader * unk_50;
    UnkStruct_0200B358 * unk_54;
    Strbuf* unk_58;
    u16 unk_5C[1024];
--- a/include/overlay083/struct_ov83_0223DEA0.h
+++ b/include/overlay083/struct_ov83_0223DEA0.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV83_0223DEA0_H
 #define POKEPLATINUM_STRUCT_OV83_0223DEA0_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"

 typedef struct {
-    UnkStruct_0200B144 * unk_00;
+    MessageLoader * unk_00;
    UnkStruct_0200B358 * unk_04;
    Strbuf* unk_08;
    Strbuf* unk_0C;
--- a/include/overlay084/ov84_0223F040.h
+++ b/include/overlay084/ov84_0223F040.h
@@ -18,8 +18,8 @@ void ov84_0223F584(UnkStruct_ov84_0223B5A0 * param0, u16 param1);
 void ov84_0223F7D4(UnkStruct_ov84_0223B5A0 * param0);
 void ov84_0223F800(UnkStruct_ov84_0223B5A0 * param0);
 void ov84_0223F81C(UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 param2, u32 param3);
-void ov84_0223F8D0(UnkStruct_ov84_0223B5A0 * param0, UnkStruct_0207CDEC * param1, u32 param2);
-void ov84_0223F94C(UnkStruct_ov84_0223B5A0 * param0, UnkStruct_0207CDEC * param1, u32 param2);
+void ov84_0223F8D0(UnkStruct_ov84_0223B5A0 * param0, BagItem * param1, u32 param2);
+void ov84_0223F94C(UnkStruct_ov84_0223B5A0 * param0, BagItem * param1, u32 param2);
 void ov84_0223F9F0(UnkStruct_ov84_0223B5A0 * param0, u32 param1);
 void ov84_0223FA44(UnkStruct_ov84_0223B5A0 * param0, u32 param1);
 void ov84_0223FA88(UnkStruct_ov84_0223B5A0 * param0);
--- a/include/overlay084/struct_ov84_0223B5A0.h
+++ b/include/overlay084/struct_ov84_0223B5A0.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0200112C_decl.h"
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/struct_0205AA50.h"
@@ -34,10 +34,10 @@ typedef struct {
    UnkStruct_0200C704 * unk_DC;
    UnkStruct_0200D0F4 * unk_E0[12];
    UnkStruct_0200C440 * unk_110;
-    UnkStruct_0200B144 * unk_114;
+    MessageLoader * unk_114;
    UnkStruct_0200B358 * unk_118;
-    UnkStruct_0200B144 * unk_11C;
-    UnkStruct_0200B144 * unk_120;
+    MessageLoader * unk_11C;
+    MessageLoader * unk_120;
    Strbuf* unk_124[12];
    UnkStruct_02013A04 * unk_154;
    UnkStruct_02001AF4 * unk_158;
--- a/include/overlay084/struct_ov84_0223BE5C.h
+++ b/include/overlay084/struct_ov84_0223BE5C.h
@@ -4,7 +4,7 @@
 #include "struct_defs/struct_0207CDEC.h"

 typedef struct {
-    UnkStruct_0207CDEC * unk_00;
+    BagItem * unk_00;
    u16 unk_04;
    u16 unk_06;
    u8 unk_08;
--- a/include/overlay087/struct_ov87_021D1640.h
+++ b/include/overlay087/struct_ov87_021D1640.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV87_021D1640_H
 #define POKEPLATINUM_STRUCT_OV87_021D1640_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"

 typedef struct {
    Strbuf* unk_00;
--- a/include/overlay088/ov88_0223E9C4.h
+++ b/include/overlay088/ov88_0223E9C4.h
@@ -3,18 +3,18 @@

 #include "struct_decls/struct_0200112C_decl.h"
 #include "struct_decls/struct_02001AF4_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/struct_0205AA50.h"

 void ov88_0223E9C4(UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, UnkStruct_020279FC * param2);
 void ov88_0223EC04(UnkStruct_0205AA50 * param0);
 void ov88_0223EC78(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, u32 param3, int param4, int param5);
-int ov88_0223ECBC(UnkStruct_0205AA50 * param0, int param1, int param2, UnkStruct_0200B144 * param3, UnkStruct_0200B358 * param4);
+int ov88_0223ECBC(UnkStruct_0205AA50 * param0, int param1, int param2, MessageLoader * param3, UnkStruct_0200B358 * param4);
 u32  ov88_0223ED2C(UnkStruct_02018340 * param0, UnkStruct_02001AF4 ** param1, int * param2);
 void ov88_0223ED80(UnkStruct_0205AA50 * param0);
 UnkStruct_0200112C * ov88_0223ED94(UnkStruct_02013A04 * param0, int param1, UnkStruct_0205AA50 * param2, UnkStruct_02018340 * param3);
--- a/include/overlay092/ov92_021D0D80.h
+++ b/include/overlay092/ov92_021D0D80.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV92_021D0D80_H

 #include "struct_decls/struct_020067E8_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"

 int ov92_021D0D80(UnkStruct_020067E8 * param0, int * param1);
 int ov92_021D0EB8(UnkStruct_020067E8 * param0, int * param1);
--- a/include/overlay094/ov94_0223C610.h
+++ b/include/overlay094/ov94_0223C610.h
@@ -1,14 +1,14 @@
 #ifndef POKEPLATINUM_OV94_0223C610_H
 #define POKEPLATINUM_OV94_0223C610_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay094/struct_ov94_0223FD4C_decl.h"

 int ov94_0223C610(UnkStruct_ov94_0223FD4C * param0, int param1);
 int ov94_0223C6D4(UnkStruct_ov94_0223FD4C * param0, int param1);
 int ov94_0223C6F4(UnkStruct_ov94_0223FD4C * param0, int param1);
-void ov94_0223D030(UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, u16 param3);
+void ov94_0223D030(UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, u16 param3);
 void ov94_0223D068(UnkStruct_ov94_0223FD4C * param0);

 #endif // POKEPLATINUM_OV94_0223C610_H
--- a/include/overlay094/ov94_0223D0C4.h
+++ b/include/overlay094/ov94_0223D0C4.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV94_0223D0C4_H
 #define POKEPLATINUM_OV94_0223D0C4_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/pokemon.h"
@@ -12,8 +12,8 @@
 int ov94_0223D0C4(UnkStruct_ov94_0223FD4C * param0, int param1);
 int ov94_0223D19C(UnkStruct_ov94_0223FD4C * param0, int param1);
 int ov94_0223D1B0(UnkStruct_ov94_0223FD4C * param0, int param1);
-void ov94_0223D910(UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], BoxPokemon * param4, UnkStruct_ov94_0223BA88_sub2 * param5);
-void ov94_0223DA78(UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[], u16 * param2, Pokemon * param3, UnkStruct_0205AA50 param4[]);
+void ov94_0223D910(MessageLoader * param0, MessageLoader * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], BoxPokemon * param4, UnkStruct_ov94_0223BA88_sub2 * param5);
+void ov94_0223DA78(MessageLoader * param0, UnkStruct_0205AA50 param1[], u16 * param2, Pokemon * param3, UnkStruct_0205AA50 param4[]);
 void ov94_0223DB2C(Pokemon * param0);

 #endif // POKEPLATINUM_OV94_0223D0C4_H
--- a/include/overlay094/ov94_022414B8.h
+++ b/include/overlay094/ov94_022414B8.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV94_022414B8_H

 #include "struct_decls/struct_0200112C_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
@@ -17,23 +17,23 @@ int ov94_022414B8(UnkStruct_ov94_0223FD4C * param0, int param1);
 int ov94_02241548(UnkStruct_ov94_0223FD4C * param0, int param1);
 int ov94_02241568(UnkStruct_ov94_0223FD4C * param0, int param1);
 int ov94_02241B80(UnkStruct_ov94_0223BA88_sub3 * param0, int param1);
-void ov94_02242158(UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, u32 param5);
-void ov94_0224218C(UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B144 * param2, int param3, int param4, int param5, u32 param6);
-void ov94_02242204(UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, int param5, u32 param6);
-void ov94_0224226C(UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, u32 param5, int param6, int param7);
-void ov94_022422B8(UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, u32 param5, int param6);
-void ov94_022422D4(UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6);
-void ov94_02242368(UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6);
+void ov94_02242158(UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5);
+void ov94_0224218C(UnkStruct_0205AA50 * param0, MessageLoader * param1, MessageLoader * param2, int param3, int param4, int param5, u32 param6);
+void ov94_02242204(UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, int param3, int param4, int param5, u32 param6);
+void ov94_0224226C(UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5, int param6, int param7);
+void ov94_022422B8(UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5, int param6);
+void ov94_022422D4(MessageLoader * param0, MessageLoader * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6);
+void ov94_02242368(MessageLoader * param0, MessageLoader * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6);
 u16 * ov94_02242524(int param0, int param1, int * param2);
 u8 * ov94_02242548(int param0);
 void ov94_022425A8(UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1);
-UnkStruct_0200112C * ov94_022426A8(UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, UnkStruct_0205AA50 * param2, UnkStruct_0200B144 * param3);
-UnkStruct_0200112C * ov94_022427C0(UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, UnkStruct_0205AA50 * param2, UnkStruct_0200B144 * param3, UnkStruct_0200B144 * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, UnkStruct_02026324 * param6);
-UnkStruct_0200112C * ov94_02242840(UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2);
-UnkStruct_0200112C * ov94_022428B0(UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, int param3);
+UnkStruct_0200112C * ov94_022426A8(UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, UnkStruct_0205AA50 * param2, MessageLoader * param3);
+UnkStruct_0200112C * ov94_022427C0(UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, UnkStruct_0205AA50 * param2, MessageLoader * param3, MessageLoader * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, UnkStruct_02026324 * param6);
+UnkStruct_0200112C * ov94_02242840(UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, MessageLoader * param2);
+UnkStruct_0200112C * ov94_022428B0(UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, MessageLoader * param2, int param3);
 void ov94_02242934(UnkStruct_ov94_0223BA88_sub3 * param0, int param1, int param2);
 int ov94_02242970(int param0, int param1, int param2);
-UnkStruct_0200112C * ov94_022429B4(UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, UnkStruct_0200B144 * param3);
+UnkStruct_0200112C * ov94_022429B4(UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, MessageLoader * param2, MessageLoader * param3);
 void ov94_02242A44(UnkStruct_ov94_0223FD4C * param0, int param1);
 u32 ov94_02242A6C(UnkStruct_0200112C * param0, u16 * param1);
 void ov94_02242AAC(UnkStruct_ov94_02242AAC * param0);
--- a/include/overlay094/ov94_02244950.h
+++ b/include/overlay094/ov94_02244950.h
@@ -1,15 +1,15 @@
 #ifndef POKEPLATINUM_OV94_02244950_H
 #define POKEPLATINUM_OV94_02244950_H

-#include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "message.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay094/struct_ov94_0223FD4C_decl.h"

 int ov94_02244950(UnkStruct_ov94_0223FD4C * param0, int param1);
 int ov94_022449FC(UnkStruct_ov94_0223FD4C * param0, int param1);
 int ov94_02244A2C(UnkStruct_ov94_0223FD4C * param0, int param1);
-void ov94_02245824(UnkStruct_ov94_0223FD4C * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4);
+void ov94_02245824(UnkStruct_ov94_0223FD4C * param0, MessageLoader * param1, int param2, int param3, u16 param4);
 void ov94_022458CC(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5);
 void ov94_02245900(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5);
 void ov94_02245934(UnkStruct_ov94_0223FD4C * param0);
--- a/include/overlay094/struct_ov94_0223FD4C.h
+++ b/include/overlay094/struct_ov94_0223FD4C.h
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_020067E8_decl.h"
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02013A04_decl.h"
@@ -14,7 +14,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_defs/struct_0203E0FC.h"
@@ -89,11 +89,11 @@ typedef struct UnkStruct_ov94_0223FD4C_t {
    UnkStruct_ov94_0223BA88_sub3 unk_B80;
    int unk_B88;
    UnkStruct_0200B358 * unk_B8C;
-    UnkStruct_0200B144 * unk_B90;
-    UnkStruct_0200B144 * unk_B94;
-    UnkStruct_0200B144 * unk_B98;
-    UnkStruct_0200B144 * unk_B9C;
-    UnkStruct_0200B144 * unk_BA0;
+    MessageLoader * unk_B90;
+    MessageLoader * unk_B94;
+    MessageLoader * unk_B98;
+    MessageLoader * unk_B9C;
+    MessageLoader * unk_BA0;
    Strbuf* unk_BA4;
    Strbuf* unk_BA8;
    Strbuf* unk_BAC;
--- a/include/overlay094/struct_ov94_0223FD4C_sub3.h
+++ b/include/overlay094/struct_ov94_0223FD4C_sub3.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV94_0223FD4C_SUB3_H
 #define POKEPLATINUM_STRUCT_OV94_0223FD4C_SUB3_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"

 typedef struct {
    Strbuf **unk_00;
--- a/include/overlay095/ov95_02246C20.h
+++ b/include/overlay095/ov95_02246C20.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV95_02246C20_H

 #include "struct_decls/struct_020067E8_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
@@ -30,7 +30,7 @@ void ov95_022475C4(UnkStruct_ov19_021DA864 * param0, UnkStruct_ov95_02247568 * p
 UnkStruct_02022550 * ov95_022475E4(UnkStruct_ov95_02247628 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5);
 UnkStruct_02018340 * ov95_02247628(UnkStruct_ov95_02247628 * param0);
 UnkStruct_0200B358 * ov95_0224762C(UnkStruct_ov95_02247628 * param0);
-UnkStruct_0200B144 * ov95_02247630(UnkStruct_ov95_02247628 * param0);
+MessageLoader * ov95_02247630(UnkStruct_ov95_02247628 * param0);
 const BoxPokemon * ov95_02247634(UnkStruct_ov95_02247628 * param0);
 const BoxPokemon * ov95_0224763C(UnkStruct_ov95_02247628 * param0);
 u32 ov95_02247644(UnkStruct_ov95_02247628 * param0);
--- a/include/overlay096/ov96_0223BCE0.h
+++ b/include/overlay096/ov96_0223BCE0.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV96_0223BCE0_H
 #define POKEPLATINUM_OV96_0223BCE0_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay096/struct_ov96_0223BF40_decl.h"

--- a/include/overlay096/struct_ov96_0223BF40_t.h
+++ b/include/overlay096/struct_ov96_0223BF40_t.h
@@ -4,13 +4,13 @@
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0206BC70.h"
 #include "struct_defs/box_pokemon.h"
@@ -51,9 +51,9 @@ struct UnkStruct_ov96_0223BF40_t {
    int unk_BC4;
    int unk_BC8;
    UnkStruct_0200B358 * unk_BCC;
-    UnkStruct_0200B144 * unk_BD0;
-    UnkStruct_0200B144 * unk_BD4;
-    UnkStruct_0200B144 * unk_BD8;
+    MessageLoader * unk_BD0;
+    MessageLoader * unk_BD4;
+    MessageLoader * unk_BD8;
    Strbuf* unk_BDC;
    Strbuf* unk_BE0;
    Strbuf* unk_BE4;
--- a/include/overlay097/struct_ov97_0222D04C.h
+++ b/include/overlay097/struct_ov97_0222D04C.h
@@ -4,14 +4,14 @@
 #include "struct_decls/struct_0200112C_decl.h"
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_decls/struct_021C0794_decl.h"
@@ -26,7 +26,7 @@ typedef struct {
    UnkStruct_021C0794 * unk_04;
    UnkStruct_020279FC * unk_08;
    UnkStruct_0200B358 * unk_0C;
-    UnkStruct_0200B144 * unk_10;
+    MessageLoader * unk_10;
    Strbuf* unk_14;
    UnkStruct_0205AA50 unk_18;
    UnkStruct_0205AA50 unk_28[3];
--- a/include/overlay098/ov98_022499C8.h
+++ b/include/overlay098/ov98_022499C8.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV98_022499C8_H
 #define POKEPLATINUM_OV98_022499C8_H

-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"

 void ov98_022499C8(Strbuf *param0, char * param1, int param2);
 void ov98_02249A80(void);
--- a/include/overlay098/struct_ov98_02246E88.h
+++ b/include/overlay098/struct_ov98_02246E88.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV98_02246E88_H

 #include "struct_decls/struct_020067E8_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay096/struct_ov96_0223B574.h"
--- a/include/overlay099/ov99_021D3E78.h
+++ b/include/overlay099/ov99_021D3E78.h
@@ -1,11 +1,11 @@
 #ifndef POKEPLATINUM_OV99_021D3E78_H
 #define POKEPLATINUM_OV99_021D3E78_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "overlay099/struct_ov99_021D3E78_decl.h"

-UnkStruct_ov99_021D3E78 * ov99_021D3E78(UnkStruct_02018340 * param0, int param1, int param2, int param3, UnkStruct_0200B144 * param4);
+UnkStruct_ov99_021D3E78 * ov99_021D3E78(UnkStruct_02018340 * param0, int param1, int param2, int param3, MessageLoader * param4);
 void ov99_021D3F38(UnkStruct_ov99_021D3E78 * param0);
 BOOL ov99_021D3F6C(UnkStruct_ov99_021D3E78 * param0, int param1);
 int ov99_021D4130(void);
--- a/include/overlay099/struct_ov99_021D2CB0.h
+++ b/include/overlay099/struct_ov99_021D2CB0.h
@@ -3,7 +3,7 @@

 #include "struct_decls/struct_02002F38_decl.h"
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
@@ -29,7 +29,7 @@ typedef struct {
    UnkStruct_0201CD38 * unk_14;
    UnkStruct_0200C6E4 * unk_18;
    UnkStruct_0200C704 * unk_1C;
-    UnkStruct_0200B144 * unk_20;
+    MessageLoader * unk_20;
    UnkStruct_0205AA50 * unk_24;
    UnkStruct_020203AC * unk_28;
    UnkStruct_020170F4 unk_2C[4];
--- a/include/overlay100/struct_ov100_021D46C8.h
+++ b/include/overlay100/struct_ov100_021D46C8.h
@@ -3,7 +3,7 @@

 #include "struct_decls/struct_02002F38_decl.h"
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
@@ -27,7 +27,7 @@ typedef struct {
    UnkStruct_0207C690 * unk_14;
    UnkStruct_020203AC * unk_18;
    NNSFndAllocator unk_1C;
-    UnkStruct_0200B144 * unk_2C;
+    MessageLoader * unk_2C;
    UnkStruct_0205AA50 unk_30;
    int unk_40;
    VecFx32 unk_44;
--- a/include/overlay101/struct_ov101_021D148C.h
+++ b/include/overlay101/struct_ov101_021D148C.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV101_021D148C_H
 #define POKEPLATINUM_STRUCT_OV101_021D148C_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_defs/struct_0205AA50.h"

 typedef struct {
-    UnkStruct_0200B144 * unk_00;
+    MessageLoader * unk_00;
    UnkStruct_0200B358 * unk_04;
    UnkStruct_0205AA50 unk_08[1];
    void * unk_18;
--- a/include/overlay104/ov104_02231F74.h
+++ b/include/overlay104/ov104_02231F74.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV104_02231F74_H
 #define POKEPLATINUM_OV104_02231F74_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
@@ -14,13 +14,13 @@
 #include "overlay104/struct_ov104_02232B5C_decl.h"
 #include "overlay104/struct_ov104_0223C4CC_decl.h"

-void ov104_02231F74(UnkStruct_ov104_022320B4 * param0, const UnkStruct_0200B144 * param1, u16 param2, u8 param3, UnkStruct_ov104_0222FEDC * param4);
+void ov104_02231F74(UnkStruct_ov104_022320B4 * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov104_0222FEDC * param4);
 void ov104_02232088(UnkStruct_ov104_022320B4 * param0);
 void ov104_022320B4(UnkStruct_ov104_022320B4 * param0, u8 param1, u16 param2, u16 param3, u16 param4, s16 param5, u8 param6);
-UnkStruct_ov104_02232B5C * ov104_02232258(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0200B144 * param7);
+UnkStruct_ov104_02232B5C * ov104_02232258(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, MessageLoader * param7);
 void ov104_022322A8(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3);
 void ov104_022322B0(UnkStruct_ov104_02232B5C * param0);
-UnkStruct_ov104_02232B5C * ov104_022325FC(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0200B144 * param7);
+UnkStruct_ov104_02232B5C * ov104_022325FC(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, MessageLoader * param7);
 void ov104_0223261C(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3);
 void ov104_02232624(UnkStruct_ov104_02232B5C * param0);
 void ov104_02232B5C(UnkStruct_ov104_02232B5C * param0);
--- a/include/overlay104/struct_ov104_0222E930_t.h
+++ b/include/overlay104/struct_ov104_0222E930_t.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV104_0222E930_T_H
 #define POKEPLATINUM_STRUCT_OV104_0222E930_T_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "overlay104/funcptr_ov104_0222E930.h"
 #include "overlay104/funcptr_ov104_0222E974.h"
 #include "overlay104/struct_ov104_022320B4_decl.h"
@@ -17,7 +17,7 @@ struct UnkStruct_ov104_0222E930_t {
    const UnkFuncPtr_ov104_0222E930 * unk_70;
    u32 unk_74;
    u16 unk_78[4];
-    UnkStruct_0200B144 * unk_80;
+    MessageLoader * unk_80;
    u8 * unk_84;
    UnkFuncPtr_ov104_0222E974 unk_88;
    u8 unk_8C;
--- a/include/overlay104/struct_ov104_022320B4_t.h
+++ b/include/overlay104/struct_ov104_022320B4_t.h
@@ -2,9 +2,9 @@
 #define POKEPLATINUM_STRUCT_OV104_022320B4_T_H

 #include "struct_decls/struct_02001AF4_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_decls/struct_0209B75C_decl.h"
 #include "overlay104/struct_ov104_0222E8C8.h"
@@ -17,7 +17,7 @@ struct UnkStruct_ov104_022320B4_t {
    UnkStruct_ov104_0222E8C8 unk_24;
    int unk_34;
    u8 unk_38;
-    UnkStruct_0200B144 * unk_3C;
+    MessageLoader * unk_3C;
    u8 * unk_40;
    UnkStruct_0200B358 * unk_44;
    Strbuf* unk_48;
--- a/include/overlay109/struct_ov109_021D5140.h
+++ b/include/overlay109/struct_ov109_021D5140.h
@@ -4,14 +4,14 @@
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0209BDF8.h"
@@ -34,7 +34,7 @@ typedef struct UnkStruct_ov109_021D5140_t {
    UnkStruct_ov109_021D5140_sub1 unk_1C;
    UnkStruct_0201CD38 * unk_30;
    UnkStruct_0200B358 * unk_34;
-    UnkStruct_0200B144 * unk_38;
+    MessageLoader * unk_38;
    Strbuf* unk_3C[5];
    Strbuf* unk_50;
    Strbuf* unk_54;
--- a/include/overlay113/ov113_02260620.h
+++ b/include/overlay113/ov113_02260620.h
@@ -1,13 +1,13 @@
 #ifndef POKEPLATINUM_OV113_02260620_H
 #define POKEPLATINUM_OV113_02260620_H

-#include "struct_decls/struct_0200B144_decl.h"
+#include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay066/struct_ov66_0222DFF8_decl.h"
 #include "overlay113/struct_ov113_02260818.h"

-void ov113_02260620(UnkStruct_0200B144 * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], UnkStruct_ov66_0222DFF8 * param3, s32 param4);
+void ov113_02260620(MessageLoader * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], UnkStruct_ov66_0222DFF8 * param3, s32 param4);
 void ov113_02260714(UnkStruct_0205AA50 param0[], u32 param1);
 u16 ov113_0226072C(int param0, u32 param1);
 int ov113_02260748(UnkStruct_ov113_02260818 * param0, int param1);
--- a/include/overlay117/ov117_02263AF0.h
+++ b/include/overlay117/ov117_02263AF0.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay117/struct_ov117_02261280_decl.h"
 #include "overlay117/struct_ov117_02263DAC.h"
 #include "overlay117/struct_ov117_02264E84.h"
--- a/Show More
+++ b/Show More